Skip to content

Commit 30e6917

Browse files
yfodilyfodil
authored
Merge branch 'master' into feat/migrate-vpcgw-v2
2 parents f3e4c44 + 5a61026 commit 30e6917

File tree

991 files changed

+486629
-304191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

991 files changed

+486629
-304191
lines changed

‎.github/CODEOWNERS‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22
# the repo. Unless a later match takes precedence,
33
* @remyleone
44

5-
/internal/services/account/ @Codelax
6-
/internal/services/applesilicon/ @Laure-di
7-
/internal/services/baremetal/ @Laure-di
8-
/internal/services/billing/ @yfodil
9-
/internal/services/block/ @Codelax
10-
/internal/services/cockpit/ @jremy42
11-
/internal/services/container/ @Codelax
12-
/internal/services/documentdb/ @jremy42
13-
/internal/services/domain/ @yfodil
14-
/internal/services/flexibleip/ @yfodil
15-
/internal/services/function/ @Codelax
16-
/internal/services/iam/ @Codelax
17-
/internal/services/instance/ @Codelax
18-
/internal/services/iot/ @jremy42
19-
/internal/services/ipam/ @yfodil
20-
/internal/services/jobs/ @Codelax
21-
/internal/services/k8s/ @Mia-Cross
22-
/internal/services/lb/ @yfodil
23-
/internal/services/marketplace/ @Codelax
24-
/internal/services/mnq/ @Codelax
25-
/internal/services/object/ @Mia-Cross
26-
/internal/services/rdb/ @jremy42
27-
/internal/services/redis/ @jremy42
28-
/internal/services/registry/ @Mia-Cross
29-
/internal/services/sdb/ @jremy42
30-
/internal/services/secret/ @Codelax
31-
/internal/services/tem/ @jremy42
32-
/internal/services/vpc/ @yfodil
33-
/internal/services/vpcgw/ @yfodil
34-
/internal/services/webhosting/ @jremy42
5+
/internal/services/account/ @scaleway/devtools-core
6+
/internal/services/applesilicon/ @scaleway/devtools-compute-foundation
7+
/internal/services/baremetal/ @scaleway/devtools-compute-foundation
8+
/internal/services/billing/ @scaleway/devtools-core
9+
/internal/services/block/ @scaleway/devtools-storage
10+
/internal/services/cockpit/ @scaleway/devtools-dms
11+
/internal/services/container/ @scaleway/devtools-compute
12+
/internal/services/documentdb/ @scaleway/devtools-dms
13+
/internal/services/domain/ @scaleway/devtools-dms
14+
/internal/services/flexibleip/ @scaleway/devtools-network
15+
/internal/services/function/ @scaleway/devtools-compute
16+
/internal/services/iam/ @scaleway/devtools-core
17+
/internal/services/instance/ @scaleway/devtools-compute
18+
/internal/services/iot/ @scaleway/devtools-dms
19+
/internal/services/ipam/ @scaleway/devtools-network
20+
/internal/services/jobs/ @scaleway/devtools-compute
21+
/internal/services/k8s/ @scaleway/devtools-compute
22+
/internal/services/lb/ @scaleway/devtools-network
23+
/internal/services/marketplace/ @scaleway/devtools-compute
24+
/internal/services/mnq/ @scaleway/devtools-dms
25+
/internal/services/object/ @scaleway/devtools-storage
26+
/internal/services/rdb/ @scaleway/devtools-dms
27+
/internal/services/redis/ @scaleway/devtools-dms
28+
/internal/services/registry/ @scaleway/devtools-compute
29+
/internal/services/sdb/ @scaleway/devtools-dms
30+
/internal/services/secret/ @scaleway/devtools-core
31+
/internal/services/tem/ @scaleway/devtools-dms
32+
/internal/services/vpc/ @scaleway/devtools-network
33+
/internal/services/vpcgw/ @scaleway/devtools-network
34+
/internal/services/webhosting/ @scaleway/devtools-dms

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ jobs:
4747
# Checkout should always be before setup-go to ensure caching is working
4848
- name: Checkout
4949
uses: actions/checkout@v4
50+
- name: Install Terraform
51+
uses: hashicorp/setup-terraform@v3
5052
- name: Install Go
5153
uses: actions/setup-go@v5
5254
with:
53-
go-version: 1.22
55+
go-version: 1.24.0
5456
- name: Run Acceptance Tests
5557
run: go test -v ./internal/services/${{ matrix.products }} -timeout=2h
5658
env:
@@ -74,7 +76,9 @@ jobs:
7476
- name: Install Go
7577
uses: actions/setup-go@v5
7678
with:
77-
go-version: 1.22
79+
go-version: 1.24.0
80+
- name: Install Terraform
81+
uses: hashicorp/setup-terraform@v3
7882
- name: Run scwconfig tests
7983
run: go test -v ./internal/services/scwconfig -timeout=2m
8084
env:

‎.github/workflows/actionlint.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Lint GitHub Actions workflows
2+
on: [push, pull_request]
3+
4+
jobs:
5+
actionlint:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- name: Check workflow files
10+
uses: docker://rhysd/actionlint:latest
11+
with:
12+
args: -color -ignore SC2086

