Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(aws): upgrade to use non-deprecated attributes #256

Merged
merged 2 commits into from
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/aws-auth/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| consul | >= 2.5 |
| vault | >= 2.0 |

Expand Down
2 changes: 1 addition & 1 deletion modules/aws-auth/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
consul = ">= 2.5"
vault = ">= 2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/core/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| template | >= 2.0 |

## Inputs
Expand Down
15 changes: 9 additions & 6 deletions modules/core/elb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
Copy link
Contributor Author

@qbiqing qbiqing Aug 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}
}

Expand Down Expand Up @@ -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]
}
}
}

Expand Down Expand Up @@ -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]
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/core/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
template = ">= 2.0"
}
}
2 changes: 1 addition & 1 deletion modules/curator/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| nomad | >= 1.4 |
| template | >= 2.0 |

Expand Down
2 changes: 1 addition & 1 deletion modules/curator/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
consul = ">= 2.5"
nomad = ">= 1.4"
template = ">= 2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/ecr/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |

## Inputs

Expand Down
5 changes: 3 additions & 2 deletions modules/ecr/route53.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}
}
2 changes: 1 addition & 1 deletion modules/ecr/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
}
}
2 changes: 1 addition & 1 deletion modules/efs/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion modules/efs/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
}
}
2 changes: 1 addition & 1 deletion modules/elasticsearch/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion modules/elasticsearch/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
}
}
5 changes: 3 additions & 2 deletions modules/elasticsearch_post/redirect.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}
}
2 changes: 1 addition & 1 deletion modules/fluentd/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| consul | >= 2.5 |
| nomad | >= 1.4 |
| template | ~> 2.0 |
Expand Down
2 changes: 1 addition & 1 deletion modules/fluentd/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
consul = ">= 2.5"
nomad = ">= 1.4"
vault = ">= 2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/grafana/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| nomad | >= 1.4 |
| template | >= 2.0 |

Expand Down
2 changes: 1 addition & 1 deletion modules/grafana/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
nomad = ">= 1.4"
template = ">= 2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/lambda-api-gateway/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |

## Inputs

Expand Down
10 changes: 7 additions & 3 deletions modules/lambda-api-gateway/api-gateway.tf
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor Author

@qbiqing qbiqing Aug 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/lambda-api-gateway/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
}
}
2 changes: 1 addition & 1 deletion modules/nexus/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| consul | >= 2.5 |
| template | >= 2.0 |
| vault | >= 2.0 |
Expand Down
2 changes: 1 addition & 1 deletion modules/nexus/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
consul = ">= 2.5"
template = ">= 2.0"
vault = ">= 2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/nomad-clients/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| template | >= 2.0 |

## Inputs
Expand Down
2 changes: 1 addition & 1 deletion modules/nomad-clients/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
template = ">= 2.0"
}
}
2 changes: 1 addition & 1 deletion modules/prometheus/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| consul | >= 2.5 |
| template | >= 2.0 |
| vault | n/a |
Expand Down
2 changes: 1 addition & 1 deletion modules/prometheus/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
consul = ">= 2.5"
template = ">= 2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/traefik/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |
| consul | >= 2.5 |
| nomad | >= 1.4 |
| template | >= 2.0 |
Expand Down
5 changes: 3 additions & 2 deletions modules/traefik/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}
}
2 changes: 1 addition & 1 deletion modules/traefik/versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
consul = ">= 2.5"
nomad = ">= 1.4"
template = ">= 2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/vault-auto-unseal/INOUT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Name | Version |
|------|---------|
| aws | >= 2.7 |
| aws | >= 2.42 |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion modules/vault-auto-unseal/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_providers {
aws = ">= 2.7"
aws = ">= 2.42"
}
}