wip

Makefile

@@ -156,18 +156,6 @@ endif
 # intentional, empty line
 	$(info )
 
-
-# To update openapi.yaml:
-# curl https://crowdsecurity.github.io/cti-api/v2/swagger.yaml > ./pkg/cti/openapi.yaml
-
-.PHONY: gen-cti
-gen-cti:  ## Generate CTI client code from the specs
-	@which oapi-codegen > /dev/null 2>&1 || (echo "oapi-codegen is not installed. You can install it with 'go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@latest'" && exit 1)
-	@echo "Generating Go client from OpenAPI spec..."
-	oapi-codegen -package cti -generate client -o ./pkg/cti/client.go ./pkg/cti/openapi.yaml
-	oapi-codegen -package cti -generate types -o ./pkg/cti/types.go ./pkg/cti/openapi.yaml
-	@echo "Client generation complete."
-
 .PHONY: all
 all: clean test build  ## Clean, test and build (requires localstack)
 
@@ -223,6 +211,8 @@ crowdsec: goversion  ## Build crowdsec
 generate:  ## Generate code for the database and APIs
 	$(GO) generate ./pkg/database/ent
 	$(GO) generate ./pkg/models
+	$(GO) generate ./pkg/cti
+	@echo "Code generation complete."
 
 .PHONY: testclean
 testclean: bats-clean  ## Remove test artifacts

pkg/cti/generate.go

@@ -0,0 +1,8 @@
+package cti
+
+// To update openapi.yaml:
+// curl https://crowdsecurity.github.io/cti-api/v2/swagger.yaml > ./pkg/cti/openapi.yaml
+
+//go:generate go run -mod=mod github.com/deepmap/oapi-codegen/v2/cmd/[email protected] -package=cti -generate client -o ./client.go ./openapi.yaml
+//go:generate go run -mod=mod github.com/deepmap/oapi-codegen/v2/cmd/[email protected] -package=cti -generate types -o ./types.go ./openapi.yaml
+

pkg/models/generate.go

@@ -1,4 +1,4 @@
 package models
 
-//go:generate go run -mod=mod github.com/go-swagger/go-swagger/cmd/[email protected] generate model --spec=./localapi_swagger.yaml --target=../
+//go:generate go run -mod=mod github.com/go-swagger/go-swagger/cmd/[email protected] generate model --spec=./localapi_swagger.yaml --quiet --target=../