From e0f71ca8fbbf1c7b7dab258ac2b33a5ee96fface Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Tue, 12 Nov 2019 15:35:46 -0800 Subject: [PATCH] Change the way that the ID gets set and data source IDs as well. --- .../data_source_google_folder_organization_policy.go | 2 +- .../resources/resource_google_folder_organization_policy.go | 2 +- .../terraform/resources/resource_google_organization_policy.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/terraform/data_sources/data_source_google_folder_organization_policy.go b/third_party/terraform/data_sources/data_source_google_folder_organization_policy.go index 5777ea75d268..b31f18c7687b 100644 --- a/third_party/terraform/data_sources/data_source_google_folder_organization_policy.go +++ b/third_party/terraform/data_sources/data_source_google_folder_organization_policy.go @@ -21,7 +21,7 @@ func dataSourceGoogleFolderOrganizationPolicy() *schema.Resource { func datasourceGoogleFolderOrganizationPolicyRead(d *schema.ResourceData, meta interface{}) error { - d.SetId(fmt.Sprintf("%s:%s", d.Get("folder"), d.Get("constraint"))) + d.SetId(fmt.Sprintf("%s/%s", d.Get("folder"), d.Get("constraint"))) return resourceGoogleFolderOrganizationPolicyRead(d, meta) } diff --git a/third_party/terraform/resources/resource_google_folder_organization_policy.go b/third_party/terraform/resources/resource_google_folder_organization_policy.go index 740697948bd5..6bed8a291b24 100644 --- a/third_party/terraform/resources/resource_google_folder_organization_policy.go +++ b/third_party/terraform/resources/resource_google_folder_organization_policy.go @@ -59,7 +59,7 @@ func resourceFolderOrgPolicyImporter(d *schema.ResourceData, meta interface{}) ( } func resourceGoogleFolderOrganizationPolicyCreate(d *schema.ResourceData, meta interface{}) error { - d.SetId(fmt.Sprintf("%s:%s", d.Get("folder"), d.Get("constraint"))) + d.SetId(fmt.Sprintf("%s/%s", d.Get("folder"), d.Get("constraint"))) if isOrganizationPolicyUnset(d) { return resourceGoogleFolderOrganizationPolicyDelete(d, meta) diff --git a/third_party/terraform/resources/resource_google_organization_policy.go b/third_party/terraform/resources/resource_google_organization_policy.go index 9f93969d41cc..66a4c72ec324 100644 --- a/third_party/terraform/resources/resource_google_organization_policy.go +++ b/third_party/terraform/resources/resource_google_organization_policy.go @@ -155,7 +155,7 @@ func resourceGoogleOrganizationPolicy() *schema.Resource { } func resourceGoogleOrganizationPolicyCreate(d *schema.ResourceData, meta interface{}) error { - d.SetId(fmt.Sprintf("%s:%s", d.Get("org_id"), d.Get("constraint").(string))) + d.SetId(fmt.Sprintf("%s/%s", d.Get("org_id"), d.Get("constraint").(string))) if isOrganizationPolicyUnset(d) { return resourceGoogleOrganizationPolicyDelete(d, meta)