From 9ad91d3408f74b2e8b3b857c42daf1587094d2dd Mon Sep 17 00:00:00 2001
From: "J. Q." <55899496+jawadqur@users.noreply.github.com>
Date: Tue, 5 Nov 2024 14:40:58 -0600
Subject: [PATCH 1/2] Update outputs.tf

---
 tf_files/aws/commons/outputs.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tf_files/aws/commons/outputs.tf b/tf_files/aws/commons/outputs.tf
index 5e541cf..614d475 100644
--- a/tf_files/aws/commons/outputs.tf
+++ b/tf_files/aws/commons/outputs.tf
@@ -121,5 +121,5 @@ output "es_endpoint" {
 
 output "waf_arn" {
   description = "WAF arn - annotate the cluster ingress"
-  value       = module.aws_waf[0].waf_arn
-}
\ No newline at end of file
+  value       = var.deploy_waf ? module.aws_waf[0].waf_arn : null
+}

From 2ae3e1077d030f77928859be7f435ae881f91a96 Mon Sep 17 00:00:00 2001
From: "J. Q." <55899496+jawadqur@users.noreply.github.com>
Date: Tue, 5 Nov 2024 14:50:13 -0600
Subject: [PATCH 2/2] Update outputs.tf

---
 tf_files/aws/commons/outputs.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tf_files/aws/commons/outputs.tf b/tf_files/aws/commons/outputs.tf
index 614d475..3e2e76d 100644
--- a/tf_files/aws/commons/outputs.tf
+++ b/tf_files/aws/commons/outputs.tf
@@ -82,7 +82,7 @@ output "cluster_oidc_provider_arn" {
 }
 
 output "opensearch_cluster_arn" {
-  value = module.commons_vpc_es[0].es_arn
+  value = var.deploy_es ? module.commons_vpc_es[0].es_arn : null
 }
 
 ##
@@ -112,7 +112,7 @@ output "aurora_cluster_master_password" {
 }
 
 output "es_endpoint" {
-  value       = module.commons_vpc_es[0].es_endpoint
+  value       = var.deploy_es ? module.commons_vpc_es[0].es_endpoint : null
 }
 
 ##