Merge branch 'master' into feat/add-lb-pn-resource

Author: yfodil

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.
 

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/services/edgeservices/dns_stage.go

@@ -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/webhosting/helpers.go

@@ -2,6 +2,7 @@ package webhosting
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -79,9 +80,15 @@ func waitForHosting(ctx context.Context, api *webhosting.HostingAPI, region scw.
 
 func flattenDNSRecords(records []*webhosting.DNSRecord) []map[string]any {
 	result := []map[string]any{}
+
 	for _, r := range records {
+		name := r.Name
+		if name == "" {
+			name = extractDNSRecordName(r.RawData)
+		}
+
 		result = append(result, map[string]any{
-			"name":     r.Name,
+			"name":     name,
 			"type":     r.Type.String(),
 			"ttl":      r.TTL,
 			"value":    r.Value,
@@ -93,6 +100,15 @@ func flattenDNSRecords(records []*webhosting.DNSRecord) []map[string]any {
 	return result
 }
 
+func extractDNSRecordName(raw string) string {
+	fields := strings.Fields(raw)
+	if len(fields) == 0 {
+		return ""
+	}
+
+	return strings.TrimSuffix(fields[0], ".")
+}
+
 func flattenNameServers(servers []*webhosting.Nameserver) []map[string]any {
 	result := []map[string]any{}
 	for _, s := range servers {

internal/services/webhosting/testdata/data-source-offer-basic.cassette.yaml

@@ -35,15 +35,15 @@ func TestAccWebhosting_Basic(t *testing.T) {
 				resource "scaleway_webhosting" "main" {
 				  offer_id     = data.scaleway_webhosting_offer.by_name.offer_id
 				  email        = "[email protected]"
-				  domain       = "scaleway.com"
+				  domain       = "devtools-tf-tests.scaleway.com"
 				  tags         = ["devtools", "provider", "terraform"]
 				}
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckWebhostingExists(tt, "scaleway_webhosting.main"),
 					resource.TestCheckResourceAttrPair("scaleway_webhosting.main", "offer_id", "data.scaleway_webhosting_offer.by_name", "offer_id"),
 					resource.TestCheckResourceAttr("scaleway_webhosting.main", "email", "[email protected]"),
-					resource.TestCheckResourceAttr("scaleway_webhosting.main", "domain", "scaleway.com"),
+					resource.TestCheckResourceAttr("scaleway_webhosting.main", "domain", "devtools-tf-tests.scaleway.com"),
 					resource.TestCheckResourceAttr("scaleway_webhosting.main", "status", webhostingSDK.HostingStatusReady.String()),
 					resource.TestCheckResourceAttr("scaleway_webhosting.main", "tags.0", "devtools"),
 					resource.TestCheckResourceAttr("scaleway_webhosting.main", "tags.1", "provider"),

internal/services/webhosting/testdata/data-source-webhosting-basic.cassette.yaml

@@ -34,6 +34,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.