Updated buf action and use go to execute buf cli

treeverse · Oct 23, 2023 · 1cc816a · 1cc816a
1 parent 53be3f1
commit 1cc816a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/docker-publish-exp-image.yaml b/.github/workflows/docker-publish-exp-image.yaml
@@ -43,7 +43,7 @@ jobs:
           go-version: "1.20.6"
         id: go
 
-      - uses: bufbuild/buf-setup-action@v1.27.0
+      - uses: bufbuild/buf-setup-action@v1.27.1
 
       - name: Extract version
         shell: bash

diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -33,7 +33,7 @@ jobs:
           go-version: "1.20.6"
         id: go
 
-      - uses: bufbuild/buf-setup-action@v1.27.0
+      - uses: bufbuild/buf-setup-action@v1.27.1
 
       - name: Extract version
         shell: bash

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -18,7 +18,7 @@ jobs:
         with:
           go-version: "1.20.6"
         id: go
-      - uses: bufbuild/buf-setup-action@v1.27.0
+      - uses: bufbuild/buf-setup-action@v1.27.1
       - name: Generate code
         env:
           NODE_OPTIONS: "--max-old-space-size=4096"

diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ OPENAPI_GENERATOR_IMAGE=openapitools/openapi-generator-cli:v7.0.0
 OPENAPI_GENERATOR=$(DOCKER) run --user $(UID_GID) --rm -v $(shell pwd):/mnt $(OPENAPI_GENERATOR_IMAGE)
 
 GOLANGCI_LINT_VERSION=v1.53.3
+BUF_CLI_VERSION=v1.27.1
 
 ifndef PACKAGE_VERSION
 	PACKAGE_VERSION=0.1.0-SNAPSHOT
@@ -104,6 +105,7 @@ gen-metastore: ## Run Metastore Code generation
 
 tools: ## Install tools
 	$(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	$(GOCMD) install github.com/bufbuild/buf/cmd/buf@$(BUF_CLI_VERSION)
 
 client-python: sdk-python-legacy sdk-python
 
@@ -179,10 +181,7 @@ package: package-python
 
 .PHONY: gen-api
 gen-api: docs/assets/js/swagger.yml ## Run the swagger code generator
-	rm -f pkg/api/lakefs.gen.go
-	$(GOGENERATE) \
-		./pkg/api/apigen \
-		./pkg/auth
+	$(GOGENERATE) ./pkg/api/apigen ./pkg/auth
 
 .PHONY: gen-code
 gen-code: gen-api ## Run the generator for inline commands
@@ -296,7 +295,7 @@ gen-ui: $(UI_DIR)/node_modules  ## Build UI web app
 	cd $(UI_DIR) && $(NPM) run build
 
 gen-proto: ## Build Protocol Buffers (proto) files using Buf CLI
-	buf generate
+	go run github.com/bufbuild/buf/cmd/buf@$(BUF_CLI_VERSION) generate
 
 publish-scala: ## sbt publish spark client jars to nexus and s3 bucket
 	cd clients/spark && sbt assembly && sbt s3Upload && sbt "project root" publishSigned

diff --git a/pkg/plugins/diff/table_diff.pb.go b/pkg/plugins/diff/table_diff.pb.go