Removes duplicate variable declarations in terraform

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

terraform/amazon/modules/bastion/bastion_iam.tf

@@ -41,8 +41,3 @@ resource "aws_iam_role_policy_attachment" "bastion_tagging_control_lambda_invoke
   role       = "${aws_iam_role.bastion.name}"
   policy_arn = "${var.tagging_control_policy_arn}"
 }
-
-resource "aws_iam_role_policy_attachment" "bastion_wing_binary_read" {
-  role       = "${aws_iam_role.bastion.name}"
-  policy_arn = "${aws_iam_policy.wing_binary_read.arn}"
-}

terraform/amazon/modules/jenkins/inputs.tf

@@ -48,5 +48,3 @@ variable "jenkins_admin_cidrs" {
 
 variable "tagging_control_policy_arn" {}
 variable "wing_binary_read_policy_arn" {}
-
-variable "secrets_bucket" {}

terraform/amazon/modules/kubernetes/inputs.tf

@@ -89,6 +89,5 @@ variable "elb_access_logs_internal_bucket_interval" {}
 
 variable "backups_bucket" {}
 
-variable "wing_binary_read_policy_arn" {}
 variable "tagging_control_policy_arn" {}
 variable "wing_binary_read_policy_arn" {}

terraform/amazon/modules/vault/inputs.tf

@@ -90,4 +90,3 @@ locals {
 
 variable "wing_binary_read_policy_arn" {}
 variable "tagging_control_policy_arn" {}
-variable "wing_binary_read_policy_arn" {}

terraform/amazon/modules/vault/vault_iam.tf

@@ -77,16 +77,8 @@ resource "aws_iam_role_policy_attachment" "vault_wing_binary_read" {
   count      = "${var.vault_min_instance_count}"
 }
 
-resource "aws_iam_policy_attachment" "vault_tagging_control_lambda_invoke" {
-  name       = "${data.template_file.stack_name.rendered}-tagging-control-lambda-invoke"
-  roles      = ["${aws_iam_role.vault.*.name}"]
+resource "aws_iam_role_policy_attachment" "vault_tagging_control_lambda_invoke" {
+  role       = "${element(aws_iam_role.vault.*.name, count.index)}"
   policy_arn = "${var.tagging_control_policy_arn}"
-  count      = "${length(var.vault_iam_additional_policy_arns)}"
-}
-
-resource "aws_iam_policy_attachment" "vault_wing_binary_read" {
-  name       = "${data.template_file.stack_name.rendered}-wing-binary-read"
-  roles      = ["${aws_iam_role.vault.*.name}"]
-  policy_arn = "${var.wing_binary_read_policy_arn}"
-  count      = "${length(var.vault_iam_additional_policy_arns)}"
+  count      = "${var.vault_min_instance_count}"
 }

terraform/amazon/templates/modules.tf.template

@@ -217,13 +217,8 @@ module "kubernetes" {
   elb_access_logs_internal_bucket_prefix   = "${var.elb_access_logs_internal_bucket_prefix}"
   elb_access_logs_internal_bucket_interval = "${var.elb_access_logs_internal_bucket_interval}"
 
-<<<<<<< HEAD
   wing_binary_read_policy_arn = "${module.bastion.wing_binary_read_policy_arn}"
   tagging_control_policy_arn  = "${module.tagging_control.tagging_control_policy_arn}"
-=======
-  tagging_control_policy_arn  = "${module.tagging_control.tagging_control_policy_arn}"
-  wing_binary_read_policy_arn = "${module.bastion.wing_binary_read_policy_arn}"
->>>>>>> Share wing binary read policy across roles in terraform
 }
 {{- end -}}
 
@@ -293,7 +288,5 @@ module "kubernetes" {
   elb_access_logs_internal_bucket          = "${var.elb_access_logs_internal_bucket}"
   elb_access_logs_internal_bucket_prefix   = "${var.elb_access_logs_internal_bucket_prefix}"
   elb_access_logs_internal_bucket_interval = "${var.elb_access_logs_internal_bucket_interval}"
-
-  wing_binary_read_policy_arn = "${data.terraform_remote_state.hub_state.bastion_bastion_wing_binary_read_policy_arn}"
 }
 {{- end }}

terraform/amazon/templates/outputs.tf.template

@@ -106,10 +106,6 @@ output "tagging_control_tagging_control_policy_arn" {
   value = "${module.tagging_control.tagging_control_policy_arn}"
 }
 
-output "bastion_bastion_wing_binary_read_policy_arn" {
-  value = "${module.bastion.wing_binary_read_policy_arn}"
-}
-
 output "instance_fqdns" {
   value = ["${module.vault.instance_fqdns}"]
 }