Skip to content

Commit

Permalink
Fix CR failure
Browse files Browse the repository at this point in the history
  • Loading branch information
@blueww
blueww committed Feb 19, 2025
1 parent 51a13c2 commit 33c21a9
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/Storage/Storage.Autorest/docs/Get-AzStorageFileServiceUsage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Gets the usage of file service in storage account including account limits, file

### Example 1: Get a Storage account file service usage data
```powershell
Get-AzStorageFileServiceUsage -AccountName myaccount -ResourceGroupName myresroucegroup
Get-AzStorageFileServiceUsage -StorageAccountName myaccount -ResourceGroupName myresroucegroup
```

```output
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Storage.Autorest/examples/Get-AzStorageFileServiceUsage.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### Example 1: Get a Storage account file service usage data
```powershell
Get-AzStorageFileServiceUsage -AccountName myaccount -ResourceGroupName myresroucegroup
Get-AzStorageFileServiceUsage -StorageAccountName myaccount -ResourceGroupName myresroucegroup
```

```output
Expand Down
2 changes: 2 additions & 0 deletions src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2277,6 +2277,8 @@ function Test-NewAzStorageContext
Assert-AreEqual $stoname $sto.StorageAccountName;

$stokey = (Get-AzStorageAccountKey -ResourceGroupName $rgname -StorageAccountName $sto.StorageAccountName)[0].Value
# Need sanitize the sharedkey in record file, but New-AzStorageContext assume it's based64 string, so update it to a static based64 string.
$stokey = "xxxxxxxx"
$ctxAccountInfo = New-AzStorageContext -StorageAccountName $sto.StorageAccountName -StorageAccountKey $stokey
Assert-AreEqual $ctxAccountInfo.BlobEndpoint $blobEndpoint
Assert-AreEqual $ctxAccountInfo.TableEndpoint $tableEndpoint
Expand Down
10 changes: 5 additions & 5 deletions ...agement.Storage.Test.ScenarioTests.StorageAccountTests/TestAzureStorageLocalUserSftp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"id\": \"/subscriptions/45b60d85-fd72-427a-a708-f994d26e593e/resourceGroups/pstestrg1345/providers/Microsoft.Storage/storageAccounts/stopstestrg1345/localusers/testuser1\",\r\n \"name\": \"testuser1\",\r\n \"type\": \"Microsoft.Storage/storageAccounts/localUsers\",\r\n \"properties\": {\r\n \"hasSshPassword\": true,\r\n \"sshPassword\": \"F2HNcQaxFxy3l/UqdYtkYCONm9ZFP+61AkuicYllstWdhNDFrDXpygeT6EewnNAlWFjoUegD95hiJTkFn+sqng==\",\r\n \"permissionScopes\": [\r\n {\r\n \"permissions\": \"rwd\",\r\n \"service\": \"blob\",\r\n \"resourceName\": \"container1\"\r\n },\r\n {\r\n \"permissions\": \"rw\",\r\n \"service\": \"file\",\r\n \"resourceName\": \"share2\"\r\n }\r\n ],\r\n \"homeDirectory\": \"/\",\r\n \"sshAuthorizedKeys\": [\r\n {\r\n \"description\": \"sshpulickey name1\",\r\n \"key\": \"ssh-rsa keykeykeykeykey=\"\r\n },\r\n {\r\n \"description\": \"sshpulickey name2\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n }\r\n ],\r\n \"sid\": \"S-1-2-0-1611252643-3822659537-461345879-1000\",\r\n \"sharedKey\": \"pog0POM8/+sjL5CXyLd2ELsiZtQIGTdlXOxZ0EdXPv489bOJvE5pd4D/3XVv0eWSdIFY8Qbmpm2U30XV/pzvIQ==\",\r\n \"hasSharedKey\": true,\r\n \"hasSshKey\": true\r\n }\r\n}",
"ResponseBody": "{\r\n \"id\": \"/subscriptions/45b60d85-fd72-427a-a708-f994d26e593e/resourceGroups/pstestrg1345/providers/Microsoft.Storage/storageAccounts/stopstestrg1345/localusers/testuser1\",\r\n \"name\": \"testuser1\",\r\n \"type\": \"Microsoft.Storage/storageAccounts/localUsers\",\r\n \"properties\": {\r\n \"hasSshPassword\": true,\r\n \"sshPassword\": \"[sanitize]\",\r\n \"permissionScopes\": [\r\n {\r\n \"permissions\": \"rwd\",\r\n \"service\": \"blob\",\r\n \"resourceName\": \"container1\"\r\n },\r\n {\r\n \"permissions\": \"rw\",\r\n \"service\": \"file\",\r\n \"resourceName\": \"share2\"\r\n }\r\n ],\r\n \"homeDirectory\": \"/\",\r\n \"sshAuthorizedKeys\": [\r\n {\r\n \"description\": \"sshpulickey name1\",\r\n \"key\": \"ssh-rsa keykeykeykeykey=\"\r\n },\r\n {\r\n \"description\": \"sshpulickey name2\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n }\r\n ],\r\n \"sid\": \"S-1-2-0-1611252643-3822659537-461345879-1000\",\r\n \"sharedKey\": \"[sanitize]\",\r\n \"hasSharedKey\": true,\r\n \"hasSshKey\": true\r\n }\r\n}",
"StatusCode": 200
},
{
Expand Down Expand Up @@ -927,7 +927,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"id\": \"/subscriptions/45b60d85-fd72-427a-a708-f994d26e593e/resourceGroups/pstestrg1345/providers/Microsoft.Storage/storageAccounts/stopstestrg1345/localusers/testuser2\",\r\n \"name\": \"testuser2\",\r\n \"type\": \"Microsoft.Storage/storageAccounts/localUsers\",\r\n \"properties\": {\r\n \"homeDirectory\": \"/dir1\",\r\n \"sid\": \"S-1-2-0-2854737607-717915506-2156295004-1001\",\r\n \"sharedKey\": \"yka9qwL5PV5tjk9QMqG/l3OzXdKrhScoldXZyFPe5YOb6mhzisxrAZgZzxKqM6S1GNpf4xKWku0MKMzFHER7Hw==\"\r\n }\r\n}",
"ResponseBody": "{\r\n \"id\": \"/subscriptions/45b60d85-fd72-427a-a708-f994d26e593e/resourceGroups/pstestrg1345/providers/Microsoft.Storage/storageAccounts/stopstestrg1345/localusers/testuser2\",\r\n \"name\": \"testuser2\",\r\n \"type\": \"Microsoft.Storage/storageAccounts/localUsers\",\r\n \"properties\": {\r\n \"homeDirectory\": \"/dir1\",\r\n \"sid\": \"S-1-2-0-2854737607-717915506-2156295004-1001\",\r\n \"sharedKey\": \"[sanitize]\"\r\n }\r\n}",
"StatusCode": 200
},
{
Expand Down Expand Up @@ -996,7 +996,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"id\": \"/subscriptions/45b60d85-fd72-427a-a708-f994d26e593e/resourceGroups/pstestrg1345/providers/Microsoft.Storage/storageAccounts/stopstestrg1345/localusers/testuser2\",\r\n \"name\": \"testuser2\",\r\n \"type\": \"Microsoft.Storage/storageAccounts/localUsers\",\r\n \"properties\": {\r\n \"hasSshPassword\": true,\r\n \"sshPassword\": \"Ey7gMzxHkb/rVVmm/FNWDAiF3BvVIO8qRaoaiViGcwhWGVh0cbQvJGdB7xHdX9GwKfacjHnQb/2OpcbB+yRHdQ==\",\r\n \"permissionScopes\": [\r\n {\r\n \"permissions\": \"rw\",\r\n \"service\": \"blob\",\r\n \"resourceName\": \"container1\"\r\n },\r\n {\r\n \"permissions\": \"rwd\",\r\n \"service\": \"file\",\r\n \"resourceName\": \"share1\"\r\n }\r\n ],\r\n \"homeDirectory\": \"/dir2\",\r\n \"sshAuthorizedKeys\": [\r\n {\r\n \"description\": \"sshpulickey name3\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n },\r\n {\r\n \"description\": \"sshpulickey name4\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n }\r\n ],\r\n \"sid\": \"S-1-2-0-2854737607-717915506-2156295004-1001\",\r\n \"sharedKey\": \"yka9qwL5PV5tjk9QMqG/l3OzXdKrhScoldXZyFPe5YOb6mhzisxrAZgZzxKqM6S1GNpf4xKWku0MKMzFHER7Hw==\",\r\n \"hasSharedKey\": true,\r\n \"hasSshKey\": true\r\n }\r\n}",
"ResponseBody": "{\r\n \"id\": \"/subscriptions/45b60d85-fd72-427a-a708-f994d26e593e/resourceGroups/pstestrg1345/providers/Microsoft.Storage/storageAccounts/stopstestrg1345/localusers/testuser2\",\r\n \"name\": \"testuser2\",\r\n \"type\": \"Microsoft.Storage/storageAccounts/localUsers\",\r\n \"properties\": {\r\n \"hasSshPassword\": true,\r\n \"sshPassword\": \"[sanitize]\",\r\n \"permissionScopes\": [\r\n {\r\n \"permissions\": \"rw\",\r\n \"service\": \"blob\",\r\n \"resourceName\": \"container1\"\r\n },\r\n {\r\n \"permissions\": \"rwd\",\r\n \"service\": \"file\",\r\n \"resourceName\": \"share1\"\r\n }\r\n ],\r\n \"homeDirectory\": \"/dir2\",\r\n \"sshAuthorizedKeys\": [\r\n {\r\n \"description\": \"sshpulickey name3\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n },\r\n {\r\n \"description\": \"sshpulickey name4\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n }\r\n ],\r\n \"sid\": \"S-1-2-0-2854737607-717915506-2156295004-1001\",\r\n \"sharedKey\": \"[sanitize]\",\r\n \"hasSharedKey\": true,\r\n \"hasSshKey\": true\r\n }\r\n}",
"StatusCode": 200
},
{
Expand Down Expand Up @@ -1248,7 +1248,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"sshAuthorizedKeys\": [\r\n {\r\n \"description\": \"sshpulickey name1\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n },\r\n {\r\n \"description\": \"sshpulickey name2\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n }\r\n ],\r\n \"sharedKey\": \"pog0POM8/+sjL5CXyLd2ELsiZtQIGTdlXOxZ0EdXPv489bOJvE5pd4D/3XVv0eWSdIFY8Qbmpm2U30XV/pzvIQ==\"\r\n}",
"ResponseBody": "{\r\n \"sshAuthorizedKeys\": [\r\n {\r\n \"description\": \"sshpulickey name1\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n },\r\n {\r\n \"description\": \"sshpulickey name2\",\r\n \"key\": \"ssh-rsa keykeykeykeykew=\"\r\n }\r\n ],\r\n \"sharedKey\": \"[sanitize]\"\r\n}",
"StatusCode": 200
},
{
Expand Down Expand Up @@ -1311,7 +1311,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"hasSshPassword\": true,\r\n \"sshPassword\": \"NvGIGbQnlh54aZ2XGP7Ugv4GAdPatPVblOx0Y4wlUpfQXbyj3qTNPc4Tcwmn0yw+eaCI9forjlsX/X3unCHiyg==\",\r\n \"permissionScopes\": [\r\n {\r\n \"permissions\": \"rwd\",\r\n \"service\": \"blob\",\r\n \"resourceName\": \"container1\"\r\n },\r\n {\r\n \"permissions\": \"rw\",\r\n \"service\": \"file\",\r\n \"resourceName\": \"share2\"\r\n }\r\n ],\r\n \"homeDirectory\": \"/\",\r\n \"sid\": \"S-1-2-0-1611252643-3822659537-461345879-1000\",\r\n \"hasSharedKey\": true,\r\n \"hasSshKey\": true\r\n}",
"ResponseBody": "{\r\n \"hasSshPassword\": true,\r\n \"sshPassword\": \"[sanitize]\",\r\n \"permissionScopes\": [\r\n {\r\n \"permissions\": \"rwd\",\r\n \"service\": \"blob\",\r\n \"resourceName\": \"container1\"\r\n },\r\n {\r\n \"permissions\": \"rw\",\r\n \"service\": \"file\",\r\n \"resourceName\": \"share2\"\r\n }\r\n ],\r\n \"homeDirectory\": \"/\",\r\n \"sid\": \"S-1-2-0-1611252643-3822659537-461345879-1000\",\r\n \"hasSharedKey\": true,\r\n \"hasSshKey\": true\r\n}",
"StatusCode": 200
},
{
Expand Down
2 changes: 1 addition & 1 deletion ...ds.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzStorageContext.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"keys\": [\r\n {\r\n \"creationTime\": \"2022-03-14T05:13:10.1452242Z\",\r\n \"keyName\": \"key1\",\r\n \"value\": \"0Ijo+xd/w7VEo55xc2T7DCbS37fAkfeITcC2DRnKBoxwDvUkJz3z+5wbaOusdzAB3pxaVUhLg1jM+5iZEGBXYA==\",\r\n \"permissions\": \"FULL\"\r\n },\r\n {\r\n \"creationTime\": \"2022-03-14T05:13:10.1452242Z\",\r\n \"keyName\": \"key2\",\r\n \"value\": \"0KYEVAbAkzuAP/SwGa0898IQLNQz0ugxqjEKDCJpZ7ERMAN4kqwjQ8JD5jmdwFJj78ttPGDcDPvY1MIJGuT5VQ==\",\r\n \"permissions\": \"FULL\"\r\n }\r\n ]\r\n}",
"ResponseBody": "{\r\n \"keys\": [\r\n {\r\n \"creationTime\": \"2022-03-14T05:13:10.1452242Z\",\r\n \"keyName\": \"key1\",\r\n \"value\": \"[sanitize]\",\r\n \"permissions\": \"FULL\"\r\n },\r\n {\r\n \"creationTime\": \"2022-03-14T05:13:10.1452242Z\",\r\n \"keyName\": \"key2\",\r\n \"value\": \"0KYEVAbAkzuAP/SwGa0898IQLNQz0ugxqjEKDCJpZ7ERMAN4kqwjQ8JD5jmdwFJj78ttPGDcDPvY1MIJGuT5VQ==\",\r\n \"permissions\": \"FULL\"\r\n }\r\n ]\r\n}",
"StatusCode": 200
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Storage.Management/help/Get-AzStorageFileServiceUsage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Gets the usage of file service in storage account including account limits, file

### Example 1: Get a Storage account file service usage data
```powershell
Get-AzStorageFileServiceUsage -AccountName myaccount -ResourceGroupName myresroucegroup
Get-AzStorageFileServiceUsage -StorageAccountName myaccount -ResourceGroupName myresroucegroup
```

```output
Expand Down
8 changes: 8 additions & 0 deletions tools/StaticAnalysis/Exceptions/Az.Storage/SignatureIssues.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,11 @@
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageLocalUserPermissionScopeCommand","New-AzStorageLocalUserPermissionScope","1","8100","New-AzStorageLocalUserPermissionScope Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageLocalUserSshPublicKeyCommand","New-AzStorageLocalUserSshPublicKey","1","8100","New-AzStorageLocalUserSshPublicKey Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageAccountManagementPolicyBlobIndexMatchObjectCommand","New-AzStorageAccountManagementPolicyBlobIndexMatchObject","1","8100","New-AzStorageAccountManagementPolicyBlobIndexMatchObject Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageShareCommand","New-AzRmStorageShare","1","8410","Parameter ProvisionedBandwidthMibps of cmdlet New-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageShareCommand","New-AzRmStorageShare","1","8410","Parameter ProvisionedIops of cmdlet New-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageShareCommand","New-AzRmStorageShare","1","8410","Parameter PaidBurstingMaxIops of cmdlet New-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageShareCommand","New-AzRmStorageShare","1","8410","Parameter PaidBurstingMaxBandwidthMibps of cmdlet New-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.UpdateAzureStorageShareCommand","Update-AzRmStorageShare","1","8410","Parameter ProvisionedBandwidthMibps of cmdlet Update-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.UpdateAzureStorageShareCommand","Update-AzRmStorageShare","1","8410","Parameter ProvisionedIops of cmdlet Update-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.UpdateAzureStorageShareCommand","Update-AzRmStorageShare","1","8410","Parameter PaidBurstingMaxIops of cmdlet Update-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
"Az.Storage","Microsoft.Azure.Commands.Management.Storage.UpdateAzureStorageShareCommand","Update-AzRmStorageShare","1","8410","Parameter PaidBurstingMaxBandwidthMibps of cmdlet Update-AzRmStorageShare does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."

0 comments on commit 33c21a9

Please sign in to comment.