Merge pull request Azure#10005 from kingwil/wiking-ppinv-ui-fix

CreateUi fix for manual role assignment
Accelerynt-Security · Feb 23, 2024 · eebfa3f · eebfa3f
2 parents b408077 + b0bb7df
commit eebfa3f
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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]"
 			}
 		}
 	}
-}
+}