Skip to content

Commit 4bcc24a

Browse files
authored
Merge branch 'main' into feat/huaweicloud-kms
Signed-off-by: Enbiya Göral <[email protected]>
2 parents feb4f94 + fe9ab6e commit 4bcc24a

File tree

5 files changed

+82
-85
lines changed

5 files changed

+82
-85
lines changed

.github/workflows/cli.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
persist-credentials: false
4141

42-
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
42+
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
4343
with:
4444
path: ~/go/pkg/mod
4545
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -68,14 +68,14 @@ jobs:
6868

6969
- name: Upload artifact for ${{ matrix.os }}
7070
if: matrix.os != 'windows'
71-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
71+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
7272
with:
7373
name: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
7474
path: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
7575

7676
- name: Upload artifact for ${{ matrix.os }}
7777
if: matrix.os == 'windows'
78-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
78+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
7979
with:
8080
name: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ github.sha }}
8181
path: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ github.sha }}
@@ -105,7 +105,7 @@ jobs:
105105
- name: Show Rust version
106106
run: cargo --version
107107

108-
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
108+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.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@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
38+
uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
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@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
55+
uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
5656
with:
5757
category: "/language:go"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache: false
3838

3939
- name: Setup Syft
40-
uses: anchore/sbom-action/download-syft@fbfd9c6c189226748411491745178e0c2017392d # v0.20.10
40+
uses: anchore/sbom-action/download-syft@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.11
4141

4242
- name: Setup Cosign
4343
uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ require (
1010
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
1111
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0
1212
github.com/ProtonMail/go-crypto v1.3.0
13-
github.com/aws/aws-sdk-go-v2 v1.40.1
14-
github.com/aws/aws-sdk-go-v2/config v1.32.3
15-
github.com/aws/aws-sdk-go-v2/credentials v1.19.3
16-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.13
17-
github.com/aws/aws-sdk-go-v2/service/kms v1.49.2
18-
github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0
19-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.3
13+
github.com/aws/aws-sdk-go-v2 v1.41.0
14+
github.com/aws/aws-sdk-go-v2/config v1.32.5
15+
github.com/aws/aws-sdk-go-v2/credentials v1.19.5
16+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.15
17+
github.com/aws/aws-sdk-go-v2/service/kms v1.49.4
18+
github.com/aws/aws-sdk-go-v2/service/s3 v1.93.2
19+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5
2020
github.com/blang/semver v3.5.1+incompatible
2121
github.com/fatih/color v1.18.0
2222
github.com/getsops/gopgagent v0.0.0-20241224165529-7044f28e491e
@@ -35,15 +35,15 @@ require (
3535
github.com/stretchr/testify v1.11.1
3636
github.com/urfave/cli v1.22.17
3737
go.yaml.in/yaml/v3 v3.0.4
38-
golang.org/x/crypto v0.45.0
39-
golang.org/x/net v0.47.0
40-
golang.org/x/oauth2 v0.33.0
41-
golang.org/x/sys v0.38.0
42-
golang.org/x/term v0.37.0
38+
golang.org/x/crypto v0.46.0
39+
golang.org/x/net v0.48.0
40+
golang.org/x/oauth2 v0.34.0
41+
golang.org/x/sys v0.39.0
42+
golang.org/x/term v0.38.0
4343
google.golang.org/api v0.257.0
4444
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846
4545
google.golang.org/grpc v1.77.0
46-
google.golang.org/protobuf v1.36.10
46+
google.golang.org/protobuf v1.36.11
4747
gopkg.in/ini.v1 v1.67.0
4848
)
4949

@@ -68,18 +68,18 @@ require (
6868
github.com/Microsoft/go-winio v0.6.2 // indirect
6969
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
7070
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
71-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15 // indirect
72-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15 // indirect
73-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15 // indirect
71+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
72+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
73+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
7474
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
75-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15 // indirect
75+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
7676
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
77-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6 // indirect
78-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15 // indirect
79-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15 // indirect
80-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.3 // indirect
81-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.6 // indirect
82-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11 // indirect
77+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
78+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
79+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
80+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
81+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 // indirect
82+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
8383
github.com/aws/smithy-go v1.24.0 // indirect
8484
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
8585
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -147,8 +147,8 @@ require (
147147
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
148148
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
149149
go.opentelemetry.io/otel/trace v1.38.0 // indirect
150-
golang.org/x/sync v0.18.0 // indirect
151-
golang.org/x/text v0.31.0 // indirect
150+
golang.org/x/sync v0.19.0 // indirect
151+
golang.org/x/text v0.32.0 // indirect
152152
golang.org/x/time v0.14.0 // indirect
153153
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
154154
google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9 // indirect

0 commit comments

Comments
 (0)