Merge pull request #53 from g-greatdevaks/feature/apigee-org-kms-keyr…

…ing-custom-name

feat: add org kms key ring custom name logic

modules/apigee-x-core/README.md

@@ -29,6 +29,7 @@
 | <a name="input_apigee_envgroups"></a> [apigee\_envgroups](#input\_apigee\_envgroups) | Apigee Environment Groups. | <pre>map(object({<br>    environments = list(string)<br>    hostnames    = list(string)<br>  }))</pre> | `{}` | no |
 | <a name="input_apigee_environments"></a> [apigee\_environments](#input\_apigee\_environments) | Apigee Environment Names. | `list(string)` | `[]` | no |
 | <a name="input_apigee_instances"></a> [apigee\_instances](#input\_apigee\_instances) | Apigee Instances (only one instance for EVAL). | <pre>map(object({<br>    region       = string<br>    ip_range     = string<br>    environments = list(string)<br>  }))</pre> | `{}` | no |
+| <a name="input_apigee_org_kms_keyring_name"></a> [apigee_org_kms_keyring_name](#input_apigee_org_kms_keyring_name)    | Name of the KMS Key Ring for Apigee Organization DB.                                                                          | `string`                                                                                                  | `"apigee-x-org"` |    no    |
 | <a name="input_ax_region"></a> [ax\_region](#input\_ax\_region) | GCP region for storing Apigee analytics data (see https://cloud.google.com/apigee/docs/api-platform/get-started/install-cli). | `string` | n/a | yes |
 | <a name="input_billing_type"></a> [billing\_type](#input\_billing\_type) | Billing type of the Apigee organization. | `string` | `null` | no |
 | <a name="input_instance_key_rotation_period"></a> [instance\_key\_rotation\_period](#input\_instance\_key\_rotation\_period) | Rotaton period for the instance disk encryption key | `string` | `"2592000s"` | no |
@@ -43,4 +44,4 @@
 | <a name="output_instance_endpoints"></a> [instance\_endpoints](#output\_instance\_endpoints) | Map of instance name -> internal runtime endpoint IP address |
 | <a name="output_instance_service_attachments"></a> [instance\_service\_attachments](#output\_instance\_service\_attachments) | Map of instance region -> instance PSC service attachment |
 | <a name="output_org_id"></a> [org\_id](#output\_org\_id) | Apigee Organization ID |
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->

modules/apigee-x-core/main.tf

@@ -30,7 +30,7 @@ module "kms-org-db" {
   }
   keyring = {
     location = var.ax_region
-    name     = "apigee-x-org"
+    name     = var.apigee_org_kms_keyring_name
   }
   keys = {
     org-db = { rotation_period = var.org_key_rotation_period, labels = null }

modules/apigee-x-core/variables.tf

@@ -71,3 +71,9 @@ variable "instance_key_rotation_period" {
   type        = string
   default     = "2592000s"
 }
+
+variable "apigee_org_kms_keyring_name" {
+  description = "Name of the KMS Key Ring for Apigee Organization DB."
+  type        = string
+  default     = "apigee-x-org"
+}