From 2bf1b130e25595b6f8f350fce1f9d23d80cb1ae5 Mon Sep 17 00:00:00 2001
From: "Jonathan.Core" <jonathan@corefamily.us>
Date: Tue, 3 Dec 2024 11:59:57 -0500
Subject: [PATCH] refactor: clean up unused parameters and comments in storage
 CMK configuration

---
 workload/arm/deploy-baseline.json             |  2 +-
 workload/bicep/deploy-baseline.bicep          |  2 --
 .../zeroTrust/.bicep/StorageCmkConfig.bicep   | 27 ++-----------------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json
index 0443a7d9..bdacec5c 100644
--- a/workload/arm/deploy-baseline.json
+++ b/workload/arm/deploy-baseline.json
@@ -41276,4 +41276,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep
index 8f7f1719..1089dbf5 100644
--- a/workload/bicep/deploy-baseline.bicep
+++ b/workload/bicep/deploy-baseline.bicep
@@ -1612,7 +1612,6 @@ module fslogixCmk './modules/zeroTrust/.bicep/storageCmkConfig.bicep' = if (stor
     location: avdSessionHostLocation
     managedIdentityStorageResourceId: identity.outputs.managedIdentityStorageResourceId
     keyVaultUri: strgKeyVault.outputs.uri
-    // keyVaultResId: strgKeyVault.outputs.resourceId
     storageSkuName: varFslogixStorageSku
     }
   dependsOn: [
@@ -1633,7 +1632,6 @@ module msixCmk './modules/zeroTrust/.bicep/storageCmkConfig.bicep' = if (storage
     location: avdSessionHostLocation
     managedIdentityStorageResourceId: identity.outputs.managedIdentityStorageResourceId
     keyVaultUri: strgKeyVault.outputs.uri
-    // keyVaultResId: strgKeyVault.outputs.resourceId
     storageSkuName: varMsixStorageSku
     }
   dependsOn: [
diff --git a/workload/bicep/modules/zeroTrust/.bicep/StorageCmkConfig.bicep b/workload/bicep/modules/zeroTrust/.bicep/StorageCmkConfig.bicep
index 69b598b4..4768e133 100644
--- a/workload/bicep/modules/zeroTrust/.bicep/StorageCmkConfig.bicep
+++ b/workload/bicep/modules/zeroTrust/.bicep/StorageCmkConfig.bicep
@@ -14,9 +14,6 @@ param location string = resourceGroup().location
 @sys.description('Key Vault URI associated with Storage Account.')
 param keyVaultUri string
 
-// @sys.description('Key Vault Resource ID associated with Storage Acccount.')
-// param keyVaultResId string
-
 @sys.description('Managed Identity Resource ID associated with Storage Account and used for Zero Trust.')
 param managedIdentityStorageResourceId string
 
@@ -32,7 +29,7 @@ var keyName = 'key-${storageAccountName}'
 // =========== //
 // Deployments //
 // =========== //
-
+// Using AVM - the key rotation is not enabled on the Storage Account.
 resource storageAccount 'Microsoft.Storage/storageAccounts@2021-04-01' = {
   name: storageAccountName
   location: location
@@ -66,24 +63,4 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-04-01' = {
   }
 }
 
-// Using AVM - the key rotation is not enabled on the Storage Account.
-/* module storageAccountAVM '../../../../../avm/1.0.0/res/storage/storage-account/main.bicep' = {
-  name: 'storageAccountAVM'
-  params: {
-    name:storageAccountName
-    location:location
-    kind:((storageSkuName == 'Premium_LRS') || (storageSkuName == 'Premium_ZRS')) ? 'FileStorage' : 'StorageV2'
-    skuName:storageSkuName
-    managedIdentities: {
-      userAssignedResourceIds: [
-        managedIdentityStorageResourceId
-      ]
-    }
-    customerManagedKey: {
-      userAssignedIdentityResourceId: managedIdentityStorageResourceId
-      keyName: keyName
-      keyVaultResourceId: keyVaultResId
-      keyVersion: ''
-    }
-  }
-} */
+