Merge pull request #36 from hyder/issue-33

hyder · web-flow · commit 64740e147547 · 2020-02-06T10:28:04.000+11:00
duplicate label prefix in bastion notification
diff --git a/locals.tf b/locals.tf
@@ -42,7 +42,7 @@ locals {
     notification_enabled  = var.oci_base_bastion.notification_enabled
     notification_endpoint = var.oci_base_bastion.notification_endpoint
     notification_protocol = var.oci_base_bastion.notification_protocol
-    notification_topic    = "${var.oci_base_general.label_prefix}-${var.oci_base_bastion.notification_topic}"
+    notification_topic    = var.oci_base_bastion.notification_topic
   }
 
   oci_admin_network = {
@@ -69,6 +69,6 @@ locals {
     notification_enabled  = var.oci_base_admin.notification_enabled
     notification_endpoint = var.oci_base_admin.notification_endpoint
     notification_protocol = var.oci_base_admin.notification_protocol
-    notification_topic    = "${var.oci_base_general.label_prefix}-${var.oci_base_admin.notification_topic}"
+    notification_topic    = var.oci_base_admin.notification_topic
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ locals {`
`42`	`42`	`notification_enabled = var.oci_base_bastion.notification_enabled`
`43`	`43`	`notification_endpoint = var.oci_base_bastion.notification_endpoint`
`44`	`44`	`notification_protocol = var.oci_base_bastion.notification_protocol`
`45`		`- notification_topic = "${var.oci_base_general.label_prefix}-${var.oci_base_bastion.notification_topic}"`
	`45`	`+ notification_topic = var.oci_base_bastion.notification_topic`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`oci_admin_network = {`
`@@ -69,6 +69,6 @@ locals {`
`69`	`69`	`notification_enabled = var.oci_base_admin.notification_enabled`
`70`	`70`	`notification_endpoint = var.oci_base_admin.notification_endpoint`
`71`	`71`	`notification_protocol = var.oci_base_admin.notification_protocol`
`72`		`- notification_topic = "${var.oci_base_general.label_prefix}-${var.oci_base_admin.notification_topic}"`
	`72`	`+ notification_topic = var.oci_base_admin.notification_topic`
`73`	`73`	`}`
`74`	`74`	`}`