From 214184950143eea2ea6fcc7e965456fdad043b62 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Thu, 12 Sep 2024 17:09:56 -0400 Subject: [PATCH] fmt --- .../_mcmCluster/eks-grafana/terragrunt.hcl | 12 ++--- .../vpc/_mcmCluster/eks/terragrunt.hcl | 17 ++++--- .../vpc/_mcmCluster/terragrunt.hcl | 44 +++++++++---------- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl index 58cf714..4836624 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl @@ -15,20 +15,20 @@ dependency "eks-config" { } dependency "eks-istio" { - config_path = "../eks-istio" + config_path = "../eks-istio" skip_outputs = true } dependency "eks-karpenter" { - config_path = "../eks-karpenter" + config_path = "../eks-karpenter" skip_outputs = true } inputs = { - profile = dependency.eks.inputs.profile - cluster_name = dependency.eks.inputs.cluster_name - region = dependency.eks.inputs.region - cluster_domain = dependency.eks.inputs.vpc_domain_name + profile = dependency.eks.inputs.profile + cluster_name = dependency.eks.inputs.cluster_name + region = dependency.eks.inputs.region + cluster_domain = dependency.eks.inputs.vpc_domain_name # datasources = { # loki = dependency.eks-loki.outputs.gateway_internal_endpoint # } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl index bc5351f..d7a6611 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl @@ -22,7 +22,7 @@ locals { cluster_endpoint_public_access = true profile = "224384469011-lab-dev-gov" region = local.region_vars.locals.aws_region - cluster_mailing_list = "ahmed.m.youssef@census.gov" + cluster_mailing_list = "matthew.c.morgan@census.gov" # Tags applied to AWS objects created tags = { @@ -42,14 +42,13 @@ terraform { } inputs = { - aws_account_id = local.account_id - profile = local.profile - vpc_name = local.eks_vpc_name - cluster_name = local.cluster_name - cluster_version = local.cluster_version - eks_instance_disk_size = local.eks_instance_disk_size - eks_vpc_name = local.eks_vpc_name - # eks_instance_types = local.eks_instance_types + aws_account_id = local.account_id + profile = local.profile + vpc_name = local.eks_vpc_name + cluster_name = local.cluster_name + cluster_version = local.cluster_version + eks_instance_disk_size = local.eks_instance_disk_size + eks_vpc_name = local.eks_vpc_name eks_ng_desired_size = local.eks_ng_desired_size eks_ng_max_size = local.eks_ng_max_size eks_ng_min_size = local.eks_ng_min_size diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl index b26d8c1..7f2ebd2 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl @@ -14,17 +14,17 @@ locals { # vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl", "skip-account-if-does-not-exist")) # Extract the variables we need for easy access - account_id = local.account_vars.locals.aws_account_id - account_name = local.account_vars.locals.account_name - creator = "ahmed.m.youssef@census.gov" - organization = "census:ocio:csvd" - profile = "224384469011-lab-dev-gov" - project_name = "csvd_platformbaseline" - project_number = "fs0000000078" - project_role = "csvd_platformbaseline_cicd" - region = local.region_vars.locals.aws_region + account_id = local.account_vars.locals.aws_account_id + account_name = local.account_vars.locals.account_name + creator = "ahmed.m.youssef@census.gov" + organization = "census:ocio:csvd" + profile = "224384469011-lab-dev-gov" + project_name = "csvd_platformbaseline" + project_number = "fs0000000078" + project_role = "csvd_platformbaseline_cicd" + region = local.region_vars.locals.aws_region state_bucket_prefix = "inf-tfstate" - state_table_name = "tf_remote_state" + state_table_name = "tf_remote_state" } generate "provider" { @@ -71,21 +71,21 @@ EOF remote_state { backend = "s3" generate = { - path = "remote_state.backend.tf" + path = "remote_state.backend.tf" if_exists = "overwrite_terragrunt" } config = { - #--- - # "${local.account_name}": "${get_path_from_repo_root()}" - #--- - bucket = "${local.state_bucket_prefix}-${local.account_id}" - profile = "${local.profile}" - key = "${trimprefix(replace(run_cmd("realpath",get_original_terragrunt_dir()),dirname(get_repo_root()),""),"/")}" - region = "${local.region}" - dynamodb_table = "${local.state_table_name}" - skip_bucket_root_access = true - skip_bucket_ssencryption = true - skip_bucket_enforced_tls = true + #--- + # "${local.account_name}": "${get_path_from_repo_root()}" + #--- + bucket = "${local.state_bucket_prefix}-${local.account_id}" + profile = "${local.profile}" + key = "${trimprefix(replace(run_cmd("realpath", get_original_terragrunt_dir()), dirname(get_repo_root()), ""), "/")}" + region = "${local.region}" + dynamodb_table = "${local.state_table_name}" + skip_bucket_root_access = true + skip_bucket_ssencryption = true + skip_bucket_enforced_tls = true } }