Update templates

DataConnectors/PPInventory/azuredeploy_PowerPlatformInventory_API_FunctionApp.json

@@ -33,10 +33,12 @@
 		"tagsByResource": {
 			"type": "object",
 			"defaultValue": {}
+		},
+		"storageAccountName": {
+			"type": "string"
 		}
 	},
 	"variables": {
-		"storageAccountName": "[concat(replace(toLower(parameters('functionAppName')),'-',''),'sa')]",
 		"storageSuffix": "[environment().suffixes.storage]",
 		"serverFarmName": "[concat('serverfarm_', parameters('functionAppName'))]",
 		"appInsightsLogName": "[concat(parameters('functionAppName'),'Logs')]",
@@ -464,7 +466,7 @@
 									]
 								}
 							}
-						}						
+						}
 					],
 					"outputs": {}
 				}
@@ -515,7 +517,7 @@
 		{
 			"type": "Microsoft.Storage/storageAccounts",
 			"apiVersion": "2022-09-01",
-			"name": "[variables('storageAccountName')]",
+			"name": "[parameters('storageAccountName')]",
 			"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts'), parameters('tagsByResource')['Microsoft.Storage/storageAccounts'], json('{}')) ]",
 			"location": "[parameters('location')]",
 			"kind": "StorageV2",
@@ -534,7 +536,7 @@
 			"kind": "functionapp,linux",
 			"dependsOn": [
 				"[resourceId('Microsoft.Web/serverfarms', variables('serverFarmName'))]",
-				"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]",
+				"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]",
 				"[resourceId('Microsoft.Insights/components', variables('appInsightsLogName'))]",
 				"[resourceId('Microsoft.Insights/dataCollectionRules', variables('dataCollectionRuleName'))]"
 			],
@@ -560,11 +562,11 @@
 					"appSettings": [
 						{
 							"name": "AzureWebJobsStorage",
-							"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', toLower(variables('storageAccountName')),';AccountKey=',listKeys(resourceId('Microsoft.Storage/storageAccounts', toLower(variables('storageAccountName'))), '2022-09-01').keys[0].value, ';EndpointSuffix=',toLower(variables('storageSuffix')))]"
+							"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', toLower(parameters('storageAccountName')),';AccountKey=',listKeys(resourceId('Microsoft.Storage/storageAccounts', toLower(parameters('storageAccountName'))), '2022-09-01').keys[0].value, ';EndpointSuffix=',toLower(variables('storageSuffix')))]"
 						},
 						{
 							"name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING",
-							"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', toLower(variables('storageAccountName')),';AccountKey=',listKeys(resourceId('Microsoft.Storage/storageAccounts', toLower(variables('storageAccountName'))), '2022-09-01').keys[0].value, ';EndpointSuffix=',toLower(variables('storageSuffix')))]"
+							"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', toLower(parameters('storageAccountName')),';AccountKey=',listKeys(resourceId('Microsoft.Storage/storageAccounts', toLower(parameters('storageAccountName'))), '2022-09-01').keys[0].value, ';EndpointSuffix=',toLower(variables('storageSuffix')))]"
 						},
 						{
 							"name": "STORAGE_ACCOUNT_URL",

DataConnectors/PPInventory/createUIDef.json

@@ -63,7 +63,7 @@
 							"type": "Microsoft.Common.TextBlock",
 							"visible": true,
 							"options": {
-								"text": "Configure the Function App used to collect Power Platform Inventory data. As part of the deploymnet, the Function App and Storage Account resources will be created in the target resource group. Function App health logs and metrics will be sent to selected App Insights workspace."
+								"text": "Configure the Function App used to collect Power Platform Inventory data. As part of the deployment, the Function App and Storage Account resources will be created in the target resource group. Function App health logs and metrics will be sent to selected App Insights workspace."
 							}
 						},
 						{
@@ -109,10 +109,10 @@
 						{
 							"name": "newStorageAccountName",
 							"type": "Microsoft.Common.TextBox",
-							"label": "Storage account name",
+							"label": "Function App storage account name",
 							"visible": true,
 							"defaultValue": "[toLower(concat('PPInventory', first(split(steps('basics').resourceScope.subscription.subscriptionId, '-')), 'sa'))]",
-							"toolTip": "Name of the Storage account",
+							"toolTip": "Name of the storage account used by the Function App (this is NOT the ADLSv2 account)",
 							"constraints": {
 								"required": true,
 								"validations": [
@@ -128,7 +128,7 @@
 							"type": "Microsoft.Common.DropDown",
 							"label": "App Insights workspace",
 							"defaultValue": "[steps('basics').sentinelWorkspace.name]",
-							"toolTip": "Select the workspace used to send Function App health logs and metrics",
+							"toolTip": "Select the workspace used to send Function App health logs and metrics. You can use the Sentinel workspace.",
 							"multiselect": false,
 							"selectAll": true,
 							"filter": true,