diff --git a/modules/apigee-organization/README.md b/modules/apigee-organization/README.md index 36878896..11dda36f 100644 --- a/modules/apigee-organization/README.md +++ b/modules/apigee-organization/README.md @@ -110,6 +110,7 @@ module "apigee-organization" { | [apigee_envgroups](variables.tf#L22) | Apigee Environment Groups. | map(object({…})) | | {} | | [apigee_environments](variables.tf#L31) | Apigee Environment Names. | list(string) | | [] | | [authorized_network](variables.tf#L37) | VPC network self link (requires service network peering enabled (Used in Apigee X only). | string | | null | +| [billing_type](variables.tf#L75) | Billing type of the Apigee organization. | string | | null | | [database_encryption_key](variables.tf#L43) | Cloud KMS key self link (e.g. `projects/foo/locations/us/keyRings/bar/cryptoKeys/baz`) used for encrypting the data that is stored and replicated across runtime instances (immutable, used in Apigee X only). | string | | null | | [description](variables.tf#L49) | Description of the Apigee Organization. | string | | "Apigee Organization created by tf module" | | [display_name](variables.tf#L55) | Display Name of the Apigee Organization. | string | | null | diff --git a/modules/apigee-organization/main.tf b/modules/apigee-organization/main.tf index fe798f92..148711a9 100644 --- a/modules/apigee-organization/main.tf +++ b/modules/apigee-organization/main.tf @@ -31,6 +31,7 @@ resource "google_apigee_organization" "apigee_org" { display_name = var.display_name description = var.description runtime_type = var.runtime_type + billing_type = var.billing_type authorized_network = var.authorized_network runtime_database_encryption_key_name = var.database_encryption_key } diff --git a/modules/apigee-organization/variables.tf b/modules/apigee-organization/variables.tf index d7ab70da..b2b3eac9 100644 --- a/modules/apigee-organization/variables.tf +++ b/modules/apigee-organization/variables.tf @@ -72,4 +72,8 @@ variable "runtime_type" { } } - +variable "billing_type" { + description = "Billing type of the Apigee organization." + type = string + default = null +} diff --git a/tests/modules/apigee_organization/fixture/main.tf b/tests/modules/apigee_organization/fixture/main.tf index 49ad78b1..9dfb49bc 100644 --- a/tests/modules/apigee_organization/fixture/main.tf +++ b/tests/modules/apigee_organization/fixture/main.tf @@ -19,6 +19,7 @@ module "test" { project_id = "my-project" analytics_region = var.analytics_region runtime_type = "CLOUD" + billing_type = "EVALUATION" authorized_network = var.network apigee_environments = [ "eval1",