Skip to content

Commit c457137

Browse files
authored
Merge branch 'master' into feat/container_serverless_scaling_option_block
2 parents 1098037 + b1b12fd commit c457137

File tree

832 files changed

+420420
-295467
lines changed

Some content is hidden

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

832 files changed

+420420
-295467
lines changed

.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.23.5
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.23.5
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/coverage.yml

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

.github/workflows/documentation.yml

Lines changed: 2 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.23.5"
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'

.github/workflows/nightly.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ jobs:
4848
# Checkout should always be before setup-go to ensure caching is working
4949
- name: Checkout
5050
uses: actions/checkout@v4
51+
- name: Install Terraform
52+
uses: hashicorp/setup-terraform@v3
5153
- name: Install Go
5254
uses: actions/setup-go@v5
5355
with:
54-
go-version: 1.22
56+
go-version: 1.23.5
5557
- name: Run Acceptance Tests
5658
run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h
5759
env:
@@ -86,6 +88,9 @@ jobs:
8688
env:
8789
SLACK_WEBHOOK_NIGHTLY: ${{ secrets.SLACK_WEBHOOK_NIGHTLY }}
8890
FAILED_PRODUCT: ${{ matrix.products }}
91+
- name: Run acceptance test for cassettes
92+
if: success() || failure() # If the job is not cancelled, run it regardless of the result of the previous step
93+
run: go test -v github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest -run TestAccCassettes_Validator
8994

9095
# sweeper needs to run after nightly completed
9196
# no matter what are the results of the jobs
@@ -100,7 +105,9 @@ jobs:
100105
- name: Install Go
101106
uses: actions/setup-go@v5
102107
with:
103-
go-version: 1.22
108+
go-version: 1.23.5
109+
- name: Install Terraform
110+
uses: hashicorp/setup-terraform@v3
104111
- name: Run sweepers
105112
run: make sweep
106113
env:

.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.23.5
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.23.5
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.23.5
2929
- uses: hashicorp/setup-terraform@v3
3030
- run: go install github.com/bflad/tfproviderdocs@latest
3131
- run: make tfproviderdocs

.github/workflows/unit-tests.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ on:
66

77
jobs:
88
tests:
9-
strategy:
10-
matrix:
11-
go-version: [1.22.x]
12-
platform: [ubuntu-latest]
13-
runs-on: ${{ matrix.platform }}
9+
runs-on: ubuntu-latest
1410
steps:
1511
# Checkout should always be before setup-go to ensure caching is working
1612
- name: Checkout
@@ -20,7 +16,9 @@ jobs:
2016
- name: Install Go
2117
uses: actions/setup-go@v5
2218
with:
23-
go-version: ${{ matrix.go-version }}
19+
go-version: 1.23.5
20+
- name: Install Terraform
21+
uses: hashicorp/setup-terraform@v3
2422
- name: Build binaries
2523
run: make build
2624
- name: Run unit tests

.golangci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ linters:
1818
- errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: false, auto-fix: false]
1919
- errchkjson # Checks types passed to the json encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted. [fast: false, auto-fix: false]
2020
- errname # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`. [fast: false, auto-fix: false]
21+
- exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix]
2122
- forbidigo # Forbids identifiers [fast: true, auto-fix: false]
2223
- gci # Gci controls golang package import order and makes it always deterministic. [fast: true, auto-fix: false]
2324
- gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false]
@@ -48,6 +49,7 @@ linters:
4849
- musttag # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false]
4950
- nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
5051
- nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
52+
- nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: true]
5153
- noctx # noctx finds sending http request without context.Context [fast: false, auto-fix: false]
5254
- nolintlint # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false]
5355
- nosprintfhostport # Checks for misuse of Sprintf to construct a host with port in a URL. [fast: true, auto-fix: false]
@@ -65,7 +67,6 @@ linters:
6567
- stylecheck # Stylecheck is a replacement for golint [fast: false, auto-fix: false]
6668
- tagalign # check that struct tags are well aligned [fast: true, auto-fix: true]
6769
- tagliatelle # Checks the struct tags. [fast: true, auto-fix: false]
68-
- tenv # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17 [fast: false, auto-fix: false]
6970
- testifylint # Checks usage of github.com/stretchr/testify. [fast: false, auto-fix: false]
7071
- testpackage # linter that makes you use a separate _test package [fast: true, auto-fix: false]
7172
- thelper # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers [fast: false, auto-fix: false]
@@ -74,8 +75,10 @@ linters:
7475
- unconvert # Remove unnecessary type conversions [fast: false, auto-fix: false]
7576
- unused #(megacheck): Checks Go code for unused constants, variables, functions and types [fast: false, auto-fix: false]
7677
- usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library. [fast: true, auto-fix: false]
78+
- usetesting # Reports uses of functions with replacement inside the testing package. [auto-fix]
7779
- wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
7880
- whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
81+
- wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
7982
- zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
8083

8184
disable:
@@ -97,9 +100,7 @@ linters:
97100
- mnd # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
98101
- nestif # Reports deeply nested if statements [fast: true, auto-fix: false]
99102
- nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value. [fast: false, auto-fix: false]
100-
- nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false]
101103
- varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
102-
- wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
103104

104105
linters-settings:
105106
goconst:

docs/data-sources/account_project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ page_title: "Scaleway: scaleway_account_project"
77

88
The `scaleway_account_project` data source is used to retrieve information about a Scaleway project.
99

10-
Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/identity-and-access-management/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.
10+
Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.
1111

1212

1313
## Retrieve a Scaleway Project

docs/data-sources/account_ssh_key.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ page_title: "Scaleway: scaleway_account_ssh_key"
77

88
The `scaleway_account_ssh_key` data source is used to retrieve information about a the SSH key of a Scaleway account.
99

10-
Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/identity-and-access-management/organizations-and-projects/how-to/create-ssh-key/) and [API documentation](https://www.scaleway.com/en/developers/api/iam/#path-ssh-keys) for more information.
10+
Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/how-to/create-ssh-key/) and [API documentation](https://www.scaleway.com/en/developers/api/iam/#path-ssh-keys) for more information.
1111

1212

1313
## Retrieve the SSH key of a Scaleway account

0 commit comments

Comments
 (0)