From 3babc7167cd77109ae5eebe58da8c1347084b797 Mon Sep 17 00:00:00 2001 From: xuchenma <67921399+xuchenma@users.noreply.github.com> Date: Tue, 15 Mar 2022 15:47:51 -0700 Subject: [PATCH] Add billingType attribute to Apigee Organization resource (#5796) Co-authored-by: Stephen Lewis (Burrows) --- mmv1/products/apigee/api.yaml | 5 +++++ mmv1/products/apigee/terraform.yaml | 3 +++ .../examples/apigee_organization_cloud_full_test.tf.erb | 1 + 3 files changed, 9 insertions(+) diff --git a/mmv1/products/apigee/api.yaml b/mmv1/products/apigee/api.yaml index 1c0bfcec763f..e6422178aa63 100644 --- 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 index a3aae6202545..175ddb64893f 100644 --- 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 index 32b47756f31a..c1971f26ccdd 100644 --- 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 = [