CI: "make generate" target; use ent 0.12.5 (crowdsecurity#2871)

* CI: "make generate" target; pin tool versions * use ent 0.12.5 * fix make help * fix model generation target; re-run swagger
CVELab · Mar 7, 2024 · 8108e41 · 8108e41
1 parent 5731491
commit 8108e41
Showing 21 changed files with 367 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -202,6 +202,10 @@ cscli: goversion  ## Build cscli
 crowdsec: goversion  ## Build crowdsec
 	@$(MAKE) -C $(CROWDSEC_FOLDER) build $(MAKE_FLAGS)
 
+.PHONY: generate
+generate:  ## Generate code for the database and APIs
+	$(GO) generate ./pkg/database/ent
+	$(GO) generate ./pkg/models
 
 .PHONY: testclean
 testclean: bats-clean  ## Remove test artifacts

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ go 1.21
 // toolchain go1.21.3
 
 require (
-	entgo.io/ent v0.12.4
+	entgo.io/ent v0.12.5
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Masterminds/sprig/v3 v3.2.3

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ ariga.io/atlas v0.14.1-0.20230918065911-83ad451a4935 h1:JnYs/y8RJ3+MiIUp+3RgyyeO
 ariga.io/atlas v0.14.1-0.20230918065911-83ad451a4935/go.mod h1:isZrlzJ5cpoCoKFoY9knZug7Lq4pP1cm8g3XciLZ0Pw=
 bitbucket.org/creachadair/stringset v0.0.9 h1:L4vld9nzPt90UZNrXjNelTshD74ps4P5NGs3Iq6yN3o=
 bitbucket.org/creachadair/stringset v0.0.9/go.mod h1:t+4WcQ4+PXTa8aQdNKe40ZP6iwesoMFWAxPGd3UGjyY=
-entgo.io/ent v0.12.4 h1:LddPnAyxls/O7DTXZvUGDj0NZIdGSu317+aoNLJWbD8=
-entgo.io/ent v0.12.4/go.mod h1:Y3JVAjtlIk8xVZYSn3t3mf8xlZIn5SAOXZQxD6kKI+Q=
+entgo.io/ent v0.12.5 h1:KREM5E4CSoej4zeGa88Ou/gfturAnpUv0mzAjch1sj4=
+entgo.io/ent v0.12.5/go.mod h1:Y3JVAjtlIk8xVZYSn3t3mf8xlZIn5SAOXZQxD6kKI+Q=
 github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
 github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
@@ -540,8 +540,6 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec=

diff --git a/pkg/database/ent/alert_update.go b/pkg/database/ent/alert_update.go
diff --git a/pkg/database/ent/bouncer_update.go b/pkg/database/ent/bouncer_update.go
diff --git a/pkg/database/ent/client.go b/pkg/database/ent/client.go
diff --git a/pkg/database/ent/configitem_update.go b/pkg/database/ent/configitem_update.go
diff --git a/pkg/database/ent/decision_update.go b/pkg/database/ent/decision_update.go
diff --git a/pkg/database/ent/event_update.go b/pkg/database/ent/event_update.go
diff --git a/pkg/database/ent/generate.go b/pkg/database/ent/generate.go
@@ -1,4 +1,4 @@
 package ent
 
-//go:generate go run -mod=mod entgo.io/ent/cmd/ent generate ./schema
+//go:generate go run -mod=mod entgo.io/ent/cmd/ent@v0.12.5 generate ./schema
 
diff --git a/pkg/database/ent/lock_update.go b/pkg/database/ent/lock_update.go
diff --git a/pkg/database/ent/machine_update.go b/pkg/database/ent/machine_update.go
diff --git a/pkg/database/ent/meta_update.go b/pkg/database/ent/meta_update.go
diff --git a/pkg/database/ent/runtime/runtime.go b/pkg/database/ent/runtime/runtime.go
diff --git a/pkg/models/add_alerts_request.go b/pkg/models/add_alerts_request.go
diff --git a/pkg/models/alert.go b/pkg/models/alert.go
diff --git a/pkg/models/generate.go b/pkg/models/generate.go
@@ -0,0 +1,4 @@
+package models
+
+//go:generate go run -mod=mod github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5 generate model --spec=./localapi_swagger.yaml --target=../
+
diff --git a/pkg/models/get_alerts_response.go b/pkg/models/get_alerts_response.go
diff --git a/pkg/models/get_decisions_response.go b/pkg/models/get_decisions_response.go
diff --git a/pkg/models/meta.go b/pkg/models/meta.go
diff --git a/pkg/models/metrics.go b/pkg/models/metrics.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		package models

		//go:generate go run -mod=mod github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5 generate model --spec=./localapi_swagger.yaml --target=../