Merge pull request #109 from smallstep/herman/rename-module

Rename from `go.step.sm/linkedca` to `github.com/smallstep/linkedca`
smallstep · Jan 3, 2025 · 2905a10 · 2905a10
2 parents ab2201c + b25ec78
commit 2905a10
Show file tree

Hide file tree

Showing 17 changed files with 572 additions and 608 deletions.
diff --git a/Makefile b/Makefile
@@ -4,12 +4,12 @@ SRC=$(shell find . -type f -name '*.go')
 
 # protoc-gen-go constraints
 GEN_GO_BIN ?= protoc-gen-go
-GEN_GO_MIN_VERSION ?= 1.31.0
+GEN_GO_MIN_VERSION ?= 1.36.1
 GEN_GO_VERSION ?= $(shell $(GEN_GO_BIN) --version | awk -F ' v' '{print $$NF}')
 
 # protoc-gen-go-grpc constraints
 GEN_GRPC_BIN ?= protoc-gen-go-grpc
-GEN_GRPC_MIN_VERSION ?= 1.3.0
+GEN_GRPC_MIN_VERSION ?= 1.5.1
 GEN_GRPC_VERSION ?= $(shell $(GEN_GRPC_BIN) --version | awk -F ' ' '{print $$NF}')
 
 all: lint generate test
@@ -32,6 +32,8 @@ bootstra%:
 	$Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.49.0
 	$Q go install golang.org/x/vuln/cmd/govulncheck@latest
 	$Q go install gotest.tools/gotestsum@v1.8.1
+	$Q go install -mod=readonly google.golang.org/protobuf/cmd/protoc-gen-go
+	$Q go install -mod=readonly google.golang.org/grpc/cmd/protoc-gen-go-grpc
 
 .PHONY: bootstrap
 
@@ -73,12 +75,13 @@ generate: check-gen-go-version check-gen-grpc-version
 		-delete
 
 	@# generate the corresponding protobufs & gRPC code files
-	find spec -type f -name "*.proto" -print0 | xargs -0 protoc \
+	$Q protoc \
 		--proto_path=spec \
-		--go_opt=paths=source_relative \
-		--go_out=.. \
-		--go-grpc_opt=paths=source_relative \
-		--go-grpc_out=..
+		--go_opt=module=github.com/smallstep/linkedca \
+		--go_out=. \
+		--go-grpc_opt=module=github.com/smallstep/linkedca \
+		--go-grpc_out=. \
+		$(shell find spec -type f -name "*.proto")	
 
 .PHONY: generate
 

diff --git a/admin.pb.go b/admin.pb.go
diff --git a/config.pb.go b/config.pb.go
diff --git a/eab.pb.go b/eab.pb.go
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module go.step.sm/linkedca
+module github.com/smallstep/linkedca
 
 go 1.22
 
@@ -7,6 +7,7 @@ toolchain go1.22.5
 require (
 	github.com/stretchr/testify v1.10.0
 	google.golang.org/grpc v1.69.2
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
 	google.golang.org/protobuf v1.36.1
 )
 

diff --git a/go.sum b/go.sum
@@ -34,6 +34,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
 google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=
 google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
 google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=