Skip to content

Commit 919819d

Browse files
terrabitzterrabitz
authored
Merge branch 'main' into terrabitz/fix-github-hosted-runner-image-import
2 parents 9680371 + 7a217c2 commit 919819d

10 files changed

Lines changed: 124 additions & 139 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
terraform_wrapper: false
6161
- run: make checkdocs
6262
- run: make validatedocs
63-
- uses: rvben/rumdl@e8c30294f7b713c7b1ffb11fb4b86e4e8b340b19 # v0.1.89
63+
- uses: rvben/rumdl@9a78b143c00cc273fa0636410b91ec9acde1004a # v0.1.90
6464
with:
6565
path: ./docs
6666
report-type: annotations

‎.github/workflows/dotcom-acceptance-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
cache: true
8383

8484
- name: Setup Terraform
85-
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
85+
uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
8686
with:
8787
terraform_version: latest
8888
terraform_wrapper: false

‎.github/workflows/ghes-acceptance-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
cache: true
9494

9595
- name: Setup Terraform
96-
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
96+
uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
9797
with:
9898
terraform_version: latest
9999
terraform_wrapper: false

‎.github/workflows/release.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ jobs:
4545
uses: anchore/sbom-action/download-syft@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
4646

4747
- name: Install Cosign
48-
uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 # v4.1.1
48+
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
4949

5050
- name: Import GPG key
51-
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6.3.0
51+
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0
5252
id: import_gpg
5353
with:
5454
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
5555
passphrase: ${{ secrets.PASSPHRASE }}
5656

5757
- name: Run GoReleaser
58-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
58+
uses: goreleaser/goreleaser-action@1a80836c5c9d9e5755a25cb59ec6f45a3b5f41a8 # v7.2.1
5959
id: goreleaser
6060
env:
6161
# GitHub sets the GITHUB_TOKEN secret automatically.
@@ -65,6 +65,6 @@ jobs:
6565
args: release --clean
6666

6767
- name: Attest artifacts
68-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
68+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
6969
with:
7070
subject-checksums: ./dist/${{ github.event.repository.name }}_${{ fromJSON(steps.goreleaser.outputs.metadata).version }}_SHA256SUMS

‎github/apps.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"net/url"
1212
"time"
1313

14-
"github.com/go-jose/go-jose/v3"
15-
"github.com/go-jose/go-jose/v3/jwt"
14+
"github.com/go-jose/go-jose/v4"
15+
"github.com/go-jose/go-jose/v4/jwt"
1616
)
1717

1818
// GenerateOAuthTokenFromApp generates a GitHub OAuth access token from a set of valid GitHub App credentials.
@@ -95,7 +95,7 @@ func generateAppJWT(appID string, now time.Time, pemData []byte) (string, error)
9595
Expiry: jwt.NewNumericDate(now.Add(time.Duration(5) * time.Minute)),
9696
}
9797

98-
token, err := jwt.Signed(signer).Claims(claims).CompactSerialize()
98+
token, err := jwt.Signed(signer).Claims(claims).Serialize()
9999
if err != nil {
100100
return "", err
101101
}

‎github/apps_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/go-jose/go-jose/v3"
15-
"github.com/go-jose/go-jose/v3/jwt"
14+
"github.com/go-jose/go-jose/v4"
15+
"github.com/go-jose/go-jose/v4/jwt"
1616
)
1717

1818
const (
@@ -46,7 +46,7 @@ func TestGenerateAppJWT(t *testing.T) {
4646
})
4747

