From 0ef5d70cce3b4ab6940af67f1f79c8c95723457e Mon Sep 17 00:00:00 2001 From: Vincent Caggiari Date: Tue, 11 Oct 2016 23:20:58 +0200 Subject: [PATCH 1/5] stacking sg instead of replacing --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 0ec714f8..5aa9f350 100644 --- a/main.tf +++ b/main.tf @@ -203,7 +203,7 @@ module "ecs_cluster" { docker_volume_size = "${var.ecs_docker_volume_size}" docker_auth_type = "${var.ecs_docker_auth_type}" docker_auth_data = "${var.ecs_docker_auth_data}" - security_groups = "${coalesce(var.ecs_security_groups, format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb))}" + security_groups = "${join(",", ["format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb), "${var.ecs_security_groups}"])}" } module "s3_logs" { From fc3fed6c5acfa02adebb51cd7f3d3561af20baa7 Mon Sep 17 00:00:00 2001 From: Vincent Caggiari Date: Tue, 11 Oct 2016 23:23:32 +0200 Subject: [PATCH 2/5] mistyping --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 5aa9f350..111c873b 100644 --- a/main.tf +++ b/main.tf @@ -203,7 +203,7 @@ module "ecs_cluster" { docker_volume_size = "${var.ecs_docker_volume_size}" docker_auth_type = "${var.ecs_docker_auth_type}" docker_auth_data = "${var.ecs_docker_auth_data}" - security_groups = "${join(",", ["format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb), "${var.ecs_security_groups}"])}" + security_groups = "${join(",", ["format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb), "var.ecs_security_groups"])}" } module "s3_logs" { From 63ba577d1e16d0eb99f999be5cc3f1782e7aa14a Mon Sep 17 00:00:00 2001 From: Vincent Caggiari Date: Tue, 11 Oct 2016 23:26:00 +0200 Subject: [PATCH 3/5] mistyping2 --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 111c873b..9053d4b4 100644 --- a/main.tf +++ b/main.tf @@ -203,7 +203,7 @@ module "ecs_cluster" { docker_volume_size = "${var.ecs_docker_volume_size}" docker_auth_type = "${var.ecs_docker_auth_type}" docker_auth_data = "${var.ecs_docker_auth_data}" - security_groups = "${join(",", ["format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb), "var.ecs_security_groups"])}" + security_groups = "${join(",", ["${format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb)}, "${var.ecs_security_groups}"])}" } module "s3_logs" { From 2dbd5ad1bf7c7276c7c03c7684ce660bd96a0319 Mon Sep 17 00:00:00 2001 From: Vincent Caggiari Date: Wed, 12 Oct 2016 00:16:04 +0200 Subject: [PATCH 4/5] debug --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 9053d4b4..ea5cb94d 100644 --- a/main.tf +++ b/main.tf @@ -203,7 +203,7 @@ module "ecs_cluster" { docker_volume_size = "${var.ecs_docker_volume_size}" docker_auth_type = "${var.ecs_docker_auth_type}" docker_auth_data = "${var.ecs_docker_auth_data}" - security_groups = "${join(",", ["${format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb)}, "${var.ecs_security_groups}"])}" + security_groups = "${join(",", "${format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb)}", "var.ecs_security_groups")}" } module "s3_logs" { From 06ef0583e983c5b493b04cef8478fded80aedc8e Mon Sep 17 00:00:00 2001 From: Vincent Caggiari Date: Wed, 12 Oct 2016 00:59:33 +0200 Subject: [PATCH 5/5] retro compatibility + extra conf var --- main.tf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main.tf b/main.tf index ea5cb94d..362494a6 100644 --- a/main.tf +++ b/main.tf @@ -124,6 +124,11 @@ variable "ecs_security_groups" { default = "" } +variable "ecs_extra_security_groups" { + description = "A comma separated list of security groups added to the default security groups of the stack" + default = "" +} + variable "ecs_ami" { description = "The AMI that will be used to launch EC2 instances in the ECS cluster" default = "" @@ -203,7 +208,7 @@ module "ecs_cluster" { docker_volume_size = "${var.ecs_docker_volume_size}" docker_auth_type = "${var.ecs_docker_auth_type}" docker_auth_data = "${var.ecs_docker_auth_data}" - security_groups = "${join(",", "${format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb)}", "var.ecs_security_groups")}" + security_groups = "${coalesce(var.ecs_security_groups, join(",", compact(concat(split(",", "${format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb)}"), split(",", "${var.ecs_extra_security_groups}")))))}" } module "s3_logs" {