updated wording + handle 403 on ipam

Author: Mia-Cross

docs/resources/instance_private_nic.md

@@ -93,9 +93,9 @@ In addition to all arguments above, the following attributes are exported:
 ~> **Important:** Instance private NICs' 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`
 
 - `mac_address` - The MAC address of the private NIC.
-- `private_ip` - The list of private IPv4 addresses associated with the resource.
-    - `id` - The ID of the IPv4 address resource.
-    - `address` - The private IPv4 address.
+- `private_ips` - The list of private IPv4 and IPv6 addresses associated with the resource.
+    - `id` - The ID of the IP address resource.
+    - `address` - The private IP address.
 
 ## Import
 

docs/resources/instance_server.md

@@ -250,9 +250,9 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 - `private_network` - (Optional) The private network associated with the server.
    Use the `pn_id` key to attach a [private_network](https://www.scaleway.com/en/developers/api/instance/#path-private-nics-list-all-private-nics) on your instance.
 
-- `private_ip` - The list of private IPv4 addresses associated with the resource.
-    - `id` - The ID of the IPv4 address resource.
-    - `address` - The private IPv4 address.
+- `private_ips` - The list of private IPv4 and IPv6 addresses associated with the resource.
+    - `id` - The ID of the IP address resource.
+    - `address` - The private IP address.
 
 - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
 

internal/services/instance/private_nic.go

@@ -3,6 +3,7 @@ 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"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
@@ -70,21 +71,21 @@ func ResourcePrivateNIC() *schema.Resource {
 				Description: "IPAM ip list, should be for internal use only",
 				ForceNew:    true,
 			},
-			"private_ip": {
+			"private_ips": {
 				Type:        schema.TypeList,
 				Computed:    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",
 						},
 					},
 				},
@@ -189,21 +190,31 @@ func ResourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
+	diags := diag.Diagnostics{}
 	resourceType := ipamAPI.ResourceTypeInstancePrivateNic
 	opts := &ipam.GetResourcePrivateIPsOptions{
 		ResourceID:       &privateNIC.ID,
 		ResourceType:     &resourceType,
 		PrivateNetworkID: &privateNIC.PrivateNetworkID,
 	}
 
-	privateIP, err := ipam.GetResourcePrivateIPs(ctx, m, region, opts)
+	privateIPs, err := ipam.GetResourcePrivateIPs(ctx, m, region, opts)
 	if err != nil {
-		return diag.FromErr(err)
+		if !httperrors.Is403(err) {
+			return diag.FromErr(err)
+		}
+
+		diags = append(diags, diag.Diagnostic{
+			Severity:      diag.Warning,
+			Summary:       err.Error(),
+			Detail:        "Got 403 while reading private IPs from IPAM API, please check your IAM permissions",
+			AttributePath: cty.GetAttrPath("private_ips"),
+		})
 	}
 
-	_ = d.Set("private_ip", privateIP)
+	_ = d.Set("private_ips", privateIPs)
 
-	return nil
+	return diags
 }
 
 func ResourceInstancePrivateNICUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/services/instance/private_nic_test.go

@@ -41,8 +41,8 @@ func TestAccPrivateNIC_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scaleway_instance_private_nic.nic01", "mac_address"),
 					resource.TestCheckResourceAttrSet("scaleway_instance_private_nic.nic01", "private_network_id"),
 					resource.TestCheckResourceAttrSet("scaleway_instance_private_nic.nic01", "server_id"),
-					resource.TestCheckResourceAttrSet("scaleway_instance_private_nic.nic01", "private_ip.0.id"),
-					resource.TestCheckResourceAttrSet("scaleway_instance_private_nic.nic01", "private_ip.0.address"),
+					resource.TestCheckResourceAttrSet("scaleway_instance_private_nic.nic01", "private_ips.0.id"),
+					resource.TestCheckResourceAttrSet("scaleway_instance_private_nic.nic01", "private_ips.0.address"),
 				),
 			},
 		},

internal/services/instance/server.go

@@ -800,6 +800,7 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
 	}
 
 	allPrivateIPs := []map[string]interface{}(nil)
+	diags := diag.Diagnostics{}
 	resourceType := ipamAPI.ResourceTypeInstancePrivateNic
 
 	region, err := zone.Region()
@@ -815,7 +816,16 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
 
 		privateIPs, err := ipam.GetResourcePrivateIPs(ctx, m, region, opts)
 		if err != nil {
-			return diag.FromErr(err)
+			if !httperrors.Is403(err) {
+				return diag.FromErr(err)
+			}
+
+			diags = append(diags, diag.Diagnostic{
+				Severity:      diag.Warning,
+				Summary:       err.Error(),
+				Detail:        "Got 403 while reading private IPs from IPAM API, please check your IAM permissions",
+				AttributePath: cty.GetAttrPath("private_ips"),
+			})
 		}
 
 		if privateIPs != nil {
@@ -839,7 +849,7 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
 
 		mostRelevantTypes := compatibleTypes.CompatibleTypes[:5]
 
-		return diag.Diagnostics{diag.Diagnostic{
+		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Warning,
 			Detail:   fmt.Sprintf("Instance type %q will soon reach End of Service", server.CommercialType),
 			Summary: fmt.Sprintf(`Your Instance will soon reach End of Service. You can check the exact date on the Scaleway console. We recommend that you migrate your Instance before that.
@@ -855,10 +865,10 @@ You can check the full list of compatible server types:
 				server.Zone,
 			),
 			AttributePath: cty.GetAttrPath("type"),
-		}}
+		})
 	}
 
-	return nil
+	return diags
 }
 
 //gocyclo:ignore