Merge pull request #7330 from vishnuswmech/tf_format

k8s-ci-robot · web-flow · commit 0d2e2329a9a6 · 2024-09-24T09:46:00.000+01:00
Formatting Terraform code. No code changes.(Minor)
diff --git a/infra/aws/terraform/modules/registry-k8s-io-s3-bucket/main.tf b/infra/aws/terraform/modules/registry-k8s-io-s3-bucket/main.tf
@@ -26,11 +26,11 @@ locals {
 data "aws_iam_policy_document" "public_bucket_policy" {
   statement {
     actions = [
-        "s3:ListBucket"
+      "s3:ListBucket"
     ]
     effect = "Allow"
     resources = [
-        module.s3_bucket.s3_bucket_arn
+      module.s3_bucket.s3_bucket_arn
     ]
     principals {
       type        = "AWS"
@@ -39,15 +39,15 @@ data "aws_iam_policy_document" "public_bucket_policy" {
   }
   statement {
     actions = [
-        "s3:GetObject"
+      "s3:GetObject"
     ]
     effect = "Allow"
     principals {
       type        = "AWS"
       identifiers = ["*"]
     }
     resources = [
-        "${module.s3_bucket.s3_bucket_arn}/*"
+      "${module.s3_bucket.s3_bucket_arn}/*"
     ]
   }
 }
@@ -59,21 +59,21 @@ module "s3_bucket" {
   bucket = replace(lower(base64sha256(local.bucket_name)), "/[^a-zA-Z0-9-_]/", "")
 
   attach_deny_insecure_transport_policy = true
-  block_public_acls       = false
-  block_public_policy     = false
-  ignore_public_acls      = false
-  restrict_public_buckets = false
+  block_public_acls                     = false
+  block_public_policy                   = false
+  ignore_public_acls                    = false
+  restrict_public_buckets               = false
 
   control_object_ownership = true
   object_ownership         = "BucketOwnerEnforced"
   expected_bucket_owner    = data.aws_caller_identity.current.account_id
 
   attach_policy = true
-  policy = data.aws_iam_policy_document.public_bucket_policy.json
+  policy        = data.aws_iam_policy_document.public_bucket_policy.json
 
   cors_rule = [{
 
-    allowed_methods = ["GET","HEAD"]
+    allowed_methods = ["GET", "HEAD"]
     allowed_origins = ["*"]
     allowed_headers = ["*"]
 
diff --git a/infra/aws/terraform/modules/registry-k8s-io-s3-bucket/provider.tf b/infra/aws/terraform/modules/registry-k8s-io-s3-bucket/provider.tf
@@ -17,7 +17,7 @@ limitations under the License.
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
+      source  = "hashicorp/aws"
       version = "5.33.0"
     }
   }
diff --git a/infra/aws/terraform/prow-build-cluster/terraform.canary.tfvars b/infra/aws/terraform/prow-build-cluster/terraform.canary.tfvars
@@ -30,8 +30,8 @@ eks_cluster_admins = [
   "xmudrii"
 ]
 
-cluster_name               = "prow-canary-cluster"
-cluster_version            = "1.29"
+cluster_name    = "prow-canary-cluster"
+cluster_version = "1.29"
 
 node_group_version_stable  = "1.29"
 node_instance_types_stable = ["r5ad.xlarge"]
diff --git a/infra/aws/terraform/prow-build-cluster/terraform.prod.tfvars b/infra/aws/terraform/prow-build-cluster/terraform.prod.tfvars
@@ -32,8 +32,8 @@ eks_cluster_viewers = [
   "xmudrii"
 ]
 
-cluster_name               = "prow-build-cluster"
-cluster_version            = "1.30"
+cluster_name    = "prow-build-cluster"
+cluster_version = "1.30"
 
 node_group_version_stable  = "1.30"
 node_instance_types_stable = ["r5ad.2xlarge"]
diff --git a/infra/azure/terraform/capz/container-registry/main.tf b/infra/azure/terraform/capz/container-registry/main.tf
@@ -23,10 +23,10 @@ variable "location" {
 }
 
 resource "azurerm_container_registry" "capzci_registry" {
-  name                = "capzcicommunity"
-  location            = var.location
-  resource_group_name = var.resource_group_name
-  sku                 = "Premium"
+  name                   = "capzcicommunity"
+  location               = var.location
+  resource_group_name    = var.resource_group_name
+  sku                    = "Premium"
   anonymous_pull_enabled = true
 
   retention_policy {
@@ -57,7 +57,7 @@ resource "azurerm_container_registry_task" "registry_task" {
     type                        = "Runtime"
     update_trigger_payload_type = "Default"
   }
-   encoded_step {
+  encoded_step {
     task_content = base64encode(<<EOF
 version: v1.1.0
 steps:
diff --git a/infra/azure/terraform/capz/key-vault/main.tf b/infra/azure/terraform/capz/key-vault/main.tf
@@ -28,8 +28,8 @@ variable "tenant_id" {
 
 variable "identities" {
   type = object({
-    domain_vm_identity_id           = string
-    gmsa_user_identity_id           = string
+    domain_vm_identity_id = string
+    gmsa_user_identity_id = string
   })
 }
 
diff --git a/infra/azure/terraform/capz/main.tf b/infra/azure/terraform/capz/main.tf
@@ -18,7 +18,7 @@ provider "azurerm" {
   features {}
 }
 
-terraform{
+terraform {
   backend "azurerm" {
     resource_group_name  = "terraform-states-azure"
     storage_account_name = "terraformstatescomm"
@@ -80,23 +80,23 @@ resource "azurerm_storage_account" "k8sprowstorage" {
   min_tls_version                  = "TLS1_0"
   account_replication_type         = "RAGRS"
   cross_tenant_replication_enabled = true
-  depends_on = [azurerm_resource_group.capz_ci]
+  depends_on                       = [azurerm_resource_group.capz_ci]
 }
 
 # Import identities module
 module "identities" {
   source              = "./identities"
   resource_group_name = var.resource_group_name
   location            = var.location
-  depends_on = [azurerm_resource_group.capz_ci]
+  depends_on          = [azurerm_resource_group.capz_ci]
 }
 
 # Import key vault module
 module "key_vault" {
   source              = "./key-vault"
   resource_group_name = var.resource_group_name
   location            = var.location
-  tenant_id           = data.azurerm_client_config.current.tenant_id  
+  tenant_id           = data.azurerm_client_config.current.tenant_id
   identities = {
     cloud_provider_user_identity_id = module.identities.cloud_provider_user_identity_id
     domain_vm_identity_id           = module.identities.domain_vm_identity_id
@@ -110,15 +110,15 @@ module "container_registry" {
   source              = "./container-registry"
   resource_group_name = var.resource_group_name
   location            = var.location
-  depends_on = [azurerm_resource_group.capz_ci]
+  depends_on          = [azurerm_resource_group.capz_ci]
 }
 
 # Import role assignments module
 module "role_assignments" {
   source                   = "./role-assignments"
   resource_group_name      = var.resource_group_name
   container_registry_scope = module.container_registry.container_registry_id
-  subscription_id          = data.azurerm_client_config.current.subscription_id 
+  subscription_id          = data.azurerm_client_config.current.subscription_id
   depends_on = [
     azurerm_resource_group.capz_ci,
     azurerm_storage_account.k8sprowstorage,
diff --git a/infra/azure/terraform/capz/role-assignments/main.tf b/infra/azure/terraform/capz/role-assignments/main.tf
@@ -49,11 +49,11 @@ resource "azurerm_role_assignment" "acr_pull" {
 }
 
 resource "azurerm_role_definition" "custom_role" {
-  name               = "WriteAccessOnly"
-  scope              = "/subscriptions/${var.subscription_id}"
+  name  = "WriteAccessOnly"
+  scope = "/subscriptions/${var.subscription_id}"
 
   permissions {
-    actions     = [
+    actions = [
       "Microsoft.Authorization/roleAssignments/write"
     ]
     not_actions = []
diff --git a/infra/gcp/terraform/k8s-infra-kubernetes-io/main.tf b/infra/gcp/terraform/k8s-infra-kubernetes-io/main.tf
@@ -56,8 +56,8 @@ data "google_project" "kubernetes_public" {
 }
 
 resource "google_resource_manager_lien" "kubernetes_public" {
-  parent = "projects/${data.google_project.kubernetes_public.number}"
+  parent       = "projects/${data.google_project.kubernetes_public.number}"
   restrictions = ["resourcemanager.projects.delete"]
-  origin = "do-not-delete-kubernetes-public"
-  reason = "kubernetes-public hosts public-facing kubernetes project infrastructure"
+  origin       = "do-not-delete-kubernetes-public"
+  reason       = "kubernetes-public hosts public-facing kubernetes project infrastructure"
 }
diff --git a/infra/gcp/terraform/k8s-infra-porche-sandbox/porche-sandbox.tf b/infra/gcp/terraform/k8s-infra-porche-sandbox/porche-sandbox.tf
@@ -100,13 +100,13 @@ resource "google_service_account_iam_member" "cloudbuild_deploy_porche" {
 }
 
 resource "google_cloud_run_service_iam_member" "gcb_builder_sa" {
-  project = google_project.project.project_id
+  project  = google_project.project.project_id
   for_each = google_cloud_run_service.regions
 
   service  = google_cloud_run_service.regions[each.key].name
   location = google_cloud_run_service.regions[each.key].location
-  role = "roles/run.developer"
-  member = "serviceAccount:${data.google_project.k8s_infra_staging_tools.number}@cloudbuild.gserviceaccount.com"
+  role     = "roles/run.developer"
+  member   = "serviceAccount:${data.google_project.k8s_infra_staging_tools.number}@cloudbuild.gserviceaccount.com"
 }
 
 
@@ -127,7 +127,7 @@ resource "google_cloud_run_service" "regions" {
       service_account_name = google_service_account.porche.email
       containers {
         image = local.image
-        args = [ "-v=3" ]
+        args  = ["-v=3"]
 
         dynamic "env" {
           for_each = each.value.environment_variables
diff --git a/infra/gcp/terraform/k8s-infra-porche-sandbox/variables.tf b/infra/gcp/terraform/k8s-infra-porche-sandbox/variables.tf
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 variable "tag" {
-  type    = string
+  type = string
 }
 
 variable "domain" {
diff --git a/infra/gcp/terraform/k8s-infra-prow-build-trusted/main.tf b/infra/gcp/terraform/k8s-infra-prow-build-trusted/main.tf
@@ -62,11 +62,11 @@ module "prow_build_cluster" {
 
 // The image/machine/disk match prow-build for consistency's sake
 module "prow_build_nodepool" {
-  source          = "../modules/gke-nodepool"
-  project_name    = module.project.project_id
-  cluster_name    = module.prow_build_cluster.cluster.name
-  location        = module.prow_build_cluster.cluster.location
-  name            = "trusted-pool1"
+  source       = "../modules/gke-nodepool"
+  project_name = module.project.project_id
+  cluster_name = module.prow_build_cluster.cluster.name
+  location     = module.prow_build_cluster.cluster.location
+  name         = "trusted-pool1"
   node_locations = [
     "us-central1-a",
     "us-central1-b",
diff --git a/infra/gcp/terraform/k8s-infra-prow/iam.tf b/infra/gcp/terraform/k8s-infra-prow/iam.tf
@@ -129,9 +129,9 @@ resource "google_pubsub_topic_iam_binding" "publish_binding" {
 
 // Also bind TestGrid and Kettle as subscribers of this topic.
 resource "google_pubsub_topic_iam_binding" "read_binding" {
-  topic = google_pubsub_topic.kubernetes_ci_logs_topic.name
+  topic   = google_pubsub_topic.kubernetes_ci_logs_topic.name
   project = module.project.project_id
-  role  = "roles/pubsub.subscriber"
+  role    = "roles/pubsub.subscriber"
   members = [
     "serviceAccount:testgrid-canary@k8s-testgrid.iam.gserviceaccount.com",
     "serviceAccount:updater@k8s-testgrid.iam.gserviceaccount.com",
diff --git a/infra/gcp/terraform/k8s-infra-public-pii/fastly-cdn-dl-k8s-io.tf b/infra/gcp/terraform/k8s-infra-public-pii/fastly-cdn-dl-k8s-io.tf
@@ -26,16 +26,16 @@ locals {
 }
 
 resource "google_service_account" "fastly_logging_sa" {
-  project = google_project.project.project_id
-  account_id = "fastly-bigquery-logging-sa"
+  project      = google_project.project.project_id
+  account_id   = "fastly-bigquery-logging-sa"
   display_name = "Fastly BigQuery Logging SA"
 }
 
 # https://docs.fastly.com/en/guides/configuring-google-iam-servic e-account-impersonation-for-fastly-logging
 resource "google_service_account_iam_member" "cloudbuild_terraform_sa_impersonate_permissions" {
   service_account_id = google_service_account.fastly_logging_sa.name
   role               = "roles/iam.serviceAccountTokenCreator"
-  member  = "serviceAccount:${local.fastly_sa}"
+  member             = "serviceAccount:${local.fastly_sa}"
 }
 
 resource "google_bigquery_dataset" "fastly_cdn_dl_k8s_io_logging" {
diff --git a/infra/gcp/terraform/kubernetes-public/k8s-keps.tf b/infra/gcp/terraform/kubernetes-public/k8s-keps.tf
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
- 
+
 /*
 This file defines:
 - GCS bucket to serve KEP reports
diff --git a/infra/gcp/terraform/modules/gke-cluster/main.tf b/infra/gcp/terraform/modules/gke-cluster/main.tf
@@ -154,7 +154,7 @@ resource "google_container_cluster" "prod_cluster" {
   }
 
   network_policy {
-    enabled  = false
+    enabled = false
   }
 
   // Configure cluster addons
@@ -249,7 +249,7 @@ resource "google_container_cluster" "test_cluster" {
   }
 
   network_policy {
-    enabled  = false
+    enabled = false
   }
 
   // Configure cluster addons
diff --git a/infra/gcp/terraform/modules/gke-cluster/outputs.tf b/infra/gcp/terraform/modules/gke-cluster/outputs.tf
@@ -18,7 +18,7 @@ output "cluster" {
   description = "The cluster"
   // Workaround from https://github.com/hashicorp/terraform/issues/22544#issuecomment-582974372
   // This should be either test_cluster or prod_cluster
-  value       = coalescelist(
+  value = coalescelist(
     google_container_cluster.test_cluster.*,
     google_container_cluster.prod_cluster.*
   )[0]
diff --git a/infra/gcp/terraform/modules/gke-nodepool/main.tf b/infra/gcp/terraform/modules/gke-nodepool/main.tf
@@ -21,9 +21,9 @@ resource "google_container_node_pool" "node_pool" {
   // name = var.name
   name_prefix = "${var.name}-"
 
-  project     = var.project_name
-  location    = var.location
-  cluster     = var.cluster_name
+  project  = var.project_name
+  location = var.location
+  cluster  = var.cluster_name
 
   // Auto repair, and auto upgrade nodes to match the master version
   management {
@@ -52,7 +52,7 @@ resource "google_container_node_pool" "node_pool" {
     oauth_scopes    = ["https://www.googleapis.com/auth/cloud-platform"]
 
     dynamic "ephemeral_storage_config" {
-      for_each = var.ephemeral_local_ssd_count > 0 ? [var.ephemeral_local_ssd_count] : [] 
+      for_each = var.ephemeral_local_ssd_count > 0 ? [var.ephemeral_local_ssd_count] : []
       content {
         local_ssd_count = ephemeral_storage_config.value
       }
diff --git a/infra/gcp/terraform/modules/k8s-releases/outputs.tf b/infra/gcp/terraform/modules/k8s-releases/outputs.tf
@@ -19,7 +19,7 @@ output "bucket_id" {
 }
 
 output "bucket_name" {
-    value = google_storage_bucket.k8s_releases.name
+  value = google_storage_bucket.k8s_releases.name
 }
 
 output "bucket_url" {
diff --git a/infra/gcp/terraform/modules/monitoring/uptime-alert/main.tf b/infra/gcp/terraform/modules/monitoring/uptime-alert/main.tf
diff --git a/infra/gcp/terraform/modules/monitoring/uptime-alert/variables.tf b/infra/gcp/terraform/modules/monitoring/uptime-alert/variables.tf

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`terraform {`
`18`	`18`	`required_providers {`
`19`	`19`	`aws = {`
`20`		`- source = "hashicorp/aws"`
	`20`	`+ source = "hashicorp/aws"`
`21`	`21`	`version = "5.33.0"`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ eks_cluster_admins = [`
`30`	`30`	`"xmudrii"`
`31`	`31`	`]`
`32`	`32`
`33`		`-cluster_name = "prow-canary-cluster"`
`34`		`-cluster_version = "1.29"`
	`33`	`+cluster_name = "prow-canary-cluster"`
	`34`	`+cluster_version = "1.29"`
`35`	`35`
`36`	`36`	`node_group_version_stable = "1.29"`
`37`	`37`	`node_instance_types_stable = ["r5ad.xlarge"]`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ eks_cluster_viewers = [`
`32`	`32`	`"xmudrii"`
`33`	`33`	`]`
`34`	`34`
`35`		`-cluster_name = "prow-build-cluster"`
`36`		`-cluster_version = "1.30"`
	`35`	`+cluster_name = "prow-build-cluster"`
	`36`	`+cluster_version = "1.30"`
`37`	`37`
`38`	`38`	`node_group_version_stable = "1.30"`
`39`	`39`	`node_instance_types_stable = ["r5ad.2xlarge"]`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ variable "tenant_id" {`
`28`	`28`
`29`	`29`	`variable "identities" {`
`30`	`30`	`type = object({`
`31`		`- domain_vm_identity_id = string`
`32`		`- gmsa_user_identity_id = string`
	`31`	`+ domain_vm_identity_id = string`
	`32`	`+ gmsa_user_identity_id = string`
`33`	`33`	`})`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,11 @@ resource "azurerm_role_assignment" "acr_pull" {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`resource "azurerm_role_definition" "custom_role" {`
`52`		`- name = "WriteAccessOnly"`
`53`		`- scope = "/subscriptions/${var.subscription_id}"`
	`52`	`+ name = "WriteAccessOnly"`
	`53`	`+ scope = "/subscriptions/${var.subscription_id}"`
`54`	`54`
`55`	`55`	`permissions {`
`56`		`- actions = [`
	`56`	`+ actions = [`
`57`	`57`	`"Microsoft.Authorization/roleAssignments/write"`
`58`	`58`	`]`
`59`	`59`	`not_actions = []`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ data "google_project" "kubernetes_public" {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`resource "google_resource_manager_lien" "kubernetes_public" {`
`59`		`- parent = "projects/${data.google_project.kubernetes_public.number}"`
	`59`	`+ parent = "projects/${data.google_project.kubernetes_public.number}"`
`60`	`60`	`restrictions = ["resourcemanager.projects.delete"]`
`61`		`- origin = "do-not-delete-kubernetes-public"`
`62`		`- reason = "kubernetes-public hosts public-facing kubernetes project infrastructure"`
	`61`	`+ origin = "do-not-delete-kubernetes-public"`
	`62`	`+ reason = "kubernetes-public hosts public-facing kubernetes project infrastructure"`
`63`	`63`	`}`