Skip to content

Commit 1141e5f

Browse files
carlpettcarlpett
authored
Merge pull request #138 from CnTeng/bump-sops
bump sops to version 3.10.2 to support ssh key
2 parents 5485727 + eeee286 commit 1141e5f

File tree

6 files changed

+323
-331
lines changed

6 files changed

+323
-331
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- v*
77

88
env:
9-
GO_VERSION: '1.21'
9+
GO_VERSION: "1.24"
1010

1111
# Request permissions to write (edit, create) new releases
1212
permissions:

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- master
88

99
env:
10-
GO_VERSION: '1.21'
10+
GO_VERSION: "1.24"
1111

1212
jobs:
1313
build-and-test:

‎GNUmakefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ crossbuild: $(GOPATH)/bin/gox
3131
-output="binaries/$(VERSION)/{{.OS}}_{{.Arch}}/terraform-provider-sops_$(VERSION)"
3232

3333
$(GOPATH)/bin/gox:
34-
# Need to disable modules for this to not pollute go.mod
35-
@GO111MODULE=off go get -u github.com/mitchellh/gox
34+
@go install github.com/mitchellh/gox@latest
3635

3736
# This uses the `gh` tool, which is preinstalled on GitHub Actions runners.
3837
release: crossbuild

‎go.mod

Lines changed: 93 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module github.com/carlpett/terraform-provider-sops
22

3-
go 1.21
3+
go 1.24
4+
5+
toolchain go1.24.2
46

