add and fix tests for apigee module

tests/modules/apigee/all.tfvars

@@ -7,6 +7,7 @@ organization = {
   billing_type            = "Pay-as-you-go"
   database_encryption_key = "123456789"
   analytics_region        = "europe-west1"
+  disable_vpc_peering     = false
 }
 envgroups = {
   test = ["test.example.com"]

tests/modules/apigee/all.yaml

@@ -71,6 +71,7 @@ values:
     retention: DELETION_RETENTION_UNSPECIFIED
     runtime_database_encryption_key_name: '123456789'
     runtime_type: CLOUD
+    disable_vpc_peering: false
 
 counts:
   google_apigee_endpoint_attachment: 2

tests/modules/apigee/instance_only_psc_mode.tfvars

@@ -0,0 +1,18 @@
+project_id = "my-project"
+organization = {
+  display_name = "My Organization"
+  description  = "My Organization"
+  # authorized_network      = "my-vpc"
+  runtime_type            = "CLOUD"
+  billing_type            = "Pay-as-you-go"
+  database_encryption_key = "123456789"
+  analytics_region        = "europe-west1"
+  disable_vpc_peering     = true
+}
+instances = {
+  europe-west1 = {
+    # runtime_ip_cidr_range         = "10.0.4.0/22"
+    # troubleshooting_ip_cidr_range = "10.1.1.0/28"
+  }
+}
+

tests/modules/apigee/instance_only_psc_mode.yaml

@@ -0,0 +1,37 @@
+# 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_instance.instances["europe-west1"]:
+    description: Terraform-managed
+    disk_encryption_key_name: null
+    display_name: null
+    # ip_range: 10.0.4.0/22,10.1.1.0/28
+    location: europe-west1
+    name: instance-europe-west1
+  google_apigee_organization.organization[0]:
+    analytics_region: europe-west1
+    # authorized_network: my-vpc
+    billing_type: Pay-as-you-go
+    description: null
+    display_name: null
+    project_id: my-project
+    retention: DELETION_RETENTION_UNSPECIFIED
+    runtime_database_encryption_key_name: '123456789'
+    runtime_type: CLOUD
+    disable_vpc_peering: true
+
+counts:
+  google_apigee_instance: 1
+  google_apigee_organization: 1

tests/modules/apigee/instance_only_vpc_mode.tfvars

@@ -0,0 +1,18 @@
+project_id = "my-project"
+organization = {
+  display_name            = "My Organization"
+  description             = "My Organization"
+  authorized_network      = "my-vpc"
+  runtime_type            = "CLOUD"
+  billing_type            = "Pay-as-you-go"
+  database_encryption_key = "123456789"
+  analytics_region        = "europe-west1"
+  disable_vpc_peering     = false
+}
+instances = {
+  europe-west1 = {
+    runtime_ip_cidr_range         = "10.0.4.0/22"
+    troubleshooting_ip_cidr_range = "10.1.1.0/28"
+  }
+}
+

tests/modules/apigee/instance_only_vpc_mode.yaml

@@ -0,0 +1,37 @@
+# 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_instance.instances["europe-west1"]:
+    description: Terraform-managed
+    disk_encryption_key_name: null
+    display_name: null
+    ip_range: 10.0.4.0/22,10.1.1.0/28
+    location: europe-west1
+    name: instance-europe-west1
+  google_apigee_organization.organization[0]:
+    analytics_region: europe-west1
+    authorized_network: my-vpc
+    billing_type: Pay-as-you-go
+    description: null
+    display_name: null
+    project_id: my-project
+    retention: DELETION_RETENTION_UNSPECIFIED
+    runtime_database_encryption_key_name: '123456789'
+    runtime_type: CLOUD
+    disable_vpc_peering: false
+
+counts:
+  google_apigee_instance: 1
+  google_apigee_organization: 1

tests/modules/apigee/no_instances.tfvars

@@ -7,6 +7,7 @@ organization = {
   billing_type            = "PAYG"
   database_encryption_key = "123456789"
   analytics_region        = "europe-west1"
+  disable_vpc_peering     = false
 }
 envgroups = {
   test = ["test.example.com"]

tests/modules/apigee/no_instances.yaml

@@ -43,6 +43,7 @@ values:
     retention: DELETION_RETENTION_UNSPECIFIED
     runtime_database_encryption_key_name: '123456789'
     runtime_type: CLOUD
+    disable_vpc_peering: false
 
 counts:
   google_apigee_envgroup: 2

tests/modules/apigee/organization_only_psc_mode.tfvars

@@ -0,0 +1,11 @@
+project_id = "my-project"
+organization = {
+  display_name            = "My Organization"
+  description             = "My Organization"
+  authorized_network      = null
+  runtime_type            = "CLOUD"
+  billing_type            = "PAYG"
+  database_encryption_key = "123456789"
+  analytics_region        = "europe-west1"
+  disable_vpc_peering     = true
+}

tests/modules/apigee/instance_only.yaml → tests/modules/apigee/organization_only_psc_mode.yaml

@@ -13,11 +13,17 @@
 # limitations under the License.
 
 values:
-  google_apigee_instance.instances["europe-west1"]:
-    ip_range: 10.0.4.0/22,10.1.1.0.0/28
-    location: europe-west1
-    name: "instance-europe-west1"
-    org_id: organizations/my-project
+  google_apigee_organization.organization[0]:
+    analytics_region: europe-west1
+    authorized_network: null
+    billing_type: PAYG
+    description: null
+    display_name: null
+    project_id: my-project
+    retention: DELETION_RETENTION_UNSPECIFIED
+    runtime_database_encryption_key_name: '123456789'
+    runtime_type: CLOUD
+    disable_vpc_peering: true
 
 counts:
-  google_apigee_instance: 1
+  google_apigee_organization: 1

tests/modules/apigee/organization_only.tfvars → tests/modules/apigee/organization_only_vpc_mode.tfvars

@@ -7,4 +7,5 @@ organization = {
   billing_type            = "PAYG"
   database_encryption_key = "123456789"
   analytics_region        = "europe-west1"
-}
+  disable_vpc_peering     = false
+}

tests/modules/apigee/organization_only.yaml → tests/modules/apigee/organization_only_vpc_mode.yaml

@@ -23,6 +23,7 @@ values:
     retention: DELETION_RETENTION_UNSPECIFIED
     runtime_database_encryption_key_name: '123456789'
     runtime_type: CLOUD
+    disable_vpc_peering: false
 
 counts:
   google_apigee_organization: 1

tests/modules/apigee/organization_retention.tfvars

@@ -8,4 +8,5 @@ organization = {
   database_encryption_key = "123456789"
   analytics_region        = "europe-west1"
   retention               = "MINIMUM"
-}
+  disable_vpc_peering     = false
+}

tests/modules/apigee/organization_retention.yaml

@@ -23,6 +23,7 @@ values:
     retention: MINIMUM
     runtime_database_encryption_key_name: '123456789'
     runtime_type: CLOUD
+    disable_vpc_peering: false
 
 counts:
   google_apigee_organization: 1

tests/modules/apigee/tftest.yaml

@@ -21,7 +21,9 @@ tests:
   env_only_with_api_proxy_type:
   env_only_with_deployment_type:
   envgroup_only:
-  instance_only:
+  instance_only_psc_mode:
+  instance_only_vpc_mode:
   no_instances:
-  organization_only:
+  organization_only_psc_mode:
+  organization_only_vpc_mode:
   organization_retention: