update documentation and templates

Author: Mia-Cross

docs/data-sources/instance_server.md

@@ -59,8 +59,6 @@ You find all the available types on the [pricing page](https://www.scaleway.com/
 - `additional_volume_ids` - The [additional volumes](https://developers.scaleway.com/en/products/instance/api/#volumes-7e8a39)
 attached to the server.
 
-- `enable_ipv6` - Determines if IPv6 is enabled for the server.
-
 - `enable_dynamic_ip` - True if dynamic IP in enable on the server.
 
 - `state` - The state of the server. Possible values are: `started`, `stopped` or `standby`.
@@ -78,16 +76,10 @@ attached to the server.
 - `root_volume`
     - `volume_id` - The volume ID of the root volume of the server.
 
-- `private_ip` - The Scaleway internal IP address of the server.
-
-- `public_ip` - The public IP address of the server.
-
 - `public_ips` - The list of public IPs of the server
     - `id` - The ID of the IP
     - `address` - The address of the IP
 
-- `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 )
+- `private_ips` - The list of private IPs of the server.
+    - `id` - The ID of the IP address resource.
+    - `address` - The private IP address.

docs/data-sources/instance_servers.md

@@ -44,8 +44,6 @@ In addition to all above arguments, the following attributes are exported:
         ~> **Important:** Instance servers' IDs are [zoned](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
 
     - `tags` - The tags associated with the server.
-    - `public_ip` - The public IP address of the server.
-    - `private_ip` - The Scaleway internal IP address of the server.
     - `private_ips` - The list of private IPv4 and IPv6 addresses associated with the server.
         - `id` - The ID of the IP address resource.
         - `address` - The private IP address.
@@ -59,14 +57,8 @@ In addition to all above arguments, the following attributes are exported:
     - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
     - `type` - The commercial type of the server.
     - `security_group_id` - The [security group](https://developers.scaleway.com/en/products/instance/api/#security-groups-8d7f89) the server is attached to.
-    - `enable_ipv6` - Determines if IPv6 is enabled for the server.
-    - `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 )
     - `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.
     - `organization_id` - The organization ID the server is associated with.
     - `project_id` - The ID of the project the server is associated with.
-  
-

docs/guides/migration_guide_v2.md

@@ -127,7 +127,6 @@ $ terraform state show scaleway_server.main
 # scaleway_server.main:
 resource "scaleway_server" "main" {
     boot_type    = "local"
-    enable_ipv6  = false
     id           = "11111111-1111-1111-1111-111111111111"
     image        = "cf44b8f5-77e2-42ed-8f1e-09ed5bb028fc"
     name         = "foobar"

docs/resources/instance_server.md

@@ -286,11 +286,9 @@ In addition to all arguments above, the following attributes are exported:
 
 ~> **Important:** Instance servers' IDs are [zoned](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
 
-- `placement_group_policy_respected` - (Deprecated) Always false, use [instance_placement_group ressource](instance_placement_group.md) to known when the placement group policy is respected.
+- `placement_group_policy_respected` - (Deprecated) Always false, use [instance_placement_group resource](instance_placement_group.md) to known when the placement group policy is respected.
 - `root_volume`
     - `volume_id` - The volume ID of the root volume of the server.
-- `private_ip` - The Scaleway internal IP address of the server (Deprecated use [ipam_ip datasource](../data-sources/ipam_ip.md#instance-private-network-ip) instead).
-- `public_ip` -  The public IP address of the server (Deprecated use `public_ips` instead).
 - `public_ips` - The list of public IPs of the server.
     - `id` - The ID of the IP.
     - `address` - The address of the IP.
@@ -299,6 +297,9 @@ In addition to all arguments above, the following attributes are exported:
     - `family` - The IP address' family.
     - `dynamic` - Whether the IP is dynamic.
     - `provisioning_mode` - The provisioning mode of the IP
+- `private_ips` - The list of private IPs of the server.
+    - `id` - The ID of the IP.
+    - `address` - The address of the IP.
 - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
 - `organization_id` - The organization ID the server is associated with.
 

internal/services/instance/server.go

@@ -74,7 +74,7 @@ func ResourceServer() *schema.Resource {
 			"type": {
 				Type:             schema.TypeString,
 				Required:         true,
-				Description:      "The instanceSDK type of the server", // TODO: link to scaleway pricing in the doc
+				Description:      "The instance type of the server", // TODO: link to scaleway pricing in the doc
 				DiffSuppressFunc: dsf.IgnoreCase,
 			},
 			"protected": {
@@ -158,7 +158,7 @@ func ResourceServer() *schema.Resource {
 							Type:        schema.TypeBool,
 							Optional:    true,
 							Default:     true,
-							Description: "Force deletion of the root volume on instanceSDK termination",
+							Description: "Force deletion of the root volume on instance termination",
 						},
 						"boot": {
 							Type:        schema.TypeBool,
@@ -265,7 +265,7 @@ func ResourceServer() *schema.Resource {
 				Type:        schema.TypeList,
 				Optional:    true,
 				MaxItems:    8,
-				Description: "List of private network to connect with your instanceSDK",
+				Description: "List of private network to connect with your instance",
 				Elem: &schema.Resource{
 					Timeouts: &schema.ResourceTimeout{
 						Default: schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
@@ -302,7 +302,7 @@ func ResourceServer() *schema.Resource {
 				Type:        schema.TypeList,
 				Optional:    true,
 				Computed:    true,
-				Description: "List of public IPs attached to your instanceSDK",
+				Description: "List of private IPv4 and IPv6 addresses attached to your instance",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"id": {
@@ -347,18 +347,18 @@ func ResourceServer() *schema.Resource {
 				Type:        schema.TypeList,
 				Computed:    true,
 				Optional:    true,
-				Description: "List of private IPv4 addresses associated with the resource",
+				Description: "List of private IPv4 and IPv6 addresses associated with the resource",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The ID of the IPv4 address resource",
+							Description: "The ID of the IP address resource",
 						},
 						"address": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The private IPv4 address",
+							Description: "The private IP address",
 						},
 					},
 				},
@@ -930,7 +930,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 			updateRequest.PlacementGroup = &instanceSDK.NullableStringValue{Null: true}
 		} else {
 			if !isStopped {
-				return diag.FromErr(errors.New("instanceSDK must be stopped to change placement group"))
+				return diag.FromErr(errors.New("instance must be stopped to change placement group"))
 			}
 
 			updateRequest.PlacementGroup = &instanceSDK.NullableStringValue{Value: placementGroupID}
@@ -974,7 +974,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 		if !isStopped {
 			warnings = append(warnings, diag.Diagnostic{
 				Severity: diag.Warning,
-				Summary:  "instanceSDK may need to be rebooted to use the new boot type",
+				Summary:  "instance may need to be rebooted to use the new boot type",
 			})
 		}
 	}
@@ -998,7 +998,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 			if !isStopped && d.HasChange("user_data.cloud-init") {
 				warnings = append(warnings, diag.Diagnostic{
 					Severity: diag.Warning,
-					Summary:  "instanceSDK may need to be rebooted to use the new cloud init config",
+					Summary:  "instance may need to be rebooted to use the new cloud init config",
 				})
 			}
 		}
@@ -1132,7 +1132,7 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
 			ServerID:       id,
 		}, scw.WithContext(ctx))
 		if err != nil {
-			log.Print("[WARN] Failed remove server from instanceSDK group")
+			log.Print("[WARN] Failed remove server from instance group")
 		}
 	}
 

internal/services/instance/testfuncs/sweep.go

@@ -102,7 +102,7 @@ func testSweepServer(_ string) error {
 	return acctest.SweepZones(scw.AllZones, func(scwClient *scw.Client, zone scw.Zone) error {
 		instanceAPI := instanceSDK.NewAPI(scwClient)
 
-		logging.L.Debugf("sweeper: destroying the instanceSDK server in (%s)", zone)
+		logging.L.Debugf("sweeper: destroying the instance server in (%s)", zone)
 
 		listServers, err := instanceAPI.ListServers(&instanceSDK.ListServersRequest{Zone: zone}, scw.WithAllPages())
 		if err != nil {

templates/data-sources/instance_server.md.tmpl

@@ -59,8 +59,6 @@ You find all the available types on the [pricing page](https://www.scaleway.com/
 - `additional_volume_ids` - The [additional volumes](https://developers.scaleway.com/en/products/instance/api/#volumes-7e8a39)
 attached to the server.
 
-- `enable_ipv6` - Determines if IPv6 is enabled for the server.
-
 - `enable_dynamic_ip` - True if dynamic IP in enable on the server.
 
 - `state` - The state of the server. Possible values are: `started`, `stopped` or `standby`.
@@ -78,16 +76,10 @@ attached to the server.
 - `root_volume`
     - `volume_id` - The volume ID of the root volume of the server.
 
-- `private_ip` - The Scaleway internal IP address of the server.
-
-- `public_ip` - The public IP address of the server.
-
 - `public_ips` - The list of public IPs of the server
     - `id` - The ID of the IP
     - `address` - The address of the IP
 
-- `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 )
+- `private_ips` - The list of private IPs of the server.
+    - `id` - The ID of the IP address resource.
+    - `address` - The private IP address.

