tools/terraform: Adapt lists to Terraform 0.12.x, take #2

The definition of the `security_groups` variable in the `direct-vms` module was incorrect. This may explain the error seen in CI. No idea why the same error didn't appear locally though.
rabbitmq · Jun 11, 2019 · f1115f8 · f1115f8
1 parent fc081f7
commit f1115f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deps/rabbitmq_ct_helpers/tools/terraform/autoscaling-group/main.tf b/deps/rabbitmq_ct_helpers/tools/terraform/autoscaling-group/main.tf
@@ -31,7 +31,7 @@ resource "aws_launch_configuration" "lc" {
   instance_type   = "${module.direct_vms.instance_type}"
   key_name        = "${module.direct_vms.ssh_key_name}"
 
-  security_groups = flatten(module.direct_vms.security_groups)
+  security_groups = module.direct_vms.security_groups
 
   user_data       = "${module.direct_vms.instance_user_data}"
 

diff --git a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/main.tf b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/main.tf
@@ -193,7 +193,7 @@ resource "aws_instance" "vm" {
 
   subnet_id       = "${aws_subnet.vpc.id}"
 
-  vpc_security_group_ids = flatten(local.security_groups)
+  vpc_security_group_ids = local.security_groups
 
   user_data = "${data.template_file.user_data.rendered}"
 

diff --git a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/outputs.tf b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/outputs.tf
@@ -47,7 +47,7 @@ output "ssh_key_name" {
 }
 
 output "security_groups" {
-  value = ["${local.security_groups}"]
+  value = local.security_groups
 }
 
 output "instance_user_data" {