From 7453f25195fa3b79be915fdb5d4596a86b697824 Mon Sep 17 00:00:00 2001 From: Stephen Hand Date: Fri, 7 Jan 2022 12:36:13 +0000 Subject: [PATCH 1/2] Added domain_name as a computed output variable to the Serverless Environment resource (see https://github.com/twilio/terraform-provider-twilio/issues/85) --- twilio/resources/serverless/v1/api_default.go | 1 + twilio/resources_serverless_test.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/twilio/resources/serverless/v1/api_default.go b/twilio/resources/serverless/v1/api_default.go index e30685db..d137a3fd 100644 --- a/twilio/resources/serverless/v1/api_default.go +++ b/twilio/resources/serverless/v1/api_default.go @@ -247,6 +247,7 @@ func ResourceServicesEnvironments() *schema.Resource { "unique_name": AsString(SchemaForceNewRequired), "domain_suffix": AsString(SchemaForceNewOptional), "sid": AsString(SchemaComputed), + "domain_name": AsString(SchemaComputed), }, Importer: &schema.ResourceImporter{ StateContext: func(ctx context.Context, d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { diff --git a/twilio/resources_serverless_test.go b/twilio/resources_serverless_test.go index d7bd2c6c..3d8fbe8e 100644 --- a/twilio/resources_serverless_test.go +++ b/twilio/resources_serverless_test.go @@ -39,6 +39,7 @@ func TestAccServerlessSetup_basic(t *testing.T) { resource.TestCheckResourceAttr(serverlessSvcResourceName, "unique_name", serviceName), resource.TestCheckResourceAttr(serverlessSvcFuncResourceName, "friendly_name", "Serverless func"), resource.TestCheckResourceAttr(serverlessSvcEnvResourceName, "unique_name", "environment-dummy"), + resource.TestCheckResourceAttrSet(serverlessSvcEnvResourceName, "domain_name"), ), }, { @@ -49,6 +50,7 @@ func TestAccServerlessSetup_basic(t *testing.T) { resource.TestCheckResourceAttr(serverlessSvcResourceName, "unique_name", serviceName), resource.TestCheckResourceAttr(serverlessSvcFuncResourceName, "friendly_name", "Serverless func 2"), resource.TestCheckResourceAttr(serverlessSvcEnvResourceName, "unique_name", "environment-dummy-updated"), + resource.TestCheckResourceAttrSet(serverlessSvcEnvResourceName, "domain_name"), testAccEnvResourceWasRecreated(&serviceBefore, &serviceAfter), ), }, From 8ed38bfc76c98233670e42a8f6a537b1f7fc5d0e Mon Sep 17 00:00:00 2001 From: Stephen Hand Date: Fri, 7 Jan 2022 13:05:15 +0000 Subject: [PATCH 2/2] Updated docs for new serverless environment output variable --- twilio/resources/serverless/v1/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/twilio/resources/serverless/v1/README.md b/twilio/resources/serverless/v1/README.md index d0dac02f..f2fe9978 100644 --- a/twilio/resources/serverless/v1/README.md +++ b/twilio/resources/serverless/v1/README.md @@ -32,6 +32,7 @@ Name | Type | Requirement | Description **unique_name** | string | **Required** | A user-defined string that uniquely identifies the Environment resource. It can be a maximum of 100 characters. **domain_suffix** | string | Optional | A URL-friendly name that represents the environment and forms part of the domain name. It can be a maximum of 16 characters. **sid** | string | *Computed* | The SID of the Environment resource to fetch. +**domain_name** | string | *Computed* | The domain name generated for use by external callers to reach functions running in this environment, e.g. 'myservice-1234-myenvironment.twil.io'. ## twilio_serverless_services_functions_v1