Skip to content

Commit 7773999

Browse files
authored
Merge branch 'main' into proj/nb-front-end-ip-in-vpc
2 parents 25bfd3a + cd2efd0 commit 7773999

11 files changed

Lines changed: 33 additions & 32 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
GITHUB_TOKEN: ${{ github.token }}
5858

5959
- uses: actions/checkout@v7
60-
- uses: actions/setup-go@v6
60+
- uses: actions/setup-go@v7
6161
with:
6262
go-version: stable
6363

@@ -89,13 +89,13 @@ jobs:
8989
submodules: 'recursive'
9090

9191
- name: Set up Go
92-
uses: actions/setup-go@v6
92+
uses: actions/setup-go@v7
9393
with:
9494
go-version: 'stable'
9595
- run: go version
9696

9797
- name: Setup Python
98-
uses: actions/setup-python@v6
98+
uses: actions/setup-python@v7
9999
with:
100100
python-version: '3.x'
101101

@@ -136,7 +136,7 @@ jobs:
136136

137137
steps:
138138
- name: Notify Slack
139-
uses: slackapi/slack-github-action@v3
139+
uses: slackapi/slack-github-action@v4
140140
with:
141141
method: chat.postMessage
142142
token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/integration_tests_pr.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
if: github.event_name == 'workflow_dispatch' && inputs.sha != ''
2929
steps:
30-
- uses: actions/setup-go@v6
30+
- uses: actions/setup-go@v7
3131
with:
3232
go-version: 'stable'
3333
- run: go version
@@ -44,11 +44,12 @@ jobs:
4444
with:
4545
ref: ${{ inputs.sha }}
4646

47-
- run: make ARGS="-run ${{ inputs.module }}" fixtures
47+
- run: make ARGS="-run $MODULE" fixtures
4848
if: ${{ inputs.module != '' && steps.disallowed-char-check.outputs.match == '' }}
4949
env:
5050
LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }}
5151
RUN_ACLP_LOGS_STREAM_TESTS: ${{ github.event.inputs.run_aclp_logs_stream_tests }}
52+
MODULE: ${{ inputs.module }}
5253

5354
- run: make fixtures
5455
if: ${{ inputs.module == '' }}
@@ -142,7 +143,7 @@ jobs:
142143

143144
steps:
144145
- name: Set up Python
145-
uses: actions/setup-python@v6
146+
uses: actions/setup-python@v7
146147
with:
147148
python-version: '3.x'
148149

.github/workflows/nightly_smoke_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
ref: ${{ github.event.inputs.sha || github.ref }}
2626

2727
- name: Set up Go
28-
uses: actions/setup-go@v6
28+
uses: actions/setup-go@v7
2929
with:
3030
go-version: '1.x'
3131

@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Notify Slack
4040
if: (success() || failure()) && github.repository == 'linode/linodego'
41-
uses: slackapi/slack-github-action@v3
41+
uses: slackapi/slack-github-action@v4
4242
with:
4343
method: chat.postMessage
4444
token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/release-cross-repo-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
submodules: 'recursive'
1616

1717
- name: Set up Go
18-
uses: actions/setup-go@v6
18+
uses: actions/setup-go@v7
1919
with:
2020
go-version: 'stable'
2121
- run: go version

.github/workflows/release-notify-slack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Notify Slack - Main Message
13-
uses: slackapi/slack-github-action@v3
13+
uses: slackapi/slack-github-action@v4
1414
with:
1515
method: chat.postMessage
1616
token: ${{ secrets.SLACK_BOT_TOKEN }}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require (
55
github.com/google/go-querystring v1.2.0
66
github.com/jarcoal/httpmock v1.4.1
77
github.com/stretchr/testify v1.11.1
8-
golang.org/x/net v0.56.0
8+
golang.org/x/net v0.57.0
99
golang.org/x/oauth2 v0.36.0
1010
golang.org/x/text v0.40.0
1111
gopkg.in/ini.v1 v1.67.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
3535
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
3636
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
3737
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
38-
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
39-
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
38+
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
39+
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
4040
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
4141
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
4242
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=

k8s/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ require (
2828
github.com/x448/float16 v0.8.4 // indirect
2929
go.yaml.in/yaml/v2 v2.4.3 // indirect
3030
go.yaml.in/yaml/v3 v3.0.4 // indirect
31-
golang.org/x/net v0.56.0 // indirect
31+
golang.org/x/net v0.57.0 // indirect
3232
golang.org/x/oauth2 v0.36.0 // indirect
33-
golang.org/x/sys v0.46.0 // indirect
34-
golang.org/x/term v0.44.0 // indirect
33+
golang.org/x/sys v0.47.0 // indirect
34+
golang.org/x/term v0.45.0 // indirect
3535
golang.org/x/text v0.40.0 // indirect
3636
golang.org/x/time v0.14.0 // indirect
3737
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect

k8s/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
7575
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
7676
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
7777
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
78-
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
79-
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
78+
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
79+
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
8080
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
8181
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
82-
golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
83-
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
84-
golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
85-
golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
82+
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
83+
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
84+
golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
85+
golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
8686
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
8787
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
8888
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=

test/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/linode/linodego/v2 v2.0.0
99
github.com/stretchr/testify v1.11.1
1010
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
11-
golang.org/x/net v0.56.0
11+
golang.org/x/net v0.57.0
1212
golang.org/x/oauth2 v0.36.0
1313
k8s.io/client-go v0.35.6
1414
)
@@ -36,8 +36,8 @@ require (
3636
github.com/x448/float16 v0.8.4 // indirect
3737
go.yaml.in/yaml/v2 v2.4.3 // indirect
3838
go.yaml.in/yaml/v3 v3.0.4 // indirect
39-
golang.org/x/sys v0.46.0 // indirect
40-
golang.org/x/term v0.44.0 // indirect
39+
golang.org/x/sys v0.47.0 // indirect
40+
golang.org/x/term v0.45.0 // indirect
4141
golang.org/x/text v0.40.0 // indirect
4242
golang.org/x/time v0.14.0 // indirect
4343
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect

0 commit comments

Comments
 (0)