From 28a9488ef1a6ba2f92d231c78ce75c437ba9f4cc Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 27 Dec 2019 00:56:13 +0000 Subject: [PATCH] Change CR Domain Mapping route name to string Signed-off-by: Modular Magician --- google-beta/resource_cloud_run_domain_mapping.go | 11 ++--------- google-beta/resource_sql_database_instance_test.go | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/google-beta/resource_cloud_run_domain_mapping.go b/google-beta/resource_cloud_run_domain_mapping.go index 323dc8edc8..1c0f68046b 100644 --- a/google-beta/resource_cloud_run_domain_mapping.go +++ b/google-beta/resource_cloud_run_domain_mapping.go @@ -512,10 +512,7 @@ func flattenCloudRunDomainMappingSpecForceOverride(v interface{}, d *schema.Reso } func flattenCloudRunDomainMappingSpecRouteName(v interface{}, d *schema.ResourceData) interface{} { - if v == nil { - return v - } - return ConvertSelfLinkToV1(v.(string)) + return v } func flattenCloudRunDomainMappingSpecCertificateMode(v interface{}, d *schema.ResourceData) interface{} { @@ -619,11 +616,7 @@ func expandCloudRunDomainMappingSpecForceOverride(v interface{}, d TerraformReso } func expandCloudRunDomainMappingSpecRouteName(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { - f, err := parseGlobalFieldValue("services", v.(string), "project", d, config, true) - if err != nil { - return nil, fmt.Errorf("Invalid value for route_name: %s", err) - } - return f.RelativeLink(), nil + return GetResourceNameFromSelfLink(v.(string)), nil } func expandCloudRunDomainMappingSpecCertificateMode(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { diff --git a/google-beta/resource_sql_database_instance_test.go b/google-beta/resource_sql_database_instance_test.go index e481a48c2b..5ac15dea3d 100644 --- a/google-beta/resource_sql_database_instance_test.go +++ b/google-beta/resource_sql_database_instance_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - sqladmin "google.golang.org/api/sqladmin/v1beta4" )