add composer test fixes, backend bucket signed url key (#2631)

GoogleCloudPlatform · Nov 8, 2019 · a14f2b6 · a14f2b6
1 parent 06ae8e4
commit a14f2b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/third_party/terraform/resources/resource_composer_environment.go.erb b/third_party/terraform/resources/resource_composer_environment.go.erb
@@ -325,7 +325,7 @@ func resourceComposerEnvironmentCreate(d *schema.ResourceData, meta interface{})
 	}
 
 	// Store the ID now
-	id, err := replaceVars(d, config, "{{project}}/{{region}}/{{name}}")
+	id, err := replaceVars(d, config, "projects/{{project}}/locations/{{region}}/environments/{{name}}")
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}

diff --git a/third_party/terraform/tests/resource_composer_environment_test.go.erb b/third_party/terraform/tests/resource_composer_environment_test.go.erb
@@ -285,13 +285,13 @@ func testAccComposerEnvironmentDestroy(s *terraform.State) error {
 		}
 
 		idTokens := strings.Split(rs.Primary.ID, "/")
-		if len(idTokens) != 3 {
-			return fmt.Errorf("Invalid ID %q, expected format {project}/{region}/{environment}", rs.Primary.ID)
+		if len(idTokens) != 6 {
+			return fmt.Errorf("Invalid ID %q, expected format projects/{project}/regions/{region}/environments/{environment}", rs.Primary.ID)
 		}
 		envName := &composerEnvironmentName{
-			Project:     idTokens[0],
-			Region:      idTokens[1],
-			Environment: idTokens[2],
+			Project:     idTokens[1],
+			Region:      idTokens[3],
+			Environment: idTokens[5],
 		}
 
 		_, err := config.clientComposer.Projects.Locations.Environments.Get(envName.resourceName()).Do()

diff --git a/third_party/terraform/tests/resource_compute_backend_bucket_signed_url_key_test.go b/third_party/terraform/tests/resource_compute_backend_bucket_signed_url_key_test.go
@@ -85,7 +85,7 @@ func checkComputeBackendBucketSignedUrlKeyExists(s *terraform.State) (bool, erro
 		}
 
 		config := testAccProvider.Meta().(*Config)
-		keyName := rs.Primary.ID
+		keyName := rs.Primary.Attributes["name"]
 
 		url, err := replaceVarsForTest(config, rs, "{{ComputeBasePath}}projects/{{project}}/global/backendBuckets/{{backend_bucket}}")
 		if err != nil {