Add billingType attribute to Apigee Organization resource (GoogleClou…

…dPlatform#5796) Co-authored-by: Stephen Lewis (Burrows) <[email protected]>
lcaggio · Mar 16, 2022 · 3babc71 · 3babc71
1 parent 152c603
commit 3babc71
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/mmv1/products/apigee/api.yaml b/mmv1/products/apigee/api.yaml
@@ -104,6 +104,11 @@ objects:
           Output only. Subscription type of the Apigee organization.
           Valid values include trial (free, limited, and for evaluation purposes only) or paid (full subscription has been purchased).
         output: true
+      - !ruby/object:Api::Type::String
+        name: 'billingType'
+        description: |
+          Billing type of the Apigee organization. See [Apigee pricing](https://cloud.google.com/apigee/pricing).
+        input: true
       - !ruby/object:Api::Type::String
         name: 'caCertificate'
         description: |

diff --git a/mmv1/products/apigee/terraform.yaml b/mmv1/products/apigee/terraform.yaml
@@ -47,6 +47,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       min_version: beta
       # Resource creation race
       skip_vcr: true
+    properties:
+      billingType: !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
@@ -105,6 +105,7 @@ resource "google_apigee_organization" "<%= ctx[:primary_resource_id] %>" {
   analytics_region                     = "us-central1"
   project_id                           = google_project.project.project_id
   authorized_network                   = google_compute_network.apigee_network.id
+  billing_type                         = "EVALUATION"
   runtime_database_encryption_key_name = google_kms_crypto_key.apigee_key.id
 
   depends_on = [