Merge pull request #35 from hyder/issue-34

hyder · web-flow · commit d2e5a540a21e · 2020-02-06T10:21:32.000+11:00
additional check on data.oci_ons_notification_topic.oci_ons_notificat…
diff --git a/modules/bastion/datasources.tf b/modules/bastion/datasources.tf
@@ -67,5 +67,5 @@ data "oci_core_instance" "bastion" {
 data "oci_ons_notification_topic" "bastion_notification" {
   #Required
   topic_id = oci_ons_notification_topic.bastion_notification[0].topic_id
-  count    = var.oci_bastion_notification.notification_enabled == true ? 1 : 0
+  count    = (var.oci_bastion.bastion_enabled == true && var.oci_bastion_notification.notification_enabled == true) ? 1 : 0
 }

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,5 @@ data "oci_core_instance" "bastion" {`
`67`	`67`	`data "oci_ons_notification_topic" "bastion_notification" {`
`68`	`68`	`#Required`
`69`	`69`	`topic_id = oci_ons_notification_topic.bastion_notification[0].topic_id`
`70`		`- count = var.oci_bastion_notification.notification_enabled == true ? 1 : 0`
	`70`	`+ count = (var.oci_bastion.bastion_enabled == true && var.oci_bastion_notification.notification_enabled == true) ? 1 : 0`
`71`	`71`	`}`