Merge branch 'master' into feat/migrate_webhosting_to_v1

Author: jremy42

.github/workflows/acceptance-tests.yaml

@@ -52,7 +52,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.5
+          go-version: 1.24.0
       - name: Run Acceptance Tests
         run: go test -v ./internal/services/${{ matrix.products }} -timeout=2h
         env:
@@ -76,7 +76,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.5
+          go-version: 1.24.0
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v3
       - name: Run scwconfig tests

.github/workflows/documentation.yml

@@ -12,7 +12,7 @@ on:
       - docs/**
 
 env:
-  GO_VERSION: "1.23.5"
+  GO_VERSION: "1.24.0"
   GO111MODULE: on
 
 jobs:

.github/workflows/nightly.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.5
+          go-version: 1.24.0
       - name: Run Acceptance Tests
         run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h
         env:
@@ -105,7 +105,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.5
+          go-version: 1.24.0
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v3
       - name: Run sweepers

.github/workflows/purge.yml

@@ -0,0 +1,25 @@
+name: Manual Purge
+on:
+  workflow_dispatch:
+
+jobs:
+  sweeper:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout should always be before setup-go to ensure caching is working
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.24.0
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+      - name: Run sweepers
+        run: make sweep
+        env:
+          TF_TEST_DOMAIN: scaleway-terraform.com
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
+          SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.5
+          go-version: 1.24.0
 
       - name: Import GPG key
         id: import_gpg

.github/workflows/tfproviderlint.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.23.5
+          go-version: 1.24.0
       - 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.5
+            go-version: 1.24.0
       - uses: hashicorp/setup-terraform@v3
       - run: go install github.com/bflad/tfproviderdocs@latest
       - run: make tfproviderdocs

.github/workflows/unit-tests.yaml

@@ -16,7 +16,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.23.5
+        go-version: 1.24.0
     - name: Install Terraform
       uses: hashicorp/setup-terraform@v3
     - name: Build binaries

GNUmakefile

@@ -56,7 +56,7 @@ website:
 .PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website
 
 tfproviderlint:
-	go run github.com/bflad/tfproviderlint/cmd/tfproviderlint -R014=false -AT001.ignored-filename-suffixes=_data_source_test.go ./...
+	go tool tfproviderlint -R014=false -AT001.ignored-filename-suffixes=_data_source_test.go ./...
 
 tfproviderdocs:
-	go run github.com/bflad/tfproviderdocs check -provider-name scaleway -enable-contents-check
+	go tool tfproviderdocs check -provider-name scaleway -enable-contents-check

docs/index.md

@@ -65,16 +65,16 @@ resource "scaleway_instance_ip" "public_ip_backup" {
   project_id = var.project_id
 }
 
-resource "scaleway_instance_volume" "data" {
+resource "scaleway_block_volume" "data" {
   project_id = var.project_id
   size_in_gb = 30
-  type       = "l_ssd"
+  iops = 5000
 }
 
-resource "scaleway_instance_volume" "data_backup" {
+resource "scaleway_block_volume" "data_backup" {
   project_id = var.project_id
   size_in_gb = 10
-  type       = "l_ssd"
+  iops = 5000
 }
 
 resource "scaleway_instance_security_group" "www" {
@@ -108,10 +108,9 @@ resource "scaleway_instance_server" "web" {
 
   ip_id = scaleway_instance_ip.public_ip.id
 
-  additional_volume_ids = [scaleway_instance_volume.data.id]
+  additional_volume_ids = [scaleway_block_volume.data.id]
 
   root_volume {
-    # The local storage of a DEV1-L instance is 80 GB, subtract 30 GB from the additional l_ssd volume, then the root volume needs to be 50 GB.
     size_in_gb = 50
   }
 

docs/resources/instance_server.md

@@ -26,9 +26,9 @@ resource "scaleway_instance_server" "web" {
 ### With additional volumes and tags
 
 ```terraform
-resource "scaleway_instance_volume" "data" {
+resource "scaleway_block_volume" "data" {
   size_in_gb = 100
-  type = "b_ssd"
+  iops = 5000
 }
 
 resource "scaleway_instance_server" "web" {
@@ -41,7 +41,7 @@ resource "scaleway_instance_server" "web" {
     delete_on_termination = false
   }
 
-  additional_volume_ids = [ scaleway_instance_volume.data.id ]
+  additional_volume_ids = [ scaleway_block_volume.data.id ]
 }
 ```
 
@@ -137,7 +137,6 @@ resource "scaleway_instance_server" "image" {
   type = "PRO2-XXS"
   image = "ubuntu_jammy"
   root_volume {
-    volume_type = "b_ssd"
     size_in_gb = 100
   }
 }
@@ -146,19 +145,20 @@ resource "scaleway_instance_server" "image" {
 #### From snapshot
 
 ```terraform
-data "scaleway_instance_snapshot" "snapshot" {
+data "scaleway_block_snapshot" "snapshot" {
   name = "my_snapshot"
 }
 
-resource "scaleway_instance_volume" "from_snapshot" {
-  from_snapshot_id = data.scaleway_instance_snapshot.snapshot.id
-  type = "b_ssd"
+resource "scaleway_block_volume" "from_snapshot" {
+  snapshot_id = data.scaleway_block_snapshot.snapshot.id
+  iops = 5000
 }
 
 resource "scaleway_instance_server" "from_snapshot" {
   type = "PRO2-XXS"
   root_volume {
-    volume_id = scaleway_instance_volume.from_snapshot.id
+    volume_id = scaleway_block_volume.from_snapshot.id
+    volume_type = "sbs_volume"
   }
 }
 ```