refactor: clean up unused parameters and comments in storage CMK conf…

…iguration
Azure · Dec 3, 2024 · 2bf1b13 · 2bf1b13
1 parent 189df5c
commit 2bf1b13
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json
@@ -41276,4 +41276,4 @@
       ]
     }
   ]
-}
+}
diff --git 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
@@ -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: ''
-    }
-  }
-} */
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -41276,4 +41276,4 @@ @@
           ]
         }
       ]
-    }
+    }