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.

Sign up for GitHub

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

Jump to bottom

Aws provider 3.x #19

Merged
merged 4 commits into from
Sep 15, 2020
Merged

Aws provider 3.x #19

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f48f0da
use latest module versions
villegustafsson-rovio Sep 15, 2020
97ca740
allow 3.x aws provider version
villegustafsson-rovio Sep 15, 2020
35494c3
update docs
villegustafsson-rovio Sep 15, 2020
bd4d0fe
remove upper limit of TF version
villegustafsson-rovio Sep 15, 2020
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
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,20 @@ Available targets:

```
<!-- markdownlint-restore -->
<!-- markdownlint-disable -->
## Requirements

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

## Providers

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

## Inputs
Expand Down Expand Up @@ -197,6 +198,7 @@ Available targets:
| hostname | Cluster hostname |
| security\_group\_id | Security Group ID |

<!-- markdownlint-restore -->



Expand Down
6 changes: 4 additions & 2 deletions docs/terraform.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<!-- markdownlint-disable -->
## Requirements

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

## Providers

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

## Inputs
Expand Down Expand Up @@ -58,3 +59,4 @@
| hostname | Cluster hostname |
| security\_group\_id | Security Group ID |

<!-- markdownlint-restore -->
4 changes: 2 additions & 2 deletions examples/complete/main.tf
View file
Open in desktop
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.16.1"
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.26.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
2 changes: 1 addition & 1 deletion examples/complete/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_version = "~> 0.12.0"

required_providers {
aws = "~> 2.0"
aws = ">= 2.0"
null = "~> 2.0"
}
}
4 changes: 2 additions & 2 deletions main.tf
View file
Open in desktop
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 Down Expand Up @@ -158,7 +158,7 @@ resource "aws_cloudwatch_metric_alarm" "cache_memory" {
}

module "dns" {
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.zone_id != "" ? true : false
name = var.name
ttl = 60
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_version = ">= 0.12.0, < 0.14.0"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
required_version = ">= 0.12.0, < 0.14.0"
required_version = ">= 0.12.0"

please also remove the upper limit for TF version, we don't use upper limit anymore

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, done in bd4d0fe


required_providers {
aws = "~> 2.0"
aws = ">= 2.0"
null = "~> 2.0"
}
}