Skip to content

Commit 0c921c5

Browse files
authored
chore(instance): remove routed_ip_enabled references (#3024)
1 parent b168cbb commit 0c921c5

File tree

5 files changed

+1
-22
lines changed

5 files changed

+1
-22
lines changed

docs/data-sources/instance_server.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ attached to the server.
6363

6464
- `enable_dynamic_ip` - True if dynamic IP in enable on the server.
6565

66-
- `routed_ip_enabled` - True if the server support routed ip only.
67-
6866
- `state` - The state of the server. Possible values are: `started`, `stopped` or `standby`.
6967

7068
- `cloud_init` - The cloud init script associated with this server.

docs/data-sources/instance_servers.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ In addition to all above arguments, the following attributes are exported:
6060
- `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
6161
- `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )
6262
- `ipv6_prefix_length` - The prefix length of the ipv6 subnet routed to the server. ( Only set when enable_ipv6 is set to true )
63-
- `routed_ip_enabled` - True if the server support routed ip only.
6463
- `enable_dynamic_ip` - If true a dynamic IP will be attached to the server.
6564
- `image` - The UUID or the label of the base image used by the server.
6665
- `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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ attached to the server. Updates to this field will trigger a stop/start of the s
227227

228228
~> **Important:** If this field contains local volumes, you have to first detach them, in one apply, and then delete the volume in another apply.
229229

230-
- `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.
230+
- `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server.
231231
Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
232232

233233
- `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
238238

239239
- `enable_dynamic_ip` - (Defaults to `false`) If true a dynamic IP will be attached to the server.
240240

241-
- `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.
242-
243-
~> **Important:** Enabling routed ip will restart the server
244-
245241
- `state` - (Defaults to `started`) The state of the server. Possible values are: `started`, `stopped` or `standby`.
246242

247243
- `user_data` - (Optional) The user data associated with the server.

internal/services/instance/server.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,6 @@ func ResourceServer() *schema.Resource {
188188
Default: false,
189189
Description: "Determines if IPv6 is enabled for the server",
190190
Deprecated: "Please use a scaleway_instance_ip with a `routed_ipv6` type",
191-
DiffSuppressFunc: func(_, _, _ string, d *schema.ResourceData) bool {
192-
// routed_ip enabled servers already support enable_ipv6. Let's ignore this argument if it is.
193-
routedIPEnabled := types.GetBool(d, "routed_ip_enabled")
194-
if routedIPEnabled == nil || routedIPEnabled.(bool) {
195-
return true
196-
}
197-
198-
return false
199-
},
200191
},
201192
"private_ip": {
202193
Type: schema.TypeString,

internal/services/instance/servers_data_source.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,6 @@ func DataSourceServers() *schema.Resource {
129129
Computed: true,
130130
Type: schema.TypeInt,
131131
},
132-
"routed_ip_enabled": {
133-
Computed: true,
134-
Type: schema.TypeBool,
135-
},
136132
"zone": zonal.Schema(),
137133
"organization_id": account.OrganizationIDSchema(),
138134
"project_id": account.ProjectIDSchema(),
@@ -205,7 +201,6 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
205201
}
206202

207203
rawServer["enable_dynamic_ip"] = server.DynamicIPRequired
208-
rawServer["routed_ip_enabled"] = server.RoutedIPEnabled //nolint:staticcheck
209204
rawServer["organization_id"] = server.Organization
210205
rawServer["project_id"] = server.Project
211206

0 commit comments

Comments
 (0)