Skip to content

Commit dcc6216

Browse files
felixfonteinfelixfontein
authored
Merge branch 'main' into patch-1
2 parents 285d117 + 31ac73f commit dcc6216

File tree

7 files changed

+78
-72
lines changed

7 files changed

+78
-72
lines changed

‎.github/workflows/cli.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
VAULT_ADDR: "http://127.0.0.1:8200"
3030
steps:
3131
- name: Set up Go ${{ matrix.go-version }}
32-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
32+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3333
with:
3434
go-version: ${{ matrix.go-version }}
3535
id: go
@@ -105,7 +105,7 @@ jobs:
105105
- name: Show Rust version
106106
run: cargo --version
107107

108-
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
108+
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
109109
with:
110110
name: sops-${{ matrix.go-version }}-linux-amd64-${{ github.sha }}
111111

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Initializes the CodeQL tools for scanning.
3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
38+
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
3939
with:
4040
languages: go
4141
# xref: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
@@ -52,6 +52,6 @@ jobs:
5252
make install
5353
5454
- name: Perform CodeQL Analysis
55-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
55+
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
5656
with:
5757
category: "/language:go"

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ jobs:
3131
persist-credentials: false
3232

3333
- name: Setup Go
34-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v4.0.1
34+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v4.0.1
3535
with:
3636
go-version: 1.24
3737
cache: false
3838

3939
- name: Setup Syft
40-
uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
40+
uses: anchore/sbom-action/download-syft@9f7302141466aa6482940f15371237e9d9f4c34a # v0.19.0
4141

4242
- name: Setup Cosign
43-
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
43+
uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
4444

4545
- name: Setup QEMU
4646
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0

‎functional-tests/Cargo.lock‎

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

‎functional-tests/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
authors = ["Adrian Utrilla <adrianutrilla@gmail.com>"]
66

77
[dependencies]
8-
tempfile = "3.19.1"
8+
tempfile = "3.20.0"
99
serde = "1.0"
1010
serde_json = "1.0.140"
1111
serde_yaml = "0.9.34"

‎go.mod‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/getsops/sops/v3
33
go 1.23.0
44

55
require (
6-
cloud.google.com/go/kms v1.21.1
7-
cloud.google.com/go/storage v1.51.0
6+
cloud.google.com/go/kms v1.21.2
7+
cloud.google.com/go/storage v1.53.0
88
filippo.io/age v1.2.1
99
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
1010
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0
@@ -13,9 +13,9 @@ require (
1313
github.com/aws/aws-sdk-go-v2 v1.36.3
1414
github.com/aws/aws-sdk-go-v2/config v1.29.14
1515
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
16-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.72
16+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.75
1717
github.com/aws/aws-sdk-go-v2/service/kms v1.38.3
18-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.2
18+
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3
1919
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19
2020
github.com/blang/semver v3.5.1+incompatible
2121
github.com/fatih/color v1.18.0
@@ -33,27 +33,27 @@ require (
3333
github.com/sirupsen/logrus v1.9.3
3434
github.com/stretchr/testify v1.10.0
3535
github.com/urfave/cli v1.22.16
36-
golang.org/x/crypto v0.37.0
37-
golang.org/x/net v0.39.0
38-
golang.org/x/oauth2 v0.29.0
39-
golang.org/x/sys v0.32.0
40-
golang.org/x/term v0.31.0
41-
google.golang.org/api v0.228.0
42-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463
43-
google.golang.org/grpc v1.71.1
36+
golang.org/x/crypto v0.38.0
37+
golang.org/x/net v0.40.0
38+
golang.org/x/oauth2 v0.30.0
39+
golang.org/x/sys v0.33.0
40+
golang.org/x/term v0.32.0
41+
google.golang.org/api v0.232.0
42+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34
43+
google.golang.org/grpc v1.72.0
4444
google.golang.org/protobuf v1.36.6
4545
gopkg.in/ini.v1 v1.67.0
4646
gopkg.in/yaml.v3 v3.0.1
4747
)
4848

4949
require (
5050
cel.dev/expr v0.22.1 // indirect
51-
cloud.google.com/go v0.120.0 // indirect
52-
cloud.google.com/go/auth v0.15.0 // indirect
51+
cloud.google.com/go v0.120.1 // indirect
52+
cloud.google.com/go/auth v0.16.1 // indirect
5353
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
5454
cloud.google.com/go/compute/metadata v0.6.0 // indirect
55-
cloud.google.com/go/iam v1.4.2 // indirect
56-
cloud.google.com/go/longrunning v0.6.6 // indirect
55+
cloud.google.com/go/iam v1.5.2 // indirect
56+
cloud.google.com/go/longrunning v0.6.7 // indirect
5757
cloud.google.com/go/monitoring v1.24.1 // indirect
5858
dario.cat/mergo v1.0.1 // indirect
5959
filippo.io/edwards25519 v1.1.0 // indirect
@@ -73,7 +73,7 @@ require (
7373
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
7474
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
7575
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
76-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
76+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 // indirect
7777
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
7878
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
7979
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
@@ -126,9 +126,11 @@ require (
126126
github.com/pmezard/go-difflib v1.0.0 // indirect
127127
github.com/russross/blackfriday/v2 v2.1.0 // indirect
128128
github.com/ryanuber/go-glob v1.0.0 // indirect
129+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
129130
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
130131
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
131132
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
133+
github.com/zeebo/errs v1.4.0 // indirect
132134
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
133135
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
134136
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
@@ -138,9 +140,9 @@ require (
138140
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
139141
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
140142
go.opentelemetry.io/otel/trace v1.35.0 // indirect
141-
golang.org/x/sync v0.13.0 // indirect
142-
golang.org/x/text v0.24.0 // indirect
143+
golang.org/x/sync v0.14.0 // indirect
144+
golang.org/x/text v0.25.0 // indirect
143145
golang.org/x/time v0.11.0 // indirect
144146
google.golang.org/genproto v0.0.0-20250324211829-b45e905df463 // indirect
145-
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
147+
google.golang.org/genproto/googleapis/api v0.0.0-20250425173222-7b384671a197 // indirect
146148
)

0 commit comments

Comments
 (0)