57
require (
6-
github.com/getsops/sops/v3 v3.9.0
8+
github.com/getsops/sops/v3 v3.10.2
79
github.com/hashicorp/terraform-plugin-framework v1.7.0
810
github.com/hashicorp/terraform-plugin-go v0.22.1
911
github.com/hashicorp/terraform-plugin-testing v1.7.0
@@ -12,62 +14,72 @@ require (
1214
)
1315

1416
require (
15-
cloud.google.com/go v0.115.0 // indirect
16-
cloud.google.com/go/auth v0.6.0 // indirect
17-
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
18-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
19-
cloud.google.com/go/iam v1.1.8 // indirect
20-
cloud.google.com/go/kms v1.18.0 // indirect
21-
cloud.google.com/go/longrunning v0.5.7 // indirect
22-
cloud.google.com/go/storage v1.42.0 // indirect
23-
filippo.io/age v1.2.0 // indirect
24-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 // indirect
25-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
26-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
27-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0 // indirect
28-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1 // indirect
29-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
30-
github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton // indirect
17+
cel.dev/expr v0.22.1 // indirect
18+
cloud.google.com/go v0.121.0 // indirect
19+
cloud.google.com/go/auth v0.16.1 // indirect
20+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
21+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
22+
cloud.google.com/go/iam v1.5.2 // indirect
23+
cloud.google.com/go/kms v1.21.2 // indirect
24+
cloud.google.com/go/longrunning v0.6.7 // indirect
25+
cloud.google.com/go/monitoring v1.24.2 // indirect
26+
cloud.google.com/go/storage v1.52.0 // indirect
27+
filippo.io/age v1.2.1 // indirect
28+
filippo.io/edwards25519 v1.1.0 // indirect
29+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
30+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0 // indirect
31+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
32+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 // indirect
33+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
34+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
35+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
36+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
37+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
38+
github.com/ProtonMail/go-crypto v1.2.0 // indirect
3139
github.com/agext/levenshtein v1.2.3 // indirect
3240
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
33-
github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect
34-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
35-
github.com/aws/aws-sdk-go-v2/config v1.27.21 // indirect
36-
github.com/aws/aws-sdk-go-v2/credentials v1.17.21 // indirect
37-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 // indirect
38-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 // indirect
39-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
40-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
41-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
42-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
44-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 // indirect
45-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect
46-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 // indirect
47-
github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 // indirect
49-
github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 // indirect
52-
github.com/aws/smithy-go v1.20.2 // indirect
41+
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
42+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
43+
github.com/aws/aws-sdk-go-v2/config v1.29.14 // indirect
44+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
45+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
46+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.72 // indirect
47+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
48+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
49+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
50+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/kms v1.38.3 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.2 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
60+
github.com/aws/smithy-go v1.22.3 // indirect
5361
github.com/blang/semver v3.5.1+incompatible // indirect
54-
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
55-
github.com/cloudflare/circl v1.3.9 // indirect
56-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
57-
github.com/fatih/color v1.17.0 // indirect
62+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
63+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
64+
github.com/cloudflare/circl v1.6.1 // indirect
65+
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
66+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
67+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
68+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
69+
github.com/fatih/color v1.18.0 // indirect
5870
github.com/felixge/httpsnoop v1.0.4 // indirect
59-
github.com/getsops/gopgagent v0.0.0-20240527072608-0c14999532fe // indirect
60-
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
71+
github.com/getsops/gopgagent v0.0.0-20241224165529-7044f28e491e // indirect
72+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
6173
github.com/go-logr/logr v1.4.2 // indirect
6274
github.com/go-logr/stdr v1.2.2 // indirect
63-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
64-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
75+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
6576
github.com/golang/protobuf v1.5.4 // indirect
66-
github.com/google/go-cmp v0.6.0 // indirect
67-
github.com/google/s2a-go v0.1.7 // indirect
77+
github.com/google/go-cmp v0.7.0 // indirect
78+
github.com/google/s2a-go v0.1.9 // indirect
79+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6880
github.com/google/uuid v1.6.0 // indirect
69-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
70-
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
81+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
82+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
7183
github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
7284
github.com/hashicorp/errwrap v1.1.0 // indirect
7385
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -78,9 +90,9 @@ require (
7890
github.com/hashicorp/go-plugin v1.6.0 // indirect
7991
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
8092
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
81-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
93+
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect
8294
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
83-
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
95+
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
8496
github.com/hashicorp/go-uuid v1.0.3 // indirect
8597
github.com/hashicorp/go-version v1.6.0 // indirect
8698
github.com/hashicorp/hc-install v0.6.3 // indirect
@@ -93,12 +105,11 @@ require (
93105
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 // indirect
94106
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
95107
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
96-
github.com/hashicorp/vault/api v1.14.0 // indirect
108+
github.com/hashicorp/vault/api v1.16.0 // indirect
97109
github.com/hashicorp/yamux v0.1.1 // indirect
98-
github.com/jmespath/go-jmespath v0.4.0 // indirect
99110
github.com/kylelemons/godebug v1.1.0 // indirect
100111
github.com/lib/pq v1.10.9 // indirect
101-
github.com/mattn/go-colorable v0.1.13 // indirect
112+
github.com/mattn/go-colorable v0.1.14 // indirect
102113
github.com/mattn/go-isatty v0.0.20 // indirect
103114
github.com/mitchellh/copystructure v1.2.0 // indirect
104115
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -109,35 +120,41 @@ require (
109120
github.com/oklog/run v1.1.0 // indirect
110121
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
111122
github.com/pkg/errors v0.9.1 // indirect
123+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
112124
github.com/russross/blackfriday/v2 v2.1.0 // indirect
113125
github.com/ryanuber/go-glob v1.0.0 // indirect
114126
github.com/sirupsen/logrus v1.9.3 // indirect
115-
github.com/urfave/cli v1.22.15 // indirect
127+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
128+
github.com/urfave/cli v1.22.16 // indirect
116129
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
117130
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
118131
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
119132
github.com/zclconf/go-cty v1.14.3 // indirect
120-
go.opencensus.io v0.24.0 // indirect
121-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
122-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
123-
go.opentelemetry.io/otel v1.27.0 // indirect
124-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
125-
go.opentelemetry.io/otel/trace v1.27.0 // indirect
126-
golang.org/x/crypto v0.24.0 // indirect
133+
github.com/zeebo/errs v1.4.0 // indirect
134+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
135+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
136+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
137+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
138+
go.opentelemetry.io/otel v1.35.0 // indirect
139+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
140+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
141+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
142+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
143+
golang.org/x/crypto v0.38.0 // indirect
127144
golang.org/x/mod v0.18.0 // indirect
128-
golang.org/x/net v0.26.0 // indirect
129-
golang.org/x/oauth2 v0.21.0 // indirect
130-
golang.org/x/sync v0.7.0 // indirect
131-
golang.org/x/sys v0.21.0 // indirect
132-
golang.org/x/term v0.21.0 // indirect
133-
golang.org/x/text v0.16.0 // indirect
134-
golang.org/x/time v0.5.0 // indirect
145+
golang.org/x/net v0.40.0 // indirect
146+
golang.org/x/oauth2 v0.30.0 // indirect
147+
golang.org/x/sync v0.14.0 // indirect
148+
golang.org/x/sys v0.33.0 // indirect
149+
golang.org/x/term v0.32.0 // indirect
150+
golang.org/x/text v0.25.0 // indirect
151+
golang.org/x/time v0.11.0 // indirect
135152
golang.org/x/tools v0.22.0 // indirect
136-
google.golang.org/api v0.186.0 // indirect
153+
google.golang.org/api v0.232.0 // indirect
137154
google.golang.org/appengine v1.6.8 // indirect
138-
google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect
139-
google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect
140-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
141-
google.golang.org/grpc v1.64.0 // indirect
142-
google.golang.org/protobuf v1.34.2 // indirect
155+
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
156+
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
157+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
158+
google.golang.org/grpc v1.72.0 // indirect
159+
google.golang.org/protobuf v1.36.6 // indirect
143160
)

0 commit comments

Comments
 (0)