From 375147f79c4e0289008152a904a410db30a03b91 Mon Sep 17 00:00:00 2001 From: nitrocode <7775707+nitrocode@users.noreply.github.com> Date: Tue, 18 Oct 2022 21:39:20 -0500 Subject: [PATCH 01/10] Use cloudposse/template for arm support --- examples/complete/versions.tf | 2 +- examples/with_cognito_authentication/versions.tf | 2 +- examples/with_google_oidc_authentication/versions.tf | 2 +- examples/without_authentication/versions.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 5947f14..c86e922 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 2.0" } template = { - source = "hashicorp/template" + source = "cloudposse/template" version = ">= 2.0" } null = { diff --git a/examples/with_cognito_authentication/versions.tf b/examples/with_cognito_authentication/versions.tf index 5947f14..c86e922 100644 --- a/examples/with_cognito_authentication/versions.tf +++ b/examples/with_cognito_authentication/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 2.0" } template = { - source = "hashicorp/template" + source = "cloudposse/template" version = ">= 2.0" } null = { diff --git a/examples/with_google_oidc_authentication/versions.tf b/examples/with_google_oidc_authentication/versions.tf index 5947f14..c86e922 100644 --- a/examples/with_google_oidc_authentication/versions.tf +++ b/examples/with_google_oidc_authentication/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 2.0" } template = { - source = "hashicorp/template" + source = "cloudposse/template" version = ">= 2.0" } null = { diff --git a/examples/without_authentication/versions.tf b/examples/without_authentication/versions.tf index 5947f14..c86e922 100644 --- a/examples/without_authentication/versions.tf +++ b/examples/without_authentication/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 2.0" } template = { - source = "hashicorp/template" + source = "cloudposse/template" version = ">= 2.0" } null = { From 2516f4934022c7c7d99cbd9c0720d53f17cfb8fd Mon Sep 17 00:00:00 2001 From: cloudpossebot <11232728+cloudpossebot@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:43:53 +0000 Subject: [PATCH 02/10] Auto Format --- .github/auto-release.yml | 1 - .github/renovate.json | 2 +- .github/workflows/validate-codeowners.yml | 1 + README.md | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/auto-release.yml b/.github/auto-release.yml index b45efb7..17cd39c 100644 --- a/.github/auto-release.yml +++ b/.github/auto-release.yml @@ -17,7 +17,6 @@ version-resolver: - 'bugfix' - 'bug' - 'hotfix' - - 'no-release' default: 'minor' categories: diff --git a/.github/renovate.json b/.github/renovate.json index ae4f0aa..a780298 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -4,9 +4,9 @@ ":preserveSemverRanges" ], "labels": ["auto-update"], + "dependencyDashboardAutoclose": true, "enabledManagers": ["terraform"], "terraform": { "ignorePaths": ["**/context.tf", "examples/**"] } } - diff --git a/.github/workflows/validate-codeowners.yml b/.github/workflows/validate-codeowners.yml index 70f829e..4b4a226 100644 --- a/.github/workflows/validate-codeowners.yml +++ b/.github/workflows/validate-codeowners.yml @@ -10,6 +10,7 @@ jobs: steps: - name: "Checkout source code at current commit" uses: actions/checkout@v2 + # Leave pinned at 0.7.1 until https://github.com/mszostok/codeowners-validator/issues/173 is resolved - uses: mszostok/codeowners-validator@v0.7.1 if: github.event.pull_request.head.repo.full_name == github.repository name: "Full check of CODEOWNERS" diff --git a/README.md b/README.md index dbbd56a..b5eb9e0 100644 --- a/README.md +++ b/README.md @@ -832,7 +832,7 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply [![README Footer][readme_footer_img]][readme_footer_link] [![Beacon][beacon]][website] - + [logo]: https://cloudposse.com/logo-300x69.svg [docs]: https://cpco.io/docs?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-ecs-atlantis&utm_content=docs [website]: https://cpco.io/homepage?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-aws-ecs-atlantis&utm_content=website @@ -863,3 +863,4 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply [share_googleplus]: https://plus.google.com/share?url=https://github.com/cloudposse/terraform-aws-ecs-atlantis [share_email]: mailto:?subject=terraform-aws-ecs-atlantis&body=https://github.com/cloudposse/terraform-aws-ecs-atlantis [beacon]: https://ga-beacon.cloudposse.com/UA-76589703-4/cloudposse/terraform-aws-ecs-atlantis?pixel&cs=github&cm=readme&an=terraform-aws-ecs-atlantis + From 79306dd0d2b6e6a00a840cc11d0120d072302102 Mon Sep 17 00:00:00 2001 From: nitrocode <7775707+nitrocode@users.noreply.github.com> Date: Wed, 19 Oct 2022 15:08:00 -0500 Subject: [PATCH 03/10] Apply suggestions from code review --- examples/complete/versions.tf | 2 +- examples/with_cognito_authentication/versions.tf | 2 +- examples/with_google_oidc_authentication/versions.tf | 2 +- examples/without_authentication/versions.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index c86e922..1dd7c36 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -8,7 +8,7 @@ terraform { } template = { source = "cloudposse/template" - version = ">= 2.0" + version = ">= 2.2" } null = { source = "hashicorp/null" diff --git a/examples/with_cognito_authentication/versions.tf b/examples/with_cognito_authentication/versions.tf index c86e922..1dd7c36 100644 --- a/examples/with_cognito_authentication/versions.tf +++ b/examples/with_cognito_authentication/versions.tf @@ -8,7 +8,7 @@ terraform { } template = { source = "cloudposse/template" - version = ">= 2.0" + version = ">= 2.2" } null = { source = "hashicorp/null" diff --git a/examples/with_google_oidc_authentication/versions.tf b/examples/with_google_oidc_authentication/versions.tf index c86e922..1dd7c36 100644 --- a/examples/with_google_oidc_authentication/versions.tf +++ b/examples/with_google_oidc_authentication/versions.tf @@ -8,7 +8,7 @@ terraform { } template = { source = "cloudposse/template" - version = ">= 2.0" + version = ">= 2.2" } null = { source = "hashicorp/null" diff --git a/examples/without_authentication/versions.tf b/examples/without_authentication/versions.tf index c86e922..1dd7c36 100644 --- a/examples/without_authentication/versions.tf +++ b/examples/without_authentication/versions.tf @@ -8,7 +8,7 @@ terraform { } template = { source = "cloudposse/template" - version = ">= 2.0" + version = ">= 2.2" } null = { source = "hashicorp/null" From 399edcf2dfdbfbba689e21aa6595d5947aa9424b Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Fri, 28 Apr 2023 21:13:10 +0300 Subject: [PATCH 04/10] fix tests --- README.md | 2 +- versions.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b5eb9e0..20994d4 100644 --- a/README.md +++ b/README.md @@ -759,7 +759,7 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow. ## Copyright -Copyright © 2017-2022 [Cloud Posse, LLC](https://cpco.io/copyright) +Copyright © 2017-2023 [Cloud Posse, LLC](https://cpco.io/copyright) diff --git a/versions.tf b/versions.tf index 739a73c..2f264d0 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.0" + required_version = ">= 1.0.0" required_providers { aws = { From 08482019a94d2ecb3b3ace8a1730ee2a53060a17 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Fri, 28 Apr 2023 21:15:33 +0300 Subject: [PATCH 05/10] fix tests --- README.md | 2 +- docs/terraform.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 20994d4..c209b86 100644 --- a/README.md +++ b/README.md @@ -424,7 +424,7 @@ Available targets: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.0 | +| [terraform](#requirement\_terraform) | >= 1.0.0 | | [aws](#requirement\_aws) | >= 2.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/docs/terraform.md b/docs/terraform.md index 3e686fe..be8c9f7 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -3,7 +3,7 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.0 | +| [terraform](#requirement\_terraform) | >= 1.0.0 | | [aws](#requirement\_aws) | >= 2.0 | | [random](#requirement\_random) | >= 2.0 | From 50c41c04231b0f9b94b8ca00eb579ccb96f362d0 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Fri, 28 Apr 2023 21:34:22 +0300 Subject: [PATCH 06/10] fix tests --- examples/complete/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 1dd7c36..0cf02d3 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.12.26" + required_version = ">= 1.0.0" required_providers { aws = { From 6619f9f05bb5cf4ef483d7ffe382600020e70cc7 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Fri, 28 Apr 2023 21:39:05 +0300 Subject: [PATCH 07/10] fix tests --- examples/complete/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 7ac5d61..2a9a8f8 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -12,7 +12,7 @@ module "vpc" { module "subnets" { source = "cloudposse/dynamic-subnets/aws" - version = "0.33.0" + version = "2.1.0" availability_zones = var.availability_zones vpc_id = module.vpc.vpc_id igw_id = module.vpc.igw_id From 4dda01b3a58d1bc6ca3c2f187b32ba125bae3440 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Fri, 28 Apr 2023 21:42:00 +0300 Subject: [PATCH 08/10] fix tests --- examples/complete/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 2a9a8f8..6f67a86 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -16,7 +16,7 @@ module "subnets" { availability_zones = var.availability_zones vpc_id = module.vpc.vpc_id igw_id = module.vpc.igw_id - cidr_block = module.vpc.vpc_cidr_block + ipv4_cidr_block = module.vpc.vpc_cidr_block nat_gateway_enabled = true nat_instance_enabled = false From e78761e66bdb86aef33a07ac2c683eae6f984668 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Fri, 28 Apr 2023 21:46:28 +0300 Subject: [PATCH 09/10] fix tests --- examples/complete/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 6f67a86..db2fa28 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -15,8 +15,8 @@ module "subnets" { version = "2.1.0" availability_zones = var.availability_zones vpc_id = module.vpc.vpc_id - igw_id = module.vpc.igw_id - ipv4_cidr_block = module.vpc.vpc_cidr_block + igw_id = [module.vpc.igw_id] + ipv4_cidr_block = [module.vpc.vpc_cidr_block] nat_gateway_enabled = true nat_instance_enabled = false From a9486adfb5712a5f55a0ee8c707a40e398ae2e22 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Fri, 28 Apr 2023 21:56:34 +0300 Subject: [PATCH 10/10] fix tests --- examples/complete/outputs.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/complete/outputs.tf b/examples/complete/outputs.tf index 119c240..78bb969 100644 --- a/examples/complete/outputs.tf +++ b/examples/complete/outputs.tf @@ -111,11 +111,13 @@ output "alb_ingress_target_group_arn_suffix" { output "container_definition_json" { description = "JSON encoded list of container definitions for use with other terraform resources such as aws_ecs_task_definition" value = module.atlantis.container_definition_json + sensitive = true } output "container_definition_json_map" { description = "JSON encoded container definitions for use with other terraform resources such as aws_ecs_task_definition" value = module.atlantis.container_definition_json_map + sensitive = true } output "ecs_exec_role_policy_id" {