templates/data-sources/instance_servers.md.tmpl

@@ -44,8 +44,6 @@ In addition to all above arguments, the following attributes are exported:
         ~> **Important:** Instance servers' IDs are [zoned](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
 
     - `tags` - The tags associated with the server.
-    - `public_ip` - The public IP address of the server.
-    - `private_ip` - The Scaleway internal IP address of the server.
     - `private_ips` - The list of private IPv4 and IPv6 addresses associated with the server.
         - `id` - The ID of the IP address resource.
         - `address` - The private IP address.
@@ -59,14 +57,8 @@ In addition to all above arguments, the following attributes are exported:
     - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
     - `type` - The commercial type of the server.
     - `security_group_id` - The [security group](https://developers.scaleway.com/en/products/instance/api/#security-groups-8d7f89) the server is attached to.
-    - `enable_ipv6` - Determines if IPv6 is enabled for the server.
-    - `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 )
     - `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.
     - `organization_id` - The organization ID the server is associated with.
     - `project_id` - The ID of the project the server is associated with.
-  
-

templates/guides/migration_guide_v2.md

@@ -127,7 +127,6 @@ $ terraform state show scaleway_server.main
 # scaleway_server.main:
 resource "scaleway_server" "main" {
     boot_type    = "local"
-    enable_ipv6  = false
     id           = "11111111-1111-1111-1111-111111111111"
     image        = "cf44b8f5-77e2-42ed-8f1e-09ed5bb028fc"
     name         = "foobar"

templates/resources/instance_server.md.tmpl

@@ -286,11 +286,9 @@ In addition to all arguments above, the following attributes are exported:
 
 ~> **Important:** Instance servers' IDs are [zoned](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
 
-- `placement_group_policy_respected` - (Deprecated) Always false, use [instance_placement_group ressource](instance_placement_group.md) to known when the placement group policy is respected.
+- `placement_group_policy_respected` - (Deprecated) Always false, use [instance_placement_group resource](instance_placement_group.md) to known when the placement group policy is respected.
 - `root_volume`
     - `volume_id` - The volume ID of the root volume of the server.
-- `private_ip` - The Scaleway internal IP address of the server (Deprecated use [ipam_ip datasource](../data-sources/ipam_ip.md#instance-private-network-ip) instead).
-- `public_ip` -  The public IP address of the server (Deprecated use `public_ips` instead).
 - `public_ips` - The list of public IPs of the server.
     - `id` - The ID of the IP.
     - `address` - The address of the IP.
@@ -299,6 +297,9 @@ In addition to all arguments above, the following attributes are exported:
     - `family` - The IP address' family.
     - `dynamic` - Whether the IP is dynamic.
     - `provisioning_mode` - The provisioning mode of the IP
+- `private_ips` - The list of private IPs of the server.
+    - `id` - The ID of the IP.
+    - `address` - The address of the IP.
 - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
 - `organization_id` - The organization ID the server is associated with.