feat: Updated to support Terraform 0.13 also (#103)

terraform-aws-modules · Oct 30, 2020 · 0b7dbf5 · 0b7dbf5
1 parent deb8379
commit 0b7dbf5
Show file tree

Hide file tree

Showing 54 changed files with 201 additions and 87 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,6 +4,21 @@ repos:
     hooks:
       - id: terraform_fmt
       - id: terraform_docs
+      - id: terraform_tflint
+        args:
+          - '--args=--only=terraform_deprecated_interpolation'
+          - '--args=--only=terraform_deprecated_index'
+          - '--args=--only=terraform_unused_declarations'
+          - '--args=--only=terraform_comment_syntax'
+          - '--args=--only=terraform_documented_outputs'
+          - '--args=--only=terraform_documented_variables'
+          - '--args=--only=terraform_typed_variables'
+          - '--args=--only=terraform_module_pinned_source'
+          - '--args=--only=terraform_naming_convention'
+          - '--args=--only=terraform_required_version'
+          - '--args=--only=terraform_required_providers'
+          - '--args=--only=terraform_standard_module_structure'
+          - '--args=--only=terraform_workspace_remote'
   - repo: git://github.com/pre-commit/pre-commit-hooks
     rev: v3.2.0
     hooks:

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ These types of resources are supported:
 
 ## Terraform versions
 
-Terraform 0.12. Pin module version to `~> v2.0`. Submit pull-requests to `master` branch.
+Terraform 0.12 or newer. Pin module version to `~> v2.0`. Submit pull-requests to `master` branch.
 
 Terraform 0.11. Pin module version to `~> v1.0`. Submit pull-requests to `terraform011` branch.
 
@@ -117,7 +117,6 @@ module "iam_assumable_roles_with_saml" {
 
   create_readonly_role = true
 
-  provider_name = "idp_saml"
   provider_id   = "arn:aws:iam::235367859851:saml-provider/idp_saml"
 }
 ```

diff --git a/examples/iam-account/README.md b/examples/iam-account/README.md
@@ -17,7 +17,10 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 

diff --git a/examples/iam-account/variables.tf b/examples/iam-account/variables.tf
diff --git a/examples/iam-account/versions.tf b/examples/iam-account/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-assumable-role-with-oidc/README.md b/examples/iam-assumable-role-with-oidc/README.md
@@ -17,7 +17,10 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 

diff --git a/examples/iam-assumable-role-with-oidc/variables.tf b/examples/iam-assumable-role-with-oidc/variables.tf
diff --git a/examples/iam-assumable-role-with-oidc/versions.tf b/examples/iam-assumable-role-with-oidc/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-assumable-role/README.md b/examples/iam-assumable-role/README.md
@@ -19,7 +19,10 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 

diff --git a/examples/iam-assumable-role/variables.tf b/examples/iam-assumable-role/variables.tf
diff --git a/examples/iam-assumable-role/versions.tf b/examples/iam-assumable-role/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-assumable-roles-with-saml/README.md b/examples/iam-assumable-roles-with-saml/README.md
@@ -17,13 +17,16 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | n/a |
+| aws | >= 2.23 |
 
 ## Inputs
 

diff --git a/examples/iam-assumable-roles-with-saml/main.tf b/examples/iam-assumable-roles-with-saml/main.tf
@@ -21,8 +21,7 @@ module "iam_assumable_roles_with_saml" {
 
   create_readonly_role = true
 
-  provider_name = aws_iam_saml_provider.idp_saml.name
-  provider_id   = aws_iam_saml_provider.idp_saml.id
+  provider_id = aws_iam_saml_provider.idp_saml.id
 }
 
 #################################################################
@@ -35,6 +34,5 @@ module "iam_assumable_roles_with_saml_custom" {
   poweruser_role_name        = "Billing-And-Support-Access"
   poweruser_role_policy_arns = ["arn:aws:iam::aws:policy/job-function/Billing", "arn:aws:iam::aws:policy/AWSSupportAccess"]
 
-  provider_name = aws_iam_saml_provider.idp_saml.name
-  provider_id   = aws_iam_saml_provider.idp_saml.id
+  provider_id = aws_iam_saml_provider.idp_saml.id
 }
diff --git a/examples/iam-assumable-roles-with-saml/variables.tf b/examples/iam-assumable-roles-with-saml/variables.tf
diff --git a/examples/iam-assumable-roles-with-saml/versions.tf b/examples/iam-assumable-roles-with-saml/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-assumable-roles/README.md b/examples/iam-assumable-roles/README.md
@@ -17,7 +17,10 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 

diff --git a/examples/iam-assumable-roles/variables.tf b/examples/iam-assumable-roles/variables.tf
diff --git a/examples/iam-assumable-roles/versions.tf b/examples/iam-assumable-roles/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-group-complete/README.md b/examples/iam-group-complete/README.md
@@ -19,7 +19,10 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 

diff --git a/examples/iam-group-complete/variables.tf b/examples/iam-group-complete/variables.tf
diff --git a/examples/iam-group-complete/versions.tf b/examples/iam-group-complete/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-group-with-assumable-roles-policy/README.md b/examples/iam-group-with-assumable-roles-policy/README.md
@@ -17,14 +17,17 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | n/a |
-| aws.production | n/a |
+| aws | >= 2.23 |
+| aws.production | >= 2.23 |
 
 ## Inputs
 

diff --git a/examples/iam-group-with-assumable-roles-policy/variables.tf b/examples/iam-group-with-assumable-roles-policy/variables.tf
diff --git a/examples/iam-group-with-assumable-roles-policy/versions.tf b/examples/iam-group-with-assumable-roles-policy/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-group-with-policies/README.md b/examples/iam-group-with-policies/README.md
@@ -17,13 +17,16 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | n/a |
+| aws | >= 2.23 |
 
 ## Inputs
 

diff --git a/examples/iam-group-with-policies/variables.tf b/examples/iam-group-with-policies/variables.tf
diff --git a/examples/iam-group-with-policies/versions.tf b/examples/iam-group-with-policies/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-policy/README.md b/examples/iam-policy/README.md
@@ -17,13 +17,16 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | n/a |
+| aws | >= 2.23 |
 
 ## Inputs
 

diff --git a/examples/iam-policy/variables.tf b/examples/iam-policy/variables.tf
diff --git a/examples/iam-policy/versions.tf b/examples/iam-policy/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.23"
+  }
+}
diff --git a/examples/iam-user/README.md b/examples/iam-user/README.md
@@ -18,7 +18,10 @@ Run `terraform destroy` when you don't need these resources.
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| terraform | >= 0.12.6 |
+| aws | >= 2.50 |
 
 ## Providers
 
@@ -32,10 +35,10 @@ No input.
 
 | Name | Description |
 |------|-------------|
-| keybase\_password\_decrypt\_command | n/a |
-| keybase\_password\_pgp\_message | n/a |
-| keybase\_secret\_key\_decrypt\_command | n/a |
-| keybase\_secret\_key\_pgp\_message | n/a |
+| keybase\_password\_decrypt\_command | Decrypt user password command |
+| keybase\_password\_pgp\_message | Encrypted password |
+| keybase\_secret\_key\_decrypt\_command | Decrypt access secret key command |
+| keybase\_secret\_key\_pgp\_message | Encrypted access secret key |
 | pgp\_key | PGP key used to encrypt sensitive data for this user (if empty - secrets are not encrypted) |
 | this\_iam\_access\_key\_encrypted\_secret | The encrypted secret, base64 encoded |
 | this\_iam\_access\_key\_id | The access key ID |

diff --git a/examples/iam-user/outputs.tf b/examples/iam-user/outputs.tf
@@ -59,17 +59,21 @@ output "pgp_key" {
 }
 
 output "keybase_password_decrypt_command" {
-  value = module.iam_user.keybase_password_decrypt_command
+  description = "Decrypt user password command"
+  value       = module.iam_user.keybase_password_decrypt_command
 }
 
 output "keybase_password_pgp_message" {
-  value = module.iam_user.keybase_password_pgp_message
+  description = "Encrypted password"
+  value       = module.iam_user.keybase_password_pgp_message
 }
 
 output "keybase_secret_key_decrypt_command" {
-  value = module.iam_user.keybase_secret_key_decrypt_command
+  description = "Decrypt access secret key command"
+  value       = module.iam_user.keybase_secret_key_decrypt_command
 }
 
 output "keybase_secret_key_pgp_message" {
-  value = module.iam_user.keybase_secret_key_pgp_message
+  description = "Encrypted access secret key"
+  value       = module.iam_user.keybase_secret_key_pgp_message
 }
diff --git a/examples/iam-user/variables.tf b/examples/iam-user/variables.tf
diff --git a/examples/iam-user/versions.tf b/examples/iam-user/versions.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.6"
+
+  required_providers {
+    aws = ">= 2.50"
+  }
+}
diff --git a/modules/iam-account/README.md b/modules/iam-account/README.md
@@ -26,14 +26,14 @@ Import successful!
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.6, < 0.14 |
-| aws | >= 2.23, < 4.0 |
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | >= 2.23, < 4.0 |
+| aws | >= 2.23 |
 
 ## Inputs
 

diff --git a/modules/iam-account/versions.tf b/modules/iam-account/versions.tf
@@ -1,7 +1,7 @@
 terraform {
-  required_version = ">= 0.12.6, < 0.14"
+  required_version = ">= 0.12.6"
 
   required_providers {
-    aws = ">= 2.23, < 4.0"
+    aws = ">= 2.23"
   }
 }
diff --git a/modules/iam-assumable-role-with-oidc/README.md b/modules/iam-assumable-role-with-oidc/README.md
@@ -11,14 +11,14 @@ This module supports IAM Roles for kubernetes service accounts as described in t
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.6, < 0.14 |
-| aws | >= 2.23, < 4.0 |
+| terraform | >= 0.12.6 |
+| aws | >= 2.23 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | >= 2.23, < 4.0 |
+| aws | >= 2.23 |
 
 ## Inputs
 
@@ -32,8 +32,8 @@ This module supports IAM Roles for kubernetes service accounts as described in t
 | oidc\_subjects\_with\_wildcards | The OIDC subject using wildcards to be added to the role policy | `set(string)` | `[]` | no |
 | provider\_url | URL of the OIDC Provider. Use provider\_urls to specify several URLs. | `string` | `""` | no |
 | provider\_urls | List of URLs of the OIDC Providers | `list(string)` | `[]` | no |
-| role\_name | IAM role name | `string` | `""` | no |
 | role\_description | IAM Role description | `string` | `""` | no |
+| role\_name | IAM role name | `string` | `""` | no |
 | role\_path | Path of IAM role | `string` | `"/"` | no |
 | role\_permissions\_boundary\_arn | Permissions boundary ARN to use for IAM role | `string` | `""` | no |
 | role\_policy\_arns | List of ARNs of IAM policies to attach to IAM role | `list(string)` | `[]` | no |

diff --git a/modules/iam-assumable-role-with-oidc/versions.tf b/modules/iam-assumable-role-with-oidc/versions.tf
@@ -1,7 +1,7 @@
 terraform {
-  required_version = ">= 0.12.6, < 0.14"
+  required_version = ">= 0.12.6"
 
   required_providers {
-    aws = ">= 2.23, < 4.0"
+    aws = ">= 2.23"
   }
 }