Fix writing to state when creation failed on google_project_organization_policy (#5958) (#11676)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/5958.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resourcemanager: fixed a bug in wrongly writing to state when creation failed on `google_project_organization_policy` 
+```

.goreleaser.yml

@@ -35,13 +35,16 @@ checksum:
   name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
   algorithm: sha256
 publishers:
-  - name: upload
+  - name: hc-releases
     checksum: true
     signature: true
-    cmd: hc-releases upload -product {{ .ProjectName }} -version {{ .Version }} -file={{ .ArtifactPath }}={{ .ArtifactName }} -header="x-terraform-protocol-version={{ .Env.PROTOCOL_VERSION }}" -header="x-terraform-protocol-versions={{ .Env.PROTOCOL_VERSIONS }}"
+    cmd: hc-releases upload-file -header="x-terraform-protocol-version={{ .Env.PROTOCOL_VERSION }}" -header="x-terraform-protocol-versions={{ .Env.PROTOCOL_VERSIONS }}" {{ abs .ArtifactPath }}
     env:
-      - HC_RELEASES_HOST={{ .Env.HC_RELEASES_HOST }}
-      - HC_RELEASES_KEY={{ .Env.HC_RELEASES_KEY }}
+      - AWS_DEFAULT_REGION={{ .Env.AWS_DEFAULT_REGION }}
+      - AWS_REGION={{ .Env.AWS_REGION }}
+      - AWS_ACCESS_KEY_ID={{ .Env.AWS_ACCESS_KEY_ID }}
+      - AWS_SECRET_ACCESS_KEY={{ .Env.AWS_SECRET_ACCESS_KEY }}
+      - AWS_SESSION_TOKEN={{ .Env.AWS_SESSION_TOKEN }}
 release:
   ids:
     - none

.release/release-metadata.hcl

@@ -123,9 +123,9 @@ resource "google_clouddeploy_target" "primary" {
   name     = "tf-test-target%{random_suffix}"
 
   annotations = {
-    my_third_annotation = "example-annotation-3"
-
     my_second_annotation = "updated-example-annotation-2"
+
+    my_third_annotation = "example-annotation-3"
   }
 
   description = "updated description"
@@ -156,9 +156,9 @@ resource "google_clouddeploy_target" "primary" {
   name     = "tf-test-target%{random_suffix}"
 
   annotations = {
-    my_second_annotation = "updated-example-annotation-2"
-
     my_third_annotation = "example-annotation-3"
+
+    my_second_annotation = "updated-example-annotation-2"
   }
 
   description = "updated description"

google/resource_clouddeploy_target_generated_test.go

@@ -60,16 +60,17 @@ func resourceProjectOrgPolicyImporter(d *schema.ResourceData, meta interface{})
 }
 
 func resourceGoogleProjectOrganizationPolicyCreate(d *schema.ResourceData, meta interface{}) error {
-	d.SetId(fmt.Sprintf("%s:%s", d.Get("project"), d.Get("constraint")))
-
 	if isOrganizationPolicyUnset(d) {
+		d.SetId(fmt.Sprintf("%s:%s", d.Get("project"), d.Get("constraint")))
 		return resourceGoogleProjectOrganizationPolicyDelete(d, meta)
 	}
 
 	if err := setProjectOrganizationPolicy(d, meta); err != nil {
 		return err
 	}
 
+	d.SetId(fmt.Sprintf("%s:%s", d.Get("project"), d.Get("constraint")))
+
 	return resourceGoogleProjectOrganizationPolicyRead(d, meta)
 }
 

google/resource_google_project_organization_policy.go

@@ -33,9 +33,9 @@ resource "google_clouddeploy_delivery_pipeline" "primary" {
   name     = "pipeline"
 
   annotations = {
-    my_first_annotation = "example-annotation-1"
-
     my_second_annotation = "example-annotation-2"
+
+    my_first_annotation = "example-annotation-1"
   }
 
   description = "basic description"