Merge branch 'master' into tfproviderlintx

Author: remyleone

.github/workflows/documentation.yml

@@ -65,3 +65,4 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - uses: hashicorp/setup-terraform@v3
       - run: go tool tfplugindocs validate
+      - run: go tool tfplugindocs generate

docs/resources/instance_server.md

@@ -295,8 +295,13 @@ In addition to all arguments above, the following attributes are exported:
 - `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
+    - `id` - The ID of the IP.
+    - `address` - The address of the IP.
+    - `gateway` - The IP of the Gateway associated with the IP.
+    - `netmask` - The CIDR netmask of the IP.
+    - `family` - The IP address' family.
+    - `dynamic` - Whether the IP is dynamic.
+    - `provisioning_mode` - The provisioning mode of the IP
 - `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
   Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
 - `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )

internal/services/instance/server.go

@@ -352,6 +352,31 @@ func ResourceServer() *schema.Resource {
 							Computed:    true,
 							Description: "IP Address",
 						},
+						"gateway": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Gateway's IP address",
+						},
+						"netmask": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "CIDR netmask",
+						},
+						"family": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "IP address family (inet or inet6)",
+						},
+						"dynamic": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Whether the IP is dynamic",
+						},
+						"provisioning_mode": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Provisioning mode of the IP address",
+						},
 					},
 				},
 			},

internal/services/instance/server_test.go

@@ -1512,6 +1512,12 @@ func TestAccServer_IPs(t *testing.T) {
 					arePrivateNICsPresent(tt, "scaleway_instance_server.main"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.#", "1"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.0.id", "scaleway_instance_ip.ip1", "id"),
+					resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "public_ips.0.address"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.0.gateway", "62.210.0.1"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.0.netmask", "32"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.0.family", "inet"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.0.dynamic", "false"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.0.provisioning_mode", "dhcp"),
 				),
 			},
 			{

internal/services/instance/testdata/server-ips.cassette.yaml

@@ -93,8 +93,13 @@ func flattenServerPublicIPs(zone scw.Zone, ips []*instance.ServerIP) []any {
 
 	for i, ip := range ips {
 		flattenedIPs[i] = map[string]any{
-			"id":      zonal.NewIDString(zone, ip.ID),
-			"address": ip.Address.String(),
+			"id":                zonal.NewIDString(zone, ip.ID),
+			"address":           ip.Address.String(),
+			"gateway":           ip.Gateway.String(),
+			"netmask":           ip.Netmask,
+			"family":            ip.Family.String(),
+			"dynamic":           ip.Dynamic,
+			"provisioning_mode": ip.ProvisioningMode.String(),
 		}
 	}
 

internal/services/instance/types.go

@@ -189,16 +189,19 @@ func ResourceInstance() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"id": {
 							Type:        schema.TypeString,
+							Optional:    true,
 							Computed:    true,
 							Description: "ID of the public network",
 						},
 						"port": {
 							Type:        schema.TypeInt,
+							Optional:    true,
 							Computed:    true,
 							Description: "TCP port of the endpoint",
 						},
 						"dns_record": {
 							Type:        schema.TypeString,
+							Optional:    true,
 							Computed:    true,
 							Description: "The DNS record of your endpoint",
 						},

internal/services/mongodb/instance.go

@@ -61,26 +61,31 @@ func ResourceReadReplica() *schema.Resource {
 						"endpoint_id": {
 							Type:        schema.TypeString,
 							Description: "UUID of the endpoint (UUID format).",
+							Optional:    true,
 							Computed:    true,
 						},
 						"ip": {
 							Type:        schema.TypeString,
 							Description: "IPv4 address of the endpoint (IP address). Only one of ip and hostname may be set.",
+							Optional:    true,
 							Computed:    true,
 						},
 						"port": {
 							Type:        schema.TypeInt,
 							Description: "TCP port of the endpoint.",
+							Optional:    true,
 							Computed:    true,
 						},
 						"name": {
 							Type:        schema.TypeString,
 							Description: "Name of the endpoint.",
+							Optional:    true,
 							Computed:    true,
 						},
 						"hostname": {
 							Type:        schema.TypeString,
 							Description: "Hostname of the endpoint. Only one of ip and hostname may be set.",
+							Optional:    true,
 							Computed:    true,
 						},
 					},

internal/services/rdb/read_replica.go

@@ -193,10 +193,12 @@ func ResourceCluster() *schema.Resource {
 						"id": {
 							Type:        schema.TypeString,
 							Computed:    true,
+              Optional:    true,
 							Description: "UUID of the public network to be connected to the cluster",
 						},
 						"port": {
 							Type:        schema.TypeInt,
+							Optional:    true,
 							Computed:    true,
 							Description: "TCP port of the endpoint",
 						},
@@ -206,6 +208,7 @@ func ResourceCluster() *schema.Resource {
 							Elem: &schema.Schema{
 								Type: schema.TypeString,
 							},
+							Optional: true,
 							Computed: true,
 						},
 					},