feat(serverless): add support for native domain name (#1358)

Author: remyleone

docs/resources/container.md

@@ -94,6 +94,7 @@ In addition to all above arguments, the following attributes are exported:
 - `status` - The container status.
 - `cron_status` - The cron status of the container.
 - `error_message` - The error message of the container.
+- `domain_name` - The native domain name of the container
 
 ## Import
 

docs/resources/function.md

@@ -91,10 +91,10 @@ The following arguments are supported:
 In addition to all arguments above, the following attributes are exported:
 
 - `id` - The ID of the function
+- `domain_name` - The native domain name of the function
 - `organization_id` - The organization ID the function is associated with.
 - `cpu_limit` - The CPU limit in mCPU for your function. More infos on resources [here](https://developers.scaleway.com/en/products/functions/api/#functions)
 
-
 ## Import
 
 Functions can be imported using the `{region}/{id}`, e.g.

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/hashicorp/terraform-plugin-log v0.4.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220628124746-c91952af9ea3
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220706124610-072bee915715
 	github.com/stretchr/testify v1.8.0
 )
 

go.sum

@@ -254,8 +254,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220628124746-c91952af9ea3 h1:bfY4HHzHUS8PNStk8gwVlcMouelOWr1hr91hQjp+Rhw=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220628124746-c91952af9ea3/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220706124610-072bee915715 h1:e+1PXi8wsIPdl8DUOm+R23C1D91UYph6BJcrJL5NpU0=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220706124610-072bee915715/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=

scaleway/helpers_container.go

@@ -95,10 +95,6 @@ func setCreateContainerRequest(d *schema.ResourceData, region scw.Region) (*cont
 		req.MaxConcurrency = scw.Uint32Ptr(uint32(maxConcurrency.(int)))
 	}
 
-	if domainName, ok := d.GetOk("domain_name"); ok {
-		req.DomainName = expandStringPtr(domainName)
-	}
-
 	return req, nil
 }
 

scaleway/resource_container.go

@@ -114,9 +114,8 @@ func resourceScalewayContainer() *schema.Resource {
 			},
 			"domain_name": {
 				Type:        schema.TypeString,
-				Optional:    true,
 				Computed:    true,
-				Description: "The container domain name.",
+				Description: "The native container domain name.",
 			},
 			"protocol": {
 				Type:        schema.TypeString,
@@ -315,10 +314,6 @@ func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData
 		req.RegistryImage = expandStringPtr(d.Get("registry_image"))
 	}
 
-	if d.HasChanges("domain_name") {
-		req.DomainName = expandStringPtr(d.Get("domain_name"))
-	}
-
 	if d.HasChanges("max_concurrency") {
 		req.MaxConcurrency = toUint32(d.Get("max_concurrency"))
 	}

scaleway/resource_function.go

@@ -125,7 +125,11 @@ func resourceScalewayFunction() *schema.Resource {
 				Computed:    true,
 				Description: "CPU limit in mCPU for your function",
 			},
-
+			"domain_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The native function domain name.",
+			},
 			"region":          regionSchema(),
 			"organization_id": organizationIDSchema(),
 			"project_id":      projectIDSchema(),
@@ -263,6 +267,7 @@ func resourceScalewayFunctionRead(ctx context.Context, d *schema.ResourceData, m
 	_ = d.Set("privacy", f.Privacy.String())
 	_ = d.Set("region", f.Region.String())
 	_ = d.Set("timeout", flattenDuration(f.Timeout.ToTimeDuration()))
+	_ = d.Set("domain_name", f.DomainName)
 
 	return diags
 }