From 78bcfefbc66b54830899f686f7cb155a2fcf5797 Mon Sep 17 00:00:00 2001 From: Andriy Knysh Date: Mon, 28 Aug 2017 14:08:07 -0400 Subject: [PATCH] Assign `attributes` and `tags` from `variables.tf` to `label` module (#6) --- main.tf | 11 +++++++---- variables.tf | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/main.tf b/main.tf index 01c0ddb2..18df6841 100644 --- a/main.tf +++ b/main.tf @@ -1,9 +1,12 @@ # Define composite variables for resources module "label" { - source = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.1.0" - namespace = "${var.namespace}" - name = "${var.name}" - stage = "${var.stage}" + source = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.2.0" + namespace = "${var.namespace}" + name = "${var.name}" + stage = "${var.stage}" + delimiter = "${var.delimiter}" + attributes = "${var.attributes}" + tags = "${var.tags}" } data "aws_region" "default" { diff --git a/variables.tf b/variables.tf index 6b5f9242..242de87f 100644 --- a/variables.tf +++ b/variables.tf @@ -100,3 +100,18 @@ variable "alb_zone_id" { us-west-2 = "Z38NKT9BP95V3O" } } + +variable "delimiter" { + type = "string" + default = "-" +} + +variable "attributes" { + type = "list" + default = [] +} + +variable "tags" { + type = "map" + default = {} +}