Skip to content

Commit 3fae4c2

Browse files
alexcottneralexcottner
authored
Upgrading SOPS to v3.12.1 (#1209)
* Upgrading sops and dependant packages * Adjusting .golangci.yaml to ignore the deprecated warnings for now * Using normal golangci-lint instead of the action
1 parent 7736149 commit 3fae4c2

File tree

1,462 files changed

+132589
-119435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,462 files changed

+132589
-119435
lines changed

‎.github/workflows/tests.yaml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,10 @@ jobs:
6262
with:
6363
go-version-file: "./go.mod"
6464
- name: golangci-lint
65-
# If you bump this version, double check that we shouldn't also bump
66-
# GOLANGCI_LINT_VERSION in the Makefile. (The version here is for the
67-
# GitHub Action and the one in the Makefile is for the actual version of
68-
# golangci-lint.)
69-
uses: golangci/[email protected]
70-
with:
71-
args: --timeout 5m
65+
shell: bash
66+
run: |
67+
go install github.com/golangci/golangci-lint/cmd/[email protected]
68+
golangci-lint run --timeout 5m
7269
7370
unit-tests:
7471
name: Run Unit Tests

‎.golangci.yaml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@ linters-settings:
3030
desc: "Only indirect PKCS#11 work allowed in signer submodules (so, crypto11 is banned there)"
3131
- pkg: "github.com/ThalesGroup/crypto11" # ThalesGroup is the more modern version
3232
desc: "Only indirect PKCS#11 work allowed in signer submodules (so, crypto11 is banned there)"
33-
34-
severity:
35-
default-severity: error
36-
rules:
37-
# The following check fails the linting test
38-
# SA1019 - Using a deprecated function, variable, constant or field
39-
- linters:
40-
- staticcheck
41-
text: "SA1019"
42-
severity: warning
33+
staticcheck:
34+
checks:
35+
- all
36+
- "-SA1019"

‎go.mod‎

Lines changed: 76 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
module github.com/mozilla-services/autograph
22

3-
go 1.24.0
4-
5-
toolchain go1.24.1
3+
go 1.25.0
64

75
require (
8-
github.com/aws/aws-sdk-go-v2 v1.41.1
9-
github.com/aws/aws-sdk-go-v2/config v1.32.7
10-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.21.1
6+
github.com/aws/aws-sdk-go-v2 v1.41.3
7+
github.com/aws/aws-sdk-go-v2/config v1.32.11
8+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.0
119
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0
12-
github.com/getsops/sops/v3 v3.11.0
10+
github.com/getsops/sops/v3 v3.12.1
1311
github.com/google/uuid v1.6.0
1412
github.com/gorilla/mux v1.8.0
1513
github.com/hashicorp/golang-lru v0.5.4
@@ -28,67 +26,69 @@ require (
2826
)
2927

3028
require (
31-
cel.dev/expr v0.24.0 // indirect
32-
cloud.google.com/go v0.121.6 // indirect
33-
cloud.google.com/go/auth v0.16.5 // indirect
29+
cel.dev/expr v0.25.1 // indirect
30+
cloud.google.com/go v0.123.0 // indirect
31+
cloud.google.com/go/auth v0.18.2 // indirect
3432
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
35-
cloud.google.com/go/compute/metadata v0.8.4 // indirect
36-
cloud.google.com/go/iam v1.5.2 // indirect
37-
cloud.google.com/go/kms v1.23.0 // indirect
38-
cloud.google.com/go/longrunning v0.6.7 // indirect
39-
cloud.google.com/go/monitoring v1.24.2 // indirect
40-
cloud.google.com/go/storage v1.57.0 // indirect
41-
filippo.io/age v1.2.1 // indirect
42-
filippo.io/edwards25519 v1.1.1 // indirect
43-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
44-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0 // indirect
33+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
34+
cloud.google.com/go/iam v1.5.3 // indirect
35+
cloud.google.com/go/kms v1.26.0 // indirect
36+
cloud.google.com/go/longrunning v0.8.0 // indirect
37+
cloud.google.com/go/monitoring v1.24.3 // indirect
38+
cloud.google.com/go/storage v1.60.0 // indirect
39+
filippo.io/age v1.3.1 // indirect
40+
filippo.io/edwards25519 v1.2.0 // indirect
41+
filippo.io/hpke v0.4.0 // indirect
42+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
43+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
4544
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
4645
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0 // indirect
4746
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
48-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
49-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
50-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
51-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
52-
github.com/ProtonMail/go-crypto v1.3.0 // indirect
47+
github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0 // indirect
48+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
49+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0 // indirect
50+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect
51+
github.com/ProtonMail/go-crypto v1.4.0 // indirect
5352
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
54-
github.com/aws/aws-sdk-go-v2/credentials v1.19.7 // indirect
55-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
56-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
57-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
58-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
53+
github.com/aws/aws-sdk-go-v2/credentials v1.19.11 // indirect
54+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19 // indirect
55+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 // indirect
56+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 // indirect
57+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 // indirect
5958
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 // indirect
6160
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 // indirect
6362
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 // indirect
64-
github.com/aws/aws-sdk-go-v2/service/kms v1.45.6 // indirect
65-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 // indirect
66-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 // indirect
67-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 // indirect
69-
github.com/aws/smithy-go v1.24.0 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/kms v1.50.2 // indirect
64+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.12 // indirect
66+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.16 // indirect
67+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.8 // indirect
68+
github.com/aws/smithy-go v1.24.2 // indirect
7069
github.com/beorn7/perks v1.0.1 // indirect
7170
github.com/blang/semver v3.5.1+incompatible // indirect
7271
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7372
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7473
github.com/cloudflare/circl v1.6.3 // indirect
75-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
74+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
7675
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
77-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
78-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
76+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
77+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
7978
github.com/fatih/color v1.18.0 // indirect
8079
github.com/felixge/httpsnoop v1.0.4 // indirect
8180
github.com/getsops/gopgagent v0.0.0-20241224165529-7044f28e491e // indirect
82-
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
81+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
8382
github.com/go-logr/logr v1.4.3 // indirect
8483
github.com/go-logr/stdr v1.2.2 // indirect
85-
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
84+
github.com/goccy/go-yaml v1.19.2 // indirect
85+
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
8686
github.com/golang/glog v1.2.5 // indirect
8787
github.com/google/go-cmp v0.7.0 // indirect
8888
github.com/google/s2a-go v0.1.9 // indirect
8989
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
90-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
91-
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
90+
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
91+
github.com/googleapis/gax-go/v2 v2.18.0 // indirect
9292
github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
9393
github.com/hashicorp/errwrap v1.1.0 // indirect
9494
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -99,13 +99,17 @@ require (
9999
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
100100
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
101101
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
102-
github.com/hashicorp/vault/api v1.21.0 // indirect
102+
github.com/hashicorp/vault/api v1.22.0 // indirect
103+
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.187 // indirect
104+
github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12 // indirect
103105
github.com/kylelemons/godebug v1.1.0 // indirect
104106
github.com/mattn/go-colorable v0.1.14 // indirect
105107
github.com/mattn/go-isatty v0.0.20 // indirect
106108
github.com/mitchellh/go-homedir v1.1.0 // indirect
107109
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
108110
github.com/mitchellh/mapstructure v1.5.0 // indirect
111+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
112+
github.com/modern-go/reflect2 v1.0.2 // indirect
109113
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
110114
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
111115
github.com/pkg/errors v0.9.1 // indirect
@@ -115,34 +119,35 @@ require (
115119
github.com/prometheus/procfs v0.16.1 // indirect
116120
github.com/russross/blackfriday/v2 v2.1.0 // indirect
117121
github.com/ryanuber/go-glob v1.0.0 // indirect
118-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
122+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
123+
github.com/tjfoc/gmsm v1.4.1 // indirect
119124
github.com/ugorji/go v0.0.0-20180112141927-9831f2c3ac10 // indirect
120125
github.com/urfave/cli v1.22.17 // indirect
121-
github.com/zeebo/errs v1.4.0 // indirect
126+
go.mongodb.org/mongo-driver v1.17.9 // indirect
122127
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
123-
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
124-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
125-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
126-
go.opentelemetry.io/otel v1.40.0 // indirect
127-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
128-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
129-
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
130-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
128+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
129+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
131+
go.opentelemetry.io/otel v1.42.0 // indirect
132+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
133+
go.opentelemetry.io/otel/sdk v1.42.0 // indirect
134+
go.opentelemetry.io/otel/sdk/metric v1.42.0 // indirect
135+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
131136
go.yaml.in/yaml/v2 v2.4.2 // indirect
132137
go.yaml.in/yaml/v3 v3.0.4 // indirect
133-
golang.org/x/crypto v0.45.0 // indirect
134-
golang.org/x/net v0.47.0 // indirect
135-
golang.org/x/oauth2 v0.31.0 // indirect
136-
golang.org/x/sync v0.18.0 // indirect
137-
golang.org/x/sys v0.40.0 // indirect
138-
golang.org/x/term v0.37.0 // indirect
139-
golang.org/x/text v0.31.0 // indirect
140-
golang.org/x/time v0.13.0 // indirect
141-
google.golang.org/api v0.250.0 // indirect
142-
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
143-
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
144-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
145-
google.golang.org/grpc v1.75.1 // indirect
146-
google.golang.org/protobuf v1.36.9 // indirect
147-
gopkg.in/ini.v1 v1.67.0 // indirect
138+
golang.org/x/crypto v0.48.0 // indirect
139+
golang.org/x/net v0.51.0 // indirect
140+
golang.org/x/oauth2 v0.36.0 // indirect
141+
golang.org/x/sync v0.20.0 // indirect
142+
golang.org/x/sys v0.42.0 // indirect
143+
golang.org/x/term v0.41.0 // indirect
144+
golang.org/x/text v0.35.0 // indirect
145+
golang.org/x/time v0.15.0 // indirect
146+
google.golang.org/api v0.271.0 // indirect
147+
google.golang.org/genproto v0.0.0-20260311181403-84a4fc48630c // indirect
148+
google.golang.org/genproto/googleapis/api v0.0.0-20260311181403-84a4fc48630c // indirect
149+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c // indirect
150+
google.golang.org/grpc v1.79.2 // indirect
151+
google.golang.org/protobuf v1.36.11 // indirect
152+
gopkg.in/ini.v1 v1.67.1 // indirect
148153
)

0 commit comments

Comments
 (0)