Skip to content

Commit 835135b

Browse files
bryantbiggsbryantbiggs
authored
feat!: Replace use of toset() for policy attachment, bump min version of AWS provider to 4.0 and Terraform to 1.0 (terraform-aws-modules#250)
1 parent 6151579 commit 835135b

File tree

60 files changed

+181
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+181
-156
lines changed

‎examples/iam-account/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

‎examples/iam-account/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-assumable-role-with-oidc/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

‎examples/iam-assumable-role-with-oidc/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-assumable-role-with-saml/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
3030

3131
## Modules
3232

‎examples/iam-assumable-role-with-saml/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-assumable-role/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ Run `terraform destroy` when you don't need these resources.
2121

2222
| Name | Version |
2323
|------|---------|
24-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
25-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
24+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
25+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2626

2727
## Providers
2828

2929
| Name | Version |
3030
|------|---------|
31-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
31+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
3232

3333
## Modules
3434

‎examples/iam-assumable-role/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-assumable-roles-with-saml/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
3030

3131
## Modules
3232

‎examples/iam-assumable-roles-with-saml/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-assumable-roles/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

‎examples/iam-assumable-roles/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-eks-role/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
2525

2626
## Providers
2727

2828
| Name | Version |
2929
|------|---------|
30-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
30+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
3131
| <a name="provider_random"></a> [random](#provider\_random) | >= 2.0 |
3232

3333
## Modules

‎examples/iam-eks-role/main.tf

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ module "iam_eks_role" {
1414
Name = "eks-role"
1515
}
1616

17-
role_policy_arns = [
18-
"arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"
19-
]
17+
role_policy_arns = {
18+
AmazonEKS_CNI_Policy = "arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"
19+
}
2020
}
2121

2222
##################
@@ -41,6 +41,7 @@ module "eks" {
4141
##################################################################
4242
# Data sources to get VPC, subnet, security group and AMI details
4343
##################################################################
44+
4445
data "aws_vpc" "default" {
4546
default = true
4647
}

‎examples/iam-eks-role/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
random = {
1010
source = "hashicorp/random"

‎examples/iam-group-complete/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Run `terraform destroy` when you don't need these resources.
2121

2222
| Name | Version |
2323
|------|---------|
24-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
25-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
24+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
25+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2626

2727
## Providers
2828

‎examples/iam-group-complete/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-group-with-assumable-roles-policy/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
30-
| <a name="provider_aws.production"></a> [aws.production](#provider\_aws.production) | >= 2.23 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
30+
| <a name="provider_aws.production"></a> [aws.production](#provider\_aws.production) | >= 4.0 |
3131

3232
## Modules
3333

‎examples/iam-group-with-assumable-roles-policy/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-group-with-policies/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
3030

3131
## Modules
3232

‎examples/iam-group-with-policies/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-policy/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
3030

3131
## Modules
3232

‎examples/iam-policy/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

‎examples/iam-read-only-policy/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Run `terraform destroy` when you don't need these resources.
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.6 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.23 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.23 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
3030

3131
## Modules
3232

‎examples/iam-read-only-policy/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.12.6"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 2.23"
7+
version = ">= 4.0"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)