Fix sdk codegen Makefile

nginx · Feb 29, 2024 · 56cd5a9 · 56cd5a9
1 parent c56cc90
commit 56cd5a9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -114,6 +114,7 @@ build: ## Build agent executable
 	GOWORK=off CGO_ENABLED=0 GOARCH=${OSARCH} ${GOBUILD} -pgo=auto -ldflags=${LDFLAGS} -o ./build/nginx-agent 
 
 deps: ## Update dependencies in vendor folders
+	cd sdk && make generate
 	for dir in ${VENDOR_LOCATIONS}; do \
 		(cd "$$dir" && echo "Running vendor commands on $$dir" && go mod tidy && GOWORK=off go mod vendor && cd "$$OLDPWD" || exit) \
 	done
@@ -129,7 +130,7 @@ lint: ## Run linter
 	cd sdk && make lint
 
 format: ## Format code
-	GOWORK=off $(GORUN) ${GOFUMPT} -l -w .
+	$(GORUN) ${GOFUMPT} -l -w .
 	buf format -w ./sdk/proto/
 
 generate-swagger: ## Generates swagger.json from source code

diff --git a/sdk/Makefile b/sdk/Makefile
@@ -48,7 +48,7 @@ Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types:\
 		proto/*.proto; \
 	grep -v '^swagger:' ./../docs/proto/proto.md > ./../docs/proto/tmp-proto.md && mv ./../docs/proto/tmp-proto.md ./../docs/proto/proto.md
 
-	go generate ./sdk/...
+	go generate ./...
 
 all-test: unit-test ## Run all tests
 

diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/Makefile b/test/integration/vendor/github.com/nginx/agent/sdk/v2/Makefile
diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/Makefile b/test/performance/vendor/github.com/nginx/agent/sdk/v2/Makefile
diff --git a/vendor/github.com/nginx/agent/sdk/v2/Makefile b/vendor/github.com/nginx/agent/sdk/v2/Makefile