Merge pull request #993 from GoogleCloudPlatform/jccb/fix-sort

Fix variable and output sort check
GoogleCloudPlatform · Nov 21, 2022 · 428fb9e · 428fb9e
2 parents f26e864 + 882a3eb
commit 428fb9e
Show file tree

Hide file tree

Showing 108 changed files with 1,262 additions and 1,243 deletions.
diff --git a/blueprints/cloud-operations/adfs/README.md b/blueprints/cloud-operations/adfs/README.md
@@ -52,20 +52,20 @@ Once done testing, you can clean up resources by running `terraform destroy`.
 
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [ad_dns_domain_name](variables.tf#L44) | AD DNS domain name. | <code>string</code> | ✓ |  |
-| [adfs_dns_domain_name](variables.tf#L49) | ADFS DNS domain name. | <code>string</code> | ✓ |  |
-| [project_id](variables.tf#L24) | Host project ID. | <code>string</code> | ✓ |  |
-| [ad_ip_cidr_block](variables.tf#L90) | Managed AD IP CIDR block. | <code>string</code> |  | <code>&#34;10.0.0.0&#47;24&#34;</code> |
-| [disk_size](variables.tf#L54) | Disk size. | <code>number</code> |  | <code>50</code> |
-| [disk_type](variables.tf#L60) | Disk type. | <code>string</code> |  | <code>&#34;pd-ssd&#34;</code> |
-| [image](variables.tf#L66) | Image. | <code>string</code> |  | <code>&#34;projects&#47;windows-cloud&#47;global&#47;images&#47;family&#47;windows-2022&#34;</code> |
-| [instance_type](variables.tf#L72) | Instance type. | <code>string</code> |  | <code>&#34;n1-standard-2&#34;</code> |
-| [network_config](variables.tf#L35) | Network configuration | <code title="object&#40;&#123;&#10;  network &#61; string&#10;  subnet  &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
-| [prefix](variables.tf#L29) | Prefix for the resources created. | <code>string</code> |  | <code>null</code> |
-| [project_create](variables.tf#L15) | Parameters for the creation of the new project. | <code title="object&#40;&#123;&#10;  billing_account_id &#61; string&#10;  parent             &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
-| [region](variables.tf#L78) | Region. | <code>string</code> |  | <code>&#34;europe-west1&#34;</code> |
-| [subnet_ip_cidr_block](variables.tf#L96) | Subnet IP CIDR block. | <code>string</code> |  | <code>&#34;10.0.1.0&#47;28&#34;</code> |
-| [zone](variables.tf#L84) | Zone. | <code>string</code> |  | <code>&#34;europe-west1-c&#34;</code> |
+| [ad_dns_domain_name](variables.tf#L15) | AD DNS domain name. | <code>string</code> | ✓ |  |
+| [adfs_dns_domain_name](variables.tf#L26) | ADFS DNS domain name. | <code>string</code> | ✓ |  |
+| [project_id](variables.tf#L79) | Host project ID. | <code>string</code> | ✓ |  |
+| [ad_ip_cidr_block](variables.tf#L20) | Managed AD IP CIDR block. | <code>string</code> |  | <code>&#34;10.0.0.0&#47;24&#34;</code> |
+| [disk_size](variables.tf#L31) | Disk size. | <code>number</code> |  | <code>50</code> |
+| [disk_type](variables.tf#L37) | Disk type. | <code>string</code> |  | <code>&#34;pd-ssd&#34;</code> |
+| [image](variables.tf#L43) | Image. | <code>string</code> |  | <code>&#34;projects&#47;windows-cloud&#47;global&#47;images&#47;family&#47;windows-2022&#34;</code> |
+| [instance_type](variables.tf#L49) | Instance type. | <code>string</code> |  | <code>&#34;n1-standard-2&#34;</code> |
+| [network_config](variables.tf#L55) | Network configuration | <code title="object&#40;&#123;&#10;  network &#61; string&#10;  subnet  &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [prefix](variables.tf#L64) | Prefix for the resources created. | <code>string</code> |  | <code>null</code> |
+| [project_create](variables.tf#L70) | Parameters for the creation of the new project. | <code title="object&#40;&#123;&#10;  billing_account_id &#61; string&#10;  parent             &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [region](variables.tf#L84) | Region. | <code>string</code> |  | <code>&#34;europe-west1&#34;</code> |
+| [subnet_ip_cidr_block](variables.tf#L90) | Subnet IP CIDR block. | <code>string</code> |  | <code>&#34;10.0.1.0&#47;28&#34;</code> |
+| [zone](variables.tf#L96) | Zone. | <code>string</code> |  | <code>&#34;europe-west1-c&#34;</code> |
 
 ## Outputs
 

diff --git a/blueprints/cloud-operations/adfs/variables.tf b/blueprints/cloud-operations/adfs/variables.tf
@@ -12,38 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-variable "project_create" {
-  description = "Parameters for the creation of the new project."
-  type = object({
-    billing_account_id = string
-    parent             = string
-  })
-  default = null
-}
-
-variable "project_id" {
-  description = "Host project ID."
-  type        = string
-}
-
-variable "prefix" {
-  description = "Prefix for the resources created."
+variable "ad_dns_domain_name" {
+  description = "AD DNS domain name."
   type        = string
-  default     = null
 }
 
-variable "network_config" {
-  description = "Network configuration"
-  type = object({
-    network = string
-    subnet  = string
-  })
-  default = null
-}
-
-variable "ad_dns_domain_name" {
-  description = "AD DNS domain name."
+variable "ad_ip_cidr_block" {
+  description = "Managed AD IP CIDR block."
   type        = string
+  default     = "10.0.0.0/24"
 }
 
 variable "adfs_dns_domain_name" {
@@ -75,26 +52,49 @@ variable "instance_type" {
   default     = "n1-standard-2"
 }
 
-variable "region" {
-  description = "Region."
+variable "network_config" {
+  description = "Network configuration"
+  type = object({
+    network = string
+    subnet  = string
+  })
+  default = null
+}
+
+variable "prefix" {
+  description = "Prefix for the resources created."
   type        = string
-  default     = "europe-west1"
+  default     = null
 }
 
-variable "zone" {
-  description = "Zone."
+variable "project_create" {
+  description = "Parameters for the creation of the new project."
+  type = object({
+    billing_account_id = string
+    parent             = string
+  })
+  default = null
+}
+
+variable "project_id" {
+  description = "Host project ID."
   type        = string
-  default     = "europe-west1-c"
 }
 
-variable "ad_ip_cidr_block" {
-  description = "Managed AD IP CIDR block."
+variable "region" {
+  description = "Region."
   type        = string
-  default     = "10.0.0.0/24"
+  default     = "europe-west1"
 }
 
 variable "subnet_ip_cidr_block" {
   description = "Subnet IP CIDR block."
   type        = string
   default     = "10.0.1.0/28"
-}
+}
+
+variable "zone" {
+  description = "Zone."
+  type        = string
+  default     = "europe-west1-c"
+}
diff --git a/blueprints/cloud-operations/apigee/README.md b/blueprints/cloud-operations/apigee/README.md
@@ -58,16 +58,16 @@ Do the following to verify that everything works as expected.
 
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [envgroups](variables.tf#L54) | Environment groups (NAME => [HOSTNAMES]). | <code>map&#40;list&#40;string&#41;&#41;</code> | ✓ |  |
-| [environments](variables.tf#L60) | Environments. | <code title="map&#40;object&#40;&#123;&#10;  display_name &#61; optional&#40;string&#41;&#10;  description  &#61; optional&#40;string&#41;&#10;  node_config &#61; optional&#40;object&#40;&#123;&#10;    min_node_count               &#61; optional&#40;number&#41;&#10;    max_node_count               &#61; optional&#40;number&#41;&#10;    current_aggregate_node_count &#61; number&#10;  &#125;&#41;&#41;&#10;  iam       &#61; optional&#40;map&#40;list&#40;string&#41;&#41;&#41;&#10;  envgroups &#61; list&#40;string&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | ✓ |  |
-| [instances](variables.tf#L76) | Instance. | <code title="map&#40;object&#40;&#123;&#10;  display_name         &#61; optional&#40;string&#41;&#10;  description          &#61; optional&#40;string&#41;&#10;  region               &#61; string&#10;  environments         &#61; list&#40;string&#41;&#10;  psa_ip_cidr_range    &#61; string&#10;  disk_encryption_key  &#61; optional&#40;string&#41;&#10;  consumer_accept_list &#61; optional&#40;list&#40;string&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | ✓ |  |
-| [project_id](variables.tf#L32) | Project ID. | <code>string</code> | ✓ |  |
-| [psc_config](variables.tf#L104) | PSC configuration. | <code>map&#40;string&#41;</code> | ✓ |  |
-| [datastore_name](variables.tf#L97) | Datastore | <code>string</code> |  | <code>&#34;gcs&#34;</code> |
-| [organization](variables.tf#L38) | Apigee organization. | <code title="object&#40;&#123;&#10;  display_name            &#61; optional&#40;string, &#34;Apigee organization created by tf module&#34;&#41;&#10;  description             &#61; optional&#40;string, &#34;Apigee organization created by tf module&#34;&#41;&#10;  authorized_network      &#61; optional&#40;string, &#34;vpc&#34;&#41;&#10;  runtime_type            &#61; optional&#40;string, &#34;CLOUD&#34;&#41;&#10;  billing_type            &#61; optional&#40;string&#41;&#10;  database_encryption_key &#61; optional&#40;string&#41;&#10;  analytics_region        &#61; optional&#40;string, &#34;europe-west1&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code title="&#123;&#10;&#125;">&#123;&#8230;&#125;</code> |
-| [path](variables.tf#L90) | Bucket path. | <code>string</code> |  | <code>&#34;&#47;analytics&#34;</code> |
-| [project_create](variables.tf#L17) | Parameters for the creation of the new project. | <code title="object&#40;&#123;&#10;  billing_account_id &#61; string&#10;  parent             &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
-| [vpc_create](variables.tf#L26) | Boolean flag indicating whether the VPC should be created or not. | <code>bool</code> |  | <code>true</code> |
+| [envgroups](variables.tf#L24) | Environment groups (NAME => [HOSTNAMES]). | <code>map&#40;list&#40;string&#41;&#41;</code> | ✓ |  |
+| [environments](variables.tf#L30) | Environments. | <code title="map&#40;object&#40;&#123;&#10;  display_name &#61; optional&#40;string&#41;&#10;  description  &#61; optional&#40;string&#41;&#10;  node_config &#61; optional&#40;object&#40;&#123;&#10;    min_node_count               &#61; optional&#40;number&#41;&#10;    max_node_count               &#61; optional&#40;number&#41;&#10;    current_aggregate_node_count &#61; number&#10;  &#125;&#41;&#41;&#10;  iam       &#61; optional&#40;map&#40;list&#40;string&#41;&#41;&#41;&#10;  envgroups &#61; list&#40;string&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | ✓ |  |
+| [instances](variables.tf#L46) | Instance. | <code title="map&#40;object&#40;&#123;&#10;  display_name         &#61; optional&#40;string&#41;&#10;  description          &#61; optional&#40;string&#41;&#10;  region               &#61; string&#10;  environments         &#61; list&#40;string&#41;&#10;  psa_ip_cidr_range    &#61; string&#10;  disk_encryption_key  &#61; optional&#40;string&#41;&#10;  consumer_accept_list &#61; optional&#40;list&#40;string&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | ✓ |  |
+| [project_id](variables.tf#L92) | Project ID. | <code>string</code> | ✓ |  |
+| [psc_config](variables.tf#L98) | PSC configuration. | <code>map&#40;string&#41;</code> | ✓ |  |
+| [datastore_name](variables.tf#L17) | Datastore | <code>string</code> |  | <code>&#34;gcs&#34;</code> |
+| [organization](variables.tf#L60) | Apigee organization. | <code title="object&#40;&#123;&#10;  display_name            &#61; optional&#40;string, &#34;Apigee organization created by tf module&#34;&#41;&#10;  description             &#61; optional&#40;string, &#34;Apigee organization created by tf module&#34;&#41;&#10;  authorized_network      &#61; optional&#40;string, &#34;vpc&#34;&#41;&#10;  runtime_type            &#61; optional&#40;string, &#34;CLOUD&#34;&#41;&#10;  billing_type            &#61; optional&#40;string&#41;&#10;  database_encryption_key &#61; optional&#40;string&#41;&#10;  analytics_region        &#61; optional&#40;string, &#34;europe-west1&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code title="&#123;&#10;&#125;">&#123;&#8230;&#125;</code> |
+| [path](variables.tf#L76) | Bucket path. | <code>string</code> |  | <code>&#34;&#47;analytics&#34;</code> |
+| [project_create](variables.tf#L83) | Parameters for the creation of the new project. | <code title="object&#40;&#123;&#10;  billing_account_id &#61; string&#10;  parent             &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [vpc_create](variables.tf#L104) | Boolean flag indicating whether the VPC should be created or not. | <code>bool</code> |  | <code>true</code> |
 
 ## Outputs
 

diff --git a/blueprints/cloud-operations/apigee/variables.tf b/blueprints/cloud-operations/apigee/variables.tf
@@ -14,41 +14,11 @@
  * limitations under the License.
  */
 
-variable "project_create" {
-  description = "Parameters for the creation of the new project."
-  type = object({
-    billing_account_id = string
-    parent             = string
-  })
-  default = null
-}
-
-variable "vpc_create" {
-  description = "Boolean flag indicating whether the VPC should be created or not."
-  type        = bool
-  default     = true
-}
-
-variable "project_id" {
-  description = "Project ID."
+variable "datastore_name" {
+  description = "Datastore"
   type        = string
   nullable    = false
-}
-
-variable "organization" {
-  description = "Apigee organization."
-  type = object({
-    display_name            = optional(string, "Apigee organization created by tf module")
-    description             = optional(string, "Apigee organization created by tf module")
-    authorized_network      = optional(string, "vpc")
-    runtime_type            = optional(string, "CLOUD")
-    billing_type            = optional(string)
-    database_encryption_key = optional(string)
-    analytics_region        = optional(string, "europe-west1")
-  })
-  nullable = false
-  default = {
-  }
+  default     = "gcs"
 }
 
 variable "envgroups" {
@@ -87,22 +57,52 @@ variable "instances" {
   nullable = false
 }
 
+variable "organization" {
+  description = "Apigee organization."
+  type = object({
+    display_name            = optional(string, "Apigee organization created by tf module")
+    description             = optional(string, "Apigee organization created by tf module")
+    authorized_network      = optional(string, "vpc")
+    runtime_type            = optional(string, "CLOUD")
+    billing_type            = optional(string)
+    database_encryption_key = optional(string)
+    analytics_region        = optional(string, "europe-west1")
+  })
+  nullable = false
+  default = {
+  }
+}
+
 variable "path" {
   description = "Bucket path."
   type        = string
   default     = "/analytics"
   nullable    = false
 }
 
-variable "datastore_name" {
-  description = "Datastore"
+variable "project_create" {
+  description = "Parameters for the creation of the new project."
+  type = object({
+    billing_account_id = string
+    parent             = string
+  })
+  default = null
+}
+
+variable "project_id" {
+  description = "Project ID."
   type        = string
   nullable    = false
-  default     = "gcs"
 }
 
 variable "psc_config" {
   description = "PSC configuration."
   type        = map(string)
   nullable    = false
 }
+
+variable "vpc_create" {
+  description = "Boolean flag indicating whether the VPC should be created or not."
+  type        = bool
+  default     = true
+}
diff --git a/...ints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/README.md b/...ints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/README.md
@@ -11,8 +11,8 @@ The codebase provisions the following list of resources:
 
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [impersonate_service_account_email](variables.tf#L21) | Service account to be impersonated by workload identity. | <code>string</code> | ✓ |  |
-| [project_id](variables.tf#L16) | GCP project ID. | <code>string</code> | ✓ |  |
+| [impersonate_service_account_email](variables.tf#L16) | Service account to be impersonated by workload identity. | <code>string</code> | ✓ |  |
+| [project_id](variables.tf#L21) | GCP project ID. | <code>string</code> | ✓ |  |
 | [workload_identity_pool_provider_id](variables.tf#L26) | GCP workload identity pool provider ID. | <code>string</code> | ✓ |  |
 
 <!-- END TFDOC -->
diff --git a/...d-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/README.md b/...d-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/README.md
@@ -27,9 +27,9 @@ provider "google-beta" {
 
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [impersonate_service_account_email](variables.tf#L22) | Service account to be impersonated by workload identity federation. | <code>string</code> | ✓ |  |
-| [workload_identity_pool_provider_id](variables.tf#L17) | GCP workload identity pool provider ID. | <code>string</code> | ✓ |  |
-| [tmp_oidc_token_path](variables.tf#L27) | Name of the temporary file where TFC OIDC token will be stored to authentificate terraform provider google. | <code>string</code> |  | <code>&#34;.oidc_token&#34;</code> |
+| [impersonate_service_account_email](variables.tf#L17) | Service account to be impersonated by workload identity federation. | <code>string</code> | ✓ |  |
+| [workload_identity_pool_provider_id](variables.tf#L28) | GCP workload identity pool provider ID. | <code>string</code> | ✓ |  |
+| [tmp_oidc_token_path](variables.tf#L22) | Name of the temporary file where TFC OIDC token will be stored to authentificate terraform provider google. | <code>string</code> |  | <code>&#34;.oidc_token&#34;</code> |
 
 ## Outputs
 

diff --git a/...ts/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/variables.tf b/...ts/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/variables.tf
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-variable "workload_identity_pool_provider_id" {
-  description = "GCP workload identity pool provider ID."
-  type        = string
-}
-
 variable "impersonate_service_account_email" {
   description = "Service account to be impersonated by workload identity federation."
   type        = string
@@ -29,3 +24,8 @@ variable "tmp_oidc_token_path" {
   type        = string
   default     = ".oidc_token"
 }
+
+variable "workload_identity_pool_provider_id" {
+  description = "GCP workload identity pool provider ID."
+  type        = string
+}
diff --git a/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/variables.tf b/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/variables.tf
@@ -13,13 +13,13 @@
 # limitations under the License.
 
 
-variable "project_id" {
-  description = "GCP project ID."
+variable "impersonate_service_account_email" {
+  description = "Service account to be impersonated by workload identity."
   type        = string
 }
 
-variable "impersonate_service_account_email" {
-  description = "Service account to be impersonated by workload identity."
+variable "project_id" {
+  description = "GCP project ID."
   type        = string
 }