Skip to content

Commit 2b83dd2

Browse files
bluewwblueww
authored
Merge pull request #2 from maddieclayton/worm-preview-patch
Fix mappings
2 parents 16c6b64 + d5b979d commit 2b83dd2

File tree

3 files changed

+45
-53
lines changed

3 files changed

+45
-53
lines changed

‎src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,10 +1205,12 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
12051205
},
12061206
'Az.Storage': {
12071207
'New-AzStorageQueueSASToken': 'New-AzureStorageQueueSASToken',
1208+
'Get-AzRmStorageContainer': 'Get-AzureRmStorageContainer',
12081209
'Get-AzStorageFileContent': 'Get-AzureStorageFileContent',
12091210
'Remove-AzStorageFile': 'Remove-AzureStorageFile',
12101211
'Set-AzCurrentStorageAccount': 'Set-AzureRmCurrentStorageAccount',
12111212
'Get-AzStorageUsage': 'Get-AzureRmStorageUsage',
1213+
'Enable-AzStorageStaticWebsite': 'Enable-AzureStorageStaticWebsite',
12121214
'Get-AzStorageQueue': 'Get-AzureStorageQueue',
12131215
'Enable-AzStorageDeleteRetentionPolicy': 'Enable-AzureStorageDeleteRetentionPolicy',
12141216
'Update-AzStorageServiceProperty': 'Update-AzureStorageServiceProperty',
@@ -1225,53 +1227,62 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
12251227
'Remove-AzStorageShare': 'Remove-AzureStorageShare',
12261228
'Set-AzStorageShareQuota': 'Set-AzureStorageShareQuota',
12271229
'Get-AzStorageBlobContent': 'Get-AzureStorageBlobContent',
1230+
'Update-AzRmStorageContainer': 'Update-AzureRmStorageContainer',
12281231
'New-AzStorageDirectory': 'New-AzureStorageDirectory',
12291232
'New-AzStorageTableSASToken': 'New-AzureStorageTableSASToken',
12301233
'Set-AzStorageAccount': 'Set-AzureRmStorageAccount',
12311234
'New-AzStorageQueue': 'New-AzureStorageQueue',
12321235
'Remove-AzStorageTable': 'Remove-AzureStorageTable',
1236+
'Get-AzStorageFile': 'Get-AzureStorageFile',
12331237
'Get-AzStorageShareStoredAccessPolicy': 'Get-AzureStorageShareStoredAccessPolicy',
1238+
'Set-AzStorageContainerAcl': 'Set-AzureStorageContainerAcl',
1239+
'Remove-AzRmStorageContainer': 'Remove-AzureRmStorageContainer',
12341240
'Update-AzStorageAccountNetworkRuleSet': 'Update-AzureRmStorageAccountNetworkRuleSet',
12351241
'Set-AzStorageBlobContent': 'Set-AzureStorageBlobContent',
12361242
'Start-AzStorageBlobCopy': 'Start-AzureStorageBlobCopy',
12371243
'Set-AzStorageQueueStoredAccessPolicy': 'Set-AzureStorageQueueStoredAccessPolicy',
12381244
'New-AzStorageAccount': 'New-AzureRmStorageAccount',
12391245
'New-AzStorageAccountSASToken': 'New-AzureStorageAccountSASToken',
1240-
'Get-AzStorageServiceLoggingProperty': 'Get-AzureStorageServiceLoggingProperty',
1246+
'Get-AzStorageBlob': 'Get-AzureStorageBlob',
12411247
'New-AzStorageContainer': 'New-AzureStorageContainer',
1248+
'New-AzRmStorageContainer': 'New-AzureRmStorageContainer',
12421249
'Get-AzStorageContainer': 'Get-AzureStorageContainer',
1250+
'Get-AzStorageTableStoredAccessPolicy': 'Get-AzureStorageTableStoredAccessPolicy',
12431251
'New-AzStorageContext': 'New-AzureStorageContext',
12441252
'Enable-AzStorageSoftDelete': 'Enable-AzureStorageSoftDelete',
12451253
'Remove-AzStorageShareStoredAccessPolicy': 'Remove-AzureStorageShareStoredAccessPolicy',
12461254
'Get-AzStorageQueueStoredAccessPolicy': 'Get-AzureStorageQueueStoredAccessPolicy',
12471255
'New-AzStorageFileSASToken': 'New-AzureStorageFileSASToken',
12481256
'Remove-AzStorageAccountNetworkRule': 'Remove-AzureRmStorageAccountNetworkRule',
12491257
'Set-AzStorageServiceLoggingProperty': 'Set-AzureStorageServiceLoggingProperty',
1258+
'Get-AzRmStorageContainerImmutabilityPolicy': 'Get-AzureRmStorageContainerImmutabilityPolicy',
12501259
'New-AzStorageTableStoredAccessPolicy': 'New-AzureStorageTableStoredAccessPolicy',
12511260
'Add-AzStorageAccountNetworkRule': 'Add-AzureRmStorageAccountNetworkRule',
12521261
'Disable-AzStorageSoftDelete': 'Disable-AzureStorageSoftDelete',
1253-
'Get-AzStorageFile': 'Get-AzureStorageFile',
1262+
'Remove-AzRmStorageContainerImmutabilityPolicy': 'Remove-AzureRmStorageContainerImmutabilityPolicy',
1263+
'Set-AzStorageTableStoredAccessPolicy': 'Set-AzureStorageTableStoredAccessPolicy',
12541264
'Remove-AzStorageQueueStoredAccessPolicy': 'Remove-AzureStorageQueueStoredAccessPolicy',
12551265
'Set-AzStorageContainerStoredAccessPolicy': 'Set-AzureStorageContainerStoredAccessPolicy',
12561266
'Remove-AzStorageAccount': 'Remove-AzureRmStorageAccount',
12571267
'Get-AzStorageServiceMetricsProperty': 'Get-AzureStorageServiceMetricsProperty',
1258-
'New-AzStorageShareStoredAccessPolicy': 'New-AzureStorageShareStoredAccessPolicy',
12591268
'New-AzStorageContainerStoredAccessPolicy': 'New-AzureStorageContainerStoredAccessPolicy',
1260-
'Get-AzStorageTableStoredAccessPolicy': 'Get-AzureStorageTableStoredAccessPolicy',
1269+
'Disable-AzStorageStaticWebsite': 'Disable-AzureStorageStaticWebsite',
1270+
'Lock-AzRmStorageContainerImmutabilityPolicy': 'Lock-AzureRmStorageContainerImmutabilityPolicy',
1271+
'Add-AzRmStorageContainerLegalHold': 'Add-AzureRmStorageContainerLegalHold',
12611272
'Remove-AzStorageBlob': 'Remove-AzureStorageBlob',
12621273
'Remove-AzStorageContainerStoredAccessPolicy': 'Remove-AzureStorageContainerStoredAccessPolicy',
1274+
'Remove-AzRmStorageContainerLegalHold': 'Remove-AzureRmStorageContainerLegalHold',
12631275
'Remove-AzStorageTableStoredAccessPolicy': 'Remove-AzureStorageTableStoredAccessPolicy',
12641276
'Start-AzStorageFileCopy': 'Start-AzureStorageFileCopy',
12651277
'New-AzStorageAccountKey': 'New-AzureRmStorageAccountKey',
1266-
'Set-AzStorageTableStoredAccessPolicy': 'Set-AzureStorageTableStoredAccessPolicy',
1278+
'New-AzStorageShareStoredAccessPolicy': 'New-AzureStorageShareStoredAccessPolicy',
12671279
'Stop-CopyAzureStorageBlob': 'Stop-CopyAzureStorageBlob',
12681280
'Disable-AzStorageDeleteRetentionPolicy': 'Disable-AzureStorageDeleteRetentionPolicy',
12691281
'Set-AzStorageServiceMetricsProperty': 'Set-AzureStorageServiceMetricsProperty',
12701282
'New-AzStorageContainerSASToken': 'New-AzureStorageContainerSASToken',
12711283
'New-AzStorageShare': 'New-AzureStorageShare',
1272-
'Set-AzStorageContainerAcl': 'Set-AzureStorageContainerAcl',
1284+
'Get-AzStorageServiceLoggingProperty': 'Get-AzureStorageServiceLoggingProperty',
12731285
'New-AzStorageQueueStoredAccessPolicy': 'New-AzureStorageQueueStoredAccessPolicy',
1274-
'Get-AzStorageBlob': 'Get-AzureStorageBlob',
12751286
'Get-AzStorageServiceProperty': 'Get-AzureStorageServiceProperty',
12761287
'New-AzStorageBlobSASToken': 'New-AzureStorageBlobSASToken',
12771288
'Remove-AzStorageCORSRule': 'Remove-AzureStorageCORSRule',
@@ -1287,7 +1298,8 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
12871298
'Remove-AzStorageContainer': 'Remove-AzureStorageContainer',
12881299
'Start-AzStorageBlobIncrementalCopy': 'Start-AzureStorageBlobIncrementalCopy',
12891300
'Get-AzStorageFileCopyState': 'Get-AzureStorageFileCopyState',
1290-
'Get-AzStorageAccount': 'Get-AzureRmStorageAccount'
1301+
'Get-AzStorageAccount': 'Get-AzureRmStorageAccount',
1302+
'Set-AzRmStorageContainerImmutabilityPolicy': 'Set-AzureRmStorageContainerImmutabilityPolicy'
12911303
},
12921304
'Az.Insights': {
12931305
'Remove-AzAlertRule': 'Remove-AzureRmAlertRule',

‎tools/AliasMapping.json

2.41 KB
Binary file not shown.

‎tools/CreateAliasMapping.ps1

Lines changed: 25 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,39 @@ $psd1s = Get-ChildItem -Path $PSScriptRoot/../src -Recurse | `
55
-and $_.FullName -notlike "*Stack*" -and $_.FullName -notlike "*`\Package`\*" -and $_.FullName -notlike "*Test*" -and $_.FullName -notlike "*`\bin`\*" -and $_.FullName -notlike "*`\obj`\*"}
66

77
$psd1s | ForEach-Object {
8-
<# Will be added back for Storage name class in Storage preview
9-
if ($_.Name -eq "AzureRM.Storage.psd1")
8+
$name = (($_.Name -replace "AzureRM", "Az") -replace "Azure", "Az") -replace ".psd1", ""
9+
if (!($mapping.Contains($name)))
1010
{
11-
$name = ($_.Name -replace "AzureRM", "Az") -replace "Azure", "Az"
12-
if (!($mapping.Contains($name)))
11+
$mapping.Add($name, @{})
12+
}
13+
Import-LocalizedData -BindingVariable psd1info -BaseDirectory $_.DirectoryName -FileName $_.Name
14+
$psd1info.CmdletsToExport | ForEach-Object {
15+
if ($_ -like "*AzureRmStorageContainer*")
1316
{
14-
$mapping.Add($name, @{})
17+
$cmdletalias = $_ -replace "-AzureRM", "-AzRm"
18+
$mapping[$name].Add($cmdletalias, $_)
1519
}
16-
Import-LocalizedData -BindingVariable psd1info -BaseDirectory $_.DirectoryName -FileName $_.Name
17-
$psd1info.CmdletsToExport | ForEach-Object {
18-
if ($_ -like "*Azure*")
19-
{
20-
$cmdletalias = ($_ -replace "AzureRM", "Azure") -replace "Azure", "AzRm"
21-
$mapping[$name].Add($cmdletalias, $_)
22-
}
23-
else
24-
{
25-
Write-Warning $_
26-
}
20+
elseif ($_ -like "*Azure*")
21+
{
22+
$cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
23+
$mapping[$name].Add($cmdletalias, $_)
2724
}
28-
}
29-
else
30-
{ #>
31-
$name = (($_.Name -replace "AzureRM", "Az") -replace "Azure", "Az") -replace ".psd1", ""
32-
if (!($mapping.Contains($name)))
25+
else
3326
{
34-
$mapping.Add($name, @{})
27+
Write-Warning $_
3528
}
36-
Import-LocalizedData -BindingVariable psd1info -BaseDirectory $_.DirectoryName -FileName $_.Name
37-
$psd1info.CmdletsToExport | ForEach-Object {
38-
if ($_ -like "*Azure*")
39-
{
40-
$cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
41-
$mapping[$name].Add($cmdletalias, $_)
42-
}
43-
else
44-
{
45-
Write-Warning $_
46-
}
29+
}
30+
$psd1info.AliasesToExport | ForEach-Object {
31+
if ($_ -like "*Azure*")
32+
{
33+
$cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
34+
$mapping[$name].Add($cmdletalias, $_)
4735
}
48-
$psd1info.AliasesToExport | ForEach-Object {
49-
if ($_ -like "*Azure*")
50-
{
51-
$cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
52-
$mapping[$name].Add($cmdletalias, $_)
53-
}
54-
else
55-
{
56-
Write-Warning $_
57-
}
36+
else
37+
{
38+
Write-Warning $_
5839
}
59-
#}
60-
40+
}
6141
}
6242

6343
$json = ConvertTo-Json $mapping

0 commit comments

Comments
 (0)