Skip to content

Commit 2905a10

Browse files
authored
Merge pull request #109 from smallstep/herman/rename-module
Rename from `go.step.sm/linkedca` to `github.com/smallstep/linkedca`
2 parents ab2201c + b25ec78 commit 2905a10

17 files changed

+572
-608
lines changed

Makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ SRC=$(shell find . -type f -name '*.go')
44

55
# protoc-gen-go constraints
66
GEN_GO_BIN ?= protoc-gen-go
7-
GEN_GO_MIN_VERSION ?= 1.31.0
7+
GEN_GO_MIN_VERSION ?= 1.36.1
88
GEN_GO_VERSION ?= $(shell $(GEN_GO_BIN) --version | awk -F ' v' '{print $$NF}')
99

1010
# protoc-gen-go-grpc constraints
1111
GEN_GRPC_BIN ?= protoc-gen-go-grpc
12-
GEN_GRPC_MIN_VERSION ?= 1.3.0
12+
GEN_GRPC_MIN_VERSION ?= 1.5.1
1313
GEN_GRPC_VERSION ?= $(shell $(GEN_GRPC_BIN) --version | awk -F ' ' '{print $$NF}')
1414

1515
all: lint generate test
@@ -32,6 +32,8 @@ bootstra%:
3232
$Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.49.0
3333
$Q go install golang.org/x/vuln/cmd/govulncheck@latest
3434
$Q go install gotest.tools/[email protected]
35+
$Q go install -mod=readonly google.golang.org/protobuf/cmd/protoc-gen-go
36+
$Q go install -mod=readonly google.golang.org/grpc/cmd/protoc-gen-go-grpc
3537

3638
.PHONY: bootstrap
3739

@@ -73,12 +75,13 @@ generate: check-gen-go-version check-gen-grpc-version
7375
-delete
7476

7577
@# generate the corresponding protobufs & gRPC code files
76-
find spec -type f -name "*.proto" -print0 | xargs -0 protoc \
78+
$Q protoc \
7779
--proto_path=spec \
78-
--go_opt=paths=source_relative \
79-
--go_out=.. \
80-
--go-grpc_opt=paths=source_relative \
81-
--go-grpc_out=..
80+
--go_opt=module=github.com/smallstep/linkedca \
81+
--go_out=. \
82+
--go-grpc_opt=module=github.com/smallstep/linkedca \
83+
--go-grpc_out=. \
84+
$(shell find spec -type f -name "*.proto")
8285

8386
.PHONY: generate
8487

admin.pb.go

Lines changed: 11 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.pb.go

Lines changed: 111 additions & 123 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eab.pb.go

Lines changed: 15 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module go.step.sm/linkedca
1+
module github.com/smallstep/linkedca
22

33
go 1.22
44

@@ -7,6 +7,7 @@ toolchain go1.22.5
77
require (
88
github.com/stretchr/testify v1.10.0
99
google.golang.org/grpc v1.69.2
10+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
1011
google.golang.org/protobuf v1.36.1
1112
)
1213

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:
3434
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
3535
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
3636
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
37+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=
38+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=
3739
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
3840
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
3941
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

0 commit comments

Comments
 (0)