Add support for type in ApigeeEnvironment; remove obsolete broken test (

#9340)
GoogleCloudPlatform · Oct 24, 2023 · 127027f · 127027f
1 parent a67d6a3
commit 127027f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 187 deletions.
diff --git a/mmv1/products/apigee/Environment.yaml b/mmv1/products/apigee/Environment.yaml
@@ -87,7 +87,7 @@ examples:
       # Resource creation race
     skip_vcr: true
   - !ruby/object:Provider::Terraform::Examples
-    name: 'apigee_environment_nodeconfig_test'
+    name: 'apigee_environment_type_test'
     primary_resource_id: 'apigee_environment'
     primary_resource_name: "fmt.Sprintf(\"organizations/tf-test%s\",
       context[\"random_suffix\"\
@@ -184,3 +184,16 @@ properties:
           The current total number of gateway nodes that each environment currently has across
           all instances.
         output: true
+  - !ruby/object:Api::Type::Enum
+    name: 'type'
+    description: |
+      Types that can be selected for an Environment. Each of the types are
+      limited by capability and capacity. Refer to Apigee's public documentation
+      to understand about each of these types in details.
+      An Apigee org can support heterogeneous Environments.
+    default_from_api: true
+    values:
+      - 'ENVIRONMENT_TYPE_UNSPECIFIED'
+      - 'BASE'
+      - 'INTERMEDIATE'
+      - 'COMPREHENSIVE'
diff --git a/...apigee_environment_nodeconfig_test.tf.erb → ...mples/apigee_environment_type_test.tf.erb b/...apigee_environment_nodeconfig_test.tf.erb → ...mples/apigee_environment_type_test.tf.erb
@@ -120,8 +120,5 @@ resource "google_apigee_environment" "<%= ctx[:primary_resource_id] %>" {
   name         = "tf-test%{random_suffix}"
   description  = "Apigee Environment"
   display_name = "tf-test%{random_suffix}"
-  node_config {
-    min_node_count = "3"
-    max_node_count = "5"
-  }
+  type         = "COMPREHENSIVE"
 }
diff --git a/.../third_party/terraform/services/apigee/resource_apigee_environment_nodeconfig_test.go.erb b/.../third_party/terraform/services/apigee/resource_apigee_environment_nodeconfig_test.go.erb