From b98a02688fdbc972a9c16473c0bae5a3df41de85 Mon Sep 17 00:00:00 2001 From: Matthew Creal Morgan Date: Wed, 9 Oct 2024 17:07:06 -0700 Subject: [PATCH] Apply suggestions from code review --- .../vpc/platform-test-x/eks-cert-manager/terragrunt.hcl | 2 +- .../vpc/platform-test-x/eks-config/terragrunt.hcl | 2 +- .../us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl | 3 +-- .../us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl | 2 +- .../vpc/platform-test-x/eks-karpenter/terragrunt.hcl | 2 +- .../platform-test-x/eks-kiali.disable/terragrunt.hcl.disable | 3 +-- .../us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl | 2 +- .../vpc/platform-test-x/eks-loki/terragrunt.hcl.disable | 2 +- .../vpc/platform-test-x/eks-metrics-server/terragrunt.hcl | 2 +- .../vpc/platform-test-x/eks-prometheus/terragrunt.hcl | 2 +- .../vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-cert-manager/terragrunt.hcl index 1448ac8..f72b39f 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-cert-manager/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-config/terragrunt.hcl index 84bb1ff..7c6a172 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-config/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-config/terragrunt.hcl @@ -8,7 +8,7 @@ include "root" { # } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl index 02eb7fc..46d26d8 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl @@ -4,8 +4,7 @@ include "root" { } terraform { - # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git" - source = "../../../../../../../tfmod-eks-dns" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl index fc9d515..c1190ab 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-karpenter/terragrunt.hcl index 982e1d7..a6e5264 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-karpenter/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-karpenter/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable index ac0a548..3dabd56 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable @@ -4,8 +4,7 @@ include "root" { } terraform { - # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster" - source = "../../../../../../../tfmod-kiali" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl index cc94f7f..069f967 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable index cc94f7f..069f967 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-metrics-server/terragrunt.hcl index 5414a72..010e61a 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-metrics-server/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-metrics-server/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl index 62611b1..308ade0 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable index 62611b1..308ade0 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"]