diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 503bd08..697d848 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,9 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform # rev: v1.31.0 - rev: v1.47.0 + rev: v1.96.2 hooks: -# - id: terraform_validate + - id: terraform_validate - id: terraform_fmt - id: terraform_docs_replace args: ['table'] @@ -11,8 +11,8 @@ repos: # exclude: version.tf - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.1.0 + rev: v5.0.0 hooks: - id: check-symlinks - - id: detect-aws-credentials + # - id: detect-aws-credentials - id: detect-private-key diff --git a/README.md b/README.md index 1bb264b..fabdd97 100644 --- a/README.md +++ b/README.md @@ -129,11 +129,11 @@ module "myrole3" { | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.66.0 | -| [external](#provider\_external) | >= 2.2.0 | -| [ldap](#provider\_ldap) | >= 0.5.4 | -| [null](#provider\_null) | n/a | -| [template](#provider\_template) | n/a | +| [aws](#provider\_aws) | 5.74.0 | +| [external](#provider\_external) | 2.3.4 | +| [ldap](#provider\_ldap) | 0.5.4 | +| [null](#provider\_null) | 3.2.3 | +| [template](#provider\_template) | 2.2.0 | ## Modules diff --git a/main.tf b/main.tf index 03a693e..01f382c 100644 --- a/main.tf +++ b/main.tf @@ -124,10 +124,11 @@ #* ec2_attached_policies = [] locals { - account_id = var.account_id != "" ? var.account_id : data.aws_caller_identity.current.account_id - region = data.aws_region.current.name - account_environment = data.aws_arn.current.partition == "aws-us-gov" ? "gov" : "ew" - account_alias = var.account_alias != "" && var.account_alias != null ? var.account_alias : "none" + account_id = var.account_id != "" ? var.account_id : data.aws_caller_identity.current.account_id + region = data.aws_region.current.name + account_environment = data.aws_arn.current.partition == "aws-us-gov" ? "gov" : "ew" + account_alias = var.account_alias != "" && var.account_alias != null ? var.account_alias : "none" + attached_policies_map = { for idx, policy in var.attached_policies : idx => policy } # _ec2_role_name = var.ec2_role_name != "" ? var.ec2_role_name : var.role_name role_name = format("%v%v", lookup(local._prefixes, "role", ""), var.role_name) @@ -183,7 +184,7 @@ resource "aws_iam_role" "role" { } resource "aws_iam_role_policy_attachment" "role" { - for_each = var.create ? toset(var.attached_policies) : toset([]) + for_each = var.create ? local.attached_policies_map : toset([]) role = var.create ? aws_iam_role.role[0].name : "" policy_arn = each.value }