Update Test & Update docs

modules/apigee-x-core/README.md

@@ -6,6 +6,7 @@
 | Name | Version |
 |------|---------|
 | <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | >= 4.20.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | n/a |
 
 ## Modules
 
@@ -20,6 +21,7 @@
 | Name | Type |
 |------|------|
 | [google-beta_google_project_service_identity.apigee_sa](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_project_service_identity) | resource |
+| [random_string.key_random_suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
 
 ## Inputs
 

modules/apigee-x-core/main.tf

@@ -31,6 +31,14 @@ resource "google_project_service_identity" "apigee_sa" {
   service  = "apigee.googleapis.com"
 }
 
+
+
+resource "random_string" "key_random_suffix" {
+  length  = 6
+  special = false
+}
+
+
 module "kms-org-db" {
   source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v28.0.0"
   project_id = var.project_id
@@ -39,7 +47,8 @@ module "kms-org-db" {
   }
   keyring = {
     location = coalesce(var.org_kms_keyring_location, var.ax_region)
-    name     = var.org_kms_keyring_name
+
+     name     = "${var.org_kms_keyring_name}-${random_string.key_random_suffix.result}"
   }
   keyring_create = var.org_kms_keyring_create
   keys = {
@@ -56,7 +65,8 @@ module "kms-inst-disk" {
   }
   keyring = {
     location = coalesce(each.value.keyring_location, each.value.region)
-    name     = coalesce(each.value.keyring_name, "apigee-${each.key}")
+    name     = "${coalesce(each.value.keyring_name, "apigee-${each.key}")}-${random_string.key_random_suffix.result}"
+
   }
   keyring_create = each.value.keyring_create
   keys = {

tests/samples/test_controlled_internet_egress.py

@@ -34,7 +34,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 39
+    assert len(resources) == 40
 
 
 def test_apigee_instance(resources):

tests/samples/test_dns_peering.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 45
+    assert len(resources) == 46
 
 
 def test_apigee_instance(resources):

tests/samples/test_ilb_mtls.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 49
+    assert len(resources) == 50
 
 
 def test_apigee_instance(resources):

tests/samples/test_l4xlb_mtls.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 52
+    assert len(resources) == 53
 
 
 def test_apigee_instance(resources):

tests/samples/test_l7xlb.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 44
+    assert len(resources) == 45
 
 
 def test_apigee_instance(resources):

tests/samples/test_multi_region.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 60
+    assert len(resources) == 61
 
 
 def test_apigee_instance(resources):

tests/samples/test_nb_psc_xlb.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 42
+    assert len(resources) == 43
 
 
 def test_apigee_instance(resources):

tests/samples/test_sb_psc.py

@@ -34,7 +34,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 46
+    assert len(resources) == 47
 
 
 def test_apigee_instance(resources):

tests/samples/test_shared_vpc.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 53
+    assert len(resources) == 54
 
 
 def test_apigee_instance(resources):

tests/samples/test_transtive_peering.py

@@ -35,7 +35,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 60
+    assert len(resources) == 61
 
 
 def test_apigee_instance(resources):

tests/samples/test_x_basic.py

@@ -33,7 +33,7 @@ def resources(recursive_plan_runner):
 
 def test_resource_count(resources):
     "Test total number of resources created."
-    assert len(resources) == 31
+    assert len(resources) == 32
 
 
 def test_apigee_instance(resources):