Add a Properties field to ApigeeOrganization (GoogleCloudPlatform#6464)

hao-nan-li · Aug 31, 2022 · 85e8d05 · 85e8d05
1 parent 30ffac4
commit 85e8d05
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/mmv1/products/apigee/api.yaml b/mmv1/products/apigee/api.yaml
@@ -138,6 +138,21 @@ objects:
           If not specified, a Google-Managed encryption key will be used.
           Valid only when `RuntimeType` is CLOUD. For example: `projects/foo/locations/us/keyRings/bar/cryptoKeys/baz`.
         input: true
+      - !ruby/object:Api::Type::NestedObject
+        name: 'properties'
+        description: Properties defined in the Apigee organization profile.
+        properties:
+          - !ruby/object:Api::Type::Array
+            name: 'property'
+            description: List of all properties in the object.
+            item_type: !ruby/object:Api::Type::NestedObject
+              properties:
+                - !ruby/object:Api::Type::String
+                  name: 'name'
+                  description: Name of the property.
+                - !ruby/object:Api::Type::String
+                  name: 'value'
+                  description: Value of the property.
     references: !ruby/object:Api::Resource::ReferenceLinks
       guides:
         'Creating an API organization':

diff --git a/mmv1/products/apigee/terraform.yaml b/mmv1/products/apigee/terraform.yaml
@@ -60,6 +60,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     properties:
       billingType: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
+      properties: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       custom_import: templates/terraform/custom_import/apigee_organization.go.erb
       encoder: templates/terraform/encoders/apigee_organization.go.erb

diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.erb
@@ -107,6 +107,16 @@ resource "google_apigee_organization" "<%= ctx[:primary_resource_id] %>" {
   authorized_network                   = google_compute_network.apigee_network.id
   billing_type                         = "EVALUATION"
   runtime_database_encryption_key_name = google_kms_crypto_key.apigee_key.id
+  properties {
+    property {
+      name = "features.hybrid.enabled"
+      value = "true"
+    }
+    property {
+      name = "features.mart.connect.enabled"
+      value = "true"
+    }
+  }
 
   depends_on = [
     google_service_networking_connection.apigee_vpc_connection,