Merge pull request #1558 from danistrebel/feature/apigee-add-retention

feat(apigee): add retention variable
GoogleCloudPlatform · Aug 4, 2023 · 24bd617 · 24bd617
2 parents 311bed8 + 702c428
commit 24bd617
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 4 deletions.
diff --git a/modules/apigee/README.md b/modules/apigee/README.md
@@ -162,17 +162,16 @@ module "apigee" {
 # tftest modules=1 resources=1
 ```
 <!-- BEGIN TFDOC -->
-
 ## Variables
 
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [project_id](variables.tf#L77) | Project ID. | <code>string</code> | ✓ |  |
+| [project_id](variables.tf#L78) | Project ID. | <code>string</code> | ✓ |  |
 | [endpoint_attachments](variables.tf#L17) | Endpoint attachments. | <code title="map&#40;object&#40;&#123;&#10;  region             &#61; string&#10;  service_attachment &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>null</code> |
 | [envgroups](variables.tf#L26) | Environment groups (NAME => [HOSTNAMES]). | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>null</code> |
 | [environments](variables.tf#L32) | Environments. | <code title="map&#40;object&#40;&#123;&#10;  display_name    &#61; optional&#40;string&#41;&#10;  description     &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  deployment_type &#61; optional&#40;string&#41;&#10;  api_proxy_type  &#61; optional&#40;string&#41;&#10;  node_config &#61; optional&#40;object&#40;&#123;&#10;    min_node_count &#61; optional&#40;number&#41;&#10;    max_node_count &#61; optional&#40;number&#41;&#10;  &#125;&#41;&#41;&#10;  iam       &#61; optional&#40;map&#40;list&#40;string&#41;&#41;&#41;&#10;  envgroups &#61; optional&#40;list&#40;string&#41;&#41;&#10;  regions   &#61; optional&#40;list&#40;string&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>null</code> |
 | [instances](variables.tf#L50) | Instances ([REGION] => [INSTANCE]). | <code title="map&#40;object&#40;&#123;&#10;  display_name                  &#61; optional&#40;string&#41;&#10;  description                   &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  runtime_ip_cidr_range         &#61; string&#10;  troubleshooting_ip_cidr_range &#61; string&#10;  disk_encryption_key           &#61; optional&#40;string&#41;&#10;  consumer_accept_list          &#61; optional&#40;list&#40;string&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>null</code> |
-| [organization](variables.tf#L63) | Apigee organization. If set to null the organization must already exist. | <code title="object&#40;&#123;&#10;  display_name            &#61; optional&#40;string&#41;&#10;  description             &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  authorized_network      &#61; optional&#40;string&#41;&#10;  runtime_type            &#61; optional&#40;string, &#34;CLOUD&#34;&#41;&#10;  billing_type            &#61; optional&#40;string&#41;&#10;  database_encryption_key &#61; optional&#40;string&#41;&#10;  analytics_region        &#61; optional&#40;string, &#34;europe-west1&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [organization](variables.tf#L63) | Apigee organization. If set to null the organization must already exist. | <code title="object&#40;&#123;&#10;  display_name            &#61; optional&#40;string&#41;&#10;  description             &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  authorized_network      &#61; optional&#40;string&#41;&#10;  runtime_type            &#61; optional&#40;string, &#34;CLOUD&#34;&#41;&#10;  billing_type            &#61; optional&#40;string&#41;&#10;  database_encryption_key &#61; optional&#40;string&#41;&#10;  analytics_region        &#61; optional&#40;string, &#34;europe-west1&#34;&#41;&#10;  retention               &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
 
 ## Outputs
 
@@ -186,5 +185,4 @@ module "apigee" {
 | [org_name](outputs.tf#L42) | Organization name. |  |
 | [organization](outputs.tf#L47) | Organization. |  |
 | [service_attachments](outputs.tf#L52) | Service attachments. |  |
-
 <!-- END TFDOC -->
diff --git a/modules/apigee/main.tf b/modules/apigee/main.tf
@@ -30,6 +30,7 @@ resource "google_apigee_organization" "organization" {
   billing_type                         = var.organization.billing_type
   runtime_type                         = var.organization.runtime_type
   runtime_database_encryption_key_name = var.organization.database_encryption_key
+  retention                            = var.organization.retention
 }
 
 resource "google_apigee_envgroup" "envgroups" {

diff --git a/modules/apigee/variables.tf b/modules/apigee/variables.tf
@@ -70,6 +70,7 @@ variable "organization" {
     billing_type            = optional(string)
     database_encryption_key = optional(string)
     analytics_region        = optional(string, "europe-west1")
+    retention               = optional(string)
   })
   default = null
 }

diff --git a/tests/modules/apigee/organization_retention.tfvars b/tests/modules/apigee/organization_retention.tfvars
@@ -0,0 +1,11 @@
+project_id = "my-project"
+organization = {
+  display_name            = "My Organization"
+  description             = "My Organization"
+  authorized_network      = "my-vpc"
+  runtime_type            = "CLOUD"
+  billing_type            = "PAYG"
+  database_encryption_key = "123456789"
+  analytics_region        = "europe-west1"
+  retention               = "MINIMUM"
+}
diff --git a/tests/modules/apigee/organization_retention.yaml b/tests/modules/apigee/organization_retention.yaml
@@ -0,0 +1,28 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+values:
+  google_apigee_organization.organization[0]:
+    analytics_region: europe-west1
+    authorized_network: my-vpc
+    billing_type: PAYG
+    description: null
+    display_name: null
+    project_id: my-project
+    retention: MINIMUM
+    runtime_database_encryption_key_name: '123456789'
+    runtime_type: CLOUD
+
+counts:
+  google_apigee_organization: 1
diff --git a/tests/modules/apigee/tftest.yaml b/tests/modules/apigee/tftest.yaml
@@ -24,3 +24,4 @@ tests:
   instance_only:
   no_instances:
   organization_only:
+  organization_retention: