sys: assume dashes in iam_prefix (#34)

* sys: assume dashes in iam_prefix * fix typo
utilitywarehouse · Feb 28, 2019 · d26e958 · d26e958
1 parent 89a07f9
commit d26e958
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/cfssl.tf b/cfssl.tf
@@ -1,6 +1,6 @@
 // IAM instance role
 resource "aws_iam_role" "cfssl" {
-  name                 = "${var.iam_prefix}${var.cluster_name}-cfssl"
+  name                 = "${local.iam_prefix}${var.cluster_name}-cfssl"
   path                 = "${var.iam_path}"
   permissions_boundary = "${var.permissions_boundary}"
 
@@ -21,7 +21,7 @@ EOS
 }
 
 resource "aws_iam_instance_profile" "cfssl" {
-  name = "${var.iam_prefix}${var.cluster_name}-cfssl"
+  name = "${local.iam_prefix}${var.cluster_name}-cfssl"
   role = "${aws_iam_role.cfssl.name}"
   path = "${var.iam_path}"
 }

diff --git a/etcd.tf b/etcd.tf
@@ -1,6 +1,6 @@
 // IAM instance role
 resource "aws_iam_role" "etcd" {
-  name                 = "${var.iam_prefix}${var.cluster_name}-etcd"
+  name                 = "${local.iam_prefix}${var.cluster_name}-etcd"
   path                 = "${var.iam_path}"
   permissions_boundary = "${var.permissions_boundary}"
 
@@ -21,7 +21,7 @@ EOS
 }
 
 resource "aws_iam_instance_profile" "etcd" {
-  name = "${var.iam_prefix}${var.cluster_name}-etcd"
+  name = "${local.iam_prefix}${var.cluster_name}-etcd"
   role = "${aws_iam_role.etcd.name}"
   path = "${var.iam_path}"
 }

diff --git a/masters.tf b/masters.tf
@@ -1,6 +1,6 @@
 // IAM instance role
 resource "aws_iam_role" "master" {
-  name                 = "${var.iam_prefix}${var.cluster_name}-master"
+  name                 = "${local.iam_prefix}${var.cluster_name}-master"
   path                 = "${var.iam_path}"
   permissions_boundary = "${var.permissions_boundary}"
 
@@ -19,13 +19,13 @@ EOS
 }
 
 resource "aws_iam_instance_profile" "master" {
-  name = "${var.iam_prefix}${var.cluster_name}-master"
+  name = "${local.iam_prefix}${var.cluster_name}-master"
   role = "${aws_iam_role.master.name}"
   path = "${var.iam_path}"
 }
 
 resource "aws_iam_role_policy" "master" {
-  name = "${var.iam_prefix}${var.cluster_name}_master"
+  name = "${local.iam_prefix}${var.cluster_name}-master"
   role = "${aws_iam_role.master.id}"
 
   policy = <<EOS

diff --git a/variables.tf b/variables.tf
@@ -153,3 +153,7 @@ variable "worker_target_group_arns" {
   description = "A list of ALB Target Group ARNs to register the worker instances with."
   type        = "list"
 }
+
+locals {
+  iam_prefix = "${var.iam_prefix}${var.iam_prefix == "" ? "" : "-"}"
+}
diff --git a/workers.tf b/workers.tf
@@ -1,6 +1,6 @@
 // IAM instance role
 resource "aws_iam_role" "worker" {
-  name                 = "${var.iam_prefix}${var.cluster_name}-worker"
+  name                 = "${local.iam_prefix}${var.cluster_name}-worker"
   path                 = "${var.iam_path}"
   permissions_boundary = "${var.permissions_boundary}"
 
@@ -21,13 +21,13 @@ EOS
 }
 
 resource "aws_iam_instance_profile" "worker" {
-  name = "${var.iam_prefix}${var.cluster_name}-worker"
+  name = "${local.iam_prefix}${var.cluster_name}-worker"
   role = "${aws_iam_role.worker.name}"
   path = "${var.iam_path}"
 }
 
 resource "aws_iam_role_policy" "worker" {
-  name = "${var.iam_prefix}${var.cluster_name}-worker"
+  name = "${local.iam_prefix}${var.cluster_name}-worker"
   role = "${aws_iam_role.worker.id}"
 
   policy = <<EOS