From ddf92a2c1e409b28d49cc58dc5b1787bc6ce3718 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Feb 2025 14:36:24 +0100 Subject: [PATCH 1/6] ci: bump go to 1.23 --- .github/workflows/acceptance-tests.yaml | 4 ++-- .github/workflows/coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/tfproviderlint.yml | 4 ++-- .github/workflows/unit-tests.yaml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/acceptance-tests.yaml b/.github/workflows/acceptance-tests.yaml index 3107945911..a27b0fa036 100644 --- a/.github/workflows/acceptance-tests.yaml +++ b/.github/workflows/acceptance-tests.yaml @@ -50,7 +50,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: Run Acceptance Tests run: go test -v ./internal/services/${{ matrix.products }} -timeout=2h env: @@ -74,7 +74,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: Run scwconfig tests run: go test -v ./internal/services/scwconfig -timeout=2m env: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index fdc243acc5..fc529eca7d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -15,7 +15,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: Run coverage run: go test -v -timeout=2h -coverprofile=coverage.out -covermode=count ./... env: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index affecf2893..13d0c273a0 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -12,7 +12,7 @@ on: - docs/** env: - GO_VERSION: "1.22" + GO_VERSION: "1.23" GO111MODULE: on jobs: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6fa6556d78..ff25272c35 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -51,7 +51,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: Run Acceptance Tests run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h env: @@ -103,7 +103,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: Run sweepers run: make sweep env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31ac5be6d4..7a7fa07624 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: Import GPG key id: import_gpg diff --git a/.github/workflows/tfproviderlint.yml b/.github/workflows/tfproviderlint.yml index 0f36a45005..f8e17fbb91 100644 --- a/.github/workflows/tfproviderlint.yml +++ b/.github/workflows/tfproviderlint.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: Install tfproviderlint run: go install github.com/bflad/tfproviderlint/cmd/tfproviderlint - name: Run tfproviderlint @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - uses: hashicorp/setup-terraform@v3 - run: go install github.com/bflad/tfproviderdocs@latest - run: make tfproviderdocs diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 8897fb51f4..d05fc463bc 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -8,7 +8,7 @@ jobs: tests: strategy: matrix: - go-version: [1.22.x] + go-version: [1.23.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: From 8724a44cd51b0c29ea6e150736a4d31e34d4a661 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Feb 2025 14:41:57 +0100 Subject: [PATCH 2/6] set version to 1.23.5 --- .github/workflows/acceptance-tests.yaml | 4 ++-- .github/workflows/coverage.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/tfproviderlint.yml | 4 ++-- .github/workflows/unit-tests.yaml | 2 +- go.mod | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/acceptance-tests.yaml b/.github/workflows/acceptance-tests.yaml index a27b0fa036..4c27bedaaa 100644 --- a/.github/workflows/acceptance-tests.yaml +++ b/.github/workflows/acceptance-tests.yaml @@ -50,7 +50,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.23.5 - name: Run Acceptance Tests run: go test -v ./internal/services/${{ matrix.products }} -timeout=2h env: @@ -74,7 +74,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.23.5 - name: Run scwconfig tests run: go test -v ./internal/services/scwconfig -timeout=2m env: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index fc529eca7d..45d803b5fd 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -15,7 +15,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-go@v5 with: - go-version: '1.23' + go-version: '1.23.5' - name: Run coverage run: go test -v -timeout=2h -coverprofile=coverage.out -covermode=count ./... env: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 13d0c273a0..0e3254ced5 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -12,7 +12,7 @@ on: - docs/** env: - GO_VERSION: "1.23" + GO_VERSION: "1.23.5" GO111MODULE: on jobs: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ff25272c35..322c275915 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -51,7 +51,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.23.5 - name: Run Acceptance Tests run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h env: @@ -103,7 +103,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.23.5 - name: Run sweepers run: make sweep env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a7fa07624..56def9095b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.23.5 - name: Import GPG key id: import_gpg diff --git a/.github/workflows/tfproviderlint.yml b/.github/workflows/tfproviderlint.yml index f8e17fbb91..e6ebdc35d9 100644 --- a/.github/workflows/tfproviderlint.yml +++ b/.github/workflows/tfproviderlint.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.23.5 - name: Install tfproviderlint run: go install github.com/bflad/tfproviderlint/cmd/tfproviderlint - name: Run tfproviderlint @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.23.5 - uses: hashicorp/setup-terraform@v3 - run: go install github.com/bflad/tfproviderdocs@latest - run: make tfproviderdocs diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index d05fc463bc..14dd993423 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -8,7 +8,7 @@ jobs: tests: strategy: matrix: - go-version: [1.23.x] + go-version: [1.23.5] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/go.mod b/go.mod index ac413ddba0..55be8a2d61 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/scaleway/terraform-provider-scaleway/v2 go 1.22.0 -toolchain go1.23.1 +toolchain go1.23.5 require ( github.com/aws/aws-sdk-go-v2 v1.32.7 From c70153b2291650153418931c47727a705e5b93ae Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Feb 2025 15:47:52 +0100 Subject: [PATCH 3/6] remove coverage workflow --- .github/workflows/coverage.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/workflows/coverage.yml diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml deleted file mode 100644 index 45d803b5fd..0000000000 --- a/.github/workflows/coverage.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Test and coverage - -on: - push: - pull_request: - merge_group: - -jobs: - build: - runs-on: ubuntu-latest - steps: - # Checkout should always be before setup-go to ensure caching is working - - uses: actions/checkout@v4 - with: - fetch-depth: 2 - - uses: actions/setup-go@v5 - with: - go-version: '1.23.5' - - name: Run coverage - run: go test -v -timeout=2h -coverprofile=coverage.out -covermode=count ./... - env: - TF_ACC: 1 # It runs the integration test through the cassettes and not with real API calls - TF_TEST_DOMAIN: scaleway-terraform.com - TF_UPDATE_CASSETTES: false - TF_TEST_DOMAIN_ZONE: tf - SCW_ACCESS_KEY: "SCWXXXXXXXXXXXXXFAKE" - SCW_SECRET_KEY: "11111111-1111-1111-1111-111111111111" - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 From d4694b36658512d39c05d8f92b1f576560935410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Tue, 4 Feb 2025 16:14:24 +0100 Subject: [PATCH 4/6] Update go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 55be8a2d61..3d098eceee 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/scaleway/terraform-provider-scaleway/v2 -go 1.22.0 +go 1.23.5 toolchain go1.23.5 From 446dc39f3109505313e92a1e43f0c4ab736a71ff Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Feb 2025 16:27:57 +0100 Subject: [PATCH 5/6] go mod tidy --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 3d098eceee..c8ebbe32a1 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/scaleway/terraform-provider-scaleway/v2 go 1.23.5 -toolchain go1.23.5 - require ( github.com/aws/aws-sdk-go-v2 v1.32.7 github.com/aws/aws-sdk-go-v2/config v1.28.7 From 014edb5537a63e8eab10468ef58016c979afdc6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Tue, 4 Feb 2025 16:28:46 +0100 Subject: [PATCH 6/6] Fix --- .github/workflows/unit-tests.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 14dd993423..18499f252c 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -6,11 +6,7 @@ on: jobs: tests: - strategy: - matrix: - go-version: [1.23.5] - platform: [ubuntu-latest] - runs-on: ${{ matrix.platform }} + runs-on: ubuntu-latest steps: # Checkout should always be before setup-go to ensure caching is working - name: Checkout @@ -20,7 +16,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: ${{ matrix.go-version }} + go-version: 1.23.5 - name: Build binaries run: make build - name: Run unit tests