diff --git a/envs/prod/main.tf b/envs/prod/main.tf index 2c772e2..3f2f4b9 100644 --- a/envs/prod/main.tf +++ b/envs/prod/main.tf @@ -98,8 +98,10 @@ module "iam_auth" { flow_logs_role = "VPCFlowLogs-Cloudwatch-nw-flowlogs" flow_logs_policy = "VPCFlowLogs-CloudWatch-Policy-1764421371627" vault_user = "vault" + vault_group = "vault-group" kms_vault_policy = "KMS-Vault" vault_iam_create_user = "vault-iam-create" + vault_iam_create_group = "vault-iam-create-group" vault_iam_policy = "Vault-IAM-Policy" sts_route53_policy = "sts-route53" route53_role = "route53" diff --git a/modules/iam_auth/locals.tf b/modules/iam_auth/locals.tf index 6e9041f..24e4fba 100644 --- a/modules/iam_auth/locals.tf +++ b/modules/iam_auth/locals.tf @@ -3,10 +3,15 @@ locals { flow_logs_policy_name = coalesce(var.names.flow_logs_policy, "${var.name_prefix}-vpc-flow-logs-cloudwatch") vault_user_name = coalesce(var.names.vault_user, "${var.name_prefix}-vault") + vault_group_name = coalesce(var.names.vault_group, "${var.name_prefix}-vault-group") kms_vault_policy_name = coalesce(var.names.kms_vault_policy, "${var.name_prefix}-KMS-Vault") vault_iam_create_user_name = coalesce(var.names.vault_iam_create_user, "${var.name_prefix}-vault-iam-create") - vault_iam_policy_name = coalesce(var.names.vault_iam_policy, "${var.name_prefix}-Vault-IAM-Policy") - sts_route53_policy_name = coalesce(var.names.sts_route53_policy, "${var.name_prefix}-sts-route53") - route53_role_name = coalesce(var.names.route53_role, "${var.name_prefix}-route53") - vault_managed_user_stem = coalesce(var.names.vault_managed_user_stem, "${var.name_prefix}-vault-") + vault_iam_create_group_name = coalesce( + var.names.vault_iam_create_group, + "${var.name_prefix}-vault-iam-create-group", + ) + vault_iam_policy_name = coalesce(var.names.vault_iam_policy, "${var.name_prefix}-Vault-IAM-Policy") + sts_route53_policy_name = coalesce(var.names.sts_route53_policy, "${var.name_prefix}-sts-route53") + route53_role_name = coalesce(var.names.route53_role, "${var.name_prefix}-route53") + vault_managed_user_stem = coalesce(var.names.vault_managed_user_stem, "${var.name_prefix}-vault-") } diff --git a/modules/iam_auth/users.tf b/modules/iam_auth/users.tf index d526a4f..9390099 100644 --- a/modules/iam_auth/users.tf +++ b/modules/iam_auth/users.tf @@ -1,20 +1,5 @@ -resource "aws_iam_user" "vault" { - name = local.vault_user_name - path = "/" - force_destroy = false - - lifecycle { - prevent_destroy = true - # Existing tag keys contain access key IDs and are intentionally unmanaged. - ignore_changes = [tags] - } -} - -resource "aws_iam_user_policy" "kms_vault" { - name = local.kms_vault_policy_name - user = aws_iam_user.vault.name - - policy = jsonencode({ +locals { + kms_vault_policy_document = jsonencode({ Version = "2012-10-17" Statement = [ { @@ -43,25 +28,8 @@ resource "aws_iam_user_policy" "kms_vault" { }, ] }) -} -resource "aws_iam_user" "vault_iam_create" { - name = local.vault_iam_create_user_name - path = "/" - force_destroy = false - - lifecycle { - prevent_destroy = true - # Existing tag keys contain access key IDs and are intentionally unmanaged. - ignore_changes = [tags] - } -} - -resource "aws_iam_user_policy" "vault_iam" { - name = local.vault_iam_policy_name - user = aws_iam_user.vault_iam_create.name - - policy = jsonencode({ + vault_iam_policy_document = jsonencode({ Version = "2012-10-17" Statement = [{ Effect = "Allow" @@ -89,14 +57,8 @@ resource "aws_iam_user_policy" "vault_iam" { ] }] }) -} -resource "aws_iam_user_policy" "sts_route53" { - name = local.sts_route53_policy_name - user = aws_iam_user.vault_iam_create.name - - # The referenced role does not currently exist. Preserve the existing policy unchanged. - policy = jsonencode({ + sts_route53_policy_document = jsonencode({ Version = "2012-10-17" Statement = [{ Action = ["sts:AssumeRole"] @@ -105,3 +67,107 @@ resource "aws_iam_user_policy" "sts_route53" { }] }) } + +resource "aws_iam_user" "vault" { + name = local.vault_user_name + path = "/" + force_destroy = false + + lifecycle { + prevent_destroy = true + # Existing tag keys contain access key IDs and are intentionally unmanaged. + ignore_changes = [tags] + } +} + +resource "aws_iam_user_policy" "kms_vault" { + name = local.kms_vault_policy_name + user = aws_iam_user.vault.name + + policy = local.kms_vault_policy_document +} + +resource "aws_iam_group" "vault" { + name = local.vault_group_name + path = "/" + + lifecycle { + prevent_destroy = true + } +} + +resource "aws_iam_group_policy" "kms_vault" { + name = local.kms_vault_policy_name + group = aws_iam_group.vault.name + policy = local.kms_vault_policy_document + + lifecycle { + prevent_destroy = true + } +} + +resource "aws_iam_user_group_membership" "vault" { + user = aws_iam_user.vault.name + groups = [aws_iam_group.vault.name] +} + +resource "aws_iam_user" "vault_iam_create" { + name = local.vault_iam_create_user_name + path = "/" + force_destroy = false + + lifecycle { + prevent_destroy = true + # Existing tag keys contain access key IDs and are intentionally unmanaged. + ignore_changes = [tags] + } +} + +resource "aws_iam_user_policy" "vault_iam" { + name = local.vault_iam_policy_name + user = aws_iam_user.vault_iam_create.name + + policy = local.vault_iam_policy_document +} + +resource "aws_iam_user_policy" "sts_route53" { + name = local.sts_route53_policy_name + user = aws_iam_user.vault_iam_create.name + + # The referenced role does not currently exist. Preserve the existing policy unchanged. + policy = local.sts_route53_policy_document +} + +resource "aws_iam_group" "vault_iam_create" { + name = local.vault_iam_create_group_name + path = "/" + + lifecycle { + prevent_destroy = true + } +} + +resource "aws_iam_group_policy" "vault_iam" { + name = local.vault_iam_policy_name + group = aws_iam_group.vault_iam_create.name + policy = local.vault_iam_policy_document + + lifecycle { + prevent_destroy = true + } +} + +resource "aws_iam_group_policy" "sts_route53" { + name = local.sts_route53_policy_name + group = aws_iam_group.vault_iam_create.name + policy = local.sts_route53_policy_document + + lifecycle { + prevent_destroy = true + } +} + +resource "aws_iam_user_group_membership" "vault_iam_create" { + user = aws_iam_user.vault_iam_create.name + groups = [aws_iam_group.vault_iam_create.name] +} diff --git a/modules/iam_auth/variables.tf b/modules/iam_auth/variables.tf index 81e780c..4837f5e 100644 --- a/modules/iam_auth/variables.tf +++ b/modules/iam_auth/variables.tf @@ -19,8 +19,10 @@ variable "names" { flow_logs_role = optional(string) flow_logs_policy = optional(string) vault_user = optional(string) + vault_group = optional(string) kms_vault_policy = optional(string) vault_iam_create_user = optional(string) + vault_iam_create_group = optional(string) vault_iam_policy = optional(string) sts_route53_policy = optional(string) route53_role = optional(string)