diff --git a/src/bicep/add-ons/ZTA/New-AzureZeroTrustImageTemplateSpec.ps1 b/src/bicep/add-ons/Imaging/New-AzureZeroTrustImageTemplateSpec.ps1 similarity index 100% rename from src/bicep/add-ons/ZTA/New-AzureZeroTrustImageTemplateSpec.ps1 rename to src/bicep/add-ons/Imaging/New-AzureZeroTrustImageTemplateSpec.ps1 diff --git a/src/bicep/add-ons/ZTA/README.md b/src/bicep/add-ons/Imaging/README.md similarity index 100% rename from src/bicep/add-ons/ZTA/README.md rename to src/bicep/add-ons/Imaging/README.md diff --git a/src/bicep/add-ons/ZTA/images/arcGisProRuntimeExample.png b/src/bicep/add-ons/Imaging/images/arcGisProRuntimeExample.png similarity index 100% rename from src/bicep/add-ons/ZTA/images/arcGisProRuntimeExample.png rename to src/bicep/add-ons/Imaging/images/arcGisProRuntimeExample.png diff --git a/src/bicep/add-ons/ZTA/images/image.png b/src/bicep/add-ons/Imaging/images/image.png similarity index 100% rename from src/bicep/add-ons/ZTA/images/image.png rename to src/bicep/add-ons/Imaging/images/image.png diff --git a/src/bicep/add-ons/ZTA/modules/automationAccount.bicep b/src/bicep/add-ons/Imaging/modules/automationAccount.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/automationAccount.bicep rename to src/bicep/add-ons/Imaging/modules/automationAccount.bicep diff --git a/src/bicep/add-ons/ZTA/modules/baseline.bicep b/src/bicep/add-ons/Imaging/modules/baseline.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/baseline.bicep rename to src/bicep/add-ons/Imaging/modules/baseline.bicep diff --git a/src/bicep/add-ons/ZTA/modules/baseline.json b/src/bicep/add-ons/Imaging/modules/baseline.json similarity index 100% rename from src/bicep/add-ons/ZTA/modules/baseline.json rename to src/bicep/add-ons/Imaging/modules/baseline.json diff --git a/src/bicep/add-ons/ZTA/modules/buildAutomation.bicep b/src/bicep/add-ons/Imaging/modules/buildAutomation.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/buildAutomation.bicep rename to src/bicep/add-ons/Imaging/modules/buildAutomation.bicep diff --git a/src/bicep/add-ons/ZTA/modules/computeGallery.bicep b/src/bicep/add-ons/Imaging/modules/computeGallery.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/computeGallery.bicep rename to src/bicep/add-ons/Imaging/modules/computeGallery.bicep diff --git a/src/bicep/add-ons/ZTA/modules/customizations.bicep b/src/bicep/add-ons/Imaging/modules/customizations.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/customizations.bicep rename to src/bicep/add-ons/Imaging/modules/customizations.bicep diff --git a/src/bicep/add-ons/ZTA/modules/diskEncryptionSet.bicep b/src/bicep/add-ons/Imaging/modules/diskEncryptionSet.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/diskEncryptionSet.bicep rename to src/bicep/add-ons/Imaging/modules/diskEncryptionSet.bicep diff --git a/src/bicep/add-ons/ZTA/modules/exemption.bicep b/src/bicep/add-ons/Imaging/modules/exemption.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/exemption.bicep rename to src/bicep/add-ons/Imaging/modules/exemption.bicep diff --git a/src/bicep/add-ons/ZTA/modules/generalizeVirtualMachine.bicep b/src/bicep/add-ons/Imaging/modules/generalizeVirtualMachine.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/generalizeVirtualMachine.bicep rename to src/bicep/add-ons/Imaging/modules/generalizeVirtualMachine.bicep diff --git a/src/bicep/add-ons/ZTA/modules/hub-network-peering.bicep b/src/bicep/add-ons/Imaging/modules/hub-network-peering.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/hub-network-peering.bicep rename to src/bicep/add-ons/Imaging/modules/hub-network-peering.bicep diff --git a/src/bicep/add-ons/ZTA/modules/imageBuild.bicep b/src/bicep/add-ons/Imaging/modules/imageBuild.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/imageBuild.bicep rename to src/bicep/add-ons/Imaging/modules/imageBuild.bicep diff --git a/src/bicep/add-ons/ZTA/modules/imageBuild.json b/src/bicep/add-ons/Imaging/modules/imageBuild.json similarity index 100% rename from src/bicep/add-ons/ZTA/modules/imageBuild.json rename to src/bicep/add-ons/Imaging/modules/imageBuild.json diff --git a/src/bicep/add-ons/ZTA/modules/imageVersion.bicep b/src/bicep/add-ons/Imaging/modules/imageVersion.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/imageVersion.bicep rename to src/bicep/add-ons/Imaging/modules/imageVersion.bicep diff --git a/src/bicep/add-ons/ZTA/modules/keyVault.bicep b/src/bicep/add-ons/Imaging/modules/keyVault.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/keyVault.bicep rename to src/bicep/add-ons/Imaging/modules/keyVault.bicep diff --git a/src/bicep/add-ons/ZTA/modules/managementVM.bicep b/src/bicep/add-ons/Imaging/modules/managementVM.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/managementVM.bicep rename to src/bicep/add-ons/Imaging/modules/managementVM.bicep diff --git a/src/bicep/add-ons/ZTA/modules/monitoring.bicep b/src/bicep/add-ons/Imaging/modules/monitoring.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/monitoring.bicep rename to src/bicep/add-ons/Imaging/modules/monitoring.bicep diff --git a/src/bicep/add-ons/ZTA/modules/removeRunCommands.bicep b/src/bicep/add-ons/Imaging/modules/removeRunCommands.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/removeRunCommands.bicep rename to src/bicep/add-ons/Imaging/modules/removeRunCommands.bicep diff --git a/src/bicep/add-ons/ZTA/modules/removeVirtualMachine.bicep b/src/bicep/add-ons/Imaging/modules/removeVirtualMachine.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/removeVirtualMachine.bicep rename to src/bicep/add-ons/Imaging/modules/removeVirtualMachine.bicep diff --git a/src/bicep/add-ons/ZTA/modules/restartVirtualMachine.bicep b/src/bicep/add-ons/Imaging/modules/restartVirtualMachine.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/restartVirtualMachine.bicep rename to src/bicep/add-ons/Imaging/modules/restartVirtualMachine.bicep diff --git a/src/bicep/add-ons/ZTA/modules/roleAssignments.bicep b/src/bicep/add-ons/Imaging/modules/roleAssignments.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/roleAssignments.bicep rename to src/bicep/add-ons/Imaging/modules/roleAssignments.bicep diff --git a/src/bicep/add-ons/ZTA/modules/spoke-network-peering.bicep b/src/bicep/add-ons/Imaging/modules/spoke-network-peering.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/spoke-network-peering.bicep rename to src/bicep/add-ons/Imaging/modules/spoke-network-peering.bicep diff --git a/src/bicep/add-ons/ZTA/modules/storageAccount.bicep b/src/bicep/add-ons/Imaging/modules/storageAccount.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/storageAccount.bicep rename to src/bicep/add-ons/Imaging/modules/storageAccount.bicep diff --git a/src/bicep/add-ons/ZTA/modules/sysprepVirtualMachine.bicep b/src/bicep/add-ons/Imaging/modules/sysprepVirtualMachine.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/sysprepVirtualMachine.bicep rename to src/bicep/add-ons/Imaging/modules/sysprepVirtualMachine.bicep diff --git a/src/bicep/add-ons/ZTA/modules/templateSpec.bicep b/src/bicep/add-ons/Imaging/modules/templateSpec.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/templateSpec.bicep rename to src/bicep/add-ons/Imaging/modules/templateSpec.bicep diff --git a/src/bicep/add-ons/ZTA/modules/tier3.bicep b/src/bicep/add-ons/Imaging/modules/tier3.bicep similarity index 71% rename from src/bicep/add-ons/ZTA/modules/tier3.bicep rename to src/bicep/add-ons/Imaging/modules/tier3.bicep index d689621d4..1c67fd110 100644 --- a/src/bicep/add-ons/ZTA/modules/tier3.bicep +++ b/src/bicep/add-ons/Imaging/modules/tier3.bicep @@ -2,7 +2,6 @@ Copyright (c) Microsoft Corporation. Licensed under the MIT License. */ - targetScope = 'resourceGroup' /* @@ -27,56 +26,34 @@ param resourcePrefix string = 'zta' @description('A suffix, 3 to 6 characters in length, to append to resource names (e.g. "dev", "test", "prod", "mlz"). It defaults to "mlz".') param resourceSuffix string = 'mlz' -@description('The region to deploy resources into. It defaults to the deployment location.') -param location string - -@description('The subscription ID for the Identity Network and resources. It defaults to the deployment subscription.') -param workloadSubscriptionId string - -@description('MLZ Deployment output variables in json format. It defaults to the deploymentVariables.json.') +param deployDefender bool +param deploymentNameSuffix string = utcNow() +param deployPolicy bool +param emailSecurityContact string +param existingResourceGroup bool +param firewallPrivateIPAddress string +param hubResourceGroupName string param hubSubscriptionId string - -@description('The name of the hub virtual network. It defaults to the deployment output variable.') param hubVirtualNetworkName string - -@description('The resource ID of the hub virtual network. It defaults to the deployment output variable.') param hubVirtualNetworkResourceId string - -@description('The resource ID of the log analytics workspace. It defaults to the deployment output variable.') -param logAnalyticsWorkspaceResourceId string - -@description('The name of the log analytics workspace. It defaults to the deployment output variable.') +param location string param logAnalyticsWorkspaceName string - -@description('The private IP address of the firewall. It defaults to the deployment output variable.') -param firewallPrivateIPAddress string - -@description('[NISTRev4/NISTRev5/IL5/CMMC] Built-in policy assignments to assign, it defaults to "NISTRev4". IL5 is only available for AzureUsGovernment and will switch to NISTRev4 if tried in AzureCloud.') +param logAnalyticsWorkspaceResourceId string +param logStorageSkuName string = 'Standard_GRS' +param networkSecurityGroupDiagnosticsMetrics array = [] +param networkSecurityGroupRules array = [] param policy string - -@description('When set to "true", deploys the Azure Policy set defined at by the parameter "policy" to the resource groups generated in the deployment. It defaults to "false".') -param deployPolicy bool - -@description('When set to "true", enables Microsoft Defender for Cloud for the subscriptions used in the deployment. It defaults to "false".') -param deployDefender bool - -@description('Email address of the contact, in the form of john@doe.com') -param emailSecurityContact string - -@description('The address prefix for the network spoke vnet.') +param resourceGroupName string +param subnetAddressPrefix string +param subnetServiceEndpoints array = [] +param tags object = {} param virtualNetworkAddressPrefix string - -@description('An array of Network Diagnostic Logs to enable for the workload Virtual Network. See https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/diagnostic-settings?tabs=CMD#logs for valid settings.') param virtualNetworkDiagnosticsLogs array = [] - -@description('An array of Network Diagnostic Metrics to enable for the workload Virtual Network. See https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/diagnostic-settings?tabs=CMD#metrics for valid settings.') param virtualNetworkDiagnosticsMetrics array = [] - param vNetDnsServers array = [firewallPrivateIPAddress] - -@description('An array of Network Security Group rules to apply to the workload Virtual Network. See https://docs.microsoft.com/en-us/azure/templates/microsoft.network/networksecuritygroups/securityrules?tabs=bicep#securityrulepropertiesformat for valid settings.') -param networkSecurityGroupRules array = [] - +param workloadLogStorageAccountNameParameter string = 'null' +param workloadName string = 'zta' +param workloadSubscriptionId string @description('An array of Network Security Group diagnostic logs to apply to the workload Virtual Network. See https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-nsg-manage-log#log-categories for valid settings.') param networkSecurityGroupDiagnosticsLogs array = [ { @@ -88,36 +65,6 @@ param networkSecurityGroupDiagnosticsLogs array = [ enabled: true } ] -@description('An array of Network Security Group diagnostic logs to apply to the SharedServices Virtual Network. See https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-nsg-manage-log#log-categories for valid settings.') -param networkSecurityGroupDiagnosticsMetrics array = [] - -@description('The CIDR Virtual Network Address Prefix for the Workload Virtual Network.') -param subnetAddressPrefix string - -@description('An array of Service Endpoints to enable for the Operations subnet. See https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-service-endpoints-overview for valid settings.') -param subnetServiceEndpoints array = [] - -@description('The Storage Account SKU to use for log storage. It defaults to "Standard_GRS". See https://docs.microsoft.com/en-us/rest/api/storagerp/srp_sku_types for valid settings.') -param logStorageSkuName string = 'Standard_GRS' - -@description('A string dictionary of tags to add to deployed resources. See https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json#arm-templates for valid settings.') -param tags object = {} - -@description('A suffix to use for naming deployments uniquely. It defaults to the Bicep resolution of the "utcNow()" function.') -param deploymentNameSuffix string = utcNow() - -@description('The name of the tier 3 workload') -param workloadName string = 'zta' - -@maxLength(24) -@description('The name of the Storage Account if using this Parameter. Otherwise it will be a calculated value.') -param workloadLogStorageAccountNameParameter string = 'null' - -param existingResourceGroup bool - -param resourceGroupName string - -param hubResourceGroupName string /* @@ -134,12 +81,10 @@ param hubResourceGroupName string var resourceToken = 'resource_token' var nameToken = 'name_token' var namingConvention = '${toLower(resourcePrefix)}-${resourceToken}-${nameToken}-${toLower(resourceSuffix)}' - var virtualNetworkNamingConvention = replace(namingConvention, resourceToken, 'vnet') var networkSecurityGroupNamingConvention = replace(namingConvention, resourceToken, 'nsg') var storageAccountNamingConvention = toLower('${resourcePrefix}st${nameToken}unique_storage_token') var subnetNamingConvention = replace(namingConvention, resourceToken, 'snet') - var workloadLogStorageAccountNameTemplate = replace(storageAccountNamingConvention, nameToken, toLower(workloadName)) var workloadLogStorageAccountUniqueName = replace(workloadLogStorageAccountNameTemplate, 'unique_storage_token', uniqueString(resourcePrefix, resourceSuffix, workloadSubscriptionId)) var workloadLogStorageAccountNameVariable = take(workloadLogStorageAccountUniqueName, 23) @@ -147,10 +92,7 @@ var workloadVirtualNetworkName = replace(virtualNetworkNamingConvention, nameTok var workloadNetworkSecurityGroupName = replace(networkSecurityGroupNamingConvention, nameToken, workloadName) var workloadSubnetName = replace(subnetNamingConvention, nameToken, workloadName) var logAnalyticsWorkspaceResourceId_split = split(logAnalyticsWorkspaceResourceId, '/') - - var workloadLogStorageAccountName = 'null' != workloadLogStorageAccountNameParameter ? workloadLogStorageAccountNameParameter : workloadLogStorageAccountNameVariable - var defaultTags = { DeploymentType: 'MissionLandingZoneARM' } diff --git a/src/bicep/add-ons/ZTA/modules/tier3.json b/src/bicep/add-ons/Imaging/modules/tier3.json similarity index 100% rename from src/bicep/add-ons/ZTA/modules/tier3.json rename to src/bicep/add-ons/Imaging/modules/tier3.json diff --git a/src/bicep/add-ons/ZTA/modules/userAssignedIdentity.bicep b/src/bicep/add-ons/Imaging/modules/userAssignedIdentity.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/userAssignedIdentity.bicep rename to src/bicep/add-ons/Imaging/modules/userAssignedIdentity.bicep diff --git a/src/bicep/add-ons/ZTA/modules/virtual-network-peerings.bicep b/src/bicep/add-ons/Imaging/modules/virtual-network-peerings.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/virtual-network-peerings.bicep rename to src/bicep/add-ons/Imaging/modules/virtual-network-peerings.bicep diff --git a/src/bicep/add-ons/ZTA/modules/virtualMachine.bicep b/src/bicep/add-ons/Imaging/modules/virtualMachine.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/virtualMachine.bicep rename to src/bicep/add-ons/Imaging/modules/virtualMachine.bicep diff --git a/src/bicep/add-ons/ZTA/modules/virtualNetwork.bicep b/src/bicep/add-ons/Imaging/modules/virtualNetwork.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/virtualNetwork.bicep rename to src/bicep/add-ons/Imaging/modules/virtualNetwork.bicep diff --git a/src/bicep/add-ons/ZTA/modules/virtualNetworkPeerings.bicep b/src/bicep/add-ons/Imaging/modules/virtualNetworkPeerings.bicep similarity index 100% rename from src/bicep/add-ons/ZTA/modules/virtualNetworkPeerings.bicep rename to src/bicep/add-ons/Imaging/modules/virtualNetworkPeerings.bicep diff --git a/src/bicep/add-ons/ZTA/scripts/New-AzureZeroTrustImageBuild.ps1 b/src/bicep/add-ons/Imaging/scripts/New-AzureZeroTrustImageBuild.ps1 similarity index 100% rename from src/bicep/add-ons/ZTA/scripts/New-AzureZeroTrustImageBuild.ps1 rename to src/bicep/add-ons/Imaging/scripts/New-AzureZeroTrustImageBuild.ps1 diff --git a/src/bicep/add-ons/ZTA/solution.bicep b/src/bicep/add-ons/Imaging/solution.bicep similarity index 96% rename from src/bicep/add-ons/ZTA/solution.bicep rename to src/bicep/add-ons/Imaging/solution.bicep index 1839da1cf..3f9fe5a9f 100644 --- a/src/bicep/add-ons/ZTA/solution.bicep +++ b/src/bicep/add-ons/Imaging/solution.bicep @@ -12,6 +12,9 @@ param automationAccountName string @description('The private DNS zone resource ID for the automation account resource.') param automationAccountPrivateDnsZoneResourceId string +@description('The name of the Azure Firewall.') +param azureFirewallName string + @description('The resource ID of the compute gallery image.') param computeGalleryImageResourceId string = '' @@ -30,6 +33,14 @@ param diskEncryptionSetResourceId string = '' @description('The distribution group for email notifications.') param distributionGroup string = '' + +@description('Defender for Cloud enabled.') +param deployDefender bool = false + +@description('Deploy Policy enabled.') +param deployPolicy bool = false + + @description('The suffix to append to deployment names.') param deploymentNameSuffix string = utcNow('yyMMddHHs') @@ -43,15 +54,30 @@ param domainJoinUserPrincipalName string = '' @description('The domain name to join.') param domainName string = '' +@description('The email address for the security contact.') +param emailSecurityContact string + @description('Determines whether to enable build automation.') param enableBuildAutomation bool @description('Determines whether to exclude the image from the latest version.') param excludeFromLatest bool = true +@description('Determines whether to use an existing resource group.') +param existingResourceGroup bool = false + @description('The array of policy assignment IDs to exempt to prevent issues with the build process.') param exemptPolicyAssignmentIds array = [] +@description('The hub resource group name.') +param hubResourceGroupName string + +@description('The name of hub subscription.') +param hubSubscriptionId string + +@description('The hub virtual network name.') +param hubVirtualNetworkName string + @description('Determines whether to use the hybrid use benefit.') param hybridUseBenefit bool @@ -128,11 +154,12 @@ param location string = deployment().location @description('The resource ID of the log analytics workspace if using build automation and desired.') param logAnalyticsWorkspaceResourceId string = '' +@description('The log analytics workspace name.') +param logAnalyticsWorkspaceName string @description('The resource ID of the log analytics workspace if using build automation and desired.') param spokelogAnalyticsWorkspaceResourceId string - @description('The marketplace image offer.') param marketplaceImageOffer string = '' @@ -145,21 +172,25 @@ param marketplaceImageSKU string = '' @description('The file name of the msrdcwebrtcsvc installer in Azure Blobs.') param msrdcwebrtcsvcInstaller string = '' -@description('Determines whether to use an existing resource group.') -param existingResourceGroup bool = false - @description('The file name of the Office installer in Azure Blobs.') param officeInstaller string = '' @description('The distinguished name of the organizational unit to join.') param oUPath string = '' +@description('The policy name') +param policy string = '' + @description('The count of replicas for the image version resource.') param replicaCount int @description('The name of the resource group.') param resourceGroupName string +@description('The prefix for the resource names.') +param resourcePrefix string + + @allowed([ 'AzureComputeGallery' 'AzureMarketplace' @@ -170,6 +201,9 @@ param sourceImageType string @description('The resource ID of the storage account where the installers and scripts are stored in Azure Blobs.') param storageAccountResourceId string +@description('The subnet address prefix.') +param subnetAddressPrefix string + @description('The key value pairs of meta data to apply to the resources.') param tags object = {} @@ -185,36 +219,15 @@ param vcRedistInstaller string = '' @description('The file name of the vDOT installer in Azure Blobs.') param vDOTInstaller string = '' +@description('The virtual network address prefix.') +param virtualNetworkAddressPrefix string + @description('The size of the image virtual machine.') param virtualMachineSize string -param deployDefender bool = false - -param deployPolicy bool = false - -param emailSecurityContact string - -param hubSubscriptionId string - -param hubVirtualNetworkName string - -param logAnalyticsWorkspaceName string - -param policy string = '' - -param resourcePrefix string - -param hubResourceGroupName string - -param subnetAddressPrefix string - -param virtualNetworkAddressPrefix string - +@description('The workload subscription id.') param workloadSubscriptionId string -@description('The name of the Azure Firewall.') -param azureFirewallName string - var imageDefinitionName = empty(computeGalleryImageResourceId) ? '${imageDefinitionNamePrefix}-${marketplaceImageSKU}' : '${imageDefinitionNamePrefix}-${split(computeGalleryImageResourceId, '/')[10]}' var imageVirtualMachineName = take('vmimg-${uniqueString(deploymentNameSuffix)}', 15) var managementVirtualMachineName = empty(hybridWorkerName) ? take('vmmgt-${uniqueString(deploymentNameSuffix)}', 15) : hybridWorkerName diff --git a/src/bicep/add-ons/ZTA/solution.json b/src/bicep/add-ons/Imaging/solution.json similarity index 100% rename from src/bicep/add-ons/ZTA/solution.json rename to src/bicep/add-ons/Imaging/solution.json diff --git a/src/bicep/add-ons/ZTA/solution.parameters.json b/src/bicep/add-ons/Imaging/solution.parameters.json similarity index 100% rename from src/bicep/add-ons/ZTA/solution.parameters.json rename to src/bicep/add-ons/Imaging/solution.parameters.json diff --git a/src/bicep/add-ons/ZTA/uiDefinition.json b/src/bicep/add-ons/Imaging/uiDefinition.json similarity index 100% rename from src/bicep/add-ons/ZTA/uiDefinition.json rename to src/bicep/add-ons/Imaging/uiDefinition.json