bumped linting

nginx · Oct 4, 2024 · 39680ae · 39680ae
1 parent 52e7f17
commit 39680ae
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -131,7 +131,7 @@ no-local-changes:
 lint: ## Run linter
 	GOWORK=off go vet ./...
 	GOWORK=off $(GORUN) $(GOLANGCI_LINT) run -c ./scripts/.golangci.yml
-	cd sdk && make lint
+	cd sdk && make lint GOLANGCI_LINT=$(GOLANGCI_LINT)
 
 format: ## Format code
 	$(GORUN) ${GOFUMPT} -l -w .

diff --git a/sdk/Makefile b/sdk/Makefile
@@ -5,7 +5,7 @@ clean: ## Remove all .pb.go files
 	find . -name "*.pb.go" -not -path "*/vendor/*" -exec rm -f {} \;
 
 lint: ## Run linter
-	GOWORK=off go run github.com/golangci/golangci-lint/cmd/[email protected] run -c ../scripts/.golangci.yml
+	GOWORK=off go run $(GOLANGCI_LINT) run -c ../scripts/.golangci.yml
 
 generate: clean ## Generate .pb.go files
 	for packageName in "common" "events"; do \

diff --git a/sdk/client/commander.go b/sdk/client/commander.go
@@ -317,7 +317,7 @@ func (c *commander) Upload(ctx context.Context, cfg *proto.NginxConfig, messageI
 		}
 
 		if status.Status != proto.UploadStatus_OK {
-			return fmt.Errorf(status.Reason)
+			return fmt.Error(status.Reason)
 		}
 
 		return nil

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/integration/vendor/github.com/nginx/agent/sdk/v2/client/commander.go b/test/integration/vendor/github.com/nginx/agent/sdk/v2/client/commander.go
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/test/performance/vendor/github.com/nginx/agent/sdk/v2/client/commander.go b/test/performance/vendor/github.com/nginx/agent/sdk/v2/client/commander.go
diff --git a/vendor/github.com/nginx/agent/sdk/v2/Makefile b/vendor/github.com/nginx/agent/sdk/v2/Makefile
diff --git a/vendor/github.com/nginx/agent/sdk/v2/client/commander.go b/vendor/github.com/nginx/agent/sdk/v2/client/commander.go