Formatted Terraform files

ml-platform/01_gcp_project/backend.tf

@@ -18,4 +18,3 @@ terraform {
     bucket = "YOUR_STATE_BUCKET"
   }
 }
-

ml-platform/01_gcp_project/main.tf

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 module "gcp-project" {
-  source = "./modules/projects"
-  org_id = var.org_id
-  folder_id = var.folder_id
-  env = var.env
+  source          = "./modules/projects"
+  org_id          = var.org_id
+  folder_id       = var.folder_id
+  env             = var.env
   billing_account = var.billing_account
-  project_name = var.project_name
+  project_name    = var.project_name
 }

ml-platform/01_gcp_project/modules/projects/outputs.tf

@@ -14,4 +14,4 @@
 
 output "project_ids" {
   value = "${google_project.project_under_folder}" == {} ? "${google_project.project_under_org}" : "${google_project.project_under_folder}"
-}
+}

ml-platform/01_gcp_project/modules/projects/projects.tf

@@ -17,18 +17,18 @@ resource "random_id" "random_project_id_suffix" {
 }
 
 resource "google_project" "project_under_folder" {
-  for_each   = var.folder_id != null ? var.env : toset([])
-  name       = format("%s-%s",var.project_name,each.value)
-  project_id = format("%s-%s-%s",var.project_name,random_id.random_project_id_suffix.hex,each.value)
-  folder_id  = var.folder_id
+  for_each        = var.folder_id != null ? var.env : toset([])
+  name            = format("%s-%s", var.project_name, each.value)
+  project_id      = format("%s-%s-%s", var.project_name, random_id.random_project_id_suffix.hex, each.value)
+  folder_id       = var.folder_id
   billing_account = var.billing_account
 }
 
 resource "google_project" "project_under_org" {
-  for_each   = var.folder_id == null ? var.env : toset([])
-  name       = format("%s-%s",var.project_name,each.value)
-  project_id = format("%s-%s-%s",var.project_name,random_id.random_project_id_suffix.hex,each.value)
-  org_id     = var.org_id
+  for_each        = var.folder_id == null ? var.env : toset([])
+  name            = format("%s-%s", var.project_name, each.value)
+  project_id      = format("%s-%s-%s", var.project_name, random_id.random_project_id_suffix.hex, each.value)
+  org_id          = var.org_id
   billing_account = var.billing_account
 }
 
@@ -38,7 +38,7 @@ resource "google_project_service" "project_services" {
   service                    = "cloudresourcemanager.googleapis.com"
   disable_on_destroy         = true
   disable_dependent_services = true
-  depends_on = [google_project.project_under_folder,google_project.project_under_org]
+  depends_on                 = [google_project.project_under_folder, google_project.project_under_org]
 }
 
 resource "google_project_service" "project_services-1" {
@@ -47,25 +47,25 @@ resource "google_project_service" "project_services-1" {
   service                    = "iam.googleapis.com"
   disable_on_destroy         = true
   disable_dependent_services = true
-  depends_on = [google_project.project_under_folder,google_project.project_under_org]
+  depends_on                 = [google_project.project_under_folder, google_project.project_under_org]
 }
 
 resource "google_project_service" "project_services-2" {
-  for_each                   = var.folder_id == null ? google_project.project_under_org: google_project.project_under_folder
+  for_each                   = var.folder_id == null ? google_project.project_under_org : google_project.project_under_folder
   project                    = each.value.id
   service                    = "container.googleapis.com"
   disable_on_destroy         = true
   disable_dependent_services = true
-  depends_on = [google_project.project_under_folder,google_project.project_under_org]
+  depends_on                 = [google_project.project_under_folder, google_project.project_under_org]
 }
 
 resource "google_project_service" "project_services-3" {
-  for_each                   = var.folder_id == null ? google_project.project_under_org: google_project.project_under_folder
+  for_each                   = var.folder_id == null ? google_project.project_under_org : google_project.project_under_folder
   project                    = each.value.id
   service                    = "compute.googleapis.com"
   disable_on_destroy         = true
   disable_dependent_services = true
-  depends_on = [google_project.project_under_folder,google_project.project_under_org]
+  depends_on                 = [google_project.project_under_folder, google_project.project_under_org]
 }
 
 resource "google_project_service" "project_services-4" {
@@ -74,7 +74,7 @@ resource "google_project_service" "project_services-4" {
   service                    = "anthos.googleapis.com"
   disable_on_destroy         = true
   disable_dependent_services = true
-  depends_on = [google_project.project_under_folder,google_project.project_under_org]
+  depends_on                 = [google_project.project_under_folder, google_project.project_under_org]
 }
 
 resource "google_project_service" "project_services-5" {
@@ -83,7 +83,7 @@ resource "google_project_service" "project_services-5" {
   service                    = "anthosconfigmanagement.googleapis.com"
   disable_on_destroy         = true
   disable_dependent_services = true
-  depends_on = [google_project.project_under_folder,google_project.project_under_org]
+  depends_on                 = [google_project.project_under_folder, google_project.project_under_org]
 }
 
 resource "google_project_service" "project_services-6" {
@@ -92,5 +92,5 @@ resource "google_project_service" "project_services-6" {
   service                    = "gkehub.googleapis.com"
   disable_on_destroy         = true
   disable_dependent_services = true
-  depends_on = [google_project.project_under_folder,google_project.project_under_org]
-}
+  depends_on                 = [google_project.project_under_folder, google_project.project_under_org]
+}

ml-platform/01_gcp_project/outputs.tf

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 output "project_ids" {
-  value = {for k, v in "${module.gcp-project.project_ids}" : k => v.project_id}
-}
+  value = { for k, v in "${module.gcp-project.project_ids}" : k => v.project_id }
+}

ml-platform/01_gcp_project/providers.tf

@@ -19,4 +19,4 @@ terraform {
       version = "4.72.1"
     }
   }
-}
+}

