actually fix tests

third_party/terraform/tests/resource_kms_crypto_key_iam_test.go.erb

@@ -195,7 +195,7 @@ func TestAccKmsCryptoKeyIamPolicy(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccKmsCryptoKeyIamPolicy_basic(projectId, orgId, billingAccount, account, keyRingName, cryptoKeyName, roleId),
-				Check: testAccCheckGoogleCryptoKmsKeyIam(roleId, []string{
+				Check: testAccCheckGoogleCryptoKmsKeyIam("foo", roleId, []string{
 					fmt.Sprintf("serviceAccount:%s@%s.iam.gserviceaccount.com", account, projectId),
 				}),
 			},
@@ -234,9 +234,6 @@ func TestAccKmsCryptoKeyIamPolicy_withCondition(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccKmsCryptoKeyIamPolicy_withCondition(projectId, orgId, billingAccount, account, keyRingName, cryptoKeyName, roleId, conditionTitle),
-				Check: testAccCheckGoogleCryptoKmsKeyIam(roleId, []string{
-					fmt.Sprintf("serviceAccount:%s@%s.iam.gserviceaccount.com", account, projectId),
-				}),
 			},
 			{
 				ResourceName:      "google_kms_crypto_key_iam_policy.foo",
@@ -320,9 +317,9 @@ func testAccCheckGoogleKmsCryptoKeyIamMemberExists(n, role, member string) resou
 	}
 }
 
-func testAccCheckGoogleCryptoKmsKeyIam(role string, members []string) resource.TestCheckFunc {
+func testAccCheckGoogleCryptoKmsKeyIam(n, role string, members []string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		rs, ok := s.RootModule().Resources["google_kms_crypto_key_iam_policy"]
+		rs, ok := s.RootModule().Resources["google_kms_crypto_key_iam_policy."+n]
 		if !ok {
 			return fmt.Errorf("IAM policy resource not found")
 		}
@@ -623,14 +620,14 @@ resource "google_project_service" "iam" {
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_services.test_project.project
+  project      = google_project_service.iam.project
   account_id   = "%s"
-  display_name = "Kms Key Ring Iam Testing Account"
+  display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_services.test_project.project
-  location = "%s"
+  project  = google_project_service.iam.project
+  location = "us-central1"
   name     = "%s"
 }
 
@@ -650,7 +647,7 @@ resource "google_kms_crypto_key_iam_policy" "foo" {
   crypto_key_id = google_kms_crypto_key.crypto_key.id
   policy_data = data.google_iam_policy.foo.policy_data
 }
-`, projectId, orgId, billingAccount, account, DEFAULT_KMS_TEST_LOCATION, keyRingName, cryptoKeyName, roleId)
+`, projectId, orgId, billingAccount, account, keyRingName, cryptoKeyName, roleId)
 }
 
 <% unless version == 'ga' -%>
@@ -674,14 +671,14 @@ resource "google_project_service" "iam" {
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_services.test_project.project
+  project      = google_project_service.iam.project
   account_id   = "%s"
-  display_name = "Kms Key Ring Iam Testing Account"
+  display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_services.test_project.project
-  location = "%s"
+  project  = google_project_service.iam.project
+  location = "us-central1"
   name     = "%s"
 }
 
@@ -706,6 +703,6 @@ resource "google_kms_crypto_key_iam_policy" "foo" {
   crypto_key_id = google_kms_crypto_key.crypto_key.id
   policy_data = data.google_iam_policy.foo.policy_data
 }
-`, projectId, orgId, billingAccount, account, DEFAULT_KMS_TEST_LOCATION, keyRingName, cryptoKeyName, roleId, conditionTitle)
+`, projectId, orgId, billingAccount, account, keyRingName, cryptoKeyName, roleId, conditionTitle)
 }
 <% end -%>