Skip to content

Commit 3af858d

Browse files
MaxymVlasovvladget
andauthored
Add support for aws provider v5 and newer TF (#62)
* Add support for aws provider v5 Co-authored-by: vladget <[email protected]> * Update examples --------- Co-authored-by: vladget <[email protected]>
1 parent d8ab195 commit 3af858d

File tree

9 files changed

+33
-35
lines changed

9 files changed

+33
-35
lines changed

Diff for: .github/renovate.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"extends": [
33
"config:base",
4-
":preserveSemverRanges"
4+
":preserveSemverRanges",
5+
":rebaseStalePrs"
56
],
6-
"baseBranches": ["main", "master", "/^release\\/v\\d{1,2}$/"],
7+
"baseBranches": ["main"],
78
"labels": ["auto-update"],
89
"dependencyDashboardAutoclose": true,
910
"enabledManagers": ["terraform"],
1011
"terraform": {
11-
"ignorePaths": ["**/context.tf", "examples/**"]
12+
"ignorePaths": ["**/context.tf"]
1213
}
1314
}

Diff for: .github/workflows/release-branch.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- 'docs/**'
1111
- 'examples/**'
1212
- 'test/**'
13+
- 'README.*'
1314

1415
permissions:
1516
contents: write

Diff for: .github/workflows/release-published.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ permissions:
1111

1212
jobs:
1313
terraform-module:
14-
uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release.yml@main
14+
uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-published.yml@main

Diff for: README.md

+7-11
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ We highly recommend that in your code you pin the version to the exact version y
9090
using so that your infrastructure remains stable, and update versions in a
9191
systematic way so that they do not catch you by surprise.
9292

93-
Also, because of a bug in the Terraform registry ([hashicorp/terraform#21417](https://github.com/hashicorp/terraform/issues/21417)),
94-
the registry shows many of our inputs as required when in fact they are optional.
95-
The table below correctly indicates which inputs are required.
96-
9793

9894

9995
For a complete example, see [examples/complete](examples/complete).
@@ -186,23 +182,23 @@ Available targets:
186182

187183
| Name | Version |
188184
|------|---------|
189-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
190-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.26 |
191-
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 2.0 |
185+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
186+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
187+
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
192188

193189
## Providers
194190

195191
| Name | Version |
196192
|------|---------|
197-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.26 |
198-
| <a name="provider_null"></a> [null](#provider\_null) | >= 2.0 |
193+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
194+
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
199195

200196
## Modules
201197

202198
| Name | Source | Version |
203199
|------|--------|---------|
204-
| <a name="module_aws_security_group"></a> [aws\_security\_group](#module\_aws\_security\_group) | cloudposse/security-group/aws | 1.0.1 |
205-
| <a name="module_dns"></a> [dns](#module\_dns) | cloudposse/route53-cluster-hostname/aws | 0.12.0 |
200+
| <a name="module_aws_security_group"></a> [aws\_security\_group](#module\_aws\_security\_group) | cloudposse/security-group/aws | 2.2.0 |
201+
| <a name="module_dns"></a> [dns](#module\_dns) | cloudposse/route53-cluster-hostname/aws | 0.13.0 |
206202
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |
207203

208204
## Resources

Diff for: docs/terraform.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33

44
| Name | Version |
55
|------|---------|
6-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
7-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.26 |
8-
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 2.0 |
6+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
7+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
8+
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
99

1010
## Providers
1111

1212
| Name | Version |
1313
|------|---------|
14-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.26 |
15-
| <a name="provider_null"></a> [null](#provider\_null) | >= 2.0 |
14+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
15+
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
1616

1717
## Modules
1818

1919
| Name | Source | Version |
2020
|------|--------|---------|
21-
| <a name="module_aws_security_group"></a> [aws\_security\_group](#module\_aws\_security\_group) | cloudposse/security-group/aws | 1.0.1 |
22-
| <a name="module_dns"></a> [dns](#module\_dns) | cloudposse/route53-cluster-hostname/aws | 0.12.0 |
21+
| <a name="module_aws_security_group"></a> [aws\_security\_group](#module\_aws\_security\_group) | cloudposse/security-group/aws | 2.2.0 |
22+
| <a name="module_dns"></a> [dns](#module\_dns) | cloudposse/route53-cluster-hostname/aws | 0.13.0 |
2323
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |
2424

2525
## Resources

Diff for: examples/complete/main.tf

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ provider "aws" {
44

55
module "vpc" {
66
source = "cloudposse/vpc/aws"
7-
version = "0.28.0"
7+
version = "2.1.0"
88

9-
cidr_block = "172.16.0.0/16"
9+
ipv4_primary_cidr_block = "172.16.0.0/16"
1010

1111
context = module.this.context
1212
}
1313

1414
module "subnets" {
1515
source = "cloudposse/dynamic-subnets/aws"
16-
version = "0.39.7"
16+
version = "2.4.1"
1717

1818
availability_zones = var.availability_zones
1919
vpc_id = module.vpc.vpc_id
20-
igw_id = module.vpc.igw_id
21-
cidr_block = module.vpc.vpc_cidr_block
20+
igw_id = [module.vpc.igw_id]
21+
ipv4_cidr_block = [module.vpc.vpc_cidr_block]
2222
nat_gateway_enabled = false
2323
nat_instance_enabled = false
2424

Diff for: examples/complete/versions.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
terraform {
2-
required_version = ">= 0.14.0"
2+
required_version = ">= 1.0.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.0"
7+
version = ">= 4.0"
88
}
99
null = {
1010
source = "hashicorp/null"
11-
version = ">= 2.0"
11+
version = ">= 3.0"
1212
}
1313
}
1414
}

Diff for: main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ locals {
4646

4747
module "aws_security_group" {
4848
source = "cloudposse/security-group/aws"
49-
version = "1.0.1"
49+
version = "2.2.0"
5050

5151
enabled = local.create_security_group
5252

@@ -168,7 +168,7 @@ resource "aws_cloudwatch_metric_alarm" "cache_memory" {
168168

169169
module "dns" {
170170
source = "cloudposse/route53-cluster-hostname/aws"
171-
version = "0.12.0"
171+
version = "0.13.0"
172172
enabled = module.this.enabled && length(var.zone_id) > 0 ? true : false
173173
dns_name = var.dns_subdomain != "" ? var.dns_subdomain : module.this.id
174174
ttl = 60

Diff for: versions.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
terraform {
2-
required_version = ">= 0.14.0"
2+
required_version = ">= 1.0.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.26"
7+
version = ">= 4.0"
88
}
99
null = {
1010
source = "hashicorp/null"
11-
version = ">= 2.0"
11+
version = ">= 3.0"
1212
}
1313
}
1414
}

0 commit comments

Comments
 (0)