Fixed apigee organization deletion tests by adding sleep (#15729)

Author: melinath

mmv1/products/apigee/Organization.yaml

@@ -31,6 +31,7 @@ timeouts:
   delete_minutes: 45
 autogen_async: true
 async:
+  # b/242358013 blocks adding delete operation support. Once that's resolved, we can also remove sleep-after-delete from tests.
   actions: ['create']
   type: 'OpAsync'
   operation:
@@ -59,8 +60,6 @@ examples:
     ignore_read_extra:
       - 'properties'
     exclude_docs: true
-    # Resource creation race
-    skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_organization_cloud_basic_disable_vpc_peering'
     exclude_test: true
@@ -74,8 +73,7 @@ examples:
     ignore_read_extra:
       - 'properties'
     exclude_docs: true
-    # Resource creation race
-    skip_vcr: true
+    external_providers: ["time"]
   - name: 'apigee_organization_cloud_basic_data_residency'
     exclude_test: true
   # This is a more verbose version of the above that creates all
@@ -88,43 +86,40 @@ examples:
     ignore_read_extra:
       - 'properties'
     exclude_docs: true
-    # Resource creation race
-    skip_vcr: true
+    external_providers: ["time"]
   - name: 'apigee_organization_cloud_full'
     exclude_test: true
   # This is a more verbose version of the above that creates all
-  # the resources needed for the acceptance test. While all Apigee
-  # resources in this test are in the GA API, we depend on a service
-  # identity resource which is only available in the beta provider.
+  # the resources needed for the acceptance test.
   - name: 'apigee_organization_cloud_full_test'
     primary_resource_id: 'org'
+    # While all Apigee resources in this test are in the GA API, we
+    # depend on a service identity resource which is only available
+    # in the beta provider.
     min_version: 'beta'
     test_env_vars:
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     ignore_read_extra:
       - 'properties'
     exclude_docs: true
-    # Resource creation race
-    skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_organization_cloud_full_disable_vpc_peering'
     exclude_test: true
   # This is a more verbose version of the above that creates all
-  # the resources needed for the acceptance test. While all Apigee
-  # resources in this test are in the GA API, we depend on a service
-  # identity resource which is only available in the beta provider.
+  # the resources needed for the acceptance test.
   - name: 'apigee_organization_cloud_full_disable_vpc_peering_test'
     primary_resource_id: 'org'
+    # While all Apigee resources in this test are in the GA API, we
+    # depend on a service identity resource which is only available
+    # in the beta provider.
     min_version: 'beta'
     test_env_vars:
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     ignore_read_extra:
       - 'properties'
     exclude_docs: true
-    # Resource creation race
-    skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_organization_retention_test'
     primary_resource_id: 'org'
@@ -133,8 +128,6 @@ examples:
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     exclude_docs: true
-    # Resource creation race
-    skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_organization_drz_test'
     primary_resource_id: 'org'
@@ -143,8 +136,6 @@ examples:
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     exclude_docs: true
-      # Resource creation race
-    skip_vcr: true
     external_providers: ["time"]
 parameters:
   - name: 'projectId'

mmv1/templates/terraform/examples/apigee_organization_cloud_basic_data_residency_test.tf.tmpl

@@ -15,13 +15,23 @@ resource "google_project_service" "apigee" {
   service = "apigee.googleapis.com"
 }
 
+resource "time_sleep" "wait_120_seconds" {
+  create_duration = "120s"
+  depends_on = [google_project_service.apigee]
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   description                = "Terraform-provisioned basic Apigee Org under European Union hosting jurisdiction."
   project_id                 = google_project.project.project_id
   api_consumer_data_location = "europe-west1"
   billing_type               = "PAYG"
   disable_vpc_peering        = true
   depends_on                 = [
-    google_project_service.apigee,
+    time_sleep.wait_120_seconds,
   ]
 }
+
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
+}

mmv1/templates/terraform/examples/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.tmpl

@@ -11,12 +11,23 @@ resource "google_project_service" "apigee" {
   service = "apigee.googleapis.com"
 }
 
+resource "time_sleep" "wait_120_seconds" {
+  create_duration = "120s"
+  depends_on = [google_project_service.apigee]
+}
+
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   description         = "Terraform-provisioned basic Apigee Org without VPC Peering."
   analytics_region    = "us-central1"
   project_id          = google_project.project.project_id
   disable_vpc_peering = true
   depends_on          = [
-    google_project_service.apigee,
+    time_sleep.wait_120_seconds,
   ]
 }
+
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
+}

mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.tmpl

@@ -65,3 +65,8 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
     google_project_service.apigee,
   ]
 }
+
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
+}

mmv1/templates/terraform/examples/apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl

@@ -37,13 +37,18 @@ resource "google_project_service" "kms" {
   depends_on = [google_project_service.compute]
 }
 
