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

[Proposal] Add IAM objects name override option #358

Merged
merged 2 commits into from
Aug 30, 2021
Merged

[Proposal] Add IAM objects name override option #358

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
1c50232
feat: Add IAM objects name override option
Aug 25, 2021
d8ae917
fix
Aug 28, 2021
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 locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ locals {
// custom names for instances and security groups
name_runner_agent_instance = var.overrides["name_runner_agent_instance"] == "" ? local.tags["Name"] : var.overrides["name_runner_agent_instance"]
name_sg = var.overrides["name_sg"] == "" ? local.tags["Name"] : var.overrides["name_sg"]
name_iam_objects = var.overrides["name_iam_objects"] == "" ? local.tags["Name"] : var.overrides["name_iam_objects"]
runners_additional_volumes = <<-EOT
%{~for volume in var.runners_additional_volumes~},"${volume}"%{endfor~}
EOT
Expand Down
16 changes: 8 additions & 8 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,13 +328,13 @@ module "cache" {
### Trust policy
################################################################################
resource "aws_iam_instance_profile" "instance" {
name = "${var.environment}-instance-profile"
name = "${local.name_iam_objects}-instance"
role = aws_iam_role.instance.name
tags = local.tags
}

resource "aws_iam_role" "instance" {
name = "${var.environment}-instance-role"
name = "${local.name_iam_objects}-instance"
assume_role_policy = length(var.instance_role_json) > 0 ? var.instance_role_json : templatefile("${path.module}/policies/instance-role-trust-policy.json", {})
permissions_boundary = var.permissions_boundary == "" ? null : "${var.arn_format}:iam::${data.aws_caller_identity.current.account_id}:policy/${var.permissions_boundary}"
tags = merge(local.tags, var.role_tags)
Expand All @@ -344,7 +344,7 @@ resource "aws_iam_role" "instance" {
### Policies for runner agent instance to create docker machines via spot req.
################################################################################
resource "aws_iam_policy" "instance_docker_machine_policy" {
name = "${var.environment}-docker-machine"
name = "${local.name_iam_objects}-docker-machine"
path = "/"
description = "Policy for docker machine."
policy = templatefile("${path.module}/policies/instance-docker-machine-policy.json", {})
Expand All @@ -362,7 +362,7 @@ resource "aws_iam_role_policy_attachment" "instance_docker_machine_policy" {
resource "aws_iam_policy" "instance_session_manager_policy" {
count = var.enable_runner_ssm_access ? 1 : 0

name = "${var.environment}-session-manager"
name = "${local.name_iam_objects}-session-manager"
path = "/"
description = "Policy session manager."
policy = templatefile("${path.module}/policies/instance-session-manager-policy.json", {})
Expand Down Expand Up @@ -405,14 +405,14 @@ resource "aws_iam_role_policy_attachment" "docker_machine_cache_instance" {
### docker machine instance policy
################################################################################
resource "aws_iam_role" "docker_machine" {
name = "${var.environment}-docker-machine-role"
name = "${local.name_iam_objects}-docker-machine"
assume_role_policy = length(var.docker_machine_role_json) > 0 ? var.docker_machine_role_json : templatefile("${path.module}/policies/instance-role-trust-policy.json", {})
permissions_boundary = var.permissions_boundary == "" ? null : "${var.arn_format}:iam::${data.aws_caller_identity.current.account_id}:policy/${var.permissions_boundary}"
tags = local.tags
}

resource "aws_iam_instance_profile" "docker_machine" {
name = "${var.environment}-docker-machine-profile"
name = "${local.name_iam_objects}-docker-machine"
role = aws_iam_role.docker_machine.name
tags = local.tags
}
Expand Down Expand Up @@ -440,7 +440,7 @@ resource "aws_iam_role_policy_attachment" "docker_machine_session_manager_aws_ma
resource "aws_iam_policy" "service_linked_role" {
count = var.allow_iam_service_linked_role_creation ? 1 : 0

name = "${var.environment}-service_linked_role"
name = "${local.name_iam_objects}-service_linked_role"
path = "/"
description = "Policy for creation of service linked roles."
policy = templatefile("${path.module}/policies/service-linked-role-create-policy.json", { arn_format = var.arn_format })
Expand All @@ -464,7 +464,7 @@ resource "aws_eip" "gitlab_runner" {
resource "aws_iam_policy" "ssm" {
count = var.enable_manage_gitlab_token ? 1 : 0

name = "${var.environment}-ssm"
name = "${local.name_iam_objects}-ssm"
path = "/"
description = "Policy for runner token param access via SSM"
policy = templatefile("${path.module}/policies/instance-secure-parameter-role-policy.json", { arn_format = var.arn_format })
Expand Down
1 change: 1 addition & 0 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ variable "overrides" {

default = {
name_sg = ""
name_iam_objects = ""
name_runner_agent_instance = ""
name_docker_machine_runners = ""
}
Expand Down