Merge branch 'master' into feat/audit-trail-event-data-source

Author: estellesoulard

docs/resources/edge_services_dns_stage.md

@@ -33,6 +33,7 @@ In addition to all arguments above, the following attributes are exported:
 
 - `id` - The ID of the DNS stage (UUID format).
 - `type` - The type of the stage.
+- `default_fqdn` - The Default Fully Qualified Domain Name attached to the stage.
 - `created_at` - The date and time of the creation of the DNS stage.
 - `updated_at` - The date and time of the last update of the DNS stage.
 

docs/resources/instance_server.md

@@ -236,6 +236,7 @@ To retrieve more information by label please use: ```scw marketplace image get l
 ~> **Important:** When updating `placement_group_id` the `state` must be set to `stopped`, otherwise it will fail.
 
 - `root_volume` - (Optional) Root [volume](https://www.scaleway.com/en/developers/api/instance/#path-volume-types-list-volume-types) attached to the server on creation.
+    - `name` - (Optional) Name of the root volume.
     - `volume_id` - (Optional) The volume ID of the root volume of the server, allows you to create server with an existing volume. If empty, will be computed to a created volume ID.
     - `size_in_gb` - (Required) Size of the root volume in gigabytes.
       To find the right size use [this endpoint](https://www.scaleway.com/en/developers/api/instance/#path-instances-list-all-instances) and

docs/resources/lb.md

@@ -109,6 +109,8 @@ The following arguments are supported:
     - `private_network_id` - (Required) The ID of the Private Network to attach to.
     - ~> **Important:** Updates to `private_network` will recreate the attachment.
     - `ipam_ids` - (Optional) IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network.
+- `external_private_networks` - (Defaults to `false`) A boolean to specify whether to use [lb_private_network](../resources/lb_private_network.md).
+  If `external_private_networks` is set to `true`, `private_network` can not be set directly in the Load Balancer.
 - `ssl_compatibility_level` - (Optional) Enforces minimal SSL version (in SSL/TLS offloading context). Please check [possible values](https://www.scaleway.com/en/developers/api/load-balancer/zoned-api/#path-load-balancer-create-a-load-balancer).
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) of the Load Balancer.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the Project the Load Balancer is associated with.

docs/resources/lb_private_network.md

@@ -0,0 +1,72 @@
+---
+subcategory: "Load Balancers"
+page_title: "Scaleway: scaleway_lb_private_network"
+---
+
+# Resource: scaleway_lb_private_network
+
+Creates and manages Scaleway Load Balancer Private Network attachments.
+
+For more information, see the [main documentation](https://www.scaleway.com/en/docs/load-balancer/how-to/use-with-private-network/).
+
+## Example Usage
+
+### Basic
+
+```terraform
+resource "scaleway_vpc" "vpc01" {
+  name = "my vpc"
+}
+
+resource "scaleway_vpc_private_network" "pn01" {
+  vpc_id = scaleway_vpc.vpc01.id
+  ipv4_subnet {
+    subnet = "172.16.32.0/22"
+  }
+}
+
+resource "scaleway_ipam_ip" "ip01" {
+  address = "172.16.32.7"
+  source {
+    private_network_id = scaleway_vpc_private_network.pn01.id
+  }
+}
+
+resource "scaleway_lb" "lb01" {
+  name = "test-lb-private-network"
+  type = "LB-S"
+}
+
+resource "scaleway_lb_private_network" "lbpn01" {
+  lb_id              = scaleway_lb.lb01.id
+  private_network_id = scaleway_vpc_private_network.pn01.id
+  ipam_ip_ids        = [scaleway_ipam_ip.ip01.id]
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the Private Network should be attached.
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the Project the Private Network attachment is associated with.
+- `lb_id` - (Required) The load-balancer ID to attach the private network to.
+- `private_network_id` - (Required) The private network ID to attach.
+- `ipam_ip_ids` - (Required) The IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+- `id` - The ID of the Private Network attachment, which is of the form `{zone}/{lb-id}/{private-network-id}` e.g. `fr-par-1/11111111-1111-1111-1111-111111111111/11111111-1111-1111-1111-111111111111`
+- `status` - The status of the Private Network attachment.
+- `created_at` -  The date and time of the creation of the Private Network attachment (RFC 3339 format).
+- `updated_at` -  The date and time of the last update of the Private Network attachment (RFC 3339 format).
+
+## Import
+
+Private Network attachments can be imported using `{zone}/{lb-id}/{private-network-id}`, e.g.
+
+```bash
+terraform import scaleway_lb_private_network.lbpn01 fr-par-1/11111111-1111-1111-1111-111111111111/11111111-1111-1111-1111-111111111111
+```

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.8.0
 	github.com/nats-io/nats.go v1.46.1
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251017125838-3eb0f2adaa94
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/crypto v0.43.0
 	golang.org/x/sync v0.17.0

go.sum

@@ -457,8 +457,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911 h1:puwRtGGoGw9Rw3qlB7ltimV2+uugkalN08DyVEL1VoE=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251017125838-3eb0f2adaa94 h1:39j+3zweuYVml1Ozahl7RVb0AtpaiQtRztjq4W3GvNM=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251017125838-3eb0f2adaa94/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

internal/meta/extractors.go

@@ -155,6 +155,11 @@ func getKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Typ
 		case value.Type().IsListType():
 			// If it's a list and the second element of the key is an index, we look for the value in the list at the given index
 			if index, err := strconv.Atoi(keys[1]); err == nil {
+				if value.Length().Equals(cty.NumberIntVal(0)).True() {
+					// If the list is empty, then the value is not set
+					return nil, false
+				}
+
 				return getKeyInRawConfigMap(value.AsValueSlice()[index].AsValueMap(), strings.Join(keys[2:], ""), ty)
 			}
 			// If it's a list and the second element of the key is '#', we look for the value in the list's first element

internal/services/baremetal/testdata/server-with-ipam-private-network.cassette.yaml

@@ -63,6 +63,11 @@ func ResourceDNSStage() *schema.Resource {
 				Computed:    true,
 				Description: "The type of the stage",
 			},
+			"default_fqdn": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Default Fully Qualified Domain Name attached to the stage",
+			},
 			"created_at": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -120,6 +125,7 @@ func ResourceDNSStageRead(ctx context.Context, d *schema.ResourceData, m any) di
 	_ = d.Set("created_at", types.FlattenTime(dnsStage.CreatedAt))
 	_ = d.Set("updated_at", types.FlattenTime(dnsStage.UpdatedAt))
 	_ = d.Set("type", dnsStage.Type.String())
