Merge branch 'master' into chore/bump__sdk__go

Codelax · web-flow · commit 25cf380b0b3c · 2025-02-04T17:49:51.000+01:00
diff --git a/.github/workflows/acceptance-tests.yaml b/.github/workflows/acceptance-tests.yaml
@@ -47,10 +47,12 @@ jobs:
       # Checkout should always be before setup-go to ensure caching is working
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23.5
       - name: Run Acceptance Tests
         run: go test -v ./internal/services/${{ matrix.products }} -timeout=2h
         env:
@@ -74,7 +76,9 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23.5
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
       - 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
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -12,15 +12,15 @@ on:
       - docs/**
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.23.5"
   GO111MODULE: on
 
 jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.15
+      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.16
         with:
           use-quiet-mode: 'yes'
           use-verbose-mode: 'yes'
diff --git 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.5
       - name: Run Acceptance Tests
         run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h
         env:
@@ -87,6 +87,7 @@ jobs:
           SLACK_WEBHOOK_NIGHTLY: ${{ secrets.SLACK_WEBHOOK_NIGHTLY }}
           FAILED_PRODUCT: ${{ matrix.products }}
       - name: Run acceptance test for cassettes
+        if: success() || failure() # If the job is not cancelled, run it regardless of the result of the previous step
         run: go test -v github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest -run TestAccCassettes_Validator
 
   # sweeper needs to run after nightly completed
@@ -102,7 +103,9 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23.5
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
       - name: Run sweepers
         run: make sweep
         env:
diff --git 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.5
 
       - name: Import GPG key
         id: import_gpg
diff --git 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.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.22
+            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
@@ -6,11 +6,7 @@ on:
 
 jobs:
   tests:
-    strategy:
-      matrix:
-        go-version: [1.22.x]
-        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,9 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: ${{ matrix.go-version }}
+        go-version: 1.23.5
+    - name: Install Terraform
+      uses: hashicorp/setup-terraform@v3
     - name: Build binaries
       run: make build
     - name: Run unit tests
diff --git a/docs/resources/instance_ip.md b/docs/resources/instance_ip.md
@@ -17,10 +17,7 @@ resource "scaleway_instance_ip" "server_ip" {}
 
 The following arguments are supported:
 
-- `type` - (Defaults to `nat`) The type of the IP (`nat`, `routed_ipv4`, `routed_ipv6`), more information in [the documentation](https://www.scaleway.com/en/docs/compute/instances/api-cli/using-routed-ips/)
-
-~> **Important:** An IP can migrate from `nat` to `routed_ipv4` but cannot be converted back
-
+- `type` - The type of the IP (`routed_ipv4`, `routed_ipv6`), more information in [the documentation](https://www.scaleway.com/en/docs/compute/instances/api-cli/using-routed-ips/)
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the IP should be reserved.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the IP is associated with.
 
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/scaleway/terraform-provider-scaleway/v2
 
-go 1.22.0
-
-toolchain go1.23.1
+go 1.23.5
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.32.7
diff --git a/internal/services/instance/ip.go b/internal/services/instance/ip.go
@@ -3,7 +3,6 @@ package instance
 import (
 	"context"
 
-	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
@@ -12,6 +11,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
 
 func ResourceIP() *schema.Resource {
@@ -39,22 +39,12 @@ func ResourceIP() *schema.Resource {
 				Description: "The IP prefix",
 			},
 			"type": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Optional:    true,
-				Description: "The type of instance IP",
-				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics {
-					if i.(string) == "nat" {
-						return diag.Diagnostics{{
-							Severity:      diag.Error,
-							Summary:       "NAT IPs are not supported anymore",
-							Detail:        "Remove explicit nat configuration, migrate to routed ips or downgrade terraform.\nLearn more about migration: https://www.scaleway.com/en/docs/compute/instances/how-to/migrate-routed-ips/",
-							AttributePath: path,
-						}}
-					}
-
-					return nil
-				},
+				Type:             schema.TypeString,
+				Computed:         true,
+				Optional:         true,
+				ForceNew:         true,
+				Description:      "The type of instance IP",
+				ValidateDiagFunc: verify.ValidateEnum[instanceSDK.IPType](),
 			},
 			"reverse": {
 				Type:        schema.TypeString,
@@ -78,23 +68,6 @@ func ResourceIP() *schema.Resource {
 			"organization_id": account.OrganizationIDSchema(),
 			"project_id":      account.ProjectIDSchema(),
 		},
-		CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error {
-			// The only allowed change is
-			// nat -> routed_ipv4
-			if diff.HasChange("type") {
-				before, after := diff.GetChange("type")
-				oldType := instanceSDK.IPType(before.(string))
-				newType := instanceSDK.IPType(after.(string))
-
-				if oldType == "nat" && newType == "routed_ipv4" {
-					return nil
-				}
-
-				return diff.ForceNew("type")
-			}
-
-			return nil
-		},
 	}
 }
 
@@ -149,10 +122,6 @@ func ResourceInstanceIPUpdate(ctx context.Context, d *schema.ResourceData, m int
 		req.Tags = types.ExpandUpdatedStringsPtr(d.Get("tags"))
 	}
 
-	if d.HasChange("type") {
-		req.Type = instanceSDK.IPType(d.Get("type").(string))
-	}
-
 	_, err = instanceAPI.UpdateIP(req, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
diff --git a/internal/services/instance/server.go b/internal/services/instance/server.go
@@ -340,28 +340,6 @@ func ResourceServer() *schema.Resource {
 					},
 				},
 			},
-			"routed_ip_enabled": {
-				Type:        schema.TypeBool,
-				Description: "If server supports routed IPs, default to true",
-				Optional:    true,
-				Computed:    true,
-				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics {
-					if i == nil {
-						return nil
-					}
-					if !i.(bool) {
-						return diag.Diagnostics{{
-							Severity:      diag.Error,
-							Summary:       "NAT IPs are not supported anymore",
-							Detail:        "Remove explicit disabling, enable it or downgrade terraform.\nLearn more about migration: https://www.scaleway.com/en/docs/compute/instances/how-to/migrate-routed-ips/",
-							AttributePath: path,
-						}}
-					}
-
-					return nil
-				},
-				Deprecated: "Routed IP is the default configuration, it should always be true",
-			},
 			"zone":            zonal.Schema(),
 			"organization_id": account.OrganizationIDSchema(),
 			"project_id":      account.ProjectIDSchema(),
@@ -402,7 +380,6 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 		SecurityGroup:     types.ExpandStringPtr(zonal.ExpandID(d.Get("security_group_id")).ID),
 		DynamicIPRequired: scw.BoolPtr(d.Get("enable_dynamic_ip").(bool)),
 		Tags:              types.ExpandStrings(d.Get("tags")),
-		RoutedIPEnabled:   types.ExpandBoolPtr(types.GetBool(d, "routed_ip_enabled")),
 	}
 
 	enableIPv6, ok := d.GetOk("enable_ipv6")
@@ -627,7 +604,6 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
 		_ = d.Set("enable_dynamic_ip", server.DynamicIPRequired)
 		_ = d.Set("organization_id", server.Organization)
 		_ = d.Set("project_id", server.Project)
-		_ = d.Set("routed_ip_enabled", server.RoutedIPEnabled) //nolint:staticcheck
 
 		// Image could be empty in an import context.
 		image := regional.ExpandID(d.Get("image").(string))
@@ -1037,13 +1013,6 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
-	if d.HasChanges("routed_ip_enabled") {
-		err := ResourceInstanceServerEnableRoutedIP(ctx, d, api.API, zone, id)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-	}
-
 	if d.HasChanges("root_volume.0.sbs_iops") {
 		warnings = append(warnings, ResourceInstanceServerUpdateRootVolumeIOPS(ctx, api, zone, id, types.ExpandUint32Ptr(d.Get("root_volume.0.sbs_iops")))...)
 	}
@@ -1312,29 +1281,6 @@ func ResourceInstanceServerMigrate(ctx context.Context, d *schema.ResourceData,
 	return nil
 }
 
-func ResourceInstanceServerEnableRoutedIP(ctx context.Context, d *schema.ResourceData, instanceAPI *instanceSDK.API, zone scw.Zone, id string) error {
-	server, err := waitForServer(ctx, instanceAPI, zone, id, d.Timeout(schema.TimeoutUpdate))
-	if err != nil {
-		return err
-	}
-
-	_, err = instanceAPI.ServerAction(&instanceSDK.ServerActionRequest{
-		Zone:     server.Zone,
-		ServerID: server.ID,
-		Action:   "enable_routed_ip",
-	})
-	if err != nil {
-		return fmt.Errorf("failed to enable routed ip: %w", err)
-	}
-
-	_, err = waitForServer(ctx, instanceAPI, zone, id, d.Timeout(schema.TimeoutUpdate))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func ResourceInstanceServerUpdateIPs(ctx context.Context, d *schema.ResourceData, instanceAPI *instanceSDK.API, zone scw.Zone, id string) error {
 	server, err := waitForServer(ctx, instanceAPI, zone, id, d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
diff --git a/internal/services/instance/server_test.go b/internal/services/instance/server_test.go
@@ -1461,7 +1461,6 @@ func TestAccServer_IPs(t *testing.T) {
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					arePrivateNICsPresent(tt, "scaleway_instance_server.main"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.main", "routed_ip_enabled", "true"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.#", "1"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.0.id", "scaleway_instance_ip.ip1", "id"),
 				),
@@ -1485,7 +1484,6 @@ func TestAccServer_IPs(t *testing.T) {
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					arePrivateNICsPresent(tt, "scaleway_instance_server.main"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.main", "routed_ip_enabled", "true"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.#", "2"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.0.id", "scaleway_instance_ip.ip1", "id"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.1.id", "scaleway_instance_ip.ip2", "id"),
@@ -1510,7 +1508,6 @@ func TestAccServer_IPs(t *testing.T) {
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					arePrivateNICsPresent(tt, "scaleway_instance_server.main"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.main", "routed_ip_enabled", "true"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.#", "1"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.0.id", "scaleway_instance_ip.ip2", "id"),
 				),
@@ -1588,7 +1585,6 @@ func TestAccServer_IPsRemoved(t *testing.T) {
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					arePrivateNICsPresent(tt, "scaleway_instance_server.main"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.main", "routed_ip_enabled", "true"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.#", "1"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.0.id", "scaleway_instance_ip.main", "id"),
 				),
@@ -1608,7 +1604,6 @@ func TestAccServer_IPsRemoved(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					arePrivateNICsPresent(tt, "scaleway_instance_server.main"),
 					serverHasNoIPAssigned(tt, "scaleway_instance_server.main"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.main", "routed_ip_enabled", "true"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.#", "0"),
 				),
 			},
