Merge branch 'master' into migrate-monthly

Author: Laure-di

.github/workflows/announce.yaml

@@ -10,15 +10,15 @@ jobs:
     steps:
       - name: Get tag
         id: get_tag
-        run: echo "{TAG}=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+        run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
       - name: Get version
         id: get_version
-        run: echo "{VERSION}=${TAG##v}" >> $GITHUB_OUTPUT
+        run: echo "VERSION=${TAG##v}" >> $GITHUB_OUTPUT
         env:
           TAG: ${{ steps.get_tag.outputs.TAG }}
       - name: Prepare message
         id: get_message
-        run: echo "{MSG}=${{ secrets.SLACK_MESSAGE }}" >> $GITHUB_OUTPUT
+        run: echo "MSG=${{ secrets.SLACK_MESSAGE }}" >> $GITHUB_OUTPUT
         env:
           VERSION: ${{ steps.get_version.outputs.VERSION }}
           TAG: ${{ steps.get_tag.outputs.TAG }}

docs/data-sources/instance_server.md

@@ -63,8 +63,6 @@ attached to the server.
 
 - `enable_dynamic_ip` - True if dynamic IP in enable on the server.
 
-- `routed_ip_enabled` - True if the server support routed ip only.
-
 - `state` - The state of the server. Possible values are: `started`, `stopped` or `standby`.
 
 - `cloud_init` - The cloud init script associated with this server.

docs/data-sources/instance_servers.md

@@ -60,7 +60,6 @@ In addition to all above arguments, the following attributes are exported:
     - `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
     - `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )
     - `ipv6_prefix_length` - The prefix length of the ipv6 subnet routed to the server. ( Only set when enable_ipv6 is set to true )
-    - `routed_ip_enabled` - True if the server support routed ip only.
     - `enable_dynamic_ip` - If true a dynamic IP will be attached to the server.
     - `image` - The UUID or the label of the base image used by the server.
     - `placement_group_id` - The [placement group](https://developers.scaleway.com/en/products/instance/api/#placement-groups-d8f653) the server is attached to.

docs/resources/instance_server.md

@@ -227,7 +227,7 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 ~> **Important:** If this field contains local volumes, you have to first detach them, in one apply, and then delete the volume in another apply.
 
-- `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server. Useful only with `routed_ip_enabled` as false, otherwise ipv6 is always supported.
+- `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server.
   Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
 
 - `ip_id` - (Optional) The ID of the reserved IP that is attached to the server.
@@ -238,10 +238,6 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 - `enable_dynamic_ip` - (Defaults to `false`) If true a dynamic IP will be attached to the server.
 
-- `routed_ip_enabled` - (Defaults to `true`) If true, the server will support routed ips only. Changing it to true will migrate the server and its IP to routed type.
-
-~> **Important:** Enabling routed ip will restart the server
-
 - `state` - (Defaults to `started`) The state of the server. Possible values are: `started`, `stopped` or `standby`.
 
 - `user_data` - (Optional) The user data associated with the server.

internal/services/instance/server.go

@@ -188,15 +188,6 @@ func ResourceServer() *schema.Resource {
 				Default:     false,
 				Description: "Determines if IPv6 is enabled for the server",
 				Deprecated:  "Please use a scaleway_instance_ip with a `routed_ipv6` type",
-				DiffSuppressFunc: func(_, _, _ string, d *schema.ResourceData) bool {
-					// routed_ip enabled servers already support enable_ipv6. Let's ignore this argument if it is.
-					routedIPEnabled := types.GetBool(d, "routed_ip_enabled")
-					if routedIPEnabled == nil || routedIPEnabled.(bool) {
-						return true
-					}
-
-					return false
-				},
 			},
 			"private_ip": {
 				Type:        schema.TypeString,

internal/services/instance/servers_data_source.go

@@ -129,10 +129,6 @@ func DataSourceServers() *schema.Resource {
 							Computed: true,
 							Type:     schema.TypeInt,
 						},
-						"routed_ip_enabled": {
-							Computed: true,
-							Type:     schema.TypeBool,
-						},
 						"zone":            zonal.Schema(),
 						"organization_id": account.OrganizationIDSchema(),
 						"project_id":      account.ProjectIDSchema(),
@@ -205,7 +201,6 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
 		}
 
 		rawServer["enable_dynamic_ip"] = server.DynamicIPRequired
-		rawServer["routed_ip_enabled"] = server.RoutedIPEnabled //nolint:staticcheck
 		rawServer["organization_id"] = server.Organization
 		rawServer["project_id"] = server.Project