From ba78e5380563d03d9cf436ec6d2693ff9e95393f Mon Sep 17 00:00:00 2001 From: Tom Reinders Date: Tue, 8 Aug 2023 15:03:49 +0200 Subject: [PATCH 1/2] TD-596 - Add output with correct name for primary_connection_string --- modules/azure/storage_account_private/outputs.tf | 5 +++++ modules/azure/storage_account_public/outputs.tf | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/modules/azure/storage_account_private/outputs.tf b/modules/azure/storage_account_private/outputs.tf index 22958c78..0f0073d9 100644 --- a/modules/azure/storage_account_private/outputs.tf +++ b/modules/azure/storage_account_private/outputs.tf @@ -15,6 +15,11 @@ output "primary_access_key" { sensitive = true } +output "primary_connection_string" { + value = azurerm_storage_account.storage_account.primary_connection_string + sensitive = true +} + output "primary_access_connection_string" { value = azurerm_storage_account.storage_account.primary_connection_string sensitive = true diff --git a/modules/azure/storage_account_public/outputs.tf b/modules/azure/storage_account_public/outputs.tf index 22958c78..0f0073d9 100644 --- a/modules/azure/storage_account_public/outputs.tf +++ b/modules/azure/storage_account_public/outputs.tf @@ -15,6 +15,11 @@ output "primary_access_key" { sensitive = true } +output "primary_connection_string" { + value = azurerm_storage_account.storage_account.primary_connection_string + sensitive = true +} + output "primary_access_connection_string" { value = azurerm_storage_account.storage_account.primary_connection_string sensitive = true From da54e5489547381abda3263f5aefa52ccb0b0958 Mon Sep 17 00:00:00 2001 From: Tom Reinders Date: Mon, 14 Aug 2023 10:23:05 +0200 Subject: [PATCH 2/2] TD-596 - Add comments and descriptions to deprecated outputs. If before next major version hashicorp/terraform#18381 is fixed implement that. --- modules/azure/storage_account_private/outputs.tf | 7 +++++-- modules/azure/storage_account_public/outputs.tf | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/azure/storage_account_private/outputs.tf b/modules/azure/storage_account_private/outputs.tf index 0f0073d9..cc12a78a 100644 --- a/modules/azure/storage_account_private/outputs.tf +++ b/modules/azure/storage_account_private/outputs.tf @@ -20,7 +20,10 @@ output "primary_connection_string" { sensitive = true } +# Deprecated in favor of primary_connection_string +# TODO: Remove deprecated output in next major version output "primary_access_connection_string" { - value = azurerm_storage_account.storage_account.primary_connection_string - sensitive = true + description = "Deprecated in favor of primary_connection_string" + value = azurerm_storage_account.storage_account.primary_connection_string + sensitive = true } diff --git a/modules/azure/storage_account_public/outputs.tf b/modules/azure/storage_account_public/outputs.tf index 0f0073d9..cc12a78a 100644 --- a/modules/azure/storage_account_public/outputs.tf +++ b/modules/azure/storage_account_public/outputs.tf @@ -20,7 +20,10 @@ output "primary_connection_string" { sensitive = true } +# Deprecated in favor of primary_connection_string +# TODO: Remove deprecated output in next major version output "primary_access_connection_string" { - value = azurerm_storage_account.storage_account.primary_connection_string - sensitive = true + description = "Deprecated in favor of primary_connection_string" + value = azurerm_storage_account.storage_account.primary_connection_string + sensitive = true }