4848
t.Run("produces a jwt with expected algorithm and type", func(t *testing.T) {
49-
tok, err := jwt.ParseSigned(appJWT)
49+
tok, err := jwt.ParseSigned(appJWT, []jose.SignatureAlgorithm{jose.RS256})
5050
if err != nil {
5151
t.Logf("Failed to decode JWT '%s': %s", appJWT, err)
5252
t.Fail()
@@ -72,7 +72,7 @@ func TestGenerateAppJWT(t *testing.T) {
7272
})
7373

7474
t.Run("produces a jwt with expected claims", func(t *testing.T) {
75-
tok, err := jwt.ParseSigned(appJWT)
75+
tok, err := jwt.ParseSigned(appJWT, []jose.SignatureAlgorithm{jose.RS256})
7676
if err != nil {
7777
t.Logf("Failed to decode JWT '%s': %s", appJWT, err)
7878
t.Fail()
@@ -122,7 +122,7 @@ func TestGenerateAppJWT(t *testing.T) {
122122
t.FailNow()
123123
}
124124

125-
tok, err := jwt.ParseSigned(appJWT)
125+
tok, err := jwt.ParseSigned(appJWT, []jose.SignatureAlgorithm{jose.RS256})
126126
if err != nil {
127127
t.Logf("Failed to decode JWT '%s': %s", appJWT, err)
128128
t.Fail()

‎go.mod‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,44 @@ module github.com/integrations/terraform-provider-github/v6
33
go 1.26
44

55
require (
6-
github.com/go-jose/go-jose/v3 v3.0.4
6+
github.com/go-jose/go-jose/v4 v4.1.4
77
github.com/google/go-cmp v0.7.0
88
github.com/google/go-github/v85 v85.0.0
99
github.com/google/uuid v1.6.0
1010
github.com/hashicorp/go-cty v1.5.0
1111
github.com/hashicorp/terraform-plugin-log v0.10.0
12-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.2
13-
github.com/hashicorp/terraform-plugin-testing v1.14.0
12+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1
13+
github.com/hashicorp/terraform-plugin-testing v1.16.0
1414
github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed
15-
golang.org/x/crypto v0.48.0
16-
golang.org/x/oauth2 v0.35.0
15+
golang.org/x/crypto v0.50.0
16+
golang.org/x/oauth2 v0.36.0
1717
)
1818

1919
require (
20-
github.com/ProtonMail/go-crypto v1.1.6 // indirect
21-
github.com/agext/levenshtein v1.2.2 // indirect
20+
github.com/ProtonMail/go-crypto v1.4.1 // indirect
21+
github.com/agext/levenshtein v1.2.3 // indirect
2222
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
23-
github.com/cloudflare/circl v1.6.1 // indirect
23+
github.com/cloudflare/circl v1.6.3 // indirect
2424
github.com/fatih/color v1.18.0 // indirect
2525
github.com/golang/protobuf v1.5.4 // indirect
2626
github.com/google/go-querystring v1.2.0 // indirect
27-
github.com/hashicorp/errwrap v1.0.0 // indirect
27+
github.com/hashicorp/errwrap v1.1.0 // indirect
2828
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
2929
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
3030
github.com/hashicorp/go-hclog v1.6.3 // indirect
3131
github.com/hashicorp/go-multierror v1.1.1 // indirect
3232
github.com/hashicorp/go-plugin v1.7.0 // indirect
33-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
33+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
3434
github.com/hashicorp/go-uuid v1.0.3 // indirect
35-
github.com/hashicorp/go-version v1.8.0 // indirect
36-
github.com/hashicorp/hc-install v0.9.2 // indirect
35+
github.com/hashicorp/go-version v1.9.0 // indirect
36+
github.com/hashicorp/hc-install v0.9.4 // indirect
3737
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
3838
github.com/hashicorp/logutils v1.0.0 // indirect
39-
github.com/hashicorp/terraform-exec v0.24.0 // indirect
39+
github.com/hashicorp/terraform-exec v0.25.1 // indirect
4040
github.com/hashicorp/terraform-json v0.27.2 // indirect
41-
github.com/hashicorp/terraform-plugin-go v0.29.0 // indirect
41+
github.com/hashicorp/terraform-plugin-go v0.31.0 // indirect
4242
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
43-
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
43+
github.com/hashicorp/terraform-svchost v0.2.1 // indirect
4444
github.com/hashicorp/yamux v0.1.2 // indirect
4545
github.com/kr/text v0.2.0 // indirect
4646
github.com/mattn/go-colorable v0.1.14 // indirect
@@ -50,20 +50,20 @@ require (
5050
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
5151
github.com/mitchellh/mapstructure v1.5.0 // indirect
5252
github.com/mitchellh/reflectwalk v1.0.2 // indirect
53-
github.com/oklog/run v1.1.0 // indirect
53+
github.com/oklog/run v1.2.0 // indirect
5454
github.com/shurcooL/graphql v0.0.0-20240915155400-7ee5256398cf // indirect
5555
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
5656
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
5757
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
58-
github.com/zclconf/go-cty v1.17.0 // indirect
59-
golang.org/x/mod v0.32.0 // indirect
60-
golang.org/x/net v0.49.0 // indirect
61-
golang.org/x/sync v0.19.0 // indirect
62-
golang.org/x/sys v0.41.0 // indirect
63-
golang.org/x/text v0.34.0 // indirect
64-
golang.org/x/tools v0.41.0 // indirect
58+
github.com/zclconf/go-cty v1.18.1 // indirect
59+
golang.org/x/mod v0.35.0 // indirect
60+
golang.org/x/net v0.52.0 // indirect
61+
golang.org/x/sync v0.20.0 // indirect
62+
golang.org/x/sys v0.43.0 // indirect
63+
golang.org/x/text v0.36.0 // indirect
64+
golang.org/x/tools v0.43.0 // indirect
6565
google.golang.org/appengine v1.6.8 // indirect
66-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
67-
google.golang.org/grpc v1.75.1 // indirect
68-
google.golang.org/protobuf v1.36.9 // indirect
66+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
67+
google.golang.org/grpc v1.79.3 // indirect
68+
google.golang.org/protobuf v1.36.11 // indirect
6969
)

0 commit comments

Comments
 (0)