+	_ = d.Set("default_fqdn", dnsStage.DefaultFqdn)
 
 	oldFQDNs := d.Get("fqdns").([]any)
 	oldFQDNsSet := make(map[string]bool)

internal/services/edgeservices/dns_stage.go

@@ -126,6 +126,7 @@ func ResourceServer() *schema.Resource {
 						"name": {
 							Type:        schema.TypeString,
 							Computed:    true,
+							Optional:    true,
 							Description: "Name of the root volume",
 						},
 						"size_in_gb": {
@@ -519,7 +520,7 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	////
-	// Configure Block Volume
+	// Configure Volumes
 	////
 	var diags diag.Diagnostics
 
@@ -530,6 +531,11 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
+	err = renameRootVolumeIfNeeded(d, api, zone, res.Server.Volumes)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	////
 	// Set user data
 	////
@@ -639,10 +645,6 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 	return append(diags, ResourceInstanceServerRead(ctx, d, m)...)
 }
 
-func errorCheck(err error, message string) bool {
-	return strings.Contains(err.Error(), message)
-}
-
 //gocyclo:ignore
 func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	api, zone, id, err := instancehelpers.InstanceAndBlockAPIWithZoneAndID(m, d.Id())
@@ -701,6 +703,9 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m a
 		_ = d.Set("placement_group_policy_respected", server.PlacementGroup.PolicyRespected)
 	}
 
