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

DR2-2007 Remove mgmt terraform roles and use account ones. #38

Merged
merged 2 commits into from
Dec 5, 2024
Merged

DR2-2007 Remove mgmt terraform roles and use account ones. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90cb7f4
DR2-2007 Remove mgmt terraform roles and use account ones.
MancunianSam Nov 27, 2024
9bfc29c
Merge branch 'main' into DR2-2007-use-account-roles-for-terraform
MancunianSam Dec 3, 2024
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
1 change: 1 addition & 0 deletions .terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions environment_roles/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@ locals {
}

module "terraform_role" {
source = "git::https://github.com/nationalarchives/da-terraform-modules//iam_role"
assume_role_policy = templatefile("./templates/iam_role/account_assume_role.json.tpl", { account_id = var.management_account_number, external_id = var.terraform_external_id })
name = "${title(var.environment)}TerraformRole"
source = "git::https://github.com/nationalarchives/da-terraform-modules//iam_role"
assume_role_policy = templatefile("./templates/iam_role/account_assume_role.json.tpl", {
admin_role_arn = data.aws_ssm_parameter.dev_admin_role.value
account_id = var.account_number,
repo_filters = var.terraform_repository_filters
})
name = "${title(var.environment)}TerraformRole"
policy_attachments = {
terraform_policy = module.terraform_policy.policy_arn
}
Expand All @@ -19,7 +23,7 @@ module "terraform_role" {
module "terraform_policy" {
source = "git::https://github.com/nationalarchives/da-terraform-modules//iam_policy"
name = "${title(var.environment)}TerraformPolicy"
policy_string = templatefile("./templates/iam_policy/terraform_policy.json.tpl", { account_id = var.account_number, environment = var.environment, environment_title = title(var.environment) })
policy_string = templatefile("./templates/iam_policy/terraform_policy.json.tpl", { account_id = var.account_number, environment = var.environment, environment_title = title(var.environment), management_account_id = var.management_account_number })
}

module "custodian_repo_filters" {
Expand Down Expand Up @@ -59,8 +63,8 @@ module "copy_tna_to_preservica_role" {
assume_role_policy = templatefile("./templates/iam_role/tna_to_preservica_trust_policy.json.tpl", {
terraform_role_arn = module.terraform_role.role_arn,
account_id = data.aws_caller_identity.current.account_id,
admin_role_arn = var.management_developer_role_arn
terraform_github_role_arn = var.terraform_github_role_arn
admin_role_arn = data.aws_ssm_parameter.dev_admin_role.value
terraform_github_role_arn = module.terraform_role.role_arn
title_environment = title(var.environment)
environment = var.environment
})
Expand Down Expand Up @@ -97,3 +101,4 @@ resource "aws_cloudwatch_log_group" "terraform_plan_log_group" {
data "aws_ssm_parameter" "dev_admin_role" {
name = "/${var.environment}/developer_role"
}

6 changes: 1 addition & 5 deletions environment_roles/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@ variable "account_number" {}

variable "management_account_number" {}

variable "terraform_external_id" {}

variable "terraform_github_role_arn" {}

variable "management_developer_role_arn" {}
variable "terraform_repository_filters" {}
135 changes: 39 additions & 96 deletions root.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
locals {
terraform_state_bucket_name = "mgmt-dp-terraform-state"
terraform_role_arns = jsonencode([module.environment_roles_intg.terraform_role_arn, module.environment_roles_staging.terraform_role_arn, module.environment_roles_prod.terraform_role_arn])
code_deploy_bucket_name = "mgmt-dp-code-deploy"
environments = toset(["intg", "staging", "prod"])
dev_notifications_channel_id = "C052LJASZ08"
Expand Down Expand Up @@ -65,6 +66,9 @@ module "terraform_config" {
module "terraform_s3_bucket" {
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//s3"
bucket_name = local.terraform_state_bucket_name
bucket_policy = templatefile("${path.module}/templates/s3/terraform_state_policy.json.tpl", {
terraform_role_arns = local.terraform_role_arns
})
}

module "da_terraform_dynamo" {
Expand All @@ -77,23 +81,10 @@ module "dp_terraform_dynamo" {
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//dynamo"
hash_key = { type = "S", name = "LockID" }
table_name = "mgmt-dp-terraform-state-lock"
}

module "terraform_github_repository_iam" {
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//iam_role"
assume_role_policy = templatefile("${path.module}/templates/iam_role/github_assume_role.json.tpl", {
account_id = data.aws_caller_identity.current.account_id,
repo_filters = jsonencode([
"repo:nationalarchives/dr2-terraform-github-repositories:pull_request",
"repo:nationalarchives/dr2-terraform-github-repositories:ref:refs/heads/main"
])
resource_policy = templatefile("${path.module}/templates/dynamo/lock_table_policy.json.tpl", {
table_arn = module.dp_terraform_dynamo.table_arn
terraform_role_arns = local.terraform_role_arns
})
name = "MgmtDPTerraformGitHubRepositoriesRole"
policy_attachments = {
state_access_policy = module.terraform_github_repository_policy.policy_arn
ssm_policy = "arn:aws:iam::aws:policy/AmazonSSMReadOnlyAccess"
}
tags = {}
}

module "terraform_github_repository_da_iam" {
Expand All @@ -110,44 +101,6 @@ module "terraform_github_repository_da_iam" {
tags = {}
}

module "terraform_github_terraform_environments" {
for_each = local.environments
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//iam_role"
assume_role_policy = templatefile("${path.module}/templates/iam_role/github_assume_role.json.tpl", {
account_id = data.aws_caller_identity.current.account_id,
repo_filters = jsonencode(concat(
module.department_terraform_repository_filters.repository_environments["dr2-${each.key}"],
module.dr2_terraform_repository_filters.repository_environments[each.key],
["repo:nationalarchives/tna-custodian:pull_request", "repo:nationalarchives/tdr-aws-accounts:pull_request"]
))
})
name = "MgmtDPGithubTerraformEnvironmentsRole${title(each.key)}"
policy_attachments = {
state_access_policy = module.terraform_github_repository_policy.policy_arn
terraform_environments_policy = module.terraform_github_terraform_environments_policy[each.key].policy_arn
}
tags = {}
}

module "terraform_github_terraform_environments_policy" {
for_each = local.environments
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//iam_policy"
name = "MgmtDPGithubTerraformEnvironmentsPolicy${each.key}"
policy_string = templatefile("./templates/iam_policy/terraform_mgmt_assume_role.json.tpl", {
terraform_role_arn = local.environments_roles[each.key]
preservica_copy_role_intg_arn = module.environment_roles_intg.copy_tna_to_preservica_role_arn[0]
preservica_copy_role_staging_arn = module.environment_roles_staging.copy_tna_to_preservica_role_arn[0]
preservica_copy_role_prod_arn = module.environment_roles_prod.copy_tna_to_preservica_role_arn[0]
account_id = data.aws_caller_identity.current.account_id
})
}

module "terraform_github_repository_policy" {
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//iam_policy"
name = "MgmtDPTerraformStateAccessPolicy"
policy_string = templatefile("${path.module}/templates/iam_policy/terraform_state_access.json.tpl", { bucket_name = local.terraform_state_bucket_name, dynamo_table_arn = module.dp_terraform_dynamo.table_arn })
}

module "terraform_da_github_repository_policy" {
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//iam_policy"
name = "MgmtDATerraformGitHubRepositoriesPolicy"
Expand All @@ -158,49 +111,53 @@ module "environment_roles_intg" {
providers = {
aws = aws.intg
}
source = "./environment_roles"
account_number = data.aws_ssm_parameter.intg_account_number.value
environment = "intg"
management_account_number = data.aws_caller_identity.current.account_id
terraform_external_id = module.terraform_config.terraform_config["intg"]["terraform_external_id"]
terraform_github_role_arn = module.terraform_github_terraform_environments["intg"].role_arn
management_developer_role_arn = data.aws_ssm_parameter.dev_admin_role.value
source = "./environment_roles"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the source be adding to a local variable since it's used 4 times?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just tried it, terraform won't let you. A lot of people want it but they say no.

account_number = data.aws_ssm_parameter.intg_account_number.value
environment = "intg"
management_account_number = data.aws_caller_identity.current.account_id
terraform_repository_filters = jsonencode(concat(
module.department_terraform_repository_filters.repository_environments["dr2-intg"],
module.dr2_terraform_repository_filters.repository_environments["intg"]
))
}

module "environment_roles_staging" {
providers = {
aws = aws.staging
}
source = "./environment_roles"
account_number = data.aws_ssm_parameter.staging_account_number.value
environment = "staging"
management_account_number = data.aws_caller_identity.current.account_id
terraform_external_id = module.terraform_config.terraform_config["staging"]["terraform_external_id"]
terraform_github_role_arn = module.terraform_github_terraform_environments["staging"].role_arn
management_developer_role_arn = data.aws_ssm_parameter.dev_admin_role.value
source = "./environment_roles"
account_number = data.aws_ssm_parameter.staging_account_number.value
environment = "staging"
management_account_number = data.aws_caller_identity.current.account_id
terraform_repository_filters = jsonencode(concat(
module.department_terraform_repository_filters.repository_environments["dr2-staging"],
module.dr2_terraform_repository_filters.repository_environments["staging"]
))
}

module "environment_roles_prod" {
providers = {
aws = aws.prod
}
source = "./environment_roles"
account_number = data.aws_ssm_parameter.prod_account_number.value
environment = "prod"
management_account_number = data.aws_caller_identity.current.account_id
terraform_external_id = module.terraform_config.terraform_config["prod"]["terraform_external_id"]
terraform_github_role_arn = module.terraform_github_terraform_environments["prod"].role_arn
management_developer_role_arn = data.aws_ssm_parameter.dev_admin_role.value
source = "./environment_roles"
account_number = data.aws_ssm_parameter.prod_account_number.value
environment = "prod"
management_account_number = data.aws_caller_identity.current.account_id
terraform_repository_filters = jsonencode(concat(
module.department_terraform_repository_filters.repository_environments["dr2-prod"],
module.dr2_terraform_repository_filters.repository_environments["prod"]
))
}

module "environment_roles_mgmt" {
source = "./environment_roles"
account_number = data.aws_caller_identity.current.account_id
environment = "mgmt"
management_account_number = data.aws_caller_identity.current.account_id
terraform_external_id = module.terraform_config.terraform_config["mgmt"]["terraform_external_id"]
terraform_github_role_arn = module.terraform_github_repository_iam.role_arn
management_developer_role_arn = data.aws_ssm_parameter.dev_admin_role.value
source = "./environment_roles"
account_number = data.aws_caller_identity.current.account_id
environment = "mgmt"
management_account_number = data.aws_caller_identity.current.account_id
terraform_repository_filters = jsonencode(concat(
module.department_terraform_repository_filters.repository_environments["dr2-mgmt"],
module.dr2_terraform_repository_filters.repository_environments["mgmt"]
))
}

module "code_deploy_bucket" {
Expand Down Expand Up @@ -254,20 +211,6 @@ resource "aws_ecr_registry_scanning_configuration" "enhanced_scanning" {
scan_type = "ENHANCED"
}

module "e2e_tests_repository" {
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//ecr"
repository_name = "e2e-tests"
repository_policy = templatefile("${path.module}/templates/ecr/cross_account_repository_policy.json.tpl", {
allowed_principals = jsonencode([
"arn:aws:iam::${data.aws_ssm_parameter.intg_account_number.value}:role/intg-dr2-e2e-tests-execution-role",
"arn:aws:iam::${data.aws_ssm_parameter.staging_account_number.value}:role/staging-dr2-e2e-tests-execution-role"
]),
account_number = data.aws_caller_identity.current.account_id
})
common_tags = {}
image_source_url = "https://github.com/nationalarchives/dr2-e2e-tests"
}

module "custodial_copy_backend_repository" {
source = "git::https://github.com/nationalarchives/da-terraform-modules.git//ecr"
repository_name = "dr2-custodial-copy-backend"
Expand Down
3 changes: 0 additions & 3 deletions root_data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,3 @@ data "aws_ssm_parameter" "dr2_notifications_slack_channel" {
name = "/mgmt/slack/notifications/channel"
}

data "aws_ssm_parameter" "dev_admin_role" {
name = "/mgmt/developer_role"
}
19 changes: 19 additions & 0 deletions templates/dynamo/lock_table_policy.json.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"Version": "2012-10-17",
"Statement": [
{
"Sid": "AllowAccountAccess",
"Effect": "Allow",
"Principal": {
"AWS": ${terraform_role_arns}
},
"Action": [
"dynamodb:DescribeTable",
"dynamodb:DeleteItem",
"dynamodb:GetItem",
"dynamodb:PutItem"
],
"Resource": "${table_arn}"
}
]
}
17 changes: 17 additions & 0 deletions templates/iam_policy/terraform_policy.json.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,23 @@
"arn:aws:iam::${account_id}:policy/${environment_title}*",
"arn:aws:iam::${account_id}:instance-profile/${environment}*"
]
},
{
"Action": [
"dynamodb:DescribeTable",
"dynamodb:DeleteItem",
"dynamodb:GetItem",
"dynamodb:PutItem",
"s3:GetObject",
"s3:ListBucket",
"s3:PutObject"
],
"Effect": "Allow",
"Resource": [
"arn:aws:s3:::mgmt-dp-terraform-state",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it fine that we're hardcoding mgmt here and below?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, there's only one state bucket and it's in the management account.

"arn:aws:s3:::mgmt-dp-terraform-state/*",
"arn:aws:dynamodb:eu-west-2:${management_account_id}:table/mgmt-dp-terraform-state-lock"
]
}
]
}
1 change: 1 addition & 0 deletions templates/iam_policy/tna_to_preservica_copy.json.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"datasync:CancelTaskExecution",
"datasync:DescribeLocation*",
"datasync:CreateTask",
"datasync:CreateLocationS3",
"datasync:DescribeTask",
"datasync:DescribeLocation*",
"datasync:StartTaskExecution",
Expand Down
16 changes: 13 additions & 3 deletions templates/iam_role/account_assume_role.json.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,22 @@
{
"Effect": "Allow",
"Principal": {
"AWS": "arn:aws:iam::${account_id}:root"
"AWS": "${admin_role_arn}"
},
"Action": "sts:AssumeRole",
"Action": "sts:AssumeRole"
},
{
"Effect": "Allow",
"Principal": {
"Federated": "arn:aws:iam::${account_id}:oidc-provider/token.actions.githubusercontent.com"
},
"Action": "sts:AssumeRoleWithWebIdentity",
"Condition": {
"StringEquals": {
"sts:ExternalId": "${external_id}"
"token.actions.githubusercontent.com:aud": "sts.amazonaws.com"
},
"StringLike": {
"token.actions.githubusercontent.com:sub": ${repo_filters}
}
}
}
Expand Down
21 changes: 21 additions & 0 deletions templates/s3/terraform_state_policy.json.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"Version": "2012-10-17",
"Statement": [
{
"Sid": "Allow account roles access",
"Effect": "Allow",
"Principal": {
"AWS": ${terraform_role_arns}
},
"Action": [
"s3:GetObject",
"s3:ListBucket",
"s3:PutObject"
],
"Resource": [
"arn:aws:s3:::mgmt-dp-terraform-state",
"arn:aws:s3:::mgmt-dp-terraform-state/*"
]
}
]
}
Loading