From 2634d9cfe528708c206e281e1892f1aa8cbc8bd6 Mon Sep 17 00:00:00 2001 From: Sal Sodano Date: Wed, 24 Jul 2024 13:45:31 -0400 Subject: [PATCH 1/3] feat: add service connect timeout support --- examples/complete/main.tf | 7 +++++++ modules/service/main.tf | 18 ++++++++++++++++++ wrappers/README.md | 6 +++--- wrappers/cluster/README.md | 6 +++--- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 114f5aa1..fac916f8 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -117,6 +117,13 @@ module "ecs" { discovery_name = local.container_name } ] + timeout = { + idle_timeout_seconds = 20 + per_request_timeout_seconds = 30 + } + port_name = local.container_name + discovery_name = local.container_name + } } load_balancer = { diff --git a/modules/service/main.tf b/modules/service/main.tf index 99bc68f7..a5e00761 100644 --- a/modules/service/main.tf +++ b/modules/service/main.tf @@ -168,6 +168,15 @@ resource "aws_ecs_service" "this" { } } + dynamic "timeout" { + for_each = try([service.value.timeout], []) + + content { + idle_timeout_seconds = try(timeout.value.idle_timeout_seconds, null) + per_request_timeout_seconds = try(timeout.value.per_request_timeout_seconds, null) + } + } + discovery_name = try(service.value.discovery_name, null) ingress_port_override = try(service.value.ingress_port_override, null) port_name = service.value.port_name @@ -356,6 +365,15 @@ resource "aws_ecs_service" "ignore_task_definition" { } } + dynamic "timeout" { + for_each = try([service.value.timeout], []) + + content { + idle_timeout_seconds = try(timeout.value.idle_timeout_seconds, null) + per_request_timeout_seconds = try(timeout.value.per_request_timeout_seconds, null) + } + } + discovery_name = try(service.value.discovery_name, null) ingress_port_override = try(service.value.ingress_port_override, null) port_name = service.value.port_name diff --git a/wrappers/README.md b/wrappers/README.md index 449acd8a..4d232b92 100644 --- a/wrappers/README.md +++ b/wrappers/README.md @@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality. ```hcl terraform { - source = "tfr:///terraform-aws-modules/ecs/aws//wrappers" + source = "tfr:///terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers" # Alternative source: - # source = "git::git@github.com:terraform-aws-modules/terraform-aws-ecs.git//wrappers?ref=master" + # source = "git::git@github.com:terraform-aws-modules/terraform-aws-feature-svc-connect-timeout.git//wrappers?ref=master" } inputs = { @@ -42,7 +42,7 @@ inputs = { ```hcl module "wrapper" { - source = "terraform-aws-modules/ecs/aws//wrappers" + source = "terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers" defaults = { # Default values create = true diff --git a/wrappers/cluster/README.md b/wrappers/cluster/README.md index 1a795281..724fc78d 100644 --- a/wrappers/cluster/README.md +++ b/wrappers/cluster/README.md @@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality. ```hcl terraform { - source = "tfr:///terraform-aws-modules/ecs/aws//wrappers/cluster" + source = "tfr:///terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers/cluster" # Alternative source: - # source = "git::git@github.com:terraform-aws-modules/terraform-aws-ecs.git//wrappers/cluster?ref=master" + # source = "git::git@github.com:terraform-aws-modules/terraform-aws-feature-svc-connect-timeout.git//wrappers/cluster?ref=master" } inputs = { @@ -42,7 +42,7 @@ inputs = { ```hcl module "wrapper" { - source = "terraform-aws-modules/ecs/aws//wrappers/cluster" + source = "terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers/cluster" defaults = { # Default values create = true From c5c37bb8fab1c03e6d44bbc1dff0fb4895c37320 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Wed, 24 Jul 2024 19:23:09 -0400 Subject: [PATCH 2/3] chore: Update required min versions --- README.md | 2 +- examples/complete/README.md | 8 ++++++++ examples/complete/versions.tf | 2 +- examples/ec2-autoscaling/README.md | 8 ++++++++ examples/ec2-autoscaling/versions.tf | 2 +- examples/fargate/README.md | 8 ++++++++ examples/fargate/versions.tf | 2 +- modules/cluster/README.md | 8 ++++++++ modules/cluster/versions.tf | 2 +- modules/container-definition/README.md | 8 ++++++++ modules/container-definition/versions.tf | 4 ++++ modules/service/README.md | 8 ++++++++ modules/service/versions.tf | 4 ++++ versions.tf | 2 +- wrappers/cluster/versions.tf | 2 +- wrappers/container-definition/README.md | 6 +++--- wrappers/container-definition/versions.tf | 4 ++++ wrappers/service/README.md | 6 +++--- wrappers/service/versions.tf | 8 ++++++++ wrappers/versions.tf | 2 +- 20 files changed, 82 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 92b8e59b..301a713b 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ module "ecs" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -| [aws](#requirement\_aws) | >= 5.34 | +| [aws](#requirement\_aws) | >= 5.37 | ## Providers diff --git a/examples/complete/README.md b/examples/complete/README.md index 35429b48..a8c02a4f 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -27,13 +27,21 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | +<<<<<<< HEAD | [aws](#requirement\_aws) | >= 5.34 | +======= +| [aws](#requirement\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| +<<<<<<< HEAD | [aws](#provider\_aws) | >= 5.34 | +======= +| [aws](#provider\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 63e9319d..5f6e023e 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.34" + version = ">= 5.37" } } } diff --git a/examples/ec2-autoscaling/README.md b/examples/ec2-autoscaling/README.md index d2206f8f..bb3b4b09 100644 --- a/examples/ec2-autoscaling/README.md +++ b/examples/ec2-autoscaling/README.md @@ -27,13 +27,21 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | +<<<<<<< HEAD | [aws](#requirement\_aws) | >= 5.34 | +======= +| [aws](#requirement\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| +<<<<<<< HEAD | [aws](#provider\_aws) | >= 5.34 | +======= +| [aws](#provider\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/examples/ec2-autoscaling/versions.tf b/examples/ec2-autoscaling/versions.tf index 63e9319d..5f6e023e 100644 --- a/examples/ec2-autoscaling/versions.tf +++ b/examples/ec2-autoscaling/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.34" + version = ">= 5.37" } } } diff --git a/examples/fargate/README.md b/examples/fargate/README.md index ab579776..9177ec5d 100644 --- a/examples/fargate/README.md +++ b/examples/fargate/README.md @@ -27,13 +27,21 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | +<<<<<<< HEAD | [aws](#requirement\_aws) | >= 5.34 | +======= +| [aws](#requirement\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| +<<<<<<< HEAD | [aws](#provider\_aws) | >= 5.34 | +======= +| [aws](#provider\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/examples/fargate/versions.tf b/examples/fargate/versions.tf index 63e9319d..5f6e023e 100644 --- a/examples/fargate/versions.tf +++ b/examples/fargate/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.34" + version = ">= 5.37" } } } diff --git a/modules/cluster/README.md b/modules/cluster/README.md index 8f7cc4e3..161b31a7 100644 --- a/modules/cluster/README.md +++ b/modules/cluster/README.md @@ -137,13 +137,21 @@ module "ecs_cluster" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | +<<<<<<< HEAD | [aws](#requirement\_aws) | >= 5.34 | +======= +| [aws](#requirement\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| +<<<<<<< HEAD | [aws](#provider\_aws) | >= 5.34 | +======= +| [aws](#provider\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/modules/cluster/versions.tf b/modules/cluster/versions.tf index 63e9319d..5f6e023e 100644 --- a/modules/cluster/versions.tf +++ b/modules/cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.34" + version = ">= 5.37" } } } diff --git a/modules/container-definition/README.md b/modules/container-definition/README.md index 079bfcf6..cac6c32c 100644 --- a/modules/container-definition/README.md +++ b/modules/container-definition/README.md @@ -116,13 +116,21 @@ module "example_ecs_container_definition" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | +<<<<<<< HEAD | [aws](#requirement\_aws) | >= 5.34 | +======= +| [aws](#requirement\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| +<<<<<<< HEAD | [aws](#provider\_aws) | >= 5.34 | +======= +| [aws](#provider\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/modules/container-definition/versions.tf b/modules/container-definition/versions.tf index 63e9319d..035a4218 100644 --- a/modules/container-definition/versions.tf +++ b/modules/container-definition/versions.tf @@ -4,7 +4,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" +<<<<<<< HEAD version = ">= 5.34" +======= + version = ">= 5.37" +>>>>>>> 4930195 (chore: Update required min versions) } } } diff --git a/modules/service/README.md b/modules/service/README.md index 7fb75bd3..656fd9f3 100644 --- a/modules/service/README.md +++ b/modules/service/README.md @@ -167,13 +167,21 @@ module "ecs_service" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | +<<<<<<< HEAD | [aws](#requirement\_aws) | >= 5.34 | +======= +| [aws](#requirement\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| +<<<<<<< HEAD | [aws](#provider\_aws) | >= 5.34 | +======= +| [aws](#provider\_aws) | >= 5.37 | +>>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/modules/service/versions.tf b/modules/service/versions.tf index 63e9319d..035a4218 100644 --- a/modules/service/versions.tf +++ b/modules/service/versions.tf @@ -4,7 +4,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" +<<<<<<< HEAD version = ">= 5.34" +======= + version = ">= 5.37" +>>>>>>> 4930195 (chore: Update required min versions) } } } diff --git a/versions.tf b/versions.tf index 63e9319d..5f6e023e 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.34" + version = ">= 5.37" } } } diff --git a/wrappers/cluster/versions.tf b/wrappers/cluster/versions.tf index 63e9319d..5f6e023e 100644 --- a/wrappers/cluster/versions.tf +++ b/wrappers/cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.34" + version = ">= 5.37" } } } diff --git a/wrappers/container-definition/README.md b/wrappers/container-definition/README.md index 4731aa9a..7fec4239 100644 --- a/wrappers/container-definition/README.md +++ b/wrappers/container-definition/README.md @@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality. ```hcl terraform { - source = "tfr:///terraform-aws-modules/ecs/aws//wrappers/container-definition" + source = "tfr:///terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers/container-definition" # Alternative source: - # source = "git::git@github.com:terraform-aws-modules/terraform-aws-ecs.git//wrappers/container-definition?ref=master" + # source = "git::git@github.com:terraform-aws-modules/terraform-aws-feature-svc-connect-timeout.git//wrappers/container-definition?ref=master" } inputs = { @@ -42,7 +42,7 @@ inputs = { ```hcl module "wrapper" { - source = "terraform-aws-modules/ecs/aws//wrappers/container-definition" + source = "terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers/container-definition" defaults = { # Default values create = true diff --git a/wrappers/container-definition/versions.tf b/wrappers/container-definition/versions.tf index 63e9319d..035a4218 100644 --- a/wrappers/container-definition/versions.tf +++ b/wrappers/container-definition/versions.tf @@ -4,7 +4,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" +<<<<<<< HEAD version = ">= 5.34" +======= + version = ">= 5.37" +>>>>>>> 4930195 (chore: Update required min versions) } } } diff --git a/wrappers/service/README.md b/wrappers/service/README.md index 219da916..0704f3ba 100644 --- a/wrappers/service/README.md +++ b/wrappers/service/README.md @@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality. ```hcl terraform { - source = "tfr:///terraform-aws-modules/ecs/aws//wrappers/service" + source = "tfr:///terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers/service" # Alternative source: - # source = "git::git@github.com:terraform-aws-modules/terraform-aws-ecs.git//wrappers/service?ref=master" + # source = "git::git@github.com:terraform-aws-modules/terraform-aws-feature-svc-connect-timeout.git//wrappers/service?ref=master" } inputs = { @@ -42,7 +42,7 @@ inputs = { ```hcl module "wrapper" { - source = "terraform-aws-modules/ecs/aws//wrappers/service" + source = "terraform-aws-modules/feature-svc-connect-timeout/aws//wrappers/service" defaults = { # Default values create = true diff --git a/wrappers/service/versions.tf b/wrappers/service/versions.tf index fa179650..c19e6dc6 100644 --- a/wrappers/service/versions.tf +++ b/wrappers/service/versions.tf @@ -1,18 +1,26 @@ terraform { +<<<<<<< HEAD <<<<<<< HEAD required_version = ">= 1.0" ======= required_version = ">= 1.3" >>>>>>> edf0446 (feat: Add support for custom metric queries in customized_metric_spec (#196)) +======= + required_version = ">= 1.3" +>>>>>>> 4930195 (chore: Update required min versions) required_providers { aws = { source = "hashicorp/aws" +<<<<<<< HEAD <<<<<<< HEAD version = ">= 4.66.1" ======= version = ">= 5.34" >>>>>>> edf0446 (feat: Add support for custom metric queries in customized_metric_spec (#196)) +======= + version = ">= 5.37" +>>>>>>> 4930195 (chore: Update required min versions) } } } diff --git a/wrappers/versions.tf b/wrappers/versions.tf index 63e9319d..5f6e023e 100644 --- a/wrappers/versions.tf +++ b/wrappers/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.34" + version = ">= 5.37" } } } From 1fbf1564f44c436a4d294bcdb8b269354ac13739 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Wed, 24 Jul 2024 19:30:49 -0400 Subject: [PATCH 3/3] chore: Fix merge conflicts --- examples/complete/README.md | 8 -------- examples/complete/main.tf | 13 ++++++------- examples/ec2-autoscaling/README.md | 8 -------- examples/fargate/README.md | 8 -------- modules/cluster/README.md | 8 -------- modules/container-definition/README.md | 8 -------- modules/container-definition/versions.tf | 4 ---- modules/service/README.md | 8 -------- modules/service/versions.tf | 4 ---- wrappers/container-definition/versions.tf | 4 ---- wrappers/service/versions.tf | 16 ---------------- 11 files changed, 6 insertions(+), 83 deletions(-) diff --git a/examples/complete/README.md b/examples/complete/README.md index a8c02a4f..a3de37cf 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -27,21 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -<<<<<<< HEAD -| [aws](#requirement\_aws) | >= 5.34 | -======= | [aws](#requirement\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| -<<<<<<< HEAD -| [aws](#provider\_aws) | >= 5.34 | -======= | [aws](#provider\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/examples/complete/main.tf b/examples/complete/main.tf index fac916f8..191ad114 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -113,17 +113,16 @@ module "ecs" { port = local.container_port dns_name = local.container_name } + + timeout = { + idle_timeout_seconds = 20 + per_request_timeout_seconds = 30 + } + port_name = local.container_name discovery_name = local.container_name } ] - timeout = { - idle_timeout_seconds = 20 - per_request_timeout_seconds = 30 - } - port_name = local.container_name - discovery_name = local.container_name - } } load_balancer = { diff --git a/examples/ec2-autoscaling/README.md b/examples/ec2-autoscaling/README.md index bb3b4b09..d5288ec5 100644 --- a/examples/ec2-autoscaling/README.md +++ b/examples/ec2-autoscaling/README.md @@ -27,21 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -<<<<<<< HEAD -| [aws](#requirement\_aws) | >= 5.34 | -======= | [aws](#requirement\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| -<<<<<<< HEAD -| [aws](#provider\_aws) | >= 5.34 | -======= | [aws](#provider\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/examples/fargate/README.md b/examples/fargate/README.md index 9177ec5d..deb8f958 100644 --- a/examples/fargate/README.md +++ b/examples/fargate/README.md @@ -27,21 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -<<<<<<< HEAD -| [aws](#requirement\_aws) | >= 5.34 | -======= | [aws](#requirement\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| -<<<<<<< HEAD -| [aws](#provider\_aws) | >= 5.34 | -======= | [aws](#provider\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/modules/cluster/README.md b/modules/cluster/README.md index 161b31a7..27e5217c 100644 --- a/modules/cluster/README.md +++ b/modules/cluster/README.md @@ -137,21 +137,13 @@ module "ecs_cluster" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -<<<<<<< HEAD -| [aws](#requirement\_aws) | >= 5.34 | -======= | [aws](#requirement\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| -<<<<<<< HEAD -| [aws](#provider\_aws) | >= 5.34 | -======= | [aws](#provider\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/modules/container-definition/README.md b/modules/container-definition/README.md index cac6c32c..2b7cc211 100644 --- a/modules/container-definition/README.md +++ b/modules/container-definition/README.md @@ -116,21 +116,13 @@ module "example_ecs_container_definition" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -<<<<<<< HEAD -| [aws](#requirement\_aws) | >= 5.34 | -======= | [aws](#requirement\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| -<<<<<<< HEAD -| [aws](#provider\_aws) | >= 5.34 | -======= | [aws](#provider\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/modules/container-definition/versions.tf b/modules/container-definition/versions.tf index 035a4218..5f6e023e 100644 --- a/modules/container-definition/versions.tf +++ b/modules/container-definition/versions.tf @@ -4,11 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" -<<<<<<< HEAD - version = ">= 5.34" -======= version = ">= 5.37" ->>>>>>> 4930195 (chore: Update required min versions) } } } diff --git a/modules/service/README.md b/modules/service/README.md index 656fd9f3..b24f2b2c 100644 --- a/modules/service/README.md +++ b/modules/service/README.md @@ -167,21 +167,13 @@ module "ecs_service" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -<<<<<<< HEAD -| [aws](#requirement\_aws) | >= 5.34 | -======= | [aws](#requirement\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Providers | Name | Version | |------|---------| -<<<<<<< HEAD -| [aws](#provider\_aws) | >= 5.34 | -======= | [aws](#provider\_aws) | >= 5.37 | ->>>>>>> 4930195 (chore: Update required min versions) ## Modules diff --git a/modules/service/versions.tf b/modules/service/versions.tf index 035a4218..5f6e023e 100644 --- a/modules/service/versions.tf +++ b/modules/service/versions.tf @@ -4,11 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" -<<<<<<< HEAD - version = ">= 5.34" -======= version = ">= 5.37" ->>>>>>> 4930195 (chore: Update required min versions) } } } diff --git a/wrappers/container-definition/versions.tf b/wrappers/container-definition/versions.tf index 035a4218..5f6e023e 100644 --- a/wrappers/container-definition/versions.tf +++ b/wrappers/container-definition/versions.tf @@ -4,11 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" -<<<<<<< HEAD - version = ">= 5.34" -======= version = ">= 5.37" ->>>>>>> 4930195 (chore: Update required min versions) } } } diff --git a/wrappers/service/versions.tf b/wrappers/service/versions.tf index c19e6dc6..5f6e023e 100644 --- a/wrappers/service/versions.tf +++ b/wrappers/service/versions.tf @@ -1,26 +1,10 @@ terraform { -<<<<<<< HEAD -<<<<<<< HEAD - required_version = ">= 1.0" -======= required_version = ">= 1.3" ->>>>>>> edf0446 (feat: Add support for custom metric queries in customized_metric_spec (#196)) -======= - required_version = ">= 1.3" ->>>>>>> 4930195 (chore: Update required min versions) required_providers { aws = { source = "hashicorp/aws" -<<<<<<< HEAD -<<<<<<< HEAD - version = ">= 4.66.1" -======= - version = ">= 5.34" ->>>>>>> edf0446 (feat: Add support for custom metric queries in customized_metric_spec (#196)) -======= version = ">= 5.37" ->>>>>>> 4930195 (chore: Update required min versions) } } }