@@ -30,7 +30,8 @@ $(LOCALBIN):
3030GOLANGCI_LINT ?= $(LOCALBIN ) /golangci-lint
3131KO ?= $(LOCALBIN ) /ko
3232PROTOC ?= $(LOCALBIN ) /protoc
33- PROTOC_GO ?= $(LOCALBIN ) /protoc-gen-go-grpc
33+ PROTOC_GEN_GO ?= $(LOCALBIN ) /protoc-gen-go
34+ PROTOC_GEN_GO_GRCP ?= $(LOCALBIN ) /protoc-gen-go-grpc
3435
3536# OCI variables
3637OCI_REGISTRY ?= ghcr.io
@@ -47,7 +48,8 @@ PROTO_DIR = pkg/proto
4748PROTO_FILES = $(PROTO_DIR ) /security.proto
4849PROTO_GEN = $(PROTO_DIR ) /security.pb.go $(PROTO_DIR ) /security_grpc.pb.go
4950PROTOC_VERSION := 28.2
50- PROTOC_GO_VERSION := 1.5.1
51+ PROTOC_GEN_GO_VERSION := 1.27.1
52+ PROTOC_GEN_GO_GRCP_VERSION := 1.5.1
5153
5254# Default target - show help
5355.DEFAULT_GOAL := help
@@ -61,10 +63,15 @@ ko: $(KO) ## Download ko locally if necessary.
6163$(KO ) : $(LOCALBIN )
6264 test -s $(LOCALBIN ) /ko || GOBIN=$(LOCALBIN ) CGO_ENABLED=0 go install -ldflags=" -s -w" github.com/google/ko@v0.18.0
6365
64- .PHONY : protoc_go
65- protoc_go : $(PROTOC_GO ) # # Download protoc-gen-go-grpc locally if necessary.
66- $(PROTOC_GO ) : $(LOCALBIN )
67- test -s $(LOCALBIN ) /protoc-gen-go-grpc || GOBIN=$(LOCALBIN ) CGO_ENABLED=0 go install -ldflags=" -s -w" google.golang.org/grpc/cmd/protoc-gen-go-grpc@v$(PROTOC_GO_VERSION )
66+ .PHONY : protoc_gen_go_grpc
67+ protoc_gen_go_grpc : $(PROTOC_GEN_GO_GRCP ) # # Download protoc-gen-go-grpc locally if necessary.
68+ $(PROTOC_GEN_GO_GRCP ) : $(LOCALBIN )
69+ test -s $(LOCALBIN ) /protoc-gen-go-grpc || GOBIN=$(LOCALBIN ) CGO_ENABLED=0 go install -ldflags=" -s -w" google.golang.org/grpc/cmd/protoc-gen-go-grpc@v$(PROTOC_GEN_GO_GRCP_VERSION )
70+
71+ .PHONY : protoc_gen_go
72+ protoc_gen_go : $(PROTOC_GEN_GO ) # # Download protoc-gen-go locally if necessary.
73+ $(PROTOC_GEN_GO ) : $(LOCALBIN )
74+ test -s $(LOCALBIN ) /protoc-gen-go || GOBIN=$(LOCALBIN ) CGO_ENABLED=0 go install -ldflags=" -s -w" google.golang.org/protobuf/cmd/protoc-gen-go@v$(PROTOC_GEN_GO_VERSION )
6875
6976.PHONY : protoc
7077protoc : $(PROTOC ) # # Download protoc locally if necessary.
@@ -88,7 +95,7 @@ help: ## Display this help message
8895
8996# #@ Development
9097
91- proto : protoc protoc_go # # Generate protobuf code
98+ proto : protoc protoc_gen_go protoc_gen_go_grpc # # Generate protobuf code
9299 PATH=$$ PATH:$(LOCALBIN ) $(PROTOC ) --go_out=. --go_opt=paths=source_relative \
93100 --go-grpc_out=. --go-grpc_opt=paths=source_relative \
94101 $(PROTO_FILES )
@@ -119,7 +126,7 @@ KO_PUSH ?= false
119126
120127oci-build : $(KO ) # # Build OCI artefact
121128 KOCACHE=/tmp/ko-cache KO_DOCKER_REPO=${OCI_REGISTRY} /${OCI_REPO} \
122- $(KO ) build . --bare --tags=$(VERSION ) --local=$(KO_LOCAL ) --push=$(KO_PUSH )
129+ $(KO ) build . --bare --sbom=none -- tags=$(VERSION ) --local=$(KO_LOCAL ) --push=$(KO_PUSH )
123130
124131oci-run : oci-build # # Run OCI container locally (for testing)
125132 @docker run --rm -it \
0 commit comments