Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DSOS-2423: ssm and secrets policy fix #258

Merged
merged 9 commits into from
Dec 1, 2023
+25 −18
Merged

DSOS-2423: ssm and secrets policy fix #258

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bfdcb08
DSOS-2423: fix bug with ssm params and secrets policy
drobinson-moj Nov 30, 2023
dbcd740
fix
drobinson-moj Nov 30, 2023
db635d5
permission fix
drobinson-moj Nov 30, 2023
bc4069b
fix
drobinson-moj Nov 30, 2023
9831ece
fix
drobinson-moj Nov 30, 2023
0cd8487
fix
drobinson-moj Nov 30, 2023
4a06f6a
test
drobinson-moj Nov 30, 2023
e0c4bae
test
drobinson-moj Nov 30, 2023
bf3a573
fix
drobinson-moj Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,23 +293,30 @@ resource "aws_secretsmanager_secret" "placeholder" {
#------------------------------------------------------------------------------

data "aws_iam_policy_document" "ssm_params_and_secrets" {
statement {
effect = "Allow"
actions = flatten([
"ssm:GetParameter",
length(aws_ssm_parameter.placeholder) != 0 ? ["ssm:PutParameter"] : []
])
#tfsec:ignore:aws-iam-no-policy-wildcards: acccess scoped to parameter path of EC2
resources = ["arn:aws:ssm:${var.region}:${data.aws_caller_identity.current.id}:parameter/${var.ssm_parameters_prefix}${var.name}/*"]
count = var.ssm_parameters != null || var.secretsmanager_secrets != null ? 1 : 0
dynamic "statement" {
for_each = var.ssm_parameters != null ? ["ssm"] : []
content {
effect = "Allow"
actions = flatten([
"ssm:GetParameter",
length(aws_ssm_parameter.placeholder) != 0 ? ["ssm:PutParameter"] : []
])
#tfsec:ignore:aws-iam-no-policy-wildcards: acccess scoped to parameter path of EC2
resources = ["arn:aws:ssm:${var.region}:${data.aws_caller_identity.current.id}:parameter/${var.ssm_parameters_prefix}${var.name}/*"]
}
}
statement {
effect = "Allow"
actions = flatten([
"secretsmanager:GetSecretValue",
"secretsmanager:PutSecretValue"
])
#tfsec:ignore:aws-iam-no-policy-wildcards: acccess scoped to parameter path of EC2
resources = ["arn:aws:secretsmanager:${var.region}:${data.aws_caller_identity.current.id}:secret:/${var.secretsmanager_secrets_prefix}${var.name}/*"]
dynamic "statement" {
for_each = var.secretsmanager_secrets != null ? ["secret"] : []
content {
effect = "Allow"
actions = flatten([
"secretsmanager:GetSecretValue",
length(aws_secretsmanager_secret.placeholder) != 0 ? ["secretsmanager:PutSecretValue"] : []
])
#tfsec:ignore:aws-iam-no-policy-wildcards: acccess scoped to parameter path of EC2
resources = ["arn:aws:secretsmanager:${var.region}:${data.aws_caller_identity.current.id}:secret:/${var.secretsmanager_secrets_prefix}${var.name}/*"]
}
}
}

Expand Down Expand Up @@ -344,10 +351,10 @@ resource "aws_iam_role" "this" {
}

resource "aws_iam_role_policy" "ssm_params_and_secrets" {
count = var.ssm_parameters != null && var.secretsmanager_secrets != null ? 1 : 0
count = length(data.aws_iam_policy_document.ssm_params_and_secrets)
name = "Ec2SSMParamsAndSecretsPolicy-${var.name}"
role = aws_iam_role.this.id
policy = data.aws_iam_policy_document.ssm_params_and_secrets.json
policy = data.aws_iam_policy_document.ssm_params_and_secrets[count.index].json
}

resource "aws_iam_instance_profile" "this" {
Expand Down
Loading