Skip to content

Commit d7da2df

Browse files
authored
Merge branch 'master' into v1.5929.0
2 parents b070bc3 + 55f8111 commit d7da2df

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

.github/workflows/nightly.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,21 @@ jobs:
8686
env:
8787
SLACK_WEBHOOK_NIGHTLY: ${{ secrets.SLACK_WEBHOOK_NIGHTLY }}
8888
FAILED_PRODUCT: ${{ matrix.products }}
89+
90+
sweepers:
91+
runs-on: ubuntu-latest
92+
needs: nightly
93+
if: always()
94+
steps:
95+
# Checkout should always be before setup-go to ensure caching is working
96+
- name: Checkout
97+
uses: actions/checkout@v4
98+
- name: Install Go
99+
uses: actions/setup-go@v5
100+
with:
101+
go-version: 1.22
89102
- name: Run Sweepers
90-
run: go run -v ./cmd/scw-sweepers
103+
run: go run -v ./cmd/scw-sweeper
91104
env:
92105
SCW_DEBUG: 1
93106
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}

cmd/scw-sweeper/main.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
containerSweeper "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1/sweepers"
1313
flexibleipSweeper "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1/sweepers"
1414
functionSweeper "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1/sweepers"
15+
iamSweeper "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1/sweepers"
1516
inferenceSweeper "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1/sweepers"
1617
instanceSweeper "github.com/scaleway/scaleway-sdk-go/api/instance/v1/sweepers"
1718
iotSweeper "github.com/scaleway/scaleway-sdk-go/api/iot/v1/sweepers"
@@ -96,6 +97,11 @@ func mainNoExit() int {
9697
return -1
9798
}
9899

100+
err = iamSweeper.SweepSSHKey(client)
101+
if err != nil {
102+
return -1
103+
}
104+
99105
err = inferenceSweeper.SweepAllLocalities(client)
100106
if err != nil {
101107
return -1

0 commit comments

Comments
 (0)