ml-platform/02_gke/main.tf

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 data "terraform_remote_state" "gcp-projects" {
-  count = length(keys("${var.project_id}")) == 0 ? 1 : 0
+  count   = length(keys("${var.project_id}")) == 0 ? 1 : 0
   backend = "gcs"
   config = {
-    bucket  = var.lookup_state_bucket
-    prefix  = "01_gcp_project"
+    bucket = var.lookup_state_bucket
+    prefix = "01_gcp_project"
   }
 }
 
@@ -26,17 +26,17 @@ locals {
 }
 
 module "create-vpc" {
-  for_each = local.parsed_project_id
-  source = "./modules/network"
-  project_id   = each.value
-  network_name    = format("%s-%s",var.network_name,each.key)
-  routing_mode    = var.routing_mode
-  subnet_01_name      = format("%s-%s",var.subnet_01_name,each.key)
-  subnet_01_ip        = var.subnet_01_ip
-  subnet_01_region    = var.subnet_01_region
-  subnet_02_name      = format("%s-%s",var.subnet_02_name,each.key)
-  subnet_02_ip        = var.subnet_02_ip
-  subnet_02_region    = var.subnet_02_region
+  for_each         = local.parsed_project_id
+  source           = "./modules/network"
+  project_id       = each.value
+  network_name     = format("%s-%s", var.network_name, each.key)
+  routing_mode     = var.routing_mode
+  subnet_01_name   = format("%s-%s", var.subnet_01_name, each.key)
+  subnet_01_ip     = var.subnet_01_ip
+  subnet_01_region = var.subnet_01_region
+  subnet_02_name   = format("%s-%s", var.subnet_02_name, each.key)
+  subnet_02_ip     = var.subnet_02_ip
+  subnet_02_region = var.subnet_02_region
   #default_route_name  = format("%s-%s","default-route",each.key)
 }
 
