use google_project_service

GoogleCloudPlatform · Dec 20, 2019 · ce27ba3 · ce27ba3
1 parent d150177
commit ce27ba3
Showing 1 changed file with 26 additions and 12 deletions.
diff --git a/third_party/terraform/tests/resource_kms_crypto_key_iam_test.go.erb b/third_party/terraform/tests/resource_kms_crypto_key_iam_test.go.erb
@@ -611,34 +611,41 @@ resource "google_project" "test_project" {
   org_id          = "%s"
   billing_account = "%s"
 }
-resource "google_project_services" "test_project" {
+
+resource "google_project_service" "kms" {
   project = google_project.test_project.project_id
-  services = [
-     "cloudkms.googleapis.com",
-     "iam.googleapis.com",
-     "iamcredentials.googleapis.com",
-  ]
+  service = "cloudkms.googleapis.com"
+}
+
+resource "google_project_service" "iam" {
+  project = google_project_service.kms.project
+  service = "iam.googleapis.com"
 }
+
 resource "google_service_account" "test_account" {
   project      = google_project_services.test_project.project
   account_id   = "%s"
   display_name = "Kms Key Ring Iam Testing Account"
 }
+
 resource "google_kms_key_ring" "key_ring" {
   project  = google_project_services.test_project.project
   location = "%s"
   name     = "%s"
 }
+
 resource "google_kms_crypto_key" "crypto_key" {
   key_ring = google_kms_key_ring.key_ring.id
   name     = "%s"
 }
+
 data "google_iam_policy" "foo" {
   binding {
     role = "%s"
     members = ["serviceAccount:${google_service_account.test_account.email}"]
   }
 }
+
 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
@@ -655,28 +662,34 @@ resource "google_project" "test_project" {
   org_id          = "%s"
   billing_account = "%s"
 }
-resource "google_project_services" "test_project" {
+
+resource "google_project_service" "kms" {
   project = google_project.test_project.project_id
-  services = [
-     "cloudkms.googleapis.com",
-     "iam.googleapis.com",
-     "iamcredentials.googleapis.com",
-  ]
+  service = "cloudkms.googleapis.com"
+}
+
+resource "google_project_service" "iam" {
+  project = google_project_service.kms.project
+  service = "iam.googleapis.com"
 }
+
 resource "google_service_account" "test_account" {
   project      = google_project_services.test_project.project
   account_id   = "%s"
   display_name = "Kms Key Ring Iam Testing Account"
 }
+
 resource "google_kms_key_ring" "key_ring" {
   project  = google_project_services.test_project.project
   location = "%s"
   name     = "%s"
 }
+
 resource "google_kms_crypto_key" "crypto_key" {
   key_ring = google_kms_key_ring.key_ring.id
   name     = "%s"
 }
+
 data "google_iam_policy" "foo" {
   binding {
     role = "%s"
@@ -688,6 +701,7 @@ data "google_iam_policy" "foo" {
     }
   }
 }
+
 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