From 8e2db08ed977bfd1acdbc8fba548541a5896130c Mon Sep 17 00:00:00 2001 From: Enda Kelly <80516065+endakelly@users.noreply.github.com> Date: Thu, 19 Oct 2023 10:42:56 +0100 Subject: [PATCH 1/4] add condition --- keyvault.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyvault.tf b/keyvault.tf index 580997c0..f59bf3f9 100644 --- a/keyvault.tf +++ b/keyvault.tf @@ -44,6 +44,6 @@ data "azurerm_key_vault_secret" "splunk_pass4symmkey" { data "azurerm_key_vault_secret" "nessus_agent_key" { count = var.install_nessus_agent ? 1 : 0 provider = azurerm.soc - name = "nessus-agent-key-${var.env}" + name = var.nessus_key ? "" : "nessus-agent-key-${var.env}" key_vault_id = data.azurerm_key_vault.soc_vault[0].id } From 6776551a07f9da379aca9ae8861408a510d19065 Mon Sep 17 00:00:00 2001 From: Enda Kelly <80516065+endakelly@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:38:37 +0100 Subject: [PATCH 2/4] update condition --- keyvault.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyvault.tf b/keyvault.tf index f59bf3f9..d21d4089 100644 --- a/keyvault.tf +++ b/keyvault.tf @@ -44,6 +44,6 @@ data "azurerm_key_vault_secret" "splunk_pass4symmkey" { data "azurerm_key_vault_secret" "nessus_agent_key" { count = var.install_nessus_agent ? 1 : 0 provider = azurerm.soc - name = var.nessus_key ? "" : "nessus-agent-key-${var.env}" + name = var.nessus_key == null ? "nessus-agent-key-${var.env}" : var.nessus_key key_vault_id = data.azurerm_key_vault.soc_vault[0].id } From 57427b802191b3c002ae6b9ea797f5673478fd8f Mon Sep 17 00:00:00 2001 From: Enda Kelly <80516065+endakelly@users.noreply.github.com> Date: Thu, 19 Oct 2023 12:43:03 +0100 Subject: [PATCH 3/4] update condition --- keyvault.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyvault.tf b/keyvault.tf index d21d4089..4541cbf8 100644 --- a/keyvault.tf +++ b/keyvault.tf @@ -44,6 +44,6 @@ data "azurerm_key_vault_secret" "splunk_pass4symmkey" { data "azurerm_key_vault_secret" "nessus_agent_key" { count = var.install_nessus_agent ? 1 : 0 provider = azurerm.soc - name = var.nessus_key == null ? "nessus-agent-key-${var.env}" : var.nessus_key + name = var.nessus_key == "" ? "nessus-agent-key-${var.env}" : var.nessus_key key_vault_id = data.azurerm_key_vault.soc_vault[0].id } From 093d2a53569661ac0d51734579993f1d85a88a38 Mon Sep 17 00:00:00 2001 From: Enda Kelly <80516065+endakelly@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:28:52 +0100 Subject: [PATCH 4/4] update condition --- keyvault.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyvault.tf b/keyvault.tf index 4541cbf8..63f4a6df 100644 --- a/keyvault.tf +++ b/keyvault.tf @@ -44,6 +44,6 @@ data "azurerm_key_vault_secret" "splunk_pass4symmkey" { data "azurerm_key_vault_secret" "nessus_agent_key" { count = var.install_nessus_agent ? 1 : 0 provider = azurerm.soc - name = var.nessus_key == "" ? "nessus-agent-key-${var.env}" : var.nessus_key + name = contains(["prod", "sbox"], var.env) ? "nessus-agent-key-${var.env}" : "nessus-agent-key-nonprod" key_vault_id = data.azurerm_key_vault.soc_vault[0].id }