Skip to content

Commit

Permalink
Aws provider 3.x (#72)
Browse files Browse the repository at this point in the history
* use latest releases of modules

* allow 3.x AWS provider

* update readme

* remove upper limit of TF version

Co-authored-by: Ville Gustafsson <ville.gustafsson@rovio.com>
  • Loading branch information
gusse and villegustafsson-rovio authored Sep 16, 2020
1 parent c4f78d3 commit 0bb8d98
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 14 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,21 @@ Available targets:
```
<!-- markdownlint-restore -->
<!-- markdownlint-disable -->
## Requirements

| Name | Version |
|------|---------|
| terraform | >= 0.12.0, < 0.14.0 |
| aws | ~> 2.0 |
| terraform | >= 0.12.0 |
| aws | >= 2.0 |
| null | ~> 2.0 |
| template | ~> 2.0 |

## Providers

| Name | Version |
|------|---------|
| aws | ~> 2.0 |
| aws | >= 2.0 |
| null | ~> 2.0 |

## Inputs
Expand Down Expand Up @@ -213,6 +214,7 @@ Available targets:
| kibana\_hostname | Kibana hostname |
| security\_group\_id | Security Group ID to control access to the Elasticsearch domain |

<!-- markdownlint-restore -->



Expand Down
8 changes: 5 additions & 3 deletions docs/terraform.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<!-- markdownlint-disable -->
## Requirements

| Name | Version |
|------|---------|
| terraform | >= 0.12.0, < 0.14.0 |
| aws | ~> 2.0 |
| terraform | >= 0.12.0 |
| aws | >= 2.0 |
| null | ~> 2.0 |
| template | ~> 2.0 |

## Providers

| Name | Version |
|------|---------|
| aws | ~> 2.0 |
| aws | >= 2.0 |
| null | ~> 2.0 |

## Inputs
Expand Down Expand Up @@ -87,3 +88,4 @@
| kibana\_hostname | Kibana hostname |
| security\_group\_id | Security Group ID to control access to the Elasticsearch domain |

<!-- markdownlint-restore -->
4 changes: 2 additions & 2 deletions examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ provider "aws" {
}

module "vpc" {
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.10.0"
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.17.0"
namespace = var.namespace
stage = var.stage
name = var.name
cidr_block = "172.16.0.0/16"
}

module "subnets" {
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.19.0"
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.30.0"
availability_zones = var.availability_zones
namespace = var.namespace
stage = var.stage
Expand Down
8 changes: 4 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "label" {
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.17.0"
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.19.2"
enabled = var.enabled
namespace = var.namespace
name = var.name
Expand All @@ -12,7 +12,7 @@ module "label" {
}

module "user_label" {
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.17.0"
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.19.2"
enabled = var.enabled
namespace = var.namespace
name = var.name
Expand Down Expand Up @@ -248,7 +248,7 @@ resource "aws_elasticsearch_domain_policy" "default" {
}

module "domain_hostname" {
source = "git::https://github.com/cloudposse/terraform-aws-route53-cluster-hostname.git?ref=tags/0.5.0"
source = "git::https://github.com/cloudposse/terraform-aws-route53-cluster-hostname.git?ref=tags/0.7.0"
enabled = var.enabled && var.dns_zone_id != "" ? true : false
name = var.elasticsearch_subdomain_name == "" ? var.name : var.elasticsearch_subdomain_name
ttl = 60
Expand All @@ -257,7 +257,7 @@ module "domain_hostname" {
}

module "kibana_hostname" {
source = "git::https://github.com/cloudposse/terraform-aws-route53-cluster-hostname.git?ref=tags/0.5.0"
source = "git::https://github.com/cloudposse/terraform-aws-route53-cluster-hostname.git?ref=tags/0.7.0"
enabled = var.enabled && var.dns_zone_id != "" ? true : false
name = var.kibana_subdomain_name
ttl = 60
Expand Down
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
terraform {
required_version = ">= 0.12.0, < 0.14.0"
required_version = ">= 0.12.0"

required_providers {
aws = "~> 2.0"
aws = ">= 2.0"
template = "~> 2.0"
null = "~> 2.0"
}
Expand Down

0 comments on commit 0bb8d98

Please sign in to comment.