‎.github/workflows/announce.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
steps:
1111
- name: Get tag
1212
id: get_tag
13-
run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//}
13+
run: echo "{TAG}=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
1414
- name: Get version
1515
id: get_version
16-
run: echo ::set-output name=VERSION::${TAG##v}
16+
run: echo "{VERSION}=${TAG##v}" >> $GITHUB_OUTPUT
1717
env:
1818
TAG: ${{ steps.get_tag.outputs.TAG }}
1919
- name: Prepare message
2020
id: get_message
21-
run: echo ::set-output name=MSG::"${{ secrets.SLACK_MESSAGE }}"
21+
run: echo "{MSG}=${{ secrets.SLACK_MESSAGE }}" >> $GITHUB_OUTPUT
2222
env:
2323
VERSION: ${{ steps.get_version.outputs.VERSION }}
2424
TAG: ${{ steps.get_tag.outputs.TAG }}
@@ -27,7 +27,7 @@ jobs:
2727
id: announce_slack
2828
run: |
2929
readarray -td' ' URL_LIST <<<$SLACK_WEBHOOKS;
30-
for WEBHOOK_URL in ${URL_LIST[@]};
30+
for WEBHOOK_URL in "${URL_LIST[@]}";
3131
do curl -X POST -H 'Content-type: application/json' \
3232
--data '{
3333
"blocks": [

‎.github/workflows/coverage.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/workflows/documentation.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ on:
1212
- docs/**
1313

1414
env:
15-
GO_VERSION: "1.22"
15+
GO_VERSION: "1.24.0"
1616
GO111MODULE: on
1717

1818
jobs:
1919
markdown-link-check:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v4
23-
- uses: gaurav-nelson/[email protected].15
23+
- uses: gaurav-nelson/[email protected].16
2424
with:
2525
use-quiet-mode: 'yes'
2626
use-verbose-mode: 'yes'
@@ -51,3 +51,13 @@ jobs:
5151
key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
5252
- run: go install github.com/client9/misspell/cmd/misspell@latest
5353
- run: misspell -error -source text docs/
54+
55+
tfplugindocs:
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@v4
59+
- uses: actions/setup-go@v5
60+
with:
61+
go-version: ${{ env.GO_VERSION }}
62+
- uses: hashicorp/setup-terraform@v3
63+
- run: go tool tfplugindocs validate

‎.github/workflows/nightly.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- cockpit
2121
- container
2222
- domain
23+
- edgeservices
2324
- flexibleip
2425
- function
2526
- iam
@@ -48,10 +49,12 @@ jobs:
4849
# Checkout should always be before setup-go to ensure caching is working
4950
- name: Checkout
5051
uses: actions/checkout@v4
52+
- name: Install Terraform
53+
uses: hashicorp/setup-terraform@v3
5154
- name: Install Go
5255
uses: actions/setup-go@v5
5356
with:
54-
go-version: 1.22
57+
go-version: 1.24.0
5558
- name: Run Acceptance Tests
5659
run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h
5760
env:
@@ -86,6 +89,9 @@ jobs:
8689
env:
8790
SLACK_WEBHOOK_NIGHTLY: ${{ secrets.SLACK_WEBHOOK_NIGHTLY }}
8891
FAILED_PRODUCT: ${{ matrix.products }}
92+
- name: Run acceptance test for cassettes
93+
if: success() || failure() # If the job is not cancelled, run it regardless of the result of the previous step
94+
run: go test -v github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest -run TestAccCassettes_Validator
8995

9096
# sweeper needs to run after nightly completed
9197
# no matter what are the results of the jobs
@@ -100,7 +106,9 @@ jobs:
100106
- name: Install Go
101107
uses: actions/setup-go@v5
102108
with:
103-
go-version: 1.22
109+
go-version: 1.24.0
110+
- name: Install Terraform
111+
uses: hashicorp/setup-terraform@v3
104112
- name: Run sweepers
105113
run: make sweep
106114
env:

‎.github/workflows/purge.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Manual Purge
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
sweeper:
7+
runs-on: ubuntu-latest
8+
steps:
9+
# Checkout should always be before setup-go to ensure caching is working
10+
- name: Checkout
11+
uses: actions/checkout@v4
12+
- name: Install Go
13+
uses: actions/setup-go@v5
14+
with:
15+
go-version: 1.24.0
16+
- name: Install Terraform
17+
uses: hashicorp/setup-terraform@v3
18+
- name: Run sweepers
19+
run: make sweep
20+
env:
21+
TF_TEST_DOMAIN: scaleway-terraform.com
22+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
23+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
24+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
25+
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: 1.22
31+
go-version: 1.24.0
3232

3333
- name: Import GPG key
3434
id: import_gpg

‎.github/workflows/tfproviderlint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: 1.22
16+
go-version: 1.24.0
1717
- name: Install tfproviderlint
1818
run: go install github.com/bflad/tfproviderlint/cmd/tfproviderlint
1919
- name: Run tfproviderlint
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626
- uses: actions/setup-go@v5
2727
with:
28-
go-version: 1.22
28+
go-version: 1.24.0
2929
- uses: hashicorp/setup-terraform@v3
3030
- run: go install github.com/bflad/tfproviderdocs@latest
3131
- run: make tfproviderdocs

0 commit comments

Comments
 (0)