+	////
+	// Read server's public IPs
+	////
 	if ipID, hasIPID := d.GetOk("ip_id"); hasIPID {
 		publicIP := FindIPInList(ipID.(string), server.PublicIPs)
 		if publicIP != nil && !publicIP.Dynamic {
@@ -733,52 +738,28 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m a
 		_ = d.Set("admin_password_encryption_ssh_key_id", server.AdminPasswordEncryptionSSHKeyID)
 	}
 
-	var additionalVolumesIDs []string
+	////
+	// Read server's volumes
+	////
+	rootVolume := make(map[string]any, 1)
+	additionalVolumesIDs := make([]string, 0, len(server.Volumes)-1)
 
 	for i, serverVolume := range sortVolumeServer(server.Volumes) {
 		if i == 0 {
-			rootVolume := map[string]any{}
-
-			vs, ok := d.Get("root_volume").([]map[string]any)
-			if ok && len(vs) > 0 {
-				rootVolume = vs[0]
-			}
-
-			vol, err := api.GetUnknownVolume(&instancehelpers.GetUnknownVolumeRequest{
-				VolumeID: serverVolume.ID,
-				Zone:     server.Zone,
-			})
+			rootVolume, err = flattenServerVolume(api, serverVolume, zone)
 			if err != nil {
-				return diag.FromErr(fmt.Errorf("failed to read instance volume %s: %w", serverVolume.ID, err))
-			}
-
-			rootVolume["volume_id"] = zonal.NewID(zone, vol.ID).String()
-			if vol.Size != nil {
-				rootVolume["size_in_gb"] = int(uint64(*vol.Size) / gb)
-			} else if serverVolume.Size != nil {
-				rootVolume["size_in_gb"] = int(uint64(*serverVolume.Size) / gb)
-			}
-
-			if vol.IsBlockVolume() {
-				rootVolume["sbs_iops"] = types.FlattenUint32Ptr(vol.Iops)
+				return diag.FromErr(err)
 			}
 
 			_, rootVolumeAttributeSet := d.GetOk("root_volume") // Related to https://github.com/hashicorp/terraform-plugin-sdk/issues/142
 			rootVolume["delete_on_termination"] = d.Get("root_volume.0.delete_on_termination").(bool) || !rootVolumeAttributeSet
-			rootVolume["volume_type"] = serverVolume.VolumeType
-			rootVolume["boot"] = serverVolume.Boot
-			rootVolume["name"] = serverVolume.Name
-
-			_ = d.Set("root_volume", []map[string]any{rootVolume})
 		} else {
 			additionalVolumesIDs = append(additionalVolumesIDs, zonal.NewID(zone, serverVolume.ID).String())
 		}
 	}
 
+	_ = d.Set("root_volume", []map[string]any{rootVolume})
 	_ = d.Set("additional_volume_ids", additionalVolumesIDs)
-	if len(additionalVolumesIDs) > 0 {
-		_ = d.Set("additional_volume_ids", additionalVolumesIDs)
-	}
 
 	////
 	// Read server user data
@@ -1165,7 +1146,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
-	_, err = waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutUpdate))
+	server, err = waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -1181,6 +1162,11 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 		warnings = append(warnings, ResourceInstanceServerUpdateRootVolumeIOPS(ctx, api, zone, id, types.ExpandUint32Ptr(d.Get("root_volume.0.sbs_iops")))...)
 	}
 
+	err = renameRootVolumeIfNeeded(d, api, zone, server.Volumes)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	return append(warnings, ResourceInstanceServerRead(ctx, d, m)...)
 }
 
@@ -1707,3 +1693,28 @@ func GetEndOfServiceDate(ctx context.Context, client *scw.Client, zone scw.Zone,
 
 	return "", fmt.Errorf("could not find product catalog entry for %q in %s", commercialType, zone)
 }
+
+func renameRootVolumeIfNeeded(d *schema.ResourceData, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, volumes map[string]*instanceSDK.VolumeServer) error {
+	if volumes == nil || volumes["0"] == nil || volumes["0"].Name != nil {
+		return nil
+	}
+
+	if rootVolumeName, setByUser := meta.GetRawConfigForKey(d, "root_volume.0.name", cty.String); setByUser {
+		if *volumes["0"].Name != rootVolumeName {
+			_, err := api.UpdateVolume(&instanceSDK.UpdateVolumeRequest{
+				Zone:     zone,
+				VolumeID: volumes["0"].ID,
+				Name:     scw.StringPtr(rootVolumeName.(string)),
+			})
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func errorCheck(err error, message string) bool {
+	return strings.Contains(err.Error(), message)
+}