diff --git a/modules/aws-auth/INOUT.md b/modules/aws-auth/INOUT.md index 90463506..aeb8a7eb 100644 --- a/modules/aws-auth/INOUT.md +++ b/modules/aws-auth/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | consul | >= 2.5 | | vault | >= 2.0 | diff --git a/modules/aws-auth/versions.tf b/modules/aws-auth/versions.tf index 749e4c9b..06c189f4 100644 --- a/modules/aws-auth/versions.tf +++ b/modules/aws-auth/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" consul = ">= 2.5" vault = ">= 2.0" } diff --git a/modules/core/INOUT.md b/modules/core/INOUT.md index 74cce16e..e8a58e44 100644 --- a/modules/core/INOUT.md +++ b/modules/core/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | template | >= 2.0 | ## Inputs diff --git a/modules/core/elb.tf b/modules/core/elb.tf index d1b32ff4..5f5051d3 100644 --- a/modules/core/elb.tf +++ b/modules/core/elb.tf @@ -110,8 +110,9 @@ resource "aws_lb_listener_rule" "nomad_server" { } condition { - field = "host-header" - values = [var.nomad_api_domain] + host_header { + values = [var.nomad_api_domain] + } } } @@ -209,8 +210,9 @@ resource "aws_lb_listener_rule" "consul_server" { } condition { - field = "host-header" - values = [var.consul_api_domain] + host_header { + values = [var.consul_api_domain] + } } } @@ -307,8 +309,9 @@ resource "aws_lb_listener_rule" "vault" { } condition { - field = "host-header" - values = [var.vault_api_domain] + host_header { + values = [var.vault_api_domain] + } } } diff --git a/modules/core/versions.tf b/modules/core/versions.tf index b5958ea3..7d075386 100644 --- a/modules/core/versions.tf +++ b/modules/core/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" template = ">= 2.0" } } diff --git a/modules/curator/INOUT.md b/modules/curator/INOUT.md index 87050df9..e0e4157b 100644 --- a/modules/curator/INOUT.md +++ b/modules/curator/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | nomad | >= 1.4 | | template | >= 2.0 | diff --git a/modules/curator/versions.tf b/modules/curator/versions.tf index 8825bafd..3e97191d 100644 --- a/modules/curator/versions.tf +++ b/modules/curator/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" consul = ">= 2.5" nomad = ">= 1.4" template = ">= 2.0" diff --git a/modules/ecr/INOUT.md b/modules/ecr/INOUT.md index 1617410d..efd86b13 100644 --- a/modules/ecr/INOUT.md +++ b/modules/ecr/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | ## Inputs diff --git a/modules/ecr/route53.tf b/modules/ecr/route53.tf index d0ac36c6..1c6e7f36 100644 --- a/modules/ecr/route53.tf +++ b/modules/ecr/route53.tf @@ -29,7 +29,8 @@ resource "aws_lb_listener_rule" "redirect" { } condition { - field = "host-header" - values = [aws_route53_record.redirect[0].fqdn] + host_header { + values = [aws_route53_record.redirect[0].fqdn] + } } } diff --git a/modules/ecr/versions.tf b/modules/ecr/versions.tf index ae86a12e..933d6cf0 100644 --- a/modules/ecr/versions.tf +++ b/modules/ecr/versions.tf @@ -1,5 +1,5 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" } } diff --git a/modules/efs/INOUT.md b/modules/efs/INOUT.md index 60c8d658..2de773a9 100644 --- a/modules/efs/INOUT.md +++ b/modules/efs/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | ## Inputs diff --git a/modules/efs/versions.tf b/modules/efs/versions.tf index ae86a12e..933d6cf0 100644 --- a/modules/efs/versions.tf +++ b/modules/efs/versions.tf @@ -1,5 +1,5 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" } } diff --git a/modules/elasticsearch/INOUT.md b/modules/elasticsearch/INOUT.md index 35083965..aaae61fd 100644 --- a/modules/elasticsearch/INOUT.md +++ b/modules/elasticsearch/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | ## Inputs diff --git a/modules/elasticsearch/versions.tf b/modules/elasticsearch/versions.tf index ae86a12e..933d6cf0 100644 --- a/modules/elasticsearch/versions.tf +++ b/modules/elasticsearch/versions.tf @@ -1,5 +1,5 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" } } diff --git a/modules/elasticsearch_post/redirect.tf b/modules/elasticsearch_post/redirect.tf index a7282214..abd0b0fc 100644 --- a/modules/elasticsearch_post/redirect.tf +++ b/modules/elasticsearch_post/redirect.tf @@ -32,7 +32,8 @@ resource "aws_lb_listener_rule" "redirect" { } condition { - field = "host-header" - values = [aws_route53_record.redirect[0].fqdn] + host_header { + values = [aws_route53_record.redirect[0].fqdn] + } } } diff --git a/modules/fluentd/INOUT.md b/modules/fluentd/INOUT.md index 8151c32c..f17eea60 100644 --- a/modules/fluentd/INOUT.md +++ b/modules/fluentd/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | consul | >= 2.5 | | nomad | >= 1.4 | | template | ~> 2.0 | diff --git a/modules/fluentd/versions.tf b/modules/fluentd/versions.tf index efbd74c5..1ea69927 100644 --- a/modules/fluentd/versions.tf +++ b/modules/fluentd/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" consul = ">= 2.5" nomad = ">= 1.4" vault = ">= 2.0" diff --git a/modules/grafana/INOUT.md b/modules/grafana/INOUT.md index 8b5b1f28..c00d5713 100644 --- a/modules/grafana/INOUT.md +++ b/modules/grafana/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | nomad | >= 1.4 | | template | >= 2.0 | diff --git a/modules/grafana/versions.tf b/modules/grafana/versions.tf index 801d3822..4a1a5c7e 100644 --- a/modules/grafana/versions.tf +++ b/modules/grafana/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" nomad = ">= 1.4" template = ">= 2.0" } diff --git a/modules/lambda-api-gateway/INOUT.md b/modules/lambda-api-gateway/INOUT.md index 134885f2..90ad7d24 100644 --- a/modules/lambda-api-gateway/INOUT.md +++ b/modules/lambda-api-gateway/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | ## Inputs diff --git a/modules/lambda-api-gateway/api-gateway.tf b/modules/lambda-api-gateway/api-gateway.tf index aaf326f5..8ee34bd6 100644 --- a/modules/lambda-api-gateway/api-gateway.tf +++ b/modules/lambda-api-gateway/api-gateway.tf @@ -1,9 +1,13 @@ resource "aws_api_gateway_api_key" "ApiKey" { name = var.api_key_name +} + +resource "aws_api_gateway_usage_plan" "ApiKey" { + name = var.api_key_name - stage_key { - rest_api_id = aws_api_gateway_rest_api.api-gateway.id - stage_name = aws_api_gateway_deployment.api-gateway-deployment.stage_name + api_stages { + api_id = aws_api_gateway_rest_api.api-gateway.id + stage = aws_api_gateway_deployment.api-gateway-deployment.stage_name } } diff --git a/modules/lambda-api-gateway/versions.tf b/modules/lambda-api-gateway/versions.tf index ae86a12e..933d6cf0 100644 --- a/modules/lambda-api-gateway/versions.tf +++ b/modules/lambda-api-gateway/versions.tf @@ -1,5 +1,5 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" } } diff --git a/modules/nexus/INOUT.md b/modules/nexus/INOUT.md index d3a85640..19895239 100644 --- a/modules/nexus/INOUT.md +++ b/modules/nexus/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | consul | >= 2.5 | | template | >= 2.0 | | vault | >= 2.0 | diff --git a/modules/nexus/versions.tf b/modules/nexus/versions.tf index 8f1e4405..b2412395 100644 --- a/modules/nexus/versions.tf +++ b/modules/nexus/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" consul = ">= 2.5" template = ">= 2.0" vault = ">= 2.0" diff --git a/modules/nomad-clients/INOUT.md b/modules/nomad-clients/INOUT.md index 5dceb4ac..4b8e8db2 100644 --- a/modules/nomad-clients/INOUT.md +++ b/modules/nomad-clients/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | template | >= 2.0 | ## Inputs diff --git a/modules/nomad-clients/versions.tf b/modules/nomad-clients/versions.tf index b5958ea3..7d075386 100644 --- a/modules/nomad-clients/versions.tf +++ b/modules/nomad-clients/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" template = ">= 2.0" } } diff --git a/modules/prometheus/INOUT.md b/modules/prometheus/INOUT.md index 6fe2d47a..cd4dc434 100644 --- a/modules/prometheus/INOUT.md +++ b/modules/prometheus/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | consul | >= 2.5 | | template | >= 2.0 | | vault | n/a | diff --git a/modules/prometheus/versions.tf b/modules/prometheus/versions.tf index 940b2ef9..ac68392d 100644 --- a/modules/prometheus/versions.tf +++ b/modules/prometheus/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" consul = ">= 2.5" template = ">= 2.0" } diff --git a/modules/traefik/INOUT.md b/modules/traefik/INOUT.md index 63887d96..685ab48a 100644 --- a/modules/traefik/INOUT.md +++ b/modules/traefik/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | | consul | >= 2.5 | | nomad | >= 1.4 | | template | >= 2.0 | diff --git a/modules/traefik/main.tf b/modules/traefik/main.tf index b9ba5614..71aeb29d 100644 --- a/modules/traefik/main.tf +++ b/modules/traefik/main.tf @@ -94,7 +94,8 @@ resource "aws_lb_listener_rule" "traefik_ui" { } condition { - field = "host-header" - values = [var.traefik_ui_domain] + host_header { + values = [var.traefik_ui_domain] + } } } diff --git a/modules/traefik/versions.tf b/modules/traefik/versions.tf index 8825bafd..3e97191d 100644 --- a/modules/traefik/versions.tf +++ b/modules/traefik/versions.tf @@ -1,6 +1,6 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" consul = ">= 2.5" nomad = ">= 1.4" template = ">= 2.0" diff --git a/modules/vault-auto-unseal/INOUT.md b/modules/vault-auto-unseal/INOUT.md index aea781ac..7375dfeb 100644 --- a/modules/vault-auto-unseal/INOUT.md +++ b/modules/vault-auto-unseal/INOUT.md @@ -2,7 +2,7 @@ | Name | Version | |------|---------| -| aws | >= 2.7 | +| aws | >= 2.42 | ## Inputs diff --git a/modules/vault-auto-unseal/versions.tf b/modules/vault-auto-unseal/versions.tf index ae86a12e..933d6cf0 100644 --- a/modules/vault-auto-unseal/versions.tf +++ b/modules/vault-auto-unseal/versions.tf @@ -1,5 +1,5 @@ terraform { required_providers { - aws = ">= 2.7" + aws = ">= 2.42" } }