fixed writing to state (#5186) (#10082)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 15, 2021 · a5e5535 · a5e5535
1 parent 62e6dfe
commit a5e5535
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.changelog/5186.txt b/.changelog/5186.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+platform: fixed a bug in wrongly writing to state when creation failed on `google_organization_policy`
+```
diff --git a/google/resource_google_organization_policy.go b/google/resource_google_organization_policy.go
@@ -174,8 +174,6 @@ 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)))
-
 	if isOrganizationPolicyUnset(d) {
 		return resourceGoogleOrganizationPolicyDelete(d, meta)
 	}
@@ -184,6 +182,7 @@ func resourceGoogleOrganizationPolicyCreate(d *schema.ResourceData, meta interfa
 		return err
 	}
 
+	d.SetId(fmt.Sprintf("%s/%s", d.Get("org_id"), d.Get("constraint").(string)))
 	return resourceGoogleOrganizationPolicyRead(d, meta)
 }