EES-5660 - replaced contraction of "Fileshare" with separate "File sh…

…are" to fit in with standard Azure terminology
dfe-analytical-services · Dec 3, 2024 · 8a8163b · 8a8163b
1 parent 4c5bea1
commit 8a8163b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/infrastructure/templates/public-api/application/public-api/publicApiApp.bicep b/infrastructure/templates/public-api/application/public-api/publicApiApp.bicep
@@ -78,15 +78,15 @@ module apiContainerAppModule '../../components/containerApp.bicep' = {
     vnetName: resourceNames.existingResources.vNet
     volumeMounts: [
       {
-        volumeName: 'public-api-fileshare-mount'
+        volumeName: 'public-api-file-share-mount'
         mountPath: dataFilesFileShareMountPath
       }
     ]
     volumes: [
       {
-        name: 'public-api-fileshare-mount'
+        name: 'public-api-file-share-mount'
         storageType: 'AzureFile'
-        storageName: resourceNames.publicApi.publicApiFileshare
+        storageName: resourceNames.publicApi.publicApiFileShare
       }
     ]
     appSettings: [

diff --git a/infrastructure/templates/public-api/application/public-api/publicApiDataProcessor.bicep b/infrastructure/templates/public-api/application/public-api/publicApiDataProcessor.bicep
@@ -106,10 +106,10 @@ module dataProcessorFunctionAppModule '../../components/functionApp.bicep' = {
       App__MetaInsertBatchSize: 1000
     }
     azureFileShares: [{
-      storageName: resourceNames.publicApi.publicApiFileshare
+      storageName: resourceNames.publicApi.publicApiFileShare
       storageAccountKey: publicApiStorageAccount.listKeys().keys[0].value
       storageAccountName: resourceNames.publicApi.publicApiStorageAccount
-      fileShareName: resourceNames.publicApi.publicApiFileshare
+      fileShareName: resourceNames.publicApi.publicApiFileShare
       mountPath: publicApiDataFileShareMountPath
     }]
     storageFirewallRules: storageFirewallRules

diff --git a/infrastructure/templates/public-api/application/public-api/publicApiStorage.bicep b/infrastructure/templates/public-api/application/public-api/publicApiStorage.bicep
@@ -49,7 +49,7 @@ module publicApiStorageAccountModule '../../components/storageAccount.bicep' = {
 module dataFilesFileShareModule '../../components/fileShare.bicep' = {
   name: 'fileShareDeploy'
   params: {
-    fileShareName: resourceNames.publicApi.publicApiFileshare
+    fileShareName: resourceNames.publicApi.publicApiFileShare
     fileShareQuota: publicApiDataFileShareQuota
     storageAccountName: publicApiStorageAccountModule.outputs.storageAccountName
     fileShareAccessTier: 'TransactionOptimized'
@@ -59,5 +59,5 @@ module dataFilesFileShareModule '../../components/fileShare.bicep' = {
 output storageAccountName string = publicApiStorageAccountModule.outputs.storageAccountName
 output connectionStringSecretName string = publicApiStorageAccountModule.outputs.connectionStringSecretName
 output accessKeySecretName string = publicApiStorageAccountModule.outputs.accessKeySecretName
-output publicApiDataFileShareName string = resourceNames.publicApi.publicApiFileshare
+output publicApiDataFileShareName string = resourceNames.publicApi.publicApiFileShare
 output publicApiStorageAccountName string = resourceNames.publicApi.publicApiStorageAccount
diff --git a/infrastructure/templates/public-api/application/shared/containerAppEnvironment.bicep b/infrastructure/templates/public-api/application/shared/containerAppEnvironment.bicep
@@ -36,10 +36,10 @@ module containerAppEnvironmentModule '../../components/containerAppEnvironment.b
     tagValues: tagValues
     azureFileStorages: [
       {
-        storageName: resourceNames.publicApi.publicApiFileshare
+        storageName: resourceNames.publicApi.publicApiFileShare
         storageAccountName: resourceNames.publicApi.publicApiStorageAccount
         storageAccountKey: publicApiStorageAccount.listKeys().keys[0].value
-        fileShareName: resourceNames.publicApi.publicApiFileshare
+        fileShareName: resourceNames.publicApi.publicApiFileShare
         accessMode: 'ReadWrite'
       }
     ]

diff --git a/infrastructure/templates/public-api/components/appServiceSlotConfig.bicep b/infrastructure/templates/public-api/components/appServiceSlotConfig.bicep
@@ -1,4 +1,4 @@
-import { AzureFileshareMount } from '../types.bicep'
+import { AzureFileShareMount } from '../types.bicep'
 
 @description('Specifies the Web / Function App name that these settings belong to')
 param appName string
@@ -25,7 +25,7 @@ param existingStagingAppSettings object
 param existingProductionAppSettings object
 
 @description('Specifies additional Azure Storage Accounts to make available to the staging slot')
-param azureFileShares AzureFileshareMount[] = []
+param azureFileShares AzureFileShareMount[] = []
 
 @description('Set specific appsettings to be slot specific values')
 resource functionSlotConfig 'Microsoft.Web/sites/config@2023-12-01' = {

diff --git a/infrastructure/templates/public-api/components/functionApp.bicep b/infrastructure/templates/public-api/components/functionApp.bicep
@@ -1,4 +1,4 @@
-import { FirewallRule, AzureFileshareMount, EntraIdAuthentication } from '../types.bicep'
+import { FirewallRule, AzureFileShareMount, EntraIdAuthentication } from '../types.bicep'
 
 @description('Specifies the location for all resources.')
 param location string
@@ -71,7 +71,7 @@ param healthCheck {
 }?
 
 @description('Specifies additional Azure Storage Accounts to make available to this Function App')
-param azureFileShares AzureFileshareMount[] = []
+param azureFileShares AzureFileShareMount[] = []
 
 @description('Specifies firewall rules for the various storage accounts in use by the Function App')
 param storageFirewallRules FirewallRule[] = []

diff --git a/infrastructure/templates/public-api/main.bicep b/infrastructure/templates/public-api/main.bicep
@@ -149,7 +149,7 @@ var resourceNames = {
     dataProcessorPlan: '${publicApiResourcePrefix}-${abbreviations.webServerFarms}-${abbreviations.webSitesFunctions}-processor'
     dataProcessorStorageAccountsPrefix: '${subscription}eessaprocessor'
     docsApp: '${publicApiResourcePrefix}-${abbreviations.staticWebApps}-docs'
-    publicApiFileshare: '${publicApiResourcePrefix}-fs-data'
+    publicApiFileShare: '${publicApiResourcePrefix}-fs-data'
     publicApiStorageAccount: '${replace(publicApiResourcePrefix, '-', '')}${abbreviations.storageStorageAccounts}'
   }
 }

diff --git a/infrastructure/templates/public-api/types.bicep b/infrastructure/templates/public-api/types.bicep
@@ -36,7 +36,7 @@ type ResourceNames = {
     dataProcessorStorageAccountsPrefix: string
     docsApp: string
     publicApiStorageAccount: string
-    publicApiFileshare: string
+    publicApiFileShare: string
   }
 }
 
@@ -47,7 +47,7 @@ type FirewallRule = {
 }
 
 @export()
-type AzureFileshareMount = {
+type AzureFileShareMount = {
   storageName: string
   storageAccountKey: string
   storageAccountName: string

diff --git a/infrastructure/templates/template.json b/infrastructure/templates/template.json
@@ -1198,8 +1198,8 @@
       "[concat('Microsoft.Web/sites/', variables('contentAppName'))]",
       "[concat('Microsoft.Web/sites/', variables('dataAppName'))]"
     ],
-    "publicDataFileshareMountPath": "/data/public-api-data",
-    "publicDataFileshareName": "[concat(parameters('subscription'), '-ees-papi-fs-data')]",
+    "publicDataFileShareMountPath": "/data/public-api-data",
+    "publicDataFileShareName": "[concat(parameters('subscription'), '-ees-papi-fs-data')]",
     "publicDataStorageAccountName": "[concat(parameters('subscription'), 'eespapisa')]"
   },
   "resources": [
@@ -3286,7 +3286,7 @@
         "App:NotifierStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('ees-storage-notifications')).secretUriWithVersion, ')')]",
         "App:PublicStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('ees-storage-public')).secretUriWithVersion, ')')]",
         "App:PublisherStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('ees-storage-publisher')).secretUriWithVersion, ')')]",
-        "DataFiles:BasePath": "[parameters('publicDataFileshareMountPath')]",
+        "DataFiles:BasePath": "[parameters('publicDataFileShareMountPath')]",
         "PublicDataDbExists": "[parameters('publicDataDbExists')]"
       }
     },
@@ -3298,16 +3298,16 @@
       "apiVersion": "2019-08-01",
       "dependsOn": [
         "[resourceId('Microsoft.Web/sites', variables('publisherAppName'))]",
-        "[variables('publicDataFileshareMountPath')]",
-        "[variables('publicDataFileshareName')]",
+        "[variables('publicDataFileShareMountPath')]",
+        "[variables('publicDataFileShareName')]",
         "[variables('publicDataStorageAccountName')]"
       ],
       "properties": {
-        "[variables('publicDataFileshareName')]": {
+        "[variables('publicDataFileShareName')]": {
           "type": "AzureFiles",
           "accountName": "[variables('publicDataStorageAccountName')]",
-          "shareName": "[variables('publicDataFileshareName')]",
-          "mountPath": "[variables('publicDataFileshareMountPath')]",
+          "shareName": "[variables('publicDataFileShareName')]",
+          "mountPath": "[variables('publicDataFileShareMountPath')]",
           "protocol": "Smb"
         }
       }