From ab55e34e6b04a2b96c2936eed13ad3a30d42e682 Mon Sep 17 00:00:00 2001 From: rodriguez-matias Date: Thu, 15 Dec 2022 09:47:01 -0300 Subject: [PATCH 1/2] BBL-541: cost optimization - update natgw and cloudwatch --- .../us-east-1/k8s-eks/network/config.tf | 2 +- .../k8s-eks/network/network.auto.tfvars | 2 +- .../security-audit/.terraform.lock.hcl | 58 +++++++++------- .../us-east-1/security-audit/config.tf | 2 +- .../us-east-1/security-audit/variables.tf | 2 +- .../security-audit/.terraform.lock.hcl | 68 +++++++++++++++++++ apps-prd/us-east-1/security-audit/config.tf | 2 +- .../us-east-1/security-audit/variables.tf | 2 +- management/us-east-1/security-audit/config.tf | 2 +- .../us-east-1/security-audit/variables.tf | 2 +- network/us-east-1/security-audit/config.tf | 2 +- network/us-east-1/security-audit/variables.tf | 2 +- .../base-network/.terraform.lock.hcl | 1 + .../us-east-1/base-network/terraform.tfvars | 2 +- .../security-audit/.terraform.lock.hcl | 55 ++++++++------- shared/us-east-1/security-audit/config.tf | 2 +- shared/us-east-1/security-audit/variables.tf | 2 +- 17 files changed, 143 insertions(+), 65 deletions(-) create mode 100644 apps-prd/us-east-1/security-audit/.terraform.lock.hcl diff --git a/apps-devstg/us-east-1/k8s-eks/network/config.tf b/apps-devstg/us-east-1/k8s-eks/network/config.tf index 28d94b01e..ba01486da 100644 --- a/apps-devstg/us-east-1/k8s-eks/network/config.tf +++ b/apps-devstg/us-east-1/k8s-eks/network/config.tf @@ -16,7 +16,7 @@ provider "aws" { # Backend Config (partial) # terraform { - required_version = "~> 1.1.3" + required_version = "~> 1.2.7" required_providers { aws = "~> 4.10" diff --git a/apps-devstg/us-east-1/k8s-eks/network/network.auto.tfvars b/apps-devstg/us-east-1/k8s-eks/network/network.auto.tfvars index f38b2b3f7..88c5f3e43 100644 --- a/apps-devstg/us-east-1/k8s-eks/network/network.auto.tfvars +++ b/apps-devstg/us-east-1/k8s-eks/network/network.auto.tfvars @@ -1 +1 @@ -vpc_enable_nat_gateway = true +vpc_enable_nat_gateway = false diff --git a/apps-devstg/us-east-1/security-audit/.terraform.lock.hcl b/apps-devstg/us-east-1/security-audit/.terraform.lock.hcl index a93bf80e0..122923871 100644 --- a/apps-devstg/us-east-1/security-audit/.terraform.lock.hcl +++ b/apps-devstg/us-east-1/security-audit/.terraform.lock.hcl @@ -2,22 +2,26 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.36.0" + version = "4.46.0" constraints = ">= 2.0.0, >= 3.0.0, ~> 4.10" hashes = [ - "h1:PbMwAG0+hC+ZGhgghol6IKWAV+dKCLqW02GxZ4Dr71Q=", - "zh:07f96a0f4a7b6c1a0f77e27c10b566fe95d77673eff0f0d55cda2ce736ef0ffa", - "zh:64d60fba58515708f06eb97b310951d1c021f4d7a25c74d82274acb61494a984", - "zh:6dbc3e14521013920228e1e689527d30ce3ff91b3102014dea4a90e94a25dd1b", - "zh:6e3eaf4d2b3a9fd934193202f5b1d2122cacfc0db83602d60933b50445d00457", - "zh:6e6d824b4911df25e90555c06a9330875796ddb14e4ea925ea8683530dcaad78", - "zh:8324c3f45662fb46ab2c194536f4c02e13927e8d08ab69abc610e938ce2742eb", - "zh:83d85aa05832db2ab7ada74f677148b62c155dd269e105945a613068656072db", - "zh:87e6d5c876ad5ac24029fab7b5f187ade00f7d93329d048a192c18b8d317be58", - "zh:886d5dbf8b71bbd7c6fac80e7df998961d1c1cd217e5314d8bcb5c7b7d44418b", + "h1:1+HdnLUAzb8FDfWs/Mpyv8r2OjYh9Fpyu9Dgj8v+ZuA=", + "h1:EZB4OgvytV38JpWyye9zoMQ0bfT9yB9xSXM5NY3Lrws=", + "zh:1678e6a4bdb3d81a6713adc62ca0fdb8250c584e10c10d1daca72316e9db8df2", + "zh:329903acf86ef6072502736dff4c43c2b50f762a958f76aa924e2d74c7fca1e3", + "zh:33db8131fe0ec7e1d9f30bc9f65c2440e9c1f708d681b6062757a351f1df7ce6", + "zh:3a3b010bc393784c16f4b6cdce7f76db93d5efa323fce4920bfea9e9ba6abe44", + "zh:979e2713a5759a7483a065e149e3cb69db9225326fc0457fa3fc3a48aed0c63f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:aca15934b6e3631cbc846a4331e87ed37dfa4209cfd4552caf5ac6120219b2c4", - "zh:bc7b4b30b085f12b463ea13ad3878c6dd8d027520c8c0fd919bd688dfe118b39", + "zh:9efcf0067e16ad53da7504178a05eb2118770b4ae00c193c10ecad4cbfce308e", + "zh:a10655bf1b6376ab7f3e55efadf54dc70f7bd07ca11369557c312095076f9d62", + "zh:b0394dd42cbd2a718a7dd7ae0283f04769aaf8b3d52664e141da59c0171a11ab", + "zh:b958e614c2cf6d9c05a6ad5e94dc5c04b97ebfb84415da068be5a081b5ebbe24", + "zh:ba5069e624210c63ad9e633a8eb0108b21f2322bc4967ba2b82d09168c466888", + "zh:d7dfa597a17186e7f4d741dd7111849f1c0dd6f7ebc983043d8262d2fb37b408", + "zh:e8a641ca2c99f96d64fa2725875e797273984981d3e54772a2823541c44e3cd3", + "zh:f89898b7067c4246293a8007f59f5cfcac7b8dd251d39886c7a53ba596251466", + "zh:fb1e1df1d5cc208e08a850f8e84423bce080f01f5e901791c79df369d3ed52f2", ] } @@ -25,6 +29,7 @@ provider "registry.terraform.io/hashicorp/local" { version = "2.2.3" constraints = ">= 1.3.0" hashes = [ + "h1:aWp5iSUxBGgPv1UnV5yag9Pb0N+U1I0sZb38AXBFO8A=", "h1:m79NYOmoeeLZfRMRCmOoCe2bcCuCwuMppPpj1g5mHLU=", "zh:04f0978bb3e052707b8e82e46780c371ac1c66b689b4a23bbc2f58865ab7d5c0", "zh:6484f1b3e9e3771eb7cc8e8bab8b35f939a55d550b3f4fb2ab141a24269ee6aa", @@ -42,21 +47,22 @@ provider "registry.terraform.io/hashicorp/local" { } provider "registry.terraform.io/hashicorp/null" { - version = "3.1.1" + version = "3.2.1" constraints = ">= 2.0.0" hashes = [ - "h1:PiFCGziZKS4Kgw3vDyTXyrFUeMQWBqsXhUzX2MgnOSs=", - "zh:063466f41f1d9fd0dd93722840c1314f046d8760b1812fa67c34de0afcba5597", - "zh:08c058e367de6debdad35fc24d97131c7cf75103baec8279aba3506a08b53faf", - "zh:73ce6dff935150d6ddc6ac4a10071e02647d10175c173cfe5dca81f3d13d8afe", + "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", + "h1:nwEVpUhaxWeG5C81lwaI5buwrp1NI/mH1FFqsB2nOHg=", + "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", + "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", + "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5", + "zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8fdd792a626413502e68c195f2097352bdc6a0df694f7df350ed784741eb587e", - "zh:976bbaf268cb497400fd5b3c774d218f3933271864345f18deebe4dcbfcd6afa", - "zh:b21b78ca581f98f4cdb7a366b03ae9db23a73dfa7df12c533d7c19b68e9e72e5", - "zh:b7fc0c1615dbdb1d6fd4abb9c7dc7da286631f7ca2299fb9cd4664258ccfbff4", - "zh:d1efc942b2c44345e0c29bc976594cb7278c38cfb8897b344669eafbc3cddf46", - "zh:e356c245b3cd9d4789bab010893566acace682d7db877e52d40fc4ca34a50924", - "zh:ea98802ba92fcfa8cf12cbce2e9e7ebe999afbf8ed47fa45fc847a098d89468b", - "zh:eff8872458806499889f6927b5d954560f3d74bf20b6043409edf94d26cd906f", + "zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238", + "zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc", + "zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970", + "zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2", + "zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5", + "zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f", + "zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694", ] } diff --git a/apps-devstg/us-east-1/security-audit/config.tf b/apps-devstg/us-east-1/security-audit/config.tf index daa9bc5fc..b44514c56 100644 --- a/apps-devstg/us-east-1/security-audit/config.tf +++ b/apps-devstg/us-east-1/security-audit/config.tf @@ -10,7 +10,7 @@ provider "aws" { # Backend Config (partial) # #=============================# terraform { - required_version = "~> 1.1.9" + required_version = "~> 1.2.7" required_providers { aws = "~> 4.10" diff --git a/apps-devstg/us-east-1/security-audit/variables.tf b/apps-devstg/us-east-1/security-audit/variables.tf index 595f6983e..18780deea 100644 --- a/apps-devstg/us-east-1/security-audit/variables.tf +++ b/apps-devstg/us-east-1/security-audit/variables.tf @@ -10,7 +10,7 @@ variable "metric_namespace" { variable "create_dashboard" { type = bool description = "When true a dashboard that displays the statistics as a line graph will be created in CloudWatch" - default = true + default = false } variable "metrics" { diff --git a/apps-prd/us-east-1/security-audit/.terraform.lock.hcl b/apps-prd/us-east-1/security-audit/.terraform.lock.hcl new file mode 100644 index 000000000..122923871 --- /dev/null +++ b/apps-prd/us-east-1/security-audit/.terraform.lock.hcl @@ -0,0 +1,68 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "4.46.0" + constraints = ">= 2.0.0, >= 3.0.0, ~> 4.10" + hashes = [ + "h1:1+HdnLUAzb8FDfWs/Mpyv8r2OjYh9Fpyu9Dgj8v+ZuA=", + "h1:EZB4OgvytV38JpWyye9zoMQ0bfT9yB9xSXM5NY3Lrws=", + "zh:1678e6a4bdb3d81a6713adc62ca0fdb8250c584e10c10d1daca72316e9db8df2", + "zh:329903acf86ef6072502736dff4c43c2b50f762a958f76aa924e2d74c7fca1e3", + "zh:33db8131fe0ec7e1d9f30bc9f65c2440e9c1f708d681b6062757a351f1df7ce6", + "zh:3a3b010bc393784c16f4b6cdce7f76db93d5efa323fce4920bfea9e9ba6abe44", + "zh:979e2713a5759a7483a065e149e3cb69db9225326fc0457fa3fc3a48aed0c63f", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:9efcf0067e16ad53da7504178a05eb2118770b4ae00c193c10ecad4cbfce308e", + "zh:a10655bf1b6376ab7f3e55efadf54dc70f7bd07ca11369557c312095076f9d62", + "zh:b0394dd42cbd2a718a7dd7ae0283f04769aaf8b3d52664e141da59c0171a11ab", + "zh:b958e614c2cf6d9c05a6ad5e94dc5c04b97ebfb84415da068be5a081b5ebbe24", + "zh:ba5069e624210c63ad9e633a8eb0108b21f2322bc4967ba2b82d09168c466888", + "zh:d7dfa597a17186e7f4d741dd7111849f1c0dd6f7ebc983043d8262d2fb37b408", + "zh:e8a641ca2c99f96d64fa2725875e797273984981d3e54772a2823541c44e3cd3", + "zh:f89898b7067c4246293a8007f59f5cfcac7b8dd251d39886c7a53ba596251466", + "zh:fb1e1df1d5cc208e08a850f8e84423bce080f01f5e901791c79df369d3ed52f2", + ] +} + +provider "registry.terraform.io/hashicorp/local" { + version = "2.2.3" + constraints = ">= 1.3.0" + hashes = [ + "h1:aWp5iSUxBGgPv1UnV5yag9Pb0N+U1I0sZb38AXBFO8A=", + "h1:m79NYOmoeeLZfRMRCmOoCe2bcCuCwuMppPpj1g5mHLU=", + "zh:04f0978bb3e052707b8e82e46780c371ac1c66b689b4a23bbc2f58865ab7d5c0", + "zh:6484f1b3e9e3771eb7cc8e8bab8b35f939a55d550b3f4fb2ab141a24269ee6aa", + "zh:78a56d59a013cb0f7eb1c92815d6eb5cf07f8b5f0ae20b96d049e73db915b238", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:8aa9950f4c4db37239bcb62e19910c49e47043f6c8587e5b0396619923657797", + "zh:996beea85f9084a725ff0e6473a4594deb5266727c5f56e9c1c7c62ded6addbb", + "zh:9a7ef7a21f48fabfd145b2e2a4240ca57517ad155017e86a30860d7c0c109de3", + "zh:a63e70ac052aa25120113bcddd50c1f3cfe61f681a93a50cea5595a4b2cc3e1c", + "zh:a6e8d46f94108e049ad85dbed60354236dc0b9b5ec8eabe01c4580280a43d3b8", + "zh:bb112ce7efbfcfa0e65ed97fa245ef348e0fd5bfa5a7e4ab2091a9bd469f0a9e", + "zh:d7bec0da5c094c6955efed100f3fe22fca8866859f87c025be1760feb174d6d9", + "zh:fb9f271b72094d07cef8154cd3d50e9aa818a0ea39130bc193132ad7b23076fd", + ] +} + +provider "registry.terraform.io/hashicorp/null" { + version = "3.2.1" + constraints = ">= 2.0.0" + hashes = [ + "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", + "h1:nwEVpUhaxWeG5C81lwaI5buwrp1NI/mH1FFqsB2nOHg=", + "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", + "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", + "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5", + "zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238", + "zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc", + "zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970", + "zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2", + "zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5", + "zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f", + "zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694", + ] +} diff --git a/apps-prd/us-east-1/security-audit/config.tf b/apps-prd/us-east-1/security-audit/config.tf index fa0e5bd1e..506468ec8 100644 --- a/apps-prd/us-east-1/security-audit/config.tf +++ b/apps-prd/us-east-1/security-audit/config.tf @@ -10,7 +10,7 @@ provider "aws" { # Backend Config (partial) # #=============================# terraform { - required_version = "~> 1.1.9" + required_version = "~> 1.2.7" required_providers { aws = "~> 4.10" diff --git a/apps-prd/us-east-1/security-audit/variables.tf b/apps-prd/us-east-1/security-audit/variables.tf index 595f6983e..18780deea 100644 --- a/apps-prd/us-east-1/security-audit/variables.tf +++ b/apps-prd/us-east-1/security-audit/variables.tf @@ -10,7 +10,7 @@ variable "metric_namespace" { variable "create_dashboard" { type = bool description = "When true a dashboard that displays the statistics as a line graph will be created in CloudWatch" - default = true + default = false } variable "metrics" { diff --git a/management/us-east-1/security-audit/config.tf b/management/us-east-1/security-audit/config.tf index 10a6630c3..c3983dae7 100644 --- a/management/us-east-1/security-audit/config.tf +++ b/management/us-east-1/security-audit/config.tf @@ -10,7 +10,7 @@ provider "aws" { # Backend Config (partial) # #=============================# terraform { - required_version = "~> 1.1.9" + required_version = "~> 1.2.7" required_providers { aws = "~> 4.10" diff --git a/management/us-east-1/security-audit/variables.tf b/management/us-east-1/security-audit/variables.tf index 595f6983e..18780deea 100644 --- a/management/us-east-1/security-audit/variables.tf +++ b/management/us-east-1/security-audit/variables.tf @@ -10,7 +10,7 @@ variable "metric_namespace" { variable "create_dashboard" { type = bool description = "When true a dashboard that displays the statistics as a line graph will be created in CloudWatch" - default = true + default = false } variable "metrics" { diff --git a/network/us-east-1/security-audit/config.tf b/network/us-east-1/security-audit/config.tf index 3d9830f73..f63ab06e2 100644 --- a/network/us-east-1/security-audit/config.tf +++ b/network/us-east-1/security-audit/config.tf @@ -10,7 +10,7 @@ provider "aws" { # Backend Config (partial) # #=============================# terraform { - required_version = "~> 1.1.9" + required_version = "~> 1.2.7" required_providers { aws = "~> 4.10" diff --git a/network/us-east-1/security-audit/variables.tf b/network/us-east-1/security-audit/variables.tf index 4db0f2f1b..ce8d2e65f 100644 --- a/network/us-east-1/security-audit/variables.tf +++ b/network/us-east-1/security-audit/variables.tf @@ -10,7 +10,7 @@ variable "metric_namespace" { variable "create_dashboard" { type = bool description = "When true a dashboard that displays the statistics as a line graph will be created in CloudWatch" - default = true + default = false } variable "metrics" { diff --git a/shared/us-east-1/base-network/.terraform.lock.hcl b/shared/us-east-1/base-network/.terraform.lock.hcl index 6e615b354..000719049 100644 --- a/shared/us-east-1/base-network/.terraform.lock.hcl +++ b/shared/us-east-1/base-network/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/hashicorp/aws" { constraints = ">= 3.28.0, >= 3.37.0, >= 3.63.0, >= 4.9.0" hashes = [ "h1:0dYkCnmIGkx+TlvUy21GpK7/8cCfN/fiZjHV+AAt3Xw=", + "h1:lW3zrsW/nyPTzxfjpiKh23X6VWVKn0ELtko9QCSARlw=", "zh:51fddc33f289108f60c2de78537f758ae913b2614187abfc3f560f9dd277bc1a", "zh:5a2bfa0725a8941f12e775eb9c44582ec237a664321a740d8283e9b56452f2ad", "zh:6ca73a9f11c2a9ff8f55433c00a12c1b69c22131251cb0698d32c682229b1233", diff --git a/shared/us-east-1/base-network/terraform.tfvars b/shared/us-east-1/base-network/terraform.tfvars index 88c5f3e43..f38b2b3f7 100644 --- a/shared/us-east-1/base-network/terraform.tfvars +++ b/shared/us-east-1/base-network/terraform.tfvars @@ -1 +1 @@ -vpc_enable_nat_gateway = false +vpc_enable_nat_gateway = true diff --git a/shared/us-east-1/security-audit/.terraform.lock.hcl b/shared/us-east-1/security-audit/.terraform.lock.hcl index 0153828a1..18470e7fa 100644 --- a/shared/us-east-1/security-audit/.terraform.lock.hcl +++ b/shared/us-east-1/security-audit/.terraform.lock.hcl @@ -2,22 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.36.0" + version = "4.46.0" constraints = ">= 2.0.0, >= 3.0.0, ~> 4.10" hashes = [ - "h1:22Ha2jCqtHjc2MRsGQZWggDDb61kKgI98I5ddho8rq0=", - "zh:07f96a0f4a7b6c1a0f77e27c10b566fe95d77673eff0f0d55cda2ce736ef0ffa", - "zh:64d60fba58515708f06eb97b310951d1c021f4d7a25c74d82274acb61494a984", - "zh:6dbc3e14521013920228e1e689527d30ce3ff91b3102014dea4a90e94a25dd1b", - "zh:6e3eaf4d2b3a9fd934193202f5b1d2122cacfc0db83602d60933b50445d00457", - "zh:6e6d824b4911df25e90555c06a9330875796ddb14e4ea925ea8683530dcaad78", - "zh:8324c3f45662fb46ab2c194536f4c02e13927e8d08ab69abc610e938ce2742eb", - "zh:83d85aa05832db2ab7ada74f677148b62c155dd269e105945a613068656072db", - "zh:87e6d5c876ad5ac24029fab7b5f187ade00f7d93329d048a192c18b8d317be58", - "zh:886d5dbf8b71bbd7c6fac80e7df998961d1c1cd217e5314d8bcb5c7b7d44418b", + "h1:EZB4OgvytV38JpWyye9zoMQ0bfT9yB9xSXM5NY3Lrws=", + "zh:1678e6a4bdb3d81a6713adc62ca0fdb8250c584e10c10d1daca72316e9db8df2", + "zh:329903acf86ef6072502736dff4c43c2b50f762a958f76aa924e2d74c7fca1e3", + "zh:33db8131fe0ec7e1d9f30bc9f65c2440e9c1f708d681b6062757a351f1df7ce6", + "zh:3a3b010bc393784c16f4b6cdce7f76db93d5efa323fce4920bfea9e9ba6abe44", + "zh:979e2713a5759a7483a065e149e3cb69db9225326fc0457fa3fc3a48aed0c63f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:aca15934b6e3631cbc846a4331e87ed37dfa4209cfd4552caf5ac6120219b2c4", - "zh:bc7b4b30b085f12b463ea13ad3878c6dd8d027520c8c0fd919bd688dfe118b39", + "zh:9efcf0067e16ad53da7504178a05eb2118770b4ae00c193c10ecad4cbfce308e", + "zh:a10655bf1b6376ab7f3e55efadf54dc70f7bd07ca11369557c312095076f9d62", + "zh:b0394dd42cbd2a718a7dd7ae0283f04769aaf8b3d52664e141da59c0171a11ab", + "zh:b958e614c2cf6d9c05a6ad5e94dc5c04b97ebfb84415da068be5a081b5ebbe24", + "zh:ba5069e624210c63ad9e633a8eb0108b21f2322bc4967ba2b82d09168c466888", + "zh:d7dfa597a17186e7f4d741dd7111849f1c0dd6f7ebc983043d8262d2fb37b408", + "zh:e8a641ca2c99f96d64fa2725875e797273984981d3e54772a2823541c44e3cd3", + "zh:f89898b7067c4246293a8007f59f5cfcac7b8dd251d39886c7a53ba596251466", + "zh:fb1e1df1d5cc208e08a850f8e84423bce080f01f5e901791c79df369d3ed52f2", ] } @@ -42,21 +45,21 @@ provider "registry.terraform.io/hashicorp/local" { } provider "registry.terraform.io/hashicorp/null" { - version = "3.1.1" + version = "3.2.1" constraints = ">= 2.0.0" hashes = [ - "h1:71sNUDvmiJcijsvfXpiLCz0lXIBSsEJjMxljt7hxMhw=", - "zh:063466f41f1d9fd0dd93722840c1314f046d8760b1812fa67c34de0afcba5597", - "zh:08c058e367de6debdad35fc24d97131c7cf75103baec8279aba3506a08b53faf", - "zh:73ce6dff935150d6ddc6ac4a10071e02647d10175c173cfe5dca81f3d13d8afe", + "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", + "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", + "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", + "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5", + "zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8fdd792a626413502e68c195f2097352bdc6a0df694f7df350ed784741eb587e", - "zh:976bbaf268cb497400fd5b3c774d218f3933271864345f18deebe4dcbfcd6afa", - "zh:b21b78ca581f98f4cdb7a366b03ae9db23a73dfa7df12c533d7c19b68e9e72e5", - "zh:b7fc0c1615dbdb1d6fd4abb9c7dc7da286631f7ca2299fb9cd4664258ccfbff4", - "zh:d1efc942b2c44345e0c29bc976594cb7278c38cfb8897b344669eafbc3cddf46", - "zh:e356c245b3cd9d4789bab010893566acace682d7db877e52d40fc4ca34a50924", - "zh:ea98802ba92fcfa8cf12cbce2e9e7ebe999afbf8ed47fa45fc847a098d89468b", - "zh:eff8872458806499889f6927b5d954560f3d74bf20b6043409edf94d26cd906f", + "zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238", + "zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc", + "zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970", + "zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2", + "zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5", + "zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f", + "zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694", ] } diff --git a/shared/us-east-1/security-audit/config.tf b/shared/us-east-1/security-audit/config.tf index 35d6ad452..4f425662d 100644 --- a/shared/us-east-1/security-audit/config.tf +++ b/shared/us-east-1/security-audit/config.tf @@ -10,7 +10,7 @@ provider "aws" { # Backend Config (partial) # #=============================# terraform { - required_version = "~> 1.1.9" + required_version = "~> 1.2.7" required_providers { aws = "~> 4.10" diff --git a/shared/us-east-1/security-audit/variables.tf b/shared/us-east-1/security-audit/variables.tf index 9c3c8b7e8..001cc9252 100644 --- a/shared/us-east-1/security-audit/variables.tf +++ b/shared/us-east-1/security-audit/variables.tf @@ -10,7 +10,7 @@ variable "metric_namespace" { variable "create_dashboard" { type = bool description = "When true a dashboard that displays the statistics as a line graph will be created in CloudWatch" - default = true + default = false } variable "metrics" { From 18a7beade2262101d9498d3f3a3f38d0efa2045e Mon Sep 17 00:00:00 2001 From: rodriguez-matias Date: Fri, 16 Dec 2022 09:48:37 -0300 Subject: [PATCH 2/2] BBL-541: add k8s-eks layer to infracost --- infracost.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/infracost.yml b/infracost.yml index 1ad78bb32..ebc22cc49 100644 --- a/infracost.yml +++ b/infracost.yml @@ -547,6 +547,31 @@ projects: - "../../../config/common.tfvars" - "../../config/account.tfvars" - "../../config/backend.tfvars" + - path: "apps-devstg/us-east-1/k8s-eks/cluster" + terraform_var_files: + - "../../../../config/common.tfvars" + - "../../../config/account.tfvars" + - "../../../config/backend.tfvars" + - path: "apps-devstg/us-east-1/k8s-eks/identities" + terraform_var_files: + - "../../../../config/common.tfvars" + - "../../../config/account.tfvars" + - "../../../config/backend.tfvars" + - path: "apps-devstg/us-east-1/k8s-eks/k8s-components" + terraform_var_files: + - "../../../../config/common.tfvars" + - "../../../config/account.tfvars" + - "../../../config/backend.tfvars" + - path: "apps-devstg/us-east-1/k8s-eks/k8s-workloads" + terraform_var_files: + - "../../../../config/common.tfvars" + - "../../../config/account.tfvars" + - "../../../config/backend.tfvars" + - path: "apps-devstg/us-east-1/k8s-eks/network" + terraform_var_files: + - "../../../../config/common.tfvars" + - "../../../config/account.tfvars" + - "../../../config/backend.tfvars" - path: "apps-devstg/us-east-1/k8s-eks-v1.17/cluster" terraform_var_files: - "../../../../config/common.tfvars"