From 0b7dbf5969cd1f94dc8002fb25cb1c81c9ff0bea Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Fri, 30 Oct 2020 17:14:03 +0100 Subject: [PATCH] feat: Updated to support Terraform 0.13 also (#103) --- .pre-commit-config.yaml | 15 +++++++++++++++ README.md | 3 +-- examples/iam-account/README.md | 5 ++++- examples/iam-account/variables.tf | 0 examples/iam-account/versions.tf | 7 +++++++ examples/iam-assumable-role-with-oidc/README.md | 5 ++++- .../iam-assumable-role-with-oidc/variables.tf | 0 examples/iam-assumable-role-with-oidc/versions.tf | 7 +++++++ examples/iam-assumable-role/README.md | 5 ++++- examples/iam-assumable-role/variables.tf | 0 examples/iam-assumable-role/versions.tf | 7 +++++++ examples/iam-assumable-roles-with-saml/README.md | 7 +++++-- examples/iam-assumable-roles-with-saml/main.tf | 6 ++---- .../iam-assumable-roles-with-saml/variables.tf | 0 .../iam-assumable-roles-with-saml/versions.tf | 7 +++++++ examples/iam-assumable-roles/README.md | 5 ++++- examples/iam-assumable-roles/variables.tf | 0 examples/iam-assumable-roles/versions.tf | 7 +++++++ examples/iam-group-complete/README.md | 5 ++++- examples/iam-group-complete/variables.tf | 0 examples/iam-group-complete/versions.tf | 7 +++++++ .../README.md | 9 ++++++--- .../variables.tf | 0 .../versions.tf | 7 +++++++ examples/iam-group-with-policies/README.md | 7 +++++-- examples/iam-group-with-policies/variables.tf | 0 examples/iam-group-with-policies/versions.tf | 7 +++++++ examples/iam-policy/README.md | 7 +++++-- examples/iam-policy/variables.tf | 0 examples/iam-policy/versions.tf | 7 +++++++ examples/iam-user/README.md | 13 ++++++++----- examples/iam-user/outputs.tf | 12 ++++++++---- examples/iam-user/variables.tf | 0 examples/iam-user/versions.tf | 7 +++++++ modules/iam-account/README.md | 6 +++--- modules/iam-account/versions.tf | 4 ++-- modules/iam-assumable-role-with-oidc/README.md | 8 ++++---- modules/iam-assumable-role-with-oidc/versions.tf | 4 ++-- modules/iam-assumable-role/README.md | 6 +++--- modules/iam-assumable-role/versions.tf | 4 ++-- modules/iam-assumable-roles-with-saml/README.md | 7 +++---- .../iam-assumable-roles-with-saml/variables.tf | 5 ----- modules/iam-assumable-roles-with-saml/versions.tf | 4 ++-- modules/iam-assumable-roles/README.md | 6 +++--- modules/iam-assumable-roles/versions.tf | 4 ++-- .../README.md | 6 +++--- .../versions.tf | 4 ++-- modules/iam-group-with-policies/README.md | 6 +++--- modules/iam-group-with-policies/versions.tf | 4 ++-- modules/iam-policy/README.md | 6 +++--- modules/iam-policy/versions.tf | 4 ++-- modules/iam-user/README.md | 14 +++++++------- modules/iam-user/outputs.tf | 8 ++++++-- modules/iam-user/versions.tf | 4 ++-- 54 files changed, 201 insertions(+), 87 deletions(-) create mode 100644 examples/iam-account/variables.tf create mode 100644 examples/iam-account/versions.tf create mode 100644 examples/iam-assumable-role-with-oidc/variables.tf create mode 100644 examples/iam-assumable-role-with-oidc/versions.tf create mode 100644 examples/iam-assumable-role/variables.tf create mode 100644 examples/iam-assumable-role/versions.tf create mode 100644 examples/iam-assumable-roles-with-saml/variables.tf create mode 100644 examples/iam-assumable-roles-with-saml/versions.tf create mode 100644 examples/iam-assumable-roles/variables.tf create mode 100644 examples/iam-assumable-roles/versions.tf create mode 100644 examples/iam-group-complete/variables.tf create mode 100644 examples/iam-group-complete/versions.tf create mode 100644 examples/iam-group-with-assumable-roles-policy/variables.tf create mode 100644 examples/iam-group-with-assumable-roles-policy/versions.tf create mode 100644 examples/iam-group-with-policies/variables.tf create mode 100644 examples/iam-group-with-policies/versions.tf create mode 100644 examples/iam-policy/variables.tf create mode 100644 examples/iam-policy/versions.tf create mode 100644 examples/iam-user/variables.tf create mode 100644 examples/iam-user/versions.tf diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2a46e1c6..0c40609f 100644 --- 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 index d5975ae2..baeee5c7 100644 --- 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 index 17645a7e..a2fe8bfb 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-account/versions.tf b/examples/iam-account/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index d644263e..24cc4279 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-assumable-role-with-oidc/versions.tf b/examples/iam-assumable-role-with-oidc/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index ec732bb9..65651f9d 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-assumable-role/versions.tf b/examples/iam-assumable-role/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index f77c1640..850a6881 100644 --- 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. ## 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 index b99c2b3d..7be8434f 100644 --- 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-assumable-roles-with-saml/versions.tf b/examples/iam-assumable-roles-with-saml/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index 919b86d2..a956351b 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-assumable-roles/versions.tf b/examples/iam-assumable-roles/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index d554a1a4..5509a5e4 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-group-complete/versions.tf b/examples/iam-group-complete/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index c6023d4a..16cbaf05 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-group-with-assumable-roles-policy/versions.tf b/examples/iam-group-with-assumable-roles-policy/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index 8e4a2d42..ae10afd2 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-group-with-policies/versions.tf b/examples/iam-group-with-policies/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index 6cf4f2cb..c65f59f2 100644 --- 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. ## 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-policy/versions.tf b/examples/iam-policy/versions.tf new file mode 100644 index 00000000..fff6b757 --- /dev/null +++ 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 index 53ba8d8a..38bd0d1c 100644 --- 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. ## 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 index 2ba6577c..194cc825 100644 --- 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 new file mode 100644 index 00000000..e69de29b diff --git a/examples/iam-user/versions.tf b/examples/iam-user/versions.tf new file mode 100644 index 00000000..132c7df3 --- /dev/null +++ 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 index a5baad3b..6d3c021c 100644 --- 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 index 7f0f04a0..fff6b757 100644 --- 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 index ee9baa2f..13cd6047 100644 --- 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 index 7f0f04a0..fff6b757 100644 --- 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" } } diff --git a/modules/iam-assumable-role/README.md b/modules/iam-assumable-role/README.md index 570560d5..fcec879f 100644 --- a/modules/iam-assumable-role/README.md +++ b/modules/iam-assumable-role/README.md @@ -9,14 +9,14 @@ Trusted resources can be any [IAM ARNs](https://docs.aws.amazon.com/IAM/latest/U | 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-assumable-role/versions.tf b/modules/iam-assumable-role/versions.tf index 7f0f04a0..fff6b757 100644 --- a/modules/iam-assumable-role/versions.tf +++ b/modules/iam-assumable-role/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-roles-with-saml/README.md b/modules/iam-assumable-roles-with-saml/README.md index af445279..c7ce9442 100644 --- a/modules/iam-assumable-roles-with-saml/README.md +++ b/modules/iam-assumable-roles-with-saml/README.md @@ -11,14 +11,14 @@ Creates predefined IAM roles (admin, poweruser and readonly) which can be assume | 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 @@ -41,7 +41,6 @@ Creates predefined IAM roles (admin, poweruser and readonly) which can be assume | poweruser\_role\_policy\_arns | List of policy ARNs to use for poweruser role | `list(string)` | 
[
  "arn:aws:iam::aws:policy/PowerUserAccess"
]
| no | | poweruser\_role\_tags | A map of tags to add to poweruser role resource. | `map(string)` | `{}` | no | | provider\_id | ID of the SAML Provider | `string` | n/a | yes | -| provider\_name | Name of the SAML Provider | `string` | n/a | yes | | readonly\_role\_name | IAM role with readonly access | `string` | `"readonly"` | no | | readonly\_role\_path | Path of readonly IAM role | `string` | `"/"` | no | | readonly\_role\_permissions\_boundary\_arn | Permissions boundary ARN to use for readonly role | `string` | `""` | no | diff --git a/modules/iam-assumable-roles-with-saml/variables.tf b/modules/iam-assumable-roles-with-saml/variables.tf index b24c9aaf..516295ee 100644 --- a/modules/iam-assumable-roles-with-saml/variables.tf +++ b/modules/iam-assumable-roles-with-saml/variables.tf @@ -1,8 +1,3 @@ -variable "provider_name" { - description = "Name of the SAML Provider" - type = string -} - variable "provider_id" { description = "ID of the SAML Provider" type = string diff --git a/modules/iam-assumable-roles-with-saml/versions.tf b/modules/iam-assumable-roles-with-saml/versions.tf index 7f0f04a0..fff6b757 100644 --- a/modules/iam-assumable-roles-with-saml/versions.tf +++ b/modules/iam-assumable-roles-with-saml/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-roles/README.md b/modules/iam-assumable-roles/README.md index cde08e97..fd6f4b4a 100644 --- a/modules/iam-assumable-roles/README.md +++ b/modules/iam-assumable-roles/README.md @@ -9,14 +9,14 @@ Trusted resources can be any [IAM ARNs](https://docs.aws.amazon.com/IAM/latest/U | 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-assumable-roles/versions.tf b/modules/iam-assumable-roles/versions.tf index 7f0f04a0..fff6b757 100644 --- a/modules/iam-assumable-roles/versions.tf +++ b/modules/iam-assumable-roles/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-group-with-assumable-roles-policy/README.md b/modules/iam-group-with-assumable-roles-policy/README.md index deaf7b6a..acc25f12 100644 --- a/modules/iam-group-with-assumable-roles-policy/README.md +++ b/modules/iam-group-with-assumable-roles-policy/README.md @@ -7,14 +7,14 @@ Creates IAM group with users who are allowed to assume IAM roles. This is typica | 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-group-with-assumable-roles-policy/versions.tf b/modules/iam-group-with-assumable-roles-policy/versions.tf index 7f0f04a0..fff6b757 100644 --- a/modules/iam-group-with-assumable-roles-policy/versions.tf +++ b/modules/iam-group-with-assumable-roles-policy/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-group-with-policies/README.md b/modules/iam-group-with-policies/README.md index 7e67ceac..a6059cbc 100644 --- a/modules/iam-group-with-policies/README.md +++ b/modules/iam-group-with-policies/README.md @@ -7,14 +7,14 @@ Creates IAM group with specified IAM policies, and add users into a group. | 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-group-with-policies/versions.tf b/modules/iam-group-with-policies/versions.tf index 7f0f04a0..fff6b757 100644 --- a/modules/iam-group-with-policies/versions.tf +++ b/modules/iam-group-with-policies/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-policy/README.md b/modules/iam-policy/README.md index 7835a1ae..2e2bc0f3 100644 --- a/modules/iam-policy/README.md +++ b/modules/iam-policy/README.md @@ -7,14 +7,14 @@ Creates IAM policy. | 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-policy/versions.tf b/modules/iam-policy/versions.tf index 7f0f04a0..fff6b757 100644 --- a/modules/iam-policy/versions.tf +++ b/modules/iam-policy/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-user/README.md b/modules/iam-user/README.md index 20e86a76..14e90f33 100644 --- a/modules/iam-user/README.md +++ b/modules/iam-user/README.md @@ -23,14 +23,14 @@ This module outputs commands and PGP messages which can be decrypted either usin | Name | Version | |------|---------| -| terraform | >= 0.12.6, < 0.14 | -| aws | >= 2.50, < 4.0 | +| terraform | >= 0.12.6 | +| aws | >= 2.50 | ## Providers | Name | Version | |------|---------| -| aws | >= 2.50, < 4.0 | +| aws | >= 2.50 | ## Inputs @@ -55,10 +55,10 @@ This module outputs commands and PGP messages which can be decrypted either usin | 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/modules/iam-user/outputs.tf b/modules/iam-user/outputs.tf index b8f2a647..bd8a1e45 100644 --- a/modules/iam-user/outputs.tf +++ b/modules/iam-user/outputs.tf @@ -86,6 +86,7 @@ output "pgp_key" { } output "keybase_password_decrypt_command" { + description = "Decrypt user password command" value = <