Organize cmdlet spec via module name

src/CosmosDB/CosmosDB/Az.CosmosDB.psd1

@@ -164,7 +164,6 @@ CmdletsToExport = 'Get-AzCosmosDBSqlContainer',
                'Remove-AzCosmosDBSqlRoleAssignment', 
                'Update-AzCosmosDBSqlRoleDefinition', 
                'Update-AzCosmosDBSqlRoleAssignment', 'New-AzCosmosDBPermission',
-               'Remove-AzCosmosDBSqlRoleAssignment',
                'New-AzCosmosDBDatabaseToRestore',
                'Restore-AzCosmosDBAccount',
                'Get-AzCosmosDBRestorableDatabaseAccount',

tools/CreateMappings.ps1

@@ -16,20 +16,25 @@ $results = @{};
 $warnings = @();
 
 .($PSScriptRoot + "\PreloadToolDll.ps1")
+$RootPath = Resolve-Path $RootPath
+$RootPathRegex = [regex]::escape($RootPath) + "\\(\w*)(\\)(.*)"
 # Find all cmdlet names by help file names in the repository.
 $cmdlets = Get-ChildItem $RootPath -Recurse | Where-Object { $_.FullName -cmatch ".*\\help\\.*-.*.md" -and (-not [Tools.Common.Utilities.ModuleFilter]::IsAzureStackModule($_.FullName)) };
 
-
-$k = 0;
 $cmdlets | ForEach-Object {
     $cmdletPath = Split-Path $_.FullName -Parent;
+    $module = $null;
+    if($cmdletPath -cmatch $RootPathRegex) {
+        $module = $Matches.1
+    }
     $cmdlet = $_.BaseName;
 
+    $matchedRule = $null;
     # First, match to module path.
-    $matchedRule = @($rules | Where-Object { $cmdletPath -cmatch ".*$($_.Regex).*" })[0];
+    $matchedRule = @($rules | Where-Object { $_.Regex -ne $null -and $cmdletPath -cmatch ".*$($_.Regex).*" })[0];
 
     # Try to match this cmdlet with at least one rule.
-    $possibleBetterMatch = @($rules | Where-Object { $cmdlet -cmatch ".*$($_.Regex).*" })[0];
+    $possibleBetterMatch = @($rules | Where-Object { $_.Regex -ne $null -and $cmdlet -cmatch ".*$($_.Regex).*" })[0];
 
     # Look for the best match.
     if(
@@ -41,12 +46,19 @@ $cmdlets | ForEach-Object {
         $matchedRule = $possibleBetterMatch;
     }
 
+    if($matchedRule -ne $null) {
+        $results[$cmdlet] = $matchedRule.Alias;
+    }
+
+    $matchedModuleRule = @($rules | Where-Object { $_.Module -ne $null -and $module -eq $_.Module })[0];
+    if($matchedModuleRule -ne $null) {
+        $results[$cmdlet] = $matchedModuleRule.Alias;
+    }
+
     # Take note of unmatched cmdlets and write to outputs.
-    if($matchedRule -eq $null) {
+    if($matchedRule -eq $null -and $matchedModuleRule -eq $null) {
         $warnings += $cmdlet;
         $results[$cmdlet] = "Other";
-    } else {
-        $results[$cmdlet] = $matchedRule.Alias;
     }
 };
 

tools/CreateMappings_rules.json

@@ -312,7 +312,7 @@
     "alias": "Traffic Manager"
   },
   {
-    "regex": "MarketplaceTerms",
+    "module": "MarketplaceOrdering",
     "alias": "Marketplace Ordering"
   },
   {
@@ -534,15 +534,11 @@
     "alias": "Database for PostgreSQL"
   },
   {
-    "regex": "SqlVM",
-    "alias": "SqlVM"
+    "module": "SqlVirtualMachine",
+    "alias": "Sql VM"
   },
   {
-    "regex": "AvailabilityGroupListener",
-    "alias": "SqlVM"
-  },
-  {
-    "regex": "Sql",
+    "module": "Sql",
     "alias": "SQL"
   },
   {
@@ -574,7 +570,7 @@
     "alias": "Custom Resource Providers"
   },
   {
-    "regex": "MonitorLogAnalytics",
+    "module": "MonitoringSolutions",
     "alias": "Monitoring Solutions"
   },
   {
@@ -667,15 +663,19 @@
   },
   {
     "alias": "Security Insights",
-    "regex": "SecurityInsights"
+    "module": "SecurityInsights"
+  },
+  {
+    "alias": "Private DNS",
+    "module": "PrivateDns"
   },
   {
     "regex": "ContainerInstance",
     "alias": "ContainerInstance"
   },
   {
     "alias": "DiskPool",
-    "regex": "DiskPool"
+    "module": "DiskPool"
   },
   {
     "alias": "Datadog",