Skip to content

Commit 9ec53f0

Browse files
authored
chore: Fix protobuf CI (#570)
* update protobuf CI * example failure * adjust compile script * add name of plugin with absolute path * plugin name * fix compile script * readjust proto * remove go work file and just add the protobuf command to `tools` * remove go work refs * example failure * revert
1 parent 0774c2f commit 9ec53f0

File tree

9 files changed

+203
-2058
lines changed

9 files changed

+203
-2058
lines changed

.github/workflows/ci-go.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
with:
4242
terraform_version: ${{ matrix.terraform }}
4343
terraform_wrapper: false
44-
- run: go work use ../terraform-provider-corner
4544
- run: go mod edit -replace github.com/hashicorp/terraform-plugin-go=../
4645
- run: go mod tidy
4746
- run: go test -v ./internal/protocolprovider
@@ -75,7 +74,6 @@ jobs:
7574
with:
7675
terraform_version: ${{ matrix.terraform }}
7776
terraform_wrapper: false
78-
- run: go work use ../terraform-provider-corner
7977
- run: go mod edit -replace github.com/hashicorp/terraform-plugin-go=../
8078
- run: go mod tidy
8179
- run: go test -v ./internal/framework6provider

.github/workflows/ci-protobuf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ jobs:
2727
- run: make protobuf
2828
- name: git diff
2929
run: |
30-
git diff --compact-summary --exit-code || \
31-
(echo; git diff; echo; echo "Unexpected difference in directories after code generation. Run 'protoc' command and commit."; exit 1)
30+
git diff --compact-summary --exit-code ./tfprotov5/internal/tfplugin5 ./tfprotov6/internal/tfplugin6 || \
31+
(echo; git diff ./tfprotov5/internal/tfplugin5 ./tfprotov6/internal/tfplugin6; echo; echo "Unexpected difference in directories after code generation. Run 'make protobuf' command and commit."; exit 1)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lint:
66
# Protocol Buffers compilation is done outside of 'go generate' handling since
77
# the 'protoc' tool is not installable via 'go install'.
88
protobuf:
9-
go run ./tools/protobuf-compile .
9+
cd tools; go run ./protobuf-compile ..
1010

1111
test:
1212
go test ./...

go.work

Lines changed: 0 additions & 6 deletions
This file was deleted.

go.work.sum

Lines changed: 0 additions & 561 deletions
This file was deleted.

tools/go.mod

Lines changed: 59 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,44 @@ toolchain go1.24.4
66

77
require (
88
github.com/hashicorp/copywrite v0.22.0
9-
github.com/hashicorp/go-getter v1.7.9
9+
github.com/hashicorp/go-getter v1.8.1
1010
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
11+
google.golang.org/protobuf v1.36.9
1112
)
1213

1314
require (
1415
cel.dev/expr v0.24.0 // indirect
15-
cloud.google.com/go v0.120.0 // indirect
16-
cloud.google.com/go/auth v0.16.0 // indirect
16+
cloud.google.com/go v0.123.0 // indirect
17+
cloud.google.com/go/auth v0.16.5 // indirect
1718
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
18-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
19+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
1920
cloud.google.com/go/iam v1.5.2 // indirect
2021
cloud.google.com/go/monitoring v1.24.2 // indirect
21-
cloud.google.com/go/storage v1.50.0 // indirect
22+
cloud.google.com/go/storage v1.57.0 // indirect
2223
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
23-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
24-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
25-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
24+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
25+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect
26+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect
2627
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
2728
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
28-
github.com/aws/aws-sdk-go v1.44.122 // indirect
29+
github.com/aws/aws-sdk-go-v2 v1.39.1 // indirect
30+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
31+
github.com/aws/aws-sdk-go-v2/config v1.31.10 // indirect
32+
github.com/aws/aws-sdk-go-v2/credentials v1.18.14 // indirect
33+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.8 // indirect
34+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.8 // indirect
35+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.8 // indirect
36+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
37+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.8 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.8 // indirect
40+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.8 // indirect
41+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.8 // indirect
42+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.2 // indirect
43+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.4 // indirect
44+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.0 // indirect
45+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.5 // indirect
46+
github.com/aws/smithy-go v1.23.0 // indirect
2947
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
3048
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
3149
github.com/bradleyfalzon/ghinstallation/v2 v2.5.0 // indirect
@@ -36,10 +54,10 @@ require (
3654
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
3755
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
3856
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
39-
github.com/fatih/color v1.15.0 // indirect
57+
github.com/fatih/color v1.18.0 // indirect
4058
github.com/felixge/httpsnoop v1.0.4 // indirect
4159
github.com/fsnotify/fsnotify v1.5.4 // indirect
42-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
60+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
4361
github.com/go-logr/logr v1.4.3 // indirect
4462
github.com/go-logr/stdr v1.2.2 // indirect
4563
github.com/go-openapi/errors v0.20.2 // indirect
@@ -51,21 +69,21 @@ require (
5169
github.com/google/s2a-go v0.1.9 // indirect
5270
github.com/google/uuid v1.6.0 // indirect
5371
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
54-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
72+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
73+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 // indirect
5574
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
56-
github.com/hashicorp/go-hclog v1.5.0 // indirect
75+
github.com/hashicorp/go-hclog v1.6.3 // indirect
5776
github.com/hashicorp/go-safetemp v1.0.0 // indirect
58-
github.com/hashicorp/go-version v1.6.0 // indirect
77+
github.com/hashicorp/go-version v1.7.0 // indirect
5978
github.com/hashicorp/hcl v1.0.0 // indirect
6079
github.com/inconshreveable/mousetrap v1.0.1 // indirect
6180
github.com/jedib0t/go-pretty v4.3.0+incompatible // indirect
6281
github.com/jedib0t/go-pretty/v6 v6.4.6 // indirect
63-
github.com/jmespath/go-jmespath v0.4.0 // indirect
6482
github.com/joho/godotenv v1.3.0 // indirect
6583
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
66-
github.com/klauspost/compress v1.15.11 // indirect
84+
github.com/klauspost/compress v1.18.0 // indirect
6785
github.com/knadh/koanf v1.5.0 // indirect
68-
github.com/mattn/go-colorable v0.1.13 // indirect
86+
github.com/mattn/go-colorable v0.1.14 // indirect
6987
github.com/mattn/go-isatty v0.0.20 // indirect
7088
github.com/mattn/go-runewidth v0.0.16 // indirect
7189
github.com/mergestat/timediff v0.0.3 // indirect
@@ -80,34 +98,32 @@ require (
8098
github.com/samber/lo v1.37.0 // indirect
8199
github.com/spf13/cobra v1.6.1 // indirect
82100
github.com/spf13/pflag v1.0.5 // indirect
83-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
101+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
84102
github.com/thanhpk/randstr v1.0.4 // indirect
85-
github.com/ulikunitz/xz v0.5.14 // indirect
86-
github.com/zeebo/errs v1.4.0 // indirect
103+
github.com/ulikunitz/xz v0.5.15 // indirect
87104
go.mongodb.org/mongo-driver v1.10.0 // indirect
88-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
89-
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
91-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
92-
go.opentelemetry.io/otel v1.36.0 // indirect
93-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
94-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
95-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
96-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
97-
golang.org/x/crypto v0.41.0 // indirect
105+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
106+
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
107+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
108+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
109+
go.opentelemetry.io/otel v1.38.0 // indirect
110+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
111+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
112+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
113+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
114+
golang.org/x/crypto v0.42.0 // indirect
98115
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
99-
golang.org/x/net v0.43.0 // indirect
100-
golang.org/x/oauth2 v0.30.0 // indirect
101-
golang.org/x/sync v0.16.0 // indirect
102-
golang.org/x/sys v0.35.0 // indirect
103-
golang.org/x/term v0.34.0 // indirect
104-
golang.org/x/text v0.28.0 // indirect
105-
golang.org/x/time v0.11.0 // indirect
106-
google.golang.org/api v0.229.0 // indirect
107-
google.golang.org/genproto v0.0.0-20250908214217-97024824d090 // indirect
108-
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect
109-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
110-
google.golang.org/grpc v1.74.2 // indirect
111-
google.golang.org/protobuf v1.36.8 // indirect
116+
golang.org/x/net v0.44.0 // indirect
117+
golang.org/x/oauth2 v0.31.0 // indirect
118+
golang.org/x/sync v0.17.0 // indirect
119+
golang.org/x/sys v0.36.0 // indirect
120+
golang.org/x/term v0.35.0 // indirect
121+
golang.org/x/text v0.29.0 // indirect
122+
golang.org/x/time v0.13.0 // indirect
123+
google.golang.org/api v0.250.0 // indirect
124+
google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9 // indirect
125+
google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9 // indirect
126+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
127+
google.golang.org/grpc v1.75.1 // indirect
112128
gopkg.in/yaml.v3 v3.0.1 // indirect
113129
)

0 commit comments

Comments
 (0)