@@ -49,69 +49,69 @@ resource "google_gke_hub_feature" "configmanagement_acm_feature" {
 }
 
 module "gke" {
-  for_each = local.parsed_project_id
-  source = "./modules/cluster"
-  cluster_name   = format("%s-%s",var.cluster_name,each.key)
-  network = module.create-vpc[each.key].vpc
-  subnet  =  module.create-vpc[each.key].subnet-1
-  project_id = each.value
-  region = var.subnet_01_region
-  zone = "${var.subnet_01_region}-a"
-  master_auth_networks_ipcidr =  var.subnet_01_ip
-  depends_on = [ google_gke_hub_feature.configmanagement_acm_feature ]
-  env = each.key
+  for_each                    = local.parsed_project_id
+  source                      = "./modules/cluster"
+  cluster_name                = format("%s-%s", var.cluster_name, each.key)
+  network                     = module.create-vpc[each.key].vpc
+  subnet                      = module.create-vpc[each.key].subnet-1
+  project_id                  = each.value
+  region                      = var.subnet_01_region
+  zone                        = "${var.subnet_01_region}-a"
+  master_auth_networks_ipcidr = var.subnet_01_ip
+  depends_on                  = [google_gke_hub_feature.configmanagement_acm_feature]
+  env                         = each.key
 }
 module "reservation" {
-  for_each = local.parsed_project_id
-  source = "./modules/vm-reservations"
-  cluster_name   = module.gke[each.key].cluster_name
-  zone = "${var.subnet_01_region}-a"
-  project_id = each.value
-  depends_on = [ module.gke ]
+  for_each     = local.parsed_project_id
+  source       = "./modules/vm-reservations"
+  cluster_name = module.gke[each.key].cluster_name
+  zone         = "${var.subnet_01_region}-a"
+  project_id   = each.value
+  depends_on   = [module.gke]
 }
 module "node_pool-reserved" {
-  for_each = local.parsed_project_id
-  source = "./modules/node-pools"
-  node_pool_name = "reservation"
-  project_id = each.value
-  cluster_name   = module.gke[each.key].cluster_name
-  region = "${var.subnet_01_region}"
-  taints = var.reserved_taints
-  resource_type = "reservation"
+  for_each         = local.parsed_project_id
+  source           = "./modules/node-pools"
+  node_pool_name   = "reservation"
+  project_id       = each.value
+  cluster_name     = module.gke[each.key].cluster_name
+  region           = var.subnet_01_region
+  taints           = var.reserved_taints
+  resource_type    = "reservation"
   reservation_name = module.reservation[each.key].reservation_name
 }
 
 module "node_pool-ondemand" {
-  for_each = local.parsed_project_id
-  source = "./modules/node-pools"
+  for_each       = local.parsed_project_id
+  source         = "./modules/node-pools"
   node_pool_name = "ondemand"
-  project_id = each.value
+  project_id     = each.value
   cluster_name   = module.gke[each.key].cluster_name
-  region = "${var.subnet_01_region}"
-  taints = var.ondemand_taints
-  resource_type = "ondemand"
+  region         = var.subnet_01_region
+  taints         = var.ondemand_taints
+  resource_type  = "ondemand"
 }
 
 module "node_pool-spot" {
-  for_each = local.parsed_project_id
-  source = "./modules/node-pools"
+  for_each       = local.parsed_project_id
+  source         = "./modules/node-pools"
   node_pool_name = "spot"
-  project_id = each.value
+  project_id     = each.value
   cluster_name   = module.gke[each.key].cluster_name
-  region = "${var.subnet_01_region}"
-  taints = var.spot_taints
-  resource_type = "spot"
+  region         = var.subnet_01_region
+  taints         = var.spot_taints
+  resource_type  = "spot"
 
 }
 
 module "cloud-nat" {
-  for_each              = local.parsed_project_id
-  source                = "./modules/cloud-nat"
-  project_id            = each.value
-  region                = split("/", module.create-vpc[each.key].subnet-1)[3]
-  name                  = format("%s-%s","nat-for-acm",each.key)
-  network               = module.create-vpc[each.key].vpc
-  create_router         = true
-  router                = format("%s-%s","router-for-acm",each.key)
-  depends_on            = [ module.create-vpc ]
+  for_each      = local.parsed_project_id
+  source        = "./modules/cloud-nat"
+  project_id    = each.value
+  region        = split("/", module.create-vpc[each.key].subnet-1)[3]
+  name          = format("%s-%s", "nat-for-acm", each.key)
+  network       = module.create-vpc[each.key].vpc
+  create_router = true
+  router        = format("%s-%s", "router-for-acm", each.key)
+  depends_on    = [module.create-vpc]
 }

ml-platform/02_gke/modules/cloud-nat/outputs.tf

@@ -31,4 +31,3 @@ output "router_name" {
   description = "Cloud NAT router name"
   value       = local.router
 }
-

ml-platform/02_gke/modules/cloud-nat/versions.tf

@@ -16,7 +16,7 @@ terraform {
   required_providers {
 
     google = {
-      source  = "hashicorp/google"
+      source = "hashicorp/google"
       #version = ">= 4.51, < 5.0"
       version = "4.72.1"
     }

ml-platform/02_gke/modules/cluster/gke.tf

@@ -107,14 +107,14 @@ resource "google_container_cluster" "gke_batch" {
     channel = "RAPID"
   }
   private_cluster_config {
-    enable_private_nodes = true
+    enable_private_nodes    = true
     enable_private_endpoint = true
-    master_ipv4_cidr_block = "172.16.0.32/28"
+    master_ipv4_cidr_block  = "172.16.0.32/28"
   }
   master_authorized_networks_config {
 
     cidr_blocks {
-      cidr_block = var.master_auth_networks_ipcidr
+      cidr_block   = var.master_auth_networks_ipcidr
       display_name = "vpc-cidr"
     }
   }

ml-platform/02_gke/modules/cluster/outputs.tf

@@ -30,4 +30,4 @@ output "gke_project_id" {
 
 output "env" {
   value = var.env
-}
+}

ml-platform/02_gke/modules/cluster/variables.tf

@@ -36,23 +36,23 @@ variable "zone" {
 }
 
 variable "master_auth_networks_ipcidr" {
-  type = string
+  type        = string
   description = "master authorized network"
 }
 
 variable "network" {
-  type = string
+  type        = string
   description = "VPC network where the cluster will be created"
 }
 
 variable "subnet" {
-  type = string
+  type        = string
   description = "subnetwork where the cluster will be created"
 
 }
 
 variable "env" {
-  type = string
+  type        = string
   description = "environment"
 
-}
+}

ml-platform/02_gke/modules/cluster/versions.tf

@@ -24,4 +24,3 @@ terraform {
     }
   }
 }
-

ml-platform/02_gke/modules/network/outputs.tf

@@ -25,4 +25,4 @@ output "subnet-1" {
 output "subnet-2" {
   value       = google_compute_subnetwork.subnet-2.id
   description = "subnet2."
-}
+}