From 19695fa474ed3d2e692d2396465143cd6b096432 Mon Sep 17 00:00:00 2001 From: Ludo Date: Fri, 24 May 2024 09:03:49 +0200 Subject: [PATCH] remove default location from remaining modules --- modules/container-registry/README.md | 6 ++---- modules/container-registry/variables.tf | 1 - modules/data-catalog-policy-tag/README.md | 12 +++++++----- modules/data-catalog-policy-tag/variables.tf | 1 - modules/workstation-cluster/README.md | 10 +++++----- modules/workstation-cluster/variables.tf | 1 - 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/modules/container-registry/README.md b/modules/container-registry/README.md index a5748e2aeb..fd8b1c5245 100644 --- a/modules/container-registry/README.md +++ b/modules/container-registry/README.md @@ -16,19 +16,17 @@ module "container_registry" { # tftest modules=1 resources=2 inventory=simple.yaml ``` - ## Variables | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [project_id](variables.tf#L29) | Registry project id. | string | ✓ | | +| [location](variables.tf#L23) | Registry location. Can be US, EU, ASIA or empty. | string | ✓ | | +| [project_id](variables.tf#L28) | Registry project id. | string | ✓ | | | [iam](variables.tf#L17) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | -| [location](variables.tf#L23) | Registry location. Can be US, EU, ASIA or empty. | string | | "" | ## Outputs | name | description | sensitive | |---|---|:---:| | [id](outputs.tf#L17) | Fully qualified id of the registry bucket. | | - diff --git a/modules/container-registry/variables.tf b/modules/container-registry/variables.tf index 9a5709e967..f09274e44e 100644 --- a/modules/container-registry/variables.tf +++ b/modules/container-registry/variables.tf @@ -23,7 +23,6 @@ variable "iam" { variable "location" { description = "Registry location. Can be US, EU, ASIA or empty." type = string - default = "" } variable "project_id" { diff --git a/modules/data-catalog-policy-tag/README.md b/modules/data-catalog-policy-tag/README.md index 49f1e80f10..a9906ed635 100644 --- a/modules/data-catalog-policy-tag/README.md +++ b/modules/data-catalog-policy-tag/README.md @@ -35,6 +35,7 @@ module "cmn-dc" { source = "./fabric/modules/data-catalog-policy-tag" name = "my-datacatalog-policy-tags" project_id = "my-project" + location = "eu" tags = { low = {} medium = {} @@ -51,6 +52,7 @@ module "cmn-dc" { source = "./fabric/modules/data-catalog-policy-tag" name = "my-datacatalog-policy-tags" project_id = "my-project" + location = "eu" tags = { low = {} medium = {} @@ -79,17 +81,17 @@ module "cmn-dc" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [name](variables.tf#L35) | Name of this taxonomy. | string | ✓ | | -| [project_id](variables.tf#L50) | GCP project id. | string | ✓ | | +| [location](variables.tf#L29) | Data Catalog Taxonomy location. | string | ✓ | | +| [name](variables.tf#L34) | Name of this taxonomy. | string | ✓ | | +| [project_id](variables.tf#L49) | GCP project id. | string | ✓ | | | [activated_policy_types](variables.tf#L17) | A list of policy types that are activated for this taxonomy. | list(string) | | ["FINE_GRAINED_ACCESS_CONTROL"] | | [description](variables.tf#L23) | Description of this taxonomy. | string | | "Taxonomy - Terraform managed" | | [iam](variables-iam.tf#L23) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | | [iam_bindings](variables-iam.tf#L29) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | | [iam_bindings_additive](variables-iam.tf#L44) | Individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | | [iam_by_principals](variables-iam.tf#L17) | Authoritative IAM binding in {PRINCIPAL => [ROLES]} format. Principals need to be statically defined to avoid cycle errors. Merged internally with the `iam` variable. | map(list(string)) | | {} | -| [location](variables.tf#L29) | Data Catalog Taxonomy location. | string | | "eu" | -| [prefix](variables.tf#L40) | Optional prefix used to generate project id and name. | string | | null | -| [tags](variables.tf#L55) | List of Data Catalog Policy tags to be created with optional IAM binging configuration in {tag => {ROLE => [MEMBERS]}} format. | map(object({…})) | | {} | +| [prefix](variables.tf#L39) | Optional prefix used to generate project id and name. | string | | null | +| [tags](variables.tf#L54) | List of Data Catalog Policy tags to be created with optional IAM binging configuration in {tag => {ROLE => [MEMBERS]}} format. | map(object({…})) | | {} | ## Outputs diff --git a/modules/data-catalog-policy-tag/variables.tf b/modules/data-catalog-policy-tag/variables.tf index af06cd30b7..c294b086e9 100644 --- a/modules/data-catalog-policy-tag/variables.tf +++ b/modules/data-catalog-policy-tag/variables.tf @@ -29,7 +29,6 @@ variable "description" { variable "location" { description = "Data Catalog Taxonomy location." type = string - default = "eu" } variable "name" { diff --git a/modules/workstation-cluster/README.md b/modules/workstation-cluster/README.md index 05a0acdea2..8885acb98d 100644 --- a/modules/workstation-cluster/README.md +++ b/modules/workstation-cluster/README.md @@ -173,15 +173,15 @@ module "workstation-cluster" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| | [id](variables.tf#L35) | Workstation cluster ID. | string | ✓ | | -| [network_config](variables.tf#L52) | Network configuration. | object({…}) | ✓ | | -| [project_id](variables.tf#L70) | Cluster ID. | string | ✓ | | -| [workstation_configs](variables.tf#L75) | Workstation configurations. | map(object({…})) | ✓ | | +| [location](variables.tf#L46) | Location. | string | ✓ | | +| [network_config](variables.tf#L51) | Network configuration. | object({…}) | ✓ | | +| [project_id](variables.tf#L69) | Cluster ID. | string | ✓ | | +| [workstation_configs](variables.tf#L74) | Workstation configurations. | map(object({…})) | ✓ | | | [annotations](variables.tf#L17) | Workstation cluster annotations. | map(string) | | {} | | [display_name](variables.tf#L23) | Display name. | string | | null | | [domain](variables.tf#L29) | Domain. | string | | null | | [labels](variables.tf#L40) | Workstation cluster labels. | map(string) | | {} | -| [location](variables.tf#L46) | Location. | string | | null | -| [private_cluster_config](variables.tf#L60) | Private cluster config. | object({…}) | | {} | +| [private_cluster_config](variables.tf#L59) | Private cluster config. | object({…}) | | {} | ## Outputs diff --git a/modules/workstation-cluster/variables.tf b/modules/workstation-cluster/variables.tf index 613fe29de6..88a8ab19bb 100644 --- a/modules/workstation-cluster/variables.tf +++ b/modules/workstation-cluster/variables.tf @@ -46,7 +46,6 @@ variable "labels" { variable "location" { description = "Location." type = string - default = null } variable "network_config" {