diff --git a/DataConnectors/PPInventory/createUIDef.json b/DataConnectors/PPInventory/createUIDef.json index a6a52c8134c..34590f824a6 100644 --- a/DataConnectors/PPInventory/createUIDef.json +++ b/DataConnectors/PPInventory/createUIDef.json @@ -253,7 +253,7 @@ "constraints": { "required": true, "regex": "^https:\/\/[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", - "validationMessage": "Please enter a valid URL starting with https://." + "validationMessage": "Please enter a valid URL starting with 'https://' and no trailing '/'." }, "visible": "[steps('inventory').noADSLv2Found]" }, @@ -355,9 +355,14 @@ "roleAssignmentADLSv2": "[if(steps('inventory').noADSLv2Found, false, steps('inventory').inventoryStorageRoleAssignment.hasPermissions)]", "storageAccountUrl": "[if(steps('inventory').noADSLv2Found, steps('inventory').existingADSLv2textbox, steps('inventory').existingInventoryStorageAccount.url)]", "sentinelWorkspace": "[steps('basics').sentinelWorkspace]", - "inventoryStorageAccount": "[steps('inventory').existingInventoryStorageAccount]", + "inventoryStorageAccount": { + "url": "[coalesce(steps('inventory').existingInventoryStorageAccount.url, steps('inventory').existingADSLv2textbox, 'empty')]", + "resourceId": "[coalesce(steps('inventory').existingInventoryStorageAccount.resourceId, 'empty')]", + "subscriptionId": "[coalesce(steps('inventory').existingInventoryStorageAccount.subscriptionId, 'empty')]", + "resourceGroup": "[coalesce(steps('inventory').existingInventoryStorageAccount.resourceGroup, 'empty')]" + }, "tagsByResource": "[steps('tags').tagsByResource]" } } } -} \ No newline at end of file +}