Merge pull request #776 from simonswine/automated-cherry-pick-of-#775-release-0.6

jetstack-bot · web-flow · commit 7c8b9189950f · 2019-03-14T16:19:10.000Z
Automated cherry pick of #775
diff --git a/terraform/amazon/modules/network-existing-vpc/outputs.tf b/terraform/amazon/modules/network-existing-vpc/outputs.tf
@@ -35,11 +35,12 @@ output "route_table_private_ids" {
 }
 
 output "private_zone_id" {
-  value = ["${aws_route53_zone.private.*.id}"]
+  value = "${concat(aws_route53_zone.private.*.id, list(""))}"
 }
 
+# remove trailing dots from the name
 output "private_zone" {
-  value = ["${aws_route53_zone.private.*.name}"]
+  value = "${list(replace(aws_route53_zone.private.0.name, "/\\.$/", ""), "")}"
 }
 
 output "environment" {

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,12 @@ output "route_table_private_ids" {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`output "private_zone_id" {`
`38`		`- value = ["${aws_route53_zone.private.*.id}"]`
	`38`	`+ value = "${concat(aws_route53_zone.private.*.id, list(""))}"`
`39`	`39`	`}`
`40`	`40`
	`41`	`+# remove trailing dots from the name`
`41`	`42`	`output "private_zone" {`
`42`		`- value = ["${aws_route53_zone.private.*.name}"]`
	`43`	`+ value = "${list(replace(aws_route53_zone.private.0.name, "/\\.$/", ""), "")}"`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`output "environment" {`