From 368472c9a00a14d61bb9919547c2b856a49f04c1 Mon Sep 17 00:00:00 2001 From: lcaggio Date: Mon, 13 Mar 2023 21:24:27 +0100 Subject: [PATCH] Fix 1236 --- blueprints/data-solutions/composer-2/README.md | 13 ++++++------- blueprints/data-solutions/composer-2/variables.tf | 4 ++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/blueprints/data-solutions/composer-2/README.md b/blueprints/data-solutions/composer-2/README.md index 6ff0e8b0..ab4f65d9 100644 --- a/blueprints/data-solutions/composer-2/README.md +++ b/blueprints/data-solutions/composer-2/README.md @@ -96,14 +96,14 @@ service_encryption_keys = { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [prefix](variables.tf#L78) | Prefix used for resource names. | string | ✓ | | -| [project_id](variables.tf#L96) | Project id, references existing project if `project_create` is null. | string | ✓ | | +| [prefix](variables.tf#L82) | Prefix used for resource names. | string | ✓ | | +| [project_id](variables.tf#L100) | Project id, references existing project if `project_create` is null. | string | ✓ | | | [composer_config](variables.tf#L17) | Composer environment configuration. It accepts only following attributes: `environment_size`, `software_config` and `workloads_config`. See [attribute reference](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/composer_environment#argument-reference---cloud-composer-2) for details on settings variables. | object({…}) | | {…} | | [iam_groups_map](variables.tf#L58) | Map of Role => groups to be added on the project. Example: { \"roles/composer.admin\" = [\"group:gcp-data-engineers@example.com\"]}. | map(list(string)) | | null | -| [network_config](variables.tf#L64) | Shared VPC network configurations to use. If null networks will be created in projects with preconfigured values. | object({…}) | | null | -| [project_create](variables.tf#L87) | Provide values if project creation is needed, uses existing project if null. Parent is in 'folders/nnn' or 'organizations/nnn' format. | object({…}) | | null | -| [region](variables.tf#L101) | Reagion where instances will be deployed. | string | | "europe-west1" | -| [service_encryption_keys](variables.tf#L107) | Cloud KMS keys to use to encrypt resources. Provide a key for each reagion in use. | map(string) | | null | +| [network_config](variables.tf#L64) | Shared VPC network configurations to use. If null networks will be created in projects with preconfigured values. | object({…}) | | null | +| [project_create](variables.tf#L91) | Provide values if project creation is needed, uses existing project if null. Parent is in 'folders/nnn' or 'organizations/nnn' format. | object({…}) | | null | +| [region](variables.tf#L105) | Reagion where instances will be deployed. | string | | "europe-west1" | +| [service_encryption_keys](variables.tf#L111) | Cloud KMS keys to use to encrypt resources. Provide a key for each reagion in use. | map(string) | | null | ## Outputs @@ -113,7 +113,6 @@ service_encryption_keys = { | [composer_dag_gcs](outputs.tf#L22) | The Cloud Storage prefix of the DAGs for the Cloud Composer environment. | | - ## Test ```hcl diff --git a/blueprints/data-solutions/composer-2/variables.tf b/blueprints/data-solutions/composer-2/variables.tf index 6ff0ff46..77f095e3 100644 --- a/blueprints/data-solutions/composer-2/variables.tf +++ b/blueprints/data-solutions/composer-2/variables.tf @@ -67,6 +67,10 @@ variable "network_config" { host_project = string network_self_link = string subnet_self_link = string + composer_ip_ranges = object({ + cloudsql = string + gke_master = string + }) composer_secondary_ranges = object({ pods = string services = string