+resource "time_sleep" "wait_for_services" {
+  create_duration = "120s"
+  depends_on = [google_project_service.kms]
+}
+
 resource "google_kms_key_ring" "apigee_keyring" {
   provider = google-beta
 
   name       = "apigee-keyring"
   location   = "us-central1"
   project    = google_project.project.project_id
-  depends_on = [google_project_service.kms]
+  depends_on = [time_sleep.wait_for_services]
 }
 
 resource "google_kms_crypto_key" "apigee_key" {
@@ -69,6 +74,11 @@ resource "google_kms_crypto_key_iam_member" "apigee_sa_keyuser" {
   member = google_project_service_identity.apigee_sa.member
 }
 
+resource "time_sleep" "wait_for_iam" {
+  create_duration = "120s"
+  depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -91,6 +101,11 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   }
 
   depends_on = [
-    google_kms_crypto_key_iam_member.apigee_sa_keyuser,
+    time_sleep.wait_for_iam,
   ]
 }
+
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
+}

mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.tmpl

@@ -45,7 +45,7 @@ resource "google_project_service" "kms" {
   depends_on = [google_project_service.servicenetworking]
 }
 
-resource "time_sleep" "wait_120_seconds" {
+resource "time_sleep" "wait_for_services" {
   create_duration = "120s"
   depends_on = [google_project_service.kms]
 }
@@ -55,7 +55,7 @@ resource "google_compute_network" "apigee_network" {
 
   name       = "apigee-network"
   project    = google_project.project.project_id
-  depends_on = [time_sleep.wait_120_seconds]
+  depends_on = [time_sleep.wait_for_services]
 }
 
 resource "google_compute_global_address" "apigee_range" {
@@ -110,6 +110,11 @@ resource "google_kms_crypto_key_iam_member" "apigee_sa_keyuser" {
   member = google_project_service_identity.apigee_sa.member
 }
 
+resource "time_sleep" "wait_for_iam" {
+  create_duration = "120s"
+  depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -133,6 +138,11 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
 
   depends_on = [
     google_service_networking_connection.apigee_vpc_connection,
-    google_kms_crypto_key_iam_member.apigee_sa_keyuser,
+    time_sleep.wait_for_iam,
   ]
 }
+
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
+}

mmv1/templates/terraform/examples/apigee_organization_drz_test.tf.tmpl

@@ -49,7 +49,7 @@ resource "google_project_service" "kms" {
   depends_on = [google_project_service.servicenetworking]
 }
 
-resource "time_sleep" "wait_120_seconds" {
+resource "time_sleep" "wait_for_services" {
   create_duration = "120s"
   depends_on = [google_project_service.kms]
 }
@@ -59,7 +59,7 @@ resource "google_compute_network" "apigee_network" {
 
   name       = "apigee-network"
   project    = google_project.project.project_id
-  depends_on = [time_sleep.wait_120_seconds]
+  depends_on = [time_sleep.wait_for_services]
 }
 
 resource "google_compute_global_address" "apigee_range" {
@@ -114,6 +114,11 @@ resource "google_kms_crypto_key_iam_member" "apigee_sa_keyuser" {
   member = google_project_service_identity.apigee_sa.member
 }
 
+resource "time_sleep" "wait_for_iam" {
+  create_duration = "120s"
+  depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -128,7 +133,11 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   depends_on = [
     google_service_networking_connection.apigee_vpc_connection,
     google_project_service.apigee,
-    google_kms_crypto_key_iam_member.apigee_sa_keyuser,
+    time_sleep.wait_for_iam,
   ]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
+}

mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.tmpl

@@ -45,7 +45,7 @@ resource "google_project_service" "kms" {
   depends_on = [google_project_service.servicenetworking]
 }
 
-resource "time_sleep" "wait_120_seconds" {
+resource "time_sleep" "wait_for_services" {
   create_duration = "120s"
   depends_on = [google_project_service.kms]
 }
@@ -55,7 +55,7 @@ resource "google_compute_network" "apigee_network" {
 
   name       = "apigee-network"
   project    = google_project.project.project_id
-  depends_on = [time_sleep.wait_120_seconds]
+  depends_on = [time_sleep.wait_for_services]
 }
 
 resource "google_compute_global_address" "apigee_range" {
@@ -110,6 +110,11 @@ resource "google_kms_crypto_key_iam_member" "apigee_sa_keyuser" {
   member = google_project_service_identity.apigee_sa.member
 }
 
+resource "time_sleep" "wait_for_iam" {
+  create_duration = "120s"
+  depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -123,7 +128,11 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   depends_on = [
     google_service_networking_connection.apigee_vpc_connection,
     google_project_service.apigee,
-    google_kms_crypto_key_iam_member.apigee_sa_keyuser,
+    time_sleep.wait_for_iam,
   ]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
+}