From 7a42fa1dfd0cac10f31b159673c87f6abf2c43f2 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 30 Jul 2023 17:50:19 +0200 Subject: [PATCH 1/4] script --- Set-CARMLFoldersForPBRSingular.ps1 | 420 +++++++++++++++++++++++++++++ 1 file changed, 420 insertions(+) create mode 100644 Set-CARMLFoldersForPBRSingular.ps1 diff --git a/Set-CARMLFoldersForPBRSingular.ps1 b/Set-CARMLFoldersForPBRSingular.ps1 new file mode 100644 index 0000000000..d88da42a1e --- /dev/null +++ b/Set-CARMLFoldersForPBRSingular.ps1 @@ -0,0 +1,420 @@ +<# +.SYNOPSIS +Re-format the name of every CARML module to match the requirements of the Public Bicep Registry + +.DESCRIPTION +The names are formatted as per the following rules: +- Add a '-' prefix to every upper-case character +- Make the entire name lower case + +For example, it re-formats +- 'AppConfiguration\configurationStores\keyValues\deploy.bicep' +to +- app-configuration\configuration-stores\key-values\deploy.bicep + +.PARAMETER ModulesFolderPath +Mandatory. The path to the modules who's folder names should be converted. + +.EXAMPLE +Set-CARMLFoldersForPBRSingular -ModulesFolderPath 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules' + +Convert all folders in path 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules' + +.EXAMPLE +Set-CARMLFoldersForPBRSingular -ModulesFolderPath 'C:\dev\ip\GitHub\Azure\ResourceModules\modules' -WorkflowsPath 'C:\dev\ip\GitHub\Azure\ResourceModules\.github\workflows' -PipelinesPath 'C:\dev\ip\GitHub\Azure\ResourceModules\.azuredevops\modulePipelines' -UtilitiesPath 'C:\dev\ip\GitHub\Azure\ResourceModules\utilities' -Verbose + +Convert all folders in path 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules' and replaces all pipeline, workflows and utility references + +.EXAMPLE +Set-CARMLFoldersForPBRSingular -ResourceProviderPath 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules\KeyVault' + +Convert all folders in path 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules\KeyVault' included + +.NOTES +This script should only be run AFTER the 'Microsoft.' provider namespace prefix was removed. +Identifiers such as 'DBforPostgreSQL' becomes 'd-bfor-postgre-s-q-l' which should probably be manually reverted to 'db-for-postgre-sql'. +#> +function Set-CARMLFoldersForPBRSingular { + + [CmdletBinding(SupportsShouldProcess = $true)] + param ( + [Parameter(Mandatory = $true)] + [string] $ModulesFolderPath, + + [Parameter(Mandatory = $false)] + [string] $ResourceProviderPath = '', + + [Parameter(Mandatory = $false)] + [string] $WorkflowsPath = '', + + [Parameter(Mandatory = $false)] + [string] $PipelinesPath = '', + + [Parameter(Mandatory = $false)] + [string] $UtilitiesPath = '' + ) + + $specialConversionHash = @{ + 'a' = 'a' + 'aaaa' = 'aaaa' + 'access-policies' = 'access-policy' + 'accounts' = 'account' + 'action-groups' = 'action-group' + 'activity-log-alerts' = 'activity-log-alert' + 'administrators' = 'administrator' + 'agent-pools' = 'agent-pool' + 'api-version-sets' = 'api-version-set' + 'apis' = 'api' + 'application-gateway-web-application-firewall-policies' = 'application-gateway-web-application-firewall-policy' + 'application-gateways' = 'application-gateway' + 'application-groups' = 'application-group' + 'application-security-groups' = 'application-security-group' + 'application-types' = 'application-type' + 'applications' = 'application' + 'artifactsources' = 'artifactsource' + 'authorization-rules' = 'authorization-rule' + 'authorization-servers' = 'authorization-server' + 'automation-accounts' = 'automation-account' + 'availability-sets' = 'availability-set' + 'azure-firewalls' = 'azure-firewall' + 'azure-security-center' = 'azure-security-center' + 'backend-address-pools' = 'backend-address-pool' + 'backends' = 'backend' + 'backup-config' = 'backup-config' + 'backup-long-term-retention-policies' = 'backup-long-term-retention-policy' + 'backup-policies' = 'backup-policy' + 'backup-short-term-retention-policies' = 'backup-short-term-retention-policy' + 'backup-storage-config' = 'backup-storage-config' + 'backup-vaults' = 'backup-vault' + 'basic-publishing-credentials-policies' = 'basic-publishing-credentials-policy' + 'bastion-hosts' = 'bastion-host' + 'batch-accounts' = 'batch-account' + 'blob-services' = 'blob-service' + 'budgets' = 'budget' + 'caa' = 'caa' + 'caches' = 'cache' + 'capacities' = 'capacity' + 'capacity-pools' = 'capacity-pool' + 'clusters' = 'cluster' + 'cname' = 'cname' + 'collections' = 'collection' + 'components' = 'component' + 'computes' = 'compute' + 'config' = 'config' + 'config--appsettings' = 'config--appsetting' + 'config--authsettingsv2' = 'config--authsettingsv2' + 'configuration-stores' = 'configuration-store' + 'configurations' = 'configuration' + 'configurations--customdnssuffix' = 'configurations--customdnssuffix' + 'configurations--networking' = 'configurations--networking' + 'connection-monitors' = 'connection-monitor' + 'connections' = 'connection' + 'connectivity-configurations' = 'connectivity-configuration' + 'consumergroups' = 'consumergroup' + 'container-apps' = 'container-app' + 'container-groups' = 'container-group' + 'containers' = 'container' + 'costs' = 'cost' + 'custom-domains' = 'custom-domain' + 'data-collection-endpoints' = 'data-collection-endpoint' + 'data-collection-rules' = 'data-collection-rule' + 'data-exports' = 'data-export' + 'data-sources' = 'data-source' + 'database-accounts' = 'database-account' + 'databases' = 'database' + 'ddos-protection-plans' = 'ddos-protection-plan' + 'deployment-scripts' = 'deployment-script' + 'diagnostic-settings' = 'diagnostic-setting' + 'dicomservices' = 'dicomservice' + 'digital-twins-instances' = 'digital-twins-instance' + 'disaster-recovery-configs' = 'disaster-recovery-config' + 'disk-encryption-sets' = 'disk-encryption-set' + 'disks' = 'disk' + 'dns-forwarding-rulesets' = 'dns-forwarding-ruleset' + 'dns-resolvers' = 'dns-resolver' + 'dns-zones' = 'dns-zone' + 'domain-services' = 'domain-service' + 'domains' = 'domain' + 'elastic-pools' = 'elastic-pool' + 'encryption-protector' = 'encryption-protector' + 'endpoints' = 'endpoint' + 'endpoints--event-grid' = 'endpoints--event-grid' + 'endpoints--event-hub' = 'endpoints--event-hub' + 'endpoints--service-bus' = 'endpoints--service-bus' + 'eventhubs' = 'eventhub' + 'eventSubscriptions' = 'eventSubscription' + 'express-route-circuits' = 'express-route-circuit' + 'express-route-gateway' = 'express-route-gateway' + 'extensions' = 'extension' + 'factories' = 'factory' + 'fhirdestinations' = 'fhirdestination' + 'fhirservices' = 'fhirservice' + 'file-services' = 'file-service' + 'firewall-policies' = 'firewall-policy' + 'firewall-rules' = 'firewall-rule' + 'flexible-servers' = 'flexible-server' + 'flow-logs' = 'flow-log' + 'flux-configurations' = 'flux-configuration' + 'forwarding-rules' = 'forwarding-rule' + 'front-doors' = 'front-door' + 'galleries' = 'gallery' + 'graphs' = 'graph' + 'gremlin-databases' = 'gremlin-database' + 'groups' = 'group' + 'health-bots' = 'health-bot' + 'host-pools' = 'host-pool' + 'hosting-environments' = 'hosting-environment' + 'hub-route-tables' = 'hub-route-table' + 'hub-virtual-network-connections' = 'hub-virtual-network-connection' + 'hybrid-connections' = 'hybrid-connection' + 'hybrid-connection-namespaces' = 'hybrid-connection-namespace' + 'identity-providers' = 'identity-provider' + 'image-templates' = 'image-template' + 'images' = 'image' + 'immutability-policies' = 'immutability-policy' + 'inbound-nat-rules' = 'inbound-nat-rule' + 'integration-runtimes' = 'integration-runtime' + 'iotconnectors' = 'iotconnector' + 'ip-groups' = 'ip-group' + 'job-schedules' = 'job-schedule' + 'key-values' = 'key-value' + 'keys' = 'key' + 'labs' = 'lab' + 'linked-backends' = 'linked-backend' + 'linked-services' = 'linked-service' + 'linked-storage-accounts' = 'linked-storage-account' + 'load-balancers' = 'load-balancer' + 'local-network-gateways' = 'local-network-gateway' + 'local-users' = 'local-user' + 'locks' = 'lock' + 'maintenance-configurations' = 'maintenance-configuration' + 'managed-clusters' = 'managed-cluster' + 'managed-environments' = 'managed-environment' + 'managed-instances' = 'managed-instance' + 'managed-private-endpoints' = 'managed-private-endpoint' + 'managed-virtual-networks' = 'managed-virtual-network' + 'management-group' = 'management-group' + 'management-groups' = 'management-group' + 'management-policies' = 'management-policy' + 'metric-alerts' = 'metric-alert' + 'migration-configurations' = 'migration-configuration' + 'modules' = 'module' + 'mongodb-databases' = 'mongodb-database' + 'mx' = 'mx' + 'named-values' = 'named-value' + 'namespaces' = 'namespace' + 'nat-gateways' = 'nat-gateway' + 'nat-rules' = 'nat-rule' + 'net-app-accounts' = 'net-app-account' + 'network-groups' = 'network-group' + 'network-interfaces' = 'network-interface' + 'network-managers' = 'network-manager' + 'network-rule-sets' = 'network-rule-set' + 'network-security-groups' = 'network-security-group' + 'network-watchers' = 'network-watcher' + 'notificationchannels' = 'notificationchannel' + 'ns' = 'ns' + 'origins' = 'origin' + 'policies' = 'policy' + 'policy-assignments' = 'policy-assignment' + 'policy-definitions' = 'policy-definition' + 'policy-exemptions' = 'policy-exemption' + 'policy-set-definitions' = 'policy-set-definition' + 'policysets' = 'policyset' + 'portalsettings' = 'portalsetting' + 'private-dns-zone-groups' = 'private-dns-zone-group' + 'private-dns-zones' = 'private-dns-zone' + 'private-endpoints' = 'private-endpoint' + 'private-link-hubs' = 'private-link-hub' + 'private-link-scopes' = 'private-link-scope' + 'private-link-services' = 'private-link-service' + 'products' = 'product' + 'profiles' = 'profile' + 'protected-items' = 'protected-item' + 'protection-containers' = 'protection-container' + 'proximity-placement-groups' = 'proximity-placement-group' + 'ptr' = 'ptr' + 'public-ip-addresses' = 'public-ip-address' + 'public-ip-prefixes' = 'public-ip-prefix' + 'queue-services' = 'queue-service' + 'queues' = 'queue' + 'redis' = 'redis' + 'registration-definitions' = 'registration-definition' + 'registries' = 'registry' + 'relays' = 'relay' + 'remediations' = 'remediation' + 'replication-alert-settings' = 'replication-alert-setting' + 'replication-fabrics' = 'replication-fabric' + 'replication-policies' = 'replication-policy' + 'replication-protection-container-mappings' = 'replication-protection-container-mapping' + 'replication-protection-containers' = 'replication-protection-container' + 'replications' = 'replication' + 'resource-group' = 'resource-group' + 'resource-groups' = 'resource-group' + 'role-assignments' = 'role-assignment' + 'role-definitions' = 'role-definition' + 'route-tables' = 'route-table' + 'rule-collection-groups' = 'rule-collection-group' + 'rule-collections' = 'rule-collection' + 'rules' = 'rule' + 'runbooks' = 'runbook' + 'saved-searches' = 'saved-searche' + 'scaling-plans' = 'scaling-plan' + 'scheduled-query-rules' = 'scheduled-query-rule' + 'schedules' = 'schedule' + 'scope-connections' = 'scope-connection' + 'scoped-resources' = 'scoped-resource' + 'secrets' = 'secret' + 'security-admin-configurations' = 'security-admin-configuration' + 'security-alert-policies' = 'security-alert-policy' + 'security-rules' = 'security-rule' + 'serverfarms' = 'serverfarm' + 'servers' = 'server' + 'service' = 'service' + 'service-endpoint-policies' = 'service-endpoint-policy' + 'shares' = 'share' + 'signal-r' = 'signal-r' + 'sites' = 'site' + 'slots' = 'slot' + 'soa' = 'soa' + 'software-update-configurations' = 'software-update-configuration' + 'solutions' = 'solution' + 'sql-databases' = 'sql-database' + 'srv' = 'srv' + 'ssh-public-keys' = 'ssh-public-key' + 'static-members' = 'static-member' + 'static-sites' = 'static-site' + 'storage-accounts' = 'storage-account' + 'storage-insight-configs' = 'storage-insight-config' + 'subnets' = 'subnet' + 'subscription' = 'subscription' + 'subscriptions' = 'subscription' + 'system-topics' = 'system-topic' + 'table-services' = 'table-service' + 'tables' = 'table' + 'tags' = 'tags' + 'topics' = 'topic' + 'trafficmanagerprofiles' = 'trafficmanagerprofile' + 'txt' = 'txt' + 'user-assigned-identities' = 'user-assigned-identity' + 'variables' = 'variable' + 'vaults' = 'vault' + 'virtual-hubs' = 'virtual-hub' + 'virtual-machine-scale-sets' = 'virtual-machine-scale-set' + 'virtual-machines' = 'virtual-machine' + 'virtual-network-gateways' = 'virtual-network-gateway' + 'virtual-network-links' = 'virtual-network-link' + 'virtual-network-peerings' = 'virtual-network-peering' + 'virtual-network-rules' = 'virtual-network-rule' + 'virtual-networks' = 'virtual-network' + 'virtual-wans' = 'virtual-wan' + 'virtualnetworks' = 'virtualnetwork' + 'volumes' = 'volume' + 'vpn-gateways' = 'vpn-gateway' + 'vpn-sites' = 'vpn-site' + 'vulnerability-assessments' = 'vulnerability-assessment' + 'wcf-relays' = 'wcf-relay' + 'web-pub-sub' = 'web-pub-sub' + 'webhooks' = 'webhook' + 'webtests' = 'webtest' + 'workflows' = 'workflow' + 'workspaces' = 'workspace' + } + + $relevantFolderPaths = @() + # Get all module folder names + if ($ResourceProviderPath -ne '') { + $relevantFolderPaths += (Get-ChildItem -Path $ResourceProviderPath -Recurse -Directory).FullName | Where-Object { + $_ -notlike '*.bicep*' -and + $_ -notlike '*.shared*' -and + $_ -notlike '*.test*' + } + Write-Verbose ("relevantFolderPaths $relevantFolderPaths") -Verbose + Write-Verbose ("ResourceProviderPath $ResourceProviderPath") -Verbose + $relevantFolderPaths += $ResourceProviderPath + Write-Verbose ("relevantFolderPaths $relevantFolderPaths") -Verbose + + } else { + $relevantFolderPaths = (Get-ChildItem -Path $ModulesFolderPath -Recurse -Directory).FullName | Where-Object { + $_ -notlike '*.bicep*' -and + $_ -notlike '*.shared*' -and + $_ -notlike '*.test*' + } + } + $relevantFolderPaths | Sort-Object -Descending + + # Iterate on all folder names + foreach ($folderPath in $relevantFolderPaths) { + + # Convert each folder name to its kebab-case + $folderName = Split-Path $folderPath -Leaf + + if ($specialConversionHash.ContainsKey($folderName)) { + $newName = $specialConversionHash[$folderName] + } else { + # (? Date: Sun, 30 Jul 2023 18:00:34 +0200 Subject: [PATCH 2/4] storage --- .../modulePipelines/ms.storage.storageaccounts.yml | 4 ++-- .github/workflows/ms.storage.storageaccounts.yml | 4 ++-- .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/nfs/dependencies.bicep | 0 .../.test/nfs/main.test.bicep | 0 .../.test/v1/main.test.bicep | 0 .../{storage-accounts => storage-account}/README.md | 10 +++++----- .../blob-service}/README.md | 0 .../container}/.bicep/nested_roleAssignments.bicep | 0 .../blob-service/container}/README.md | 0 .../container/immutability-policy}/README.md | 0 .../container/immutability-policy}/main.bicep | 0 .../container/immutability-policy}/main.json | 0 .../container/immutability-policy}/metadata.json | 0 .../container/immutability-policy}/version.json | 0 .../blob-service/container}/main.bicep | 2 +- .../blob-service/container}/main.json | 0 .../blob-service/container}/metadata.json | 0 .../blob-service/container}/version.json | 0 .../blob-service}/main.bicep | 2 +- .../blob-service}/main.json | 0 .../blob-service}/metadata.json | 0 .../blob-service}/version.json | 0 .../file-service}/README.md | 0 .../file-service}/main.bicep | 2 +- .../file-service}/main.json | 0 .../file-service}/metadata.json | 0 .../share}/.bicep/nested_roleAssignments.bicep | 0 .../file-service/share}/README.md | 0 .../file-service/share}/main.bicep | 0 .../file-service/share}/main.json | 0 .../file-service/share}/metadata.json | 0 .../file-service/share}/version.json | 0 .../file-service}/version.json | 0 .../local-user}/README.md | 0 .../local-user}/main.bicep | 0 .../local-user}/main.json | 0 .../local-user}/metadata.json | 0 .../local-user}/version.json | 0 .../{storage-accounts => storage-account}/main.bicep | 12 ++++++------ .../{storage-accounts => storage-account}/main.json | 0 .../management-policy}/README.md | 0 .../management-policy}/main.bicep | 0 .../management-policy}/main.json | 0 .../management-policy}/metadata.json | 0 .../management-policy}/version.json | 0 .../metadata.json | 0 .../queue-service}/README.md | 0 .../queue-service}/main.bicep | 2 +- .../queue-service}/main.json | 0 .../queue-service}/metadata.json | 0 .../queue}/.bicep/nested_roleAssignments.bicep | 0 .../queue-service/queue}/README.md | 0 .../queue-service/queue}/main.bicep | 0 .../queue-service/queue}/main.json | 0 .../queue-service/queue}/metadata.json | 0 .../queue-service/queue}/version.json | 0 .../queue-service}/version.json | 0 .../table-service}/README.md | 0 .../table-service}/main.bicep | 2 +- .../table-service}/main.json | 0 .../table-service}/metadata.json | 0 .../table-service/table}/README.md | 0 .../table-service/table}/main.bicep | 0 .../table-service/table}/main.json | 0 .../table-service/table}/metadata.json | 0 .../table-service/table}/version.json | 0 .../table-service}/version.json | 0 .../version.json | 0 75 files changed, 20 insertions(+), 20 deletions(-) rename modules/storage/{storage-accounts => storage-account}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/common/dependencies.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/common/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/encr/dependencies.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/encr/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/min/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/nfs/dependencies.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/nfs/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/v1/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/README.md (99%) rename modules/storage/{storage-accounts/blob-services => storage-account/blob-service}/README.md (100%) rename modules/storage/{storage-accounts/blob-services/containers => storage-account/blob-service/container}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts/blob-services/containers => storage-account/blob-service/container}/README.md (100%) rename modules/storage/{storage-accounts/blob-services/containers/immutability-policies => storage-account/blob-service/container/immutability-policy}/README.md (100%) rename modules/storage/{storage-accounts/blob-services/containers/immutability-policies => storage-account/blob-service/container/immutability-policy}/main.bicep (100%) rename modules/storage/{storage-accounts/blob-services/containers/immutability-policies => storage-account/blob-service/container/immutability-policy}/main.json (100%) rename modules/storage/{storage-accounts/blob-services/containers/immutability-policies => storage-account/blob-service/container/immutability-policy}/metadata.json (100%) rename modules/storage/{storage-accounts/blob-services/containers/immutability-policies => storage-account/blob-service/container/immutability-policy}/version.json (100%) rename modules/storage/{storage-accounts/blob-services/containers => storage-account/blob-service/container}/main.bicep (98%) rename modules/storage/{storage-accounts/blob-services/containers => storage-account/blob-service/container}/main.json (100%) rename modules/storage/{storage-accounts/blob-services/containers => storage-account/blob-service/container}/metadata.json (100%) rename modules/storage/{storage-accounts/blob-services/containers => storage-account/blob-service/container}/version.json (100%) rename modules/storage/{storage-accounts/blob-services => storage-account/blob-service}/main.bicep (99%) rename modules/storage/{storage-accounts/blob-services => storage-account/blob-service}/main.json (100%) rename modules/storage/{storage-accounts/blob-services => storage-account/blob-service}/metadata.json (100%) rename modules/storage/{storage-accounts/blob-services => storage-account/blob-service}/version.json (100%) rename modules/storage/{storage-accounts/file-services => storage-account/file-service}/README.md (100%) rename modules/storage/{storage-accounts/file-services => storage-account/file-service}/main.bicep (98%) rename modules/storage/{storage-accounts/file-services => storage-account/file-service}/main.json (100%) rename modules/storage/{storage-accounts/file-services => storage-account/file-service}/metadata.json (100%) rename modules/storage/{storage-accounts/file-services/shares => storage-account/file-service/share}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts/file-services/shares => storage-account/file-service/share}/README.md (100%) rename modules/storage/{storage-accounts/file-services/shares => storage-account/file-service/share}/main.bicep (100%) rename modules/storage/{storage-accounts/file-services/shares => storage-account/file-service/share}/main.json (100%) rename modules/storage/{storage-accounts/file-services/shares => storage-account/file-service/share}/metadata.json (100%) rename modules/storage/{storage-accounts/file-services/shares => storage-account/file-service/share}/version.json (100%) rename modules/storage/{storage-accounts/file-services => storage-account/file-service}/version.json (100%) rename modules/storage/{storage-accounts/local-users => storage-account/local-user}/README.md (100%) rename modules/storage/{storage-accounts/local-users => storage-account/local-user}/main.bicep (100%) rename modules/storage/{storage-accounts/local-users => storage-account/local-user}/main.json (100%) rename modules/storage/{storage-accounts/local-users => storage-account/local-user}/metadata.json (100%) rename modules/storage/{storage-accounts/local-users => storage-account/local-user}/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/main.bicep (97%) rename modules/storage/{storage-accounts => storage-account}/main.json (100%) rename modules/storage/{storage-accounts/management-policies => storage-account/management-policy}/README.md (100%) rename modules/storage/{storage-accounts/management-policies => storage-account/management-policy}/main.bicep (100%) rename modules/storage/{storage-accounts/management-policies => storage-account/management-policy}/main.json (100%) rename modules/storage/{storage-accounts/management-policies => storage-account/management-policy}/metadata.json (100%) rename modules/storage/{storage-accounts/management-policies => storage-account/management-policy}/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/metadata.json (100%) rename modules/storage/{storage-accounts/queue-services => storage-account/queue-service}/README.md (100%) rename modules/storage/{storage-accounts/queue-services => storage-account/queue-service}/main.bicep (98%) rename modules/storage/{storage-accounts/queue-services => storage-account/queue-service}/main.json (100%) rename modules/storage/{storage-accounts/queue-services => storage-account/queue-service}/metadata.json (100%) rename modules/storage/{storage-accounts/queue-services/queues => storage-account/queue-service/queue}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts/queue-services/queues => storage-account/queue-service/queue}/README.md (100%) rename modules/storage/{storage-accounts/queue-services/queues => storage-account/queue-service/queue}/main.bicep (100%) rename modules/storage/{storage-accounts/queue-services/queues => storage-account/queue-service/queue}/main.json (100%) rename modules/storage/{storage-accounts/queue-services/queues => storage-account/queue-service/queue}/metadata.json (100%) rename modules/storage/{storage-accounts/queue-services/queues => storage-account/queue-service/queue}/version.json (100%) rename modules/storage/{storage-accounts/queue-services => storage-account/queue-service}/version.json (100%) rename modules/storage/{storage-accounts/table-services => storage-account/table-service}/README.md (100%) rename modules/storage/{storage-accounts/table-services => storage-account/table-service}/main.bicep (98%) rename modules/storage/{storage-accounts/table-services => storage-account/table-service}/main.json (100%) rename modules/storage/{storage-accounts/table-services => storage-account/table-service}/metadata.json (100%) rename modules/storage/{storage-accounts/table-services/tables => storage-account/table-service/table}/README.md (100%) rename modules/storage/{storage-accounts/table-services/tables => storage-account/table-service/table}/main.bicep (100%) rename modules/storage/{storage-accounts/table-services/tables => storage-account/table-service/table}/main.json (100%) rename modules/storage/{storage-accounts/table-services/tables => storage-account/table-service/table}/metadata.json (100%) rename modules/storage/{storage-accounts/table-services/tables => storage-account/table-service/table}/version.json (100%) rename modules/storage/{storage-accounts/table-services => storage-account/table-service}/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/version.json (100%) diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml index 4b51d88862..672f1ba59d 100644 --- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml +++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml @@ -27,7 +27,7 @@ trigger: - main paths: include: - - '/modules/storage/storage-accounts/*' + - '/modules/storage/storage-account/*' - '/modules/network/private-endpoints/*' - '/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml' - '/.azuredevops/pipelineTemplates/*.yml' @@ -40,7 +40,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/storage/storage-accounts' + value: '/modules/storage/storage-account' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml index 3cc0b29252..9dc14ff442 100644 --- a/.github/workflows/ms.storage.storageaccounts.yml +++ b/.github/workflows/ms.storage.storageaccounts.yml @@ -27,7 +27,7 @@ on: branches: - main paths: - - 'modules/storage/storage-accounts/**' + - 'modules/storage/storage-account/**' - 'modules/network/private-endpoints/**' - '.github/actions/templates/**' - '.github/workflows/template.module.yml' @@ -37,7 +37,7 @@ on: - '!*/**/README.md' env: - modulePath: 'modules/storage/storage-accounts' + modulePath: 'modules/storage/storage-account' workflowPath: '.github/workflows/ms.storage.storageaccounts.yml' concurrency: diff --git a/modules/storage/storage-accounts/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/.test/common/dependencies.bicep b/modules/storage/storage-account/.test/common/dependencies.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/common/dependencies.bicep rename to modules/storage/storage-account/.test/common/dependencies.bicep diff --git a/modules/storage/storage-accounts/.test/common/main.test.bicep b/modules/storage/storage-account/.test/common/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/common/main.test.bicep rename to modules/storage/storage-account/.test/common/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/encr/dependencies.bicep b/modules/storage/storage-account/.test/encr/dependencies.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/encr/dependencies.bicep rename to modules/storage/storage-account/.test/encr/dependencies.bicep diff --git a/modules/storage/storage-accounts/.test/encr/main.test.bicep b/modules/storage/storage-account/.test/encr/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/encr/main.test.bicep rename to modules/storage/storage-account/.test/encr/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/main.test.bicep b/modules/storage/storage-account/.test/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/main.test.bicep rename to modules/storage/storage-account/.test/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/min/main.test.bicep b/modules/storage/storage-account/.test/min/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/min/main.test.bicep rename to modules/storage/storage-account/.test/min/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/nfs/dependencies.bicep b/modules/storage/storage-account/.test/nfs/dependencies.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/nfs/dependencies.bicep rename to modules/storage/storage-account/.test/nfs/dependencies.bicep diff --git a/modules/storage/storage-accounts/.test/nfs/main.test.bicep b/modules/storage/storage-account/.test/nfs/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/nfs/main.test.bicep rename to modules/storage/storage-account/.test/nfs/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/v1/main.test.bicep b/modules/storage/storage-account/.test/v1/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/v1/main.test.bicep rename to modules/storage/storage-account/.test/v1/main.test.bicep diff --git a/modules/storage/storage-accounts/README.md b/modules/storage/storage-account/README.md similarity index 99% rename from modules/storage/storage-accounts/README.md rename to modules/storage/storage-account/README.md index a3cfbbb8b8..57b23f8dd8 100644 --- a/modules/storage/storage-accounts/README.md +++ b/modules/storage/storage-account/README.md @@ -426,7 +426,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssacom' params: { // Required parameters @@ -891,7 +891,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssaencr' params: { // Required parameters @@ -1058,7 +1058,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssamin' params: { // Required parameters @@ -1107,7 +1107,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssanfs' params: { // Required parameters @@ -1252,7 +1252,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssav1' params: { // Required parameters diff --git a/modules/storage/storage-accounts/blob-services/README.md b/modules/storage/storage-account/blob-service/README.md similarity index 100% rename from modules/storage/storage-accounts/blob-services/README.md rename to modules/storage/storage-account/blob-service/README.md diff --git a/modules/storage/storage-accounts/blob-services/containers/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/blob-service/container/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/blob-service/container/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/blob-services/containers/README.md b/modules/storage/storage-account/blob-service/container/README.md similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/README.md rename to modules/storage/storage-account/blob-service/container/README.md diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/README.md b/modules/storage/storage-account/blob-service/container/immutability-policy/README.md similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/README.md rename to modules/storage/storage-account/blob-service/container/immutability-policy/README.md diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.bicep b/modules/storage/storage-account/blob-service/container/immutability-policy/main.bicep similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.bicep rename to modules/storage/storage-account/blob-service/container/immutability-policy/main.bicep diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.json b/modules/storage/storage-account/blob-service/container/immutability-policy/main.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.json rename to modules/storage/storage-account/blob-service/container/immutability-policy/main.json diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/metadata.json b/modules/storage/storage-account/blob-service/container/immutability-policy/metadata.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/metadata.json rename to modules/storage/storage-account/blob-service/container/immutability-policy/metadata.json diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/version.json b/modules/storage/storage-account/blob-service/container/immutability-policy/version.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/version.json rename to modules/storage/storage-account/blob-service/container/immutability-policy/version.json diff --git a/modules/storage/storage-accounts/blob-services/containers/main.bicep b/modules/storage/storage-account/blob-service/container/main.bicep similarity index 98% rename from modules/storage/storage-accounts/blob-services/containers/main.bicep rename to modules/storage/storage-account/blob-service/container/main.bicep index eb0bbda0a5..8e05b15ebb 100644 --- a/modules/storage/storage-accounts/blob-services/containers/main.bicep +++ b/modules/storage/storage-account/blob-service/container/main.bicep @@ -81,7 +81,7 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } } -module immutabilityPolicy 'immutability-policies/main.bicep' = if (!empty(immutabilityPolicyProperties)) { +module immutabilityPolicy 'immutability-policy/main.bicep' = if (!empty(immutabilityPolicyProperties)) { name: immutabilityPolicyName params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/blob-services/containers/main.json b/modules/storage/storage-account/blob-service/container/main.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/main.json rename to modules/storage/storage-account/blob-service/container/main.json diff --git a/modules/storage/storage-accounts/blob-services/containers/metadata.json b/modules/storage/storage-account/blob-service/container/metadata.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/metadata.json rename to modules/storage/storage-account/blob-service/container/metadata.json diff --git a/modules/storage/storage-accounts/blob-services/containers/version.json b/modules/storage/storage-account/blob-service/container/version.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/version.json rename to modules/storage/storage-account/blob-service/container/version.json diff --git a/modules/storage/storage-accounts/blob-services/main.bicep b/modules/storage/storage-account/blob-service/main.bicep similarity index 99% rename from modules/storage/storage-accounts/blob-services/main.bicep rename to modules/storage/storage-account/blob-service/main.bicep index 28cbb45d17..5ad98b19d2 100644 --- a/modules/storage/storage-accounts/blob-services/main.bicep +++ b/modules/storage/storage-account/blob-service/main.bicep @@ -195,7 +195,7 @@ resource blobServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@ scope: blobServices } -module blobServices_container 'containers/main.bicep' = [for (container, index) in containers: { +module blobServices_container 'container/main.bicep' = [for (container, index) in containers: { name: '${deployment().name}-Container-${index}' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/blob-services/main.json b/modules/storage/storage-account/blob-service/main.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/main.json rename to modules/storage/storage-account/blob-service/main.json diff --git a/modules/storage/storage-accounts/blob-services/metadata.json b/modules/storage/storage-account/blob-service/metadata.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/metadata.json rename to modules/storage/storage-account/blob-service/metadata.json diff --git a/modules/storage/storage-accounts/blob-services/version.json b/modules/storage/storage-account/blob-service/version.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/version.json rename to modules/storage/storage-account/blob-service/version.json diff --git a/modules/storage/storage-accounts/file-services/README.md b/modules/storage/storage-account/file-service/README.md similarity index 100% rename from modules/storage/storage-accounts/file-services/README.md rename to modules/storage/storage-account/file-service/README.md diff --git a/modules/storage/storage-accounts/file-services/main.bicep b/modules/storage/storage-account/file-service/main.bicep similarity index 98% rename from modules/storage/storage-accounts/file-services/main.bicep rename to modules/storage/storage-account/file-service/main.bicep index b687090f16..be1f921551 100644 --- a/modules/storage/storage-accounts/file-services/main.bicep +++ b/modules/storage/storage-account/file-service/main.bicep @@ -131,7 +131,7 @@ resource fileServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@ scope: fileServices } -module fileServices_shares 'shares/main.bicep' = [for (share, index) in shares: { +module fileServices_shares 'share/main.bicep' = [for (share, index) in shares: { name: '${deployment().name}-shares-${index}' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/file-services/main.json b/modules/storage/storage-account/file-service/main.json similarity index 100% rename from modules/storage/storage-accounts/file-services/main.json rename to modules/storage/storage-account/file-service/main.json diff --git a/modules/storage/storage-accounts/file-services/metadata.json b/modules/storage/storage-account/file-service/metadata.json similarity index 100% rename from modules/storage/storage-accounts/file-services/metadata.json rename to modules/storage/storage-account/file-service/metadata.json diff --git a/modules/storage/storage-accounts/file-services/shares/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/file-service/share/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/file-service/share/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/file-services/shares/README.md b/modules/storage/storage-account/file-service/share/README.md similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/README.md rename to modules/storage/storage-account/file-service/share/README.md diff --git a/modules/storage/storage-accounts/file-services/shares/main.bicep b/modules/storage/storage-account/file-service/share/main.bicep similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/main.bicep rename to modules/storage/storage-account/file-service/share/main.bicep diff --git a/modules/storage/storage-accounts/file-services/shares/main.json b/modules/storage/storage-account/file-service/share/main.json similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/main.json rename to modules/storage/storage-account/file-service/share/main.json diff --git a/modules/storage/storage-accounts/file-services/shares/metadata.json b/modules/storage/storage-account/file-service/share/metadata.json similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/metadata.json rename to modules/storage/storage-account/file-service/share/metadata.json diff --git a/modules/storage/storage-accounts/file-services/shares/version.json b/modules/storage/storage-account/file-service/share/version.json similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/version.json rename to modules/storage/storage-account/file-service/share/version.json diff --git a/modules/storage/storage-accounts/file-services/version.json b/modules/storage/storage-account/file-service/version.json similarity index 100% rename from modules/storage/storage-accounts/file-services/version.json rename to modules/storage/storage-account/file-service/version.json diff --git a/modules/storage/storage-accounts/local-users/README.md b/modules/storage/storage-account/local-user/README.md similarity index 100% rename from modules/storage/storage-accounts/local-users/README.md rename to modules/storage/storage-account/local-user/README.md diff --git a/modules/storage/storage-accounts/local-users/main.bicep b/modules/storage/storage-account/local-user/main.bicep similarity index 100% rename from modules/storage/storage-accounts/local-users/main.bicep rename to modules/storage/storage-account/local-user/main.bicep diff --git a/modules/storage/storage-accounts/local-users/main.json b/modules/storage/storage-account/local-user/main.json similarity index 100% rename from modules/storage/storage-accounts/local-users/main.json rename to modules/storage/storage-account/local-user/main.json diff --git a/modules/storage/storage-accounts/local-users/metadata.json b/modules/storage/storage-account/local-user/metadata.json similarity index 100% rename from modules/storage/storage-accounts/local-users/metadata.json rename to modules/storage/storage-account/local-user/metadata.json diff --git a/modules/storage/storage-accounts/local-users/version.json b/modules/storage/storage-account/local-user/version.json similarity index 100% rename from modules/storage/storage-accounts/local-users/version.json rename to modules/storage/storage-account/local-user/version.json diff --git a/modules/storage/storage-accounts/main.bicep b/modules/storage/storage-account/main.bicep similarity index 97% rename from modules/storage/storage-accounts/main.bicep rename to modules/storage/storage-account/main.bicep index b98f5228cf..558f081f3f 100644 --- a/modules/storage/storage-accounts/main.bicep +++ b/modules/storage/storage-account/main.bicep @@ -369,7 +369,7 @@ module storageAccount_privateEndpoints '../../network/private-endpoints/main.bic }] // Lifecycle Policy -module storageAccount_managementPolicies 'management-policies/main.bicep' = if (!empty(managementPolicyRules)) { +module storageAccount_managementPolicies 'management-policy/main.bicep' = if (!empty(managementPolicyRules)) { name: '${uniqueString(deployment().name, location)}-Storage-ManagementPolicies' params: { storageAccountName: storageAccount.name @@ -379,7 +379,7 @@ module storageAccount_managementPolicies 'management-policies/main.bicep' = if ( } // SFTP user settings -module storageAccount_localUsers 'local-users/main.bicep' = [for (localUser, index) in localUsers: { +module storageAccount_localUsers 'local-user/main.bicep' = [for (localUser, index) in localUsers: { name: '${uniqueString(deployment().name, location)}-Storage-LocalUsers-${index}' params: { storageAccountName: storageAccount.name @@ -395,7 +395,7 @@ module storageAccount_localUsers 'local-users/main.bicep' = [for (localUser, ind }] // Containers -module storageAccount_blobServices 'blob-services/main.bicep' = if (!empty(blobServices)) { +module storageAccount_blobServices 'blob-service/main.bicep' = if (!empty(blobServices)) { name: '${uniqueString(deployment().name, location)}-Storage-BlobServices' params: { storageAccountName: storageAccount.name @@ -426,7 +426,7 @@ module storageAccount_blobServices 'blob-services/main.bicep' = if (!empty(blobS } // File Shares -module storageAccount_fileServices 'file-services/main.bicep' = if (!empty(fileServices)) { +module storageAccount_fileServices 'file-service/main.bicep' = if (!empty(fileServices)) { name: '${uniqueString(deployment().name, location)}-Storage-FileServices' params: { storageAccountName: storageAccount.name @@ -448,7 +448,7 @@ module storageAccount_fileServices 'file-services/main.bicep' = if (!empty(fileS } // Queue -module storageAccount_queueServices 'queue-services/main.bicep' = if (!empty(queueServices)) { +module storageAccount_queueServices 'queue-service/main.bicep' = if (!empty(queueServices)) { name: '${uniqueString(deployment().name, location)}-Storage-QueueServices' params: { storageAccountName: storageAccount.name @@ -465,7 +465,7 @@ module storageAccount_queueServices 'queue-services/main.bicep' = if (!empty(que } // Table -module storageAccount_tableServices 'table-services/main.bicep' = if (!empty(tableServices)) { +module storageAccount_tableServices 'table-service/main.bicep' = if (!empty(tableServices)) { name: '${uniqueString(deployment().name, location)}-Storage-TableServices' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/main.json b/modules/storage/storage-account/main.json similarity index 100% rename from modules/storage/storage-accounts/main.json rename to modules/storage/storage-account/main.json diff --git a/modules/storage/storage-accounts/management-policies/README.md b/modules/storage/storage-account/management-policy/README.md similarity index 100% rename from modules/storage/storage-accounts/management-policies/README.md rename to modules/storage/storage-account/management-policy/README.md diff --git a/modules/storage/storage-accounts/management-policies/main.bicep b/modules/storage/storage-account/management-policy/main.bicep similarity index 100% rename from modules/storage/storage-accounts/management-policies/main.bicep rename to modules/storage/storage-account/management-policy/main.bicep diff --git a/modules/storage/storage-accounts/management-policies/main.json b/modules/storage/storage-account/management-policy/main.json similarity index 100% rename from modules/storage/storage-accounts/management-policies/main.json rename to modules/storage/storage-account/management-policy/main.json diff --git a/modules/storage/storage-accounts/management-policies/metadata.json b/modules/storage/storage-account/management-policy/metadata.json similarity index 100% rename from modules/storage/storage-accounts/management-policies/metadata.json rename to modules/storage/storage-account/management-policy/metadata.json diff --git a/modules/storage/storage-accounts/management-policies/version.json b/modules/storage/storage-account/management-policy/version.json similarity index 100% rename from modules/storage/storage-accounts/management-policies/version.json rename to modules/storage/storage-account/management-policy/version.json diff --git a/modules/storage/storage-accounts/metadata.json b/modules/storage/storage-account/metadata.json similarity index 100% rename from modules/storage/storage-accounts/metadata.json rename to modules/storage/storage-account/metadata.json diff --git a/modules/storage/storage-accounts/queue-services/README.md b/modules/storage/storage-account/queue-service/README.md similarity index 100% rename from modules/storage/storage-accounts/queue-services/README.md rename to modules/storage/storage-account/queue-service/README.md diff --git a/modules/storage/storage-accounts/queue-services/main.bicep b/modules/storage/storage-account/queue-service/main.bicep similarity index 98% rename from modules/storage/storage-accounts/queue-services/main.bicep rename to modules/storage/storage-account/queue-service/main.bicep index e9ccd22467..391ffa103f 100644 --- a/modules/storage/storage-accounts/queue-services/main.bicep +++ b/modules/storage/storage-account/queue-service/main.bicep @@ -117,7 +117,7 @@ resource queueServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings scope: queueServices } -module queueServices_queues 'queues/main.bicep' = [for (queue, index) in queues: { +module queueServices_queues 'queue/main.bicep' = [for (queue, index) in queues: { name: '${deployment().name}-Queue-${index}' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/queue-services/main.json b/modules/storage/storage-account/queue-service/main.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/main.json rename to modules/storage/storage-account/queue-service/main.json diff --git a/modules/storage/storage-accounts/queue-services/metadata.json b/modules/storage/storage-account/queue-service/metadata.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/metadata.json rename to modules/storage/storage-account/queue-service/metadata.json diff --git a/modules/storage/storage-accounts/queue-services/queues/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/queue-service/queue/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/queue-service/queue/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/queue-services/queues/README.md b/modules/storage/storage-account/queue-service/queue/README.md similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/README.md rename to modules/storage/storage-account/queue-service/queue/README.md diff --git a/modules/storage/storage-accounts/queue-services/queues/main.bicep b/modules/storage/storage-account/queue-service/queue/main.bicep similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/main.bicep rename to modules/storage/storage-account/queue-service/queue/main.bicep diff --git a/modules/storage/storage-accounts/queue-services/queues/main.json b/modules/storage/storage-account/queue-service/queue/main.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/main.json rename to modules/storage/storage-account/queue-service/queue/main.json diff --git a/modules/storage/storage-accounts/queue-services/queues/metadata.json b/modules/storage/storage-account/queue-service/queue/metadata.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/metadata.json rename to modules/storage/storage-account/queue-service/queue/metadata.json diff --git a/modules/storage/storage-accounts/queue-services/queues/version.json b/modules/storage/storage-account/queue-service/queue/version.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/version.json rename to modules/storage/storage-account/queue-service/queue/version.json diff --git a/modules/storage/storage-accounts/queue-services/version.json b/modules/storage/storage-account/queue-service/version.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/version.json rename to modules/storage/storage-account/queue-service/version.json diff --git a/modules/storage/storage-accounts/table-services/README.md b/modules/storage/storage-account/table-service/README.md similarity index 100% rename from modules/storage/storage-accounts/table-services/README.md rename to modules/storage/storage-account/table-service/README.md diff --git a/modules/storage/storage-accounts/table-services/main.bicep b/modules/storage/storage-account/table-service/main.bicep similarity index 98% rename from modules/storage/storage-accounts/table-services/main.bicep rename to modules/storage/storage-account/table-service/main.bicep index 933d80b9fd..b2ab5ff03b 100644 --- a/modules/storage/storage-accounts/table-services/main.bicep +++ b/modules/storage/storage-account/table-service/main.bicep @@ -117,7 +117,7 @@ resource tableServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings scope: tableServices } -module tableServices_tables 'tables/main.bicep' = [for (tableName, index) in tables: { +module tableServices_tables 'table/main.bicep' = [for (tableName, index) in tables: { name: '${deployment().name}-Table-${index}' params: { name: tableName diff --git a/modules/storage/storage-accounts/table-services/main.json b/modules/storage/storage-account/table-service/main.json similarity index 100% rename from modules/storage/storage-accounts/table-services/main.json rename to modules/storage/storage-account/table-service/main.json diff --git a/modules/storage/storage-accounts/table-services/metadata.json b/modules/storage/storage-account/table-service/metadata.json similarity index 100% rename from modules/storage/storage-accounts/table-services/metadata.json rename to modules/storage/storage-account/table-service/metadata.json diff --git a/modules/storage/storage-accounts/table-services/tables/README.md b/modules/storage/storage-account/table-service/table/README.md similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/README.md rename to modules/storage/storage-account/table-service/table/README.md diff --git a/modules/storage/storage-accounts/table-services/tables/main.bicep b/modules/storage/storage-account/table-service/table/main.bicep similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/main.bicep rename to modules/storage/storage-account/table-service/table/main.bicep diff --git a/modules/storage/storage-accounts/table-services/tables/main.json b/modules/storage/storage-account/table-service/table/main.json similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/main.json rename to modules/storage/storage-account/table-service/table/main.json diff --git a/modules/storage/storage-accounts/table-services/tables/metadata.json b/modules/storage/storage-account/table-service/table/metadata.json similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/metadata.json rename to modules/storage/storage-account/table-service/table/metadata.json diff --git a/modules/storage/storage-accounts/table-services/tables/version.json b/modules/storage/storage-account/table-service/table/version.json similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/version.json rename to modules/storage/storage-account/table-service/table/version.json diff --git a/modules/storage/storage-accounts/table-services/version.json b/modules/storage/storage-account/table-service/version.json similarity index 100% rename from modules/storage/storage-accounts/table-services/version.json rename to modules/storage/storage-account/table-service/version.json diff --git a/modules/storage/storage-accounts/version.json b/modules/storage/storage-account/version.json similarity index 100% rename from modules/storage/storage-accounts/version.json rename to modules/storage/storage-account/version.json From 3fa6582989b54d902fa944c7d9dc7ddb52838bf0 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 30 Jul 2023 18:06:26 +0200 Subject: [PATCH 3/4] readmes --- modules/storage/storage-account/README.md | 22 +++++++++---------- .../storage-account/blob-service/README.md | 4 ++-- .../blob-service/container/README.md | 2 +- .../container/immutability-policy/README.md | 2 +- .../storage-account/file-service/README.md | 4 ++-- .../file-service/share/README.md | 2 +- .../storage-account/local-user/README.md | 2 +- .../management-policy/README.md | 2 +- .../storage-account/queue-service/README.md | 4 ++-- .../queue-service/queue/README.md | 2 +- .../storage-account/table-service/README.md | 4 ++-- .../table-service/table/README.md | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/storage/storage-account/README.md b/modules/storage/storage-account/README.md index 57b23f8dd8..6edbda5373 100644 --- a/modules/storage/storage-account/README.md +++ b/modules/storage/storage-account/README.md @@ -1,4 +1,4 @@ -# Storage Accounts `[Microsoft.Storage/storageAccounts]` +# Storage Accounts `[Microsoft.Storage/storageAccount]` This module deploys a Storage Account. @@ -59,7 +59,7 @@ This module deploys a Storage Account. | `allowedCopyScope` | string | `''` | `['', AAD, PrivateLink]` | Restrict copy to and from Storage Accounts within an AAD tenant or with Private Links to the same VNet. | | `allowSharedKeyAccess` | bool | `True` | | Indicates whether the storage account permits requests to be authorized with the account access key via Shared Key. If false, then all requests, including shared access signatures, must be authorized with Azure Active Directory (Azure AD). The default value is null, which is equivalent to true. | | `azureFilesIdentityBasedAuthentication` | object | `{object}` | | Provides the identity based authentication settings for Azure Files. | -| `blobServices` | _[blobServices](blob-services/README.md)_ object | `{object}` | | Blob service and containers to deploy. | +| `blobServices` | object | `{object}` | | Blob service and containers to deploy. | | `cMKKeyName` | string | `''` | | The name of the customer managed key to use for encryption. Cannot be deployed together with the parameter 'systemAssignedIdentity' enabled. | | `cMKKeyVersion` | string | `''` | | The version of the customer managed key to reference for encryption. If not provided, latest is used. | | `customDomainName` | string | `''` | | Sets the custom domain name assigned to the storage account. Name is the CNAME source. | @@ -76,11 +76,11 @@ This module deploys a Storage Account. | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | | `enableNfsV3` | bool | `False` | | If true, enables NFS 3.0 support for the storage account. Requires enableHierarchicalNamespace to be true. | | `enableSftp` | bool | `False` | | If true, enables Secure File Transfer Protocol for the storage account. Requires enableHierarchicalNamespace to be true. | -| `fileServices` | _[fileServices](file-services/README.md)_ object | `{object}` | | File service and shares to deploy. | +| `fileServices` | object | `{object}` | | File service and shares to deploy. | | `isLocalUserEnabled` | bool | `False` | | Enables local users feature, if set to true. | | `kind` | string | `'StorageV2'` | `[BlobStorage, BlockBlobStorage, FileStorage, Storage, StorageV2]` | Type of Storage Account to create. | | `largeFileSharesState` | string | `'Disabled'` | `[Disabled, Enabled]` | Allow large file shares if sets to 'Enabled'. It cannot be disabled once it is enabled. Only supported on locally redundant and zone redundant file shares. It cannot be set on FileStorage storage accounts (storage accounts for premium file shares). | -| `localUsers` | _[localUsers](local-users/README.md)_ array | `[]` | | Local users to deploy for SFTP authentication. | +| `localUsers` | array | `[]` | | Local users to deploy for SFTP authentication. | | `location` | string | `[resourceGroup().location]` | | Location for all resources. | | `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | | `managementPolicyRules` | array | `[]` | | The Storage Account ManagementPolicies Rules. | @@ -88,14 +88,14 @@ This module deploys a Storage Account. | `networkAcls` | object | `{object}` | | Networks ACLs, this value contains IPs to whitelist and/or Subnet information. For security reasons, it is recommended to set the DefaultAction Deny. | | `privateEndpoints` | array | `[]` | | Configuration details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible. | | `publicNetworkAccess` | string | `''` | `['', Disabled, Enabled]` | Whether or not public network access is allowed for this resource. For security reasons it should be disabled. If not specified, it will be disabled by default if private endpoints are set and networkAcls are not set. | -| `queueServices` | _[queueServices](queue-services/README.md)_ object | `{object}` | | Queue service and queues to create. | +| `queueServices` | object | `{object}` | | Queue service and queues to create. | | `requireInfrastructureEncryption` | bool | `True` | | A Boolean indicating whether or not the service applies a secondary layer of encryption with platform managed keys for data at rest. For security reasons, it is recommended to set it to true. | | `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | | `sasExpirationPeriod` | string | `''` | | The SAS expiration period. DD.HH:MM:SS. | | `skuName` | string | `'Standard_GRS'` | `[Premium_LRS, Premium_ZRS, Standard_GRS, Standard_GZRS, Standard_LRS, Standard_RAGRS, Standard_RAGZRS, Standard_ZRS]` | Storage Account Sku Name. | | `supportsHttpsTrafficOnly` | bool | `True` | | Allows HTTPS traffic only to storage service if sets to true. | | `systemAssignedIdentity` | bool | `False` | | Enables system assigned managed identity on the resource. | -| `tableServices` | _[tableServices](table-services/README.md)_ object | `{object}` | | Table service and tables to create. | +| `tableServices` | object | `{object}` | | Table service and tables to create. | | `tags` | object | `{object}` | | Tags of the resource. | | `userAssignedIdentities` | object | `{object}` | | The ID(s) to assign to the resource. | @@ -426,7 +426,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module storageAccounts './storage/storage-account/main.bicep' = { +module storageAccount './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssacom' params: { // Required parameters @@ -891,7 +891,7 @@ module storageAccounts './storage/storage-account/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-account/main.bicep' = { +module storageAccount './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssaencr' params: { // Required parameters @@ -1058,7 +1058,7 @@ module storageAccounts './storage/storage-account/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-account/main.bicep' = { +module storageAccount './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssamin' params: { // Required parameters @@ -1107,7 +1107,7 @@ module storageAccounts './storage/storage-account/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-account/main.bicep' = { +module storageAccount './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssanfs' params: { // Required parameters @@ -1252,7 +1252,7 @@ module storageAccounts './storage/storage-account/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-account/main.bicep' = { +module storageAccount './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssav1' params: { // Required parameters diff --git a/modules/storage/storage-account/blob-service/README.md b/modules/storage/storage-account/blob-service/README.md index 15f7d67677..1dbf60731c 100644 --- a/modules/storage/storage-account/blob-service/README.md +++ b/modules/storage/storage-account/blob-service/README.md @@ -1,4 +1,4 @@ -# Storage Account blob Services `[Microsoft.Storage/storageAccounts/blobServices]` +# Storage Account blob Services `[Microsoft.Storage/storageAccount/blobService]` This module deploys a Storage Account Blob Service. @@ -37,7 +37,7 @@ This module deploys a Storage Account Blob Service. | `containerDeleteRetentionPolicyAllowPermanentDelete` | bool | `False` | | This property when set to true allows deletion of the soft deleted blob versions and snapshots. This property cannot be used blob restore policy. This property only applies to blob service and does not apply to containers or file share. | | `containerDeleteRetentionPolicyDays` | int | `7` | | Indicates the number of days that the deleted item should be retained. | | `containerDeleteRetentionPolicyEnabled` | bool | `True` | | The blob service properties for container soft delete. Indicates whether DeleteRetentionPolicy is enabled. | -| `containers` | _[containers](containers/README.md)_ array | `[]` | | Blob containers to create. | +| `containers` | array | `[]` | | Blob containers to create. | | `corsRules` | array | `[]` | | Specifies CORS rules for the Blob service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Blob service. | | `defaultServiceVersion` | string | `''` | | Indicates the default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions. | | `deleteRetentionPolicyDays` | int | `7` | | Indicates the number of days that the deleted blob should be retained. | diff --git a/modules/storage/storage-account/blob-service/container/README.md b/modules/storage/storage-account/blob-service/container/README.md index fdd219e185..f35a761f1d 100644 --- a/modules/storage/storage-account/blob-service/container/README.md +++ b/modules/storage/storage-account/blob-service/container/README.md @@ -1,4 +1,4 @@ -# Storage Account Blob Containers `[Microsoft.Storage/storageAccounts/blobServices/containers]` +# Storage Account Blob Containers `[Microsoft.Storage/storageAccount/blobService/container]` This module deploys a Storage Account Blob Container. diff --git a/modules/storage/storage-account/blob-service/container/immutability-policy/README.md b/modules/storage/storage-account/blob-service/container/immutability-policy/README.md index d08fe5de35..541bb6dcb0 100644 --- a/modules/storage/storage-account/blob-service/container/immutability-policy/README.md +++ b/modules/storage/storage-account/blob-service/container/immutability-policy/README.md @@ -1,4 +1,4 @@ -# Storage Account Blob Container Immutability Policies `[Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies]` +# Storage Account Blob Container Immutability Policies `[Microsoft.Storage/storageAccount/blobService/container/immutabilityPolicy]` This module deploys a Storage Account Blob Container Immutability Policy. diff --git a/modules/storage/storage-account/file-service/README.md b/modules/storage/storage-account/file-service/README.md index c00e88c112..0690881db2 100644 --- a/modules/storage/storage-account/file-service/README.md +++ b/modules/storage/storage-account/file-service/README.md @@ -1,4 +1,4 @@ -# Storage Account File Share Services `[Microsoft.Storage/storageAccounts/fileServices]` +# Storage Account File Share Services `[Microsoft.Storage/storageAccount/fileService]` This module deploys a Storage Account File Share Service. @@ -42,7 +42,7 @@ This module deploys a Storage Account File Share Service. | `name` | string | `'default'` | | The name of the file service. | | `protocolSettings` | object | `{object}` | | Protocol settings for file service. | | `shareDeleteRetentionPolicy` | object | `{object}` | | The service properties for soft delete. | -| `shares` | _[shares](shares/README.md)_ array | `[]` | | File shares to create. | +| `shares` | array | `[]` | | File shares to create. | ## Outputs diff --git a/modules/storage/storage-account/file-service/share/README.md b/modules/storage/storage-account/file-service/share/README.md index db06e991f9..b5bf066e6b 100644 --- a/modules/storage/storage-account/file-service/share/README.md +++ b/modules/storage/storage-account/file-service/share/README.md @@ -1,4 +1,4 @@ -# Storage Account File Shares `[Microsoft.Storage/storageAccounts/fileServices/shares]` +# Storage Account File Shares `[Microsoft.Storage/storageAccount/fileService/share]` This module deploys a Storage Account File Share. diff --git a/modules/storage/storage-account/local-user/README.md b/modules/storage/storage-account/local-user/README.md index 2fdd397e85..5bcdd57fde 100644 --- a/modules/storage/storage-account/local-user/README.md +++ b/modules/storage/storage-account/local-user/README.md @@ -1,4 +1,4 @@ -# Storage Account Local Users `[Microsoft.Storage/storageAccounts/localUsers]` +# Storage Account Local Users `[Microsoft.Storage/storageAccount/localUser]` This module deploys a Storage Account Local User, which is used for SFTP authentication. diff --git a/modules/storage/storage-account/management-policy/README.md b/modules/storage/storage-account/management-policy/README.md index 2931f7fb9f..bf482665e6 100644 --- a/modules/storage/storage-account/management-policy/README.md +++ b/modules/storage/storage-account/management-policy/README.md @@ -1,4 +1,4 @@ -# Storage Account Management Policies `[Microsoft.Storage/storageAccounts/managementPolicies]` +# Storage Account Management Policies `[Microsoft.Storage/storageAccount/managementPolicy]` This module deploys a Storage Account Management Policy. diff --git a/modules/storage/storage-account/queue-service/README.md b/modules/storage/storage-account/queue-service/README.md index c803f6e23a..1c783e7993 100644 --- a/modules/storage/storage-account/queue-service/README.md +++ b/modules/storage/storage-account/queue-service/README.md @@ -1,4 +1,4 @@ -# Storage Account Queue Services `[Microsoft.Storage/storageAccounts/queueServices]` +# Storage Account Queue Services `[Microsoft.Storage/storageAccount/queueService]` This module deploys a Storage Account Queue Service. @@ -39,7 +39,7 @@ This module deploys a Storage Account Queue Service. | `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | `''` | | Resource ID of a log analytics workspace. | | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `queues` | _[queues](queues/README.md)_ array | `[]` | | Queues to create. | +| `queues` | array | `[]` | | Queues to create. | ## Outputs diff --git a/modules/storage/storage-account/queue-service/queue/README.md b/modules/storage/storage-account/queue-service/queue/README.md index 51328da37f..ebff2f15ce 100644 --- a/modules/storage/storage-account/queue-service/queue/README.md +++ b/modules/storage/storage-account/queue-service/queue/README.md @@ -1,4 +1,4 @@ -# Storage Account Queues `[Microsoft.Storage/storageAccounts/queueServices/queues]` +# Storage Account Queues `[Microsoft.Storage/storageAccount/queueService/queue]` This module deploys a Storage Account Queue. diff --git a/modules/storage/storage-account/table-service/README.md b/modules/storage/storage-account/table-service/README.md index e6f1e92436..194b33b330 100644 --- a/modules/storage/storage-account/table-service/README.md +++ b/modules/storage/storage-account/table-service/README.md @@ -1,4 +1,4 @@ -# Storage Account Table Services `[Microsoft.Storage/storageAccounts/tableServices]` +# Storage Account Table Services `[Microsoft.Storage/storageAccount/tableService]` This module deploys a Storage Account Table Service. @@ -38,7 +38,7 @@ This module deploys a Storage Account Table Service. | `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | `''` | | Resource ID of a log analytics workspace. | | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `tables` | _[tables](tables/README.md)_ array | `[]` | | tables to create. | +| `tables` | array | `[]` | | tables to create. | ## Outputs diff --git a/modules/storage/storage-account/table-service/table/README.md b/modules/storage/storage-account/table-service/table/README.md index 445120d8b4..a0a54a19f9 100644 --- a/modules/storage/storage-account/table-service/table/README.md +++ b/modules/storage/storage-account/table-service/table/README.md @@ -1,4 +1,4 @@ -# Storage Account Table `[Microsoft.Storage/storageAccounts/tableServices/tables]` +# Storage Account Table `[Microsoft.Storage/storageAccount/tableService/table]` This module deploys a Storage Account Table. From f7a4ff29a4d1fc8f5ffda8c4183697838c732823 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 30 Jul 2023 18:20:57 +0200 Subject: [PATCH 4/4] storage pipelines --- ...rage.storageaccounts.yml => ms.storage.storageaccount.yml} | 2 +- ...rage.storageaccounts.yml => ms.storage.storageaccount.yml} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename .azuredevops/modulePipelines/{ms.storage.storageaccounts.yml => ms.storage.storageaccount.yml} (99%) rename .github/workflows/{ms.storage.storageaccounts.yml => ms.storage.storageaccount.yml} (95%) diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccount.yml similarity index 99% rename from .azuredevops/modulePipelines/ms.storage.storageaccounts.yml rename to .azuredevops/modulePipelines/ms.storage.storageaccount.yml index 672f1ba59d..4a70fa526b 100644 --- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml +++ b/.azuredevops/modulePipelines/ms.storage.storageaccount.yml @@ -29,7 +29,7 @@ trigger: include: - '/modules/storage/storage-account/*' - '/modules/network/private-endpoints/*' - - '/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml' + - '/.azuredevops/modulePipelines/ms.storage.storageaccount.yml' - '/.azuredevops/pipelineTemplates/*.yml' - '/utilities/pipelines/*' exclude: diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccount.yml similarity index 95% rename from .github/workflows/ms.storage.storageaccounts.yml rename to .github/workflows/ms.storage.storageaccount.yml index 9dc14ff442..7825f8cd98 100644 --- a/.github/workflows/ms.storage.storageaccounts.yml +++ b/.github/workflows/ms.storage.storageaccount.yml @@ -31,14 +31,14 @@ on: - 'modules/network/private-endpoints/**' - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - - '.github/workflows/ms.storage.storageaccounts.yml' + - '.github/workflows/ms.storage.storageaccount.yml' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/README.md' env: modulePath: 'modules/storage/storage-account' - workflowPath: '.github/workflows/ms.storage.storageaccounts.yml' + workflowPath: '.github/workflows/ms.storage.storageaccount.yml' concurrency: group: ${{ github.workflow }}