Skip to content

Commit ec6762c

Browse files
azure-pipelines[bot]azure-powershell-botVeryEarly
authored
Migrate Resources from generation to main (#26244)
* Move Resources to main * Update CredScanSuppressions.json --------- Co-authored-by: azure-powershell-bot <[email protected]> Co-authored-by: Yabo Hu <[email protected]>
1 parent 0a0198b commit ec6762c

File tree

82 files changed

+8695
-7438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+8695
-7438
lines changed

src/Resources/Authorization.Autorest/Az.Authorization.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@{
2-
GUID = '35a9c347-856c-41c9-9843-5dbaed8e4ef4'
2+
GUID = '4e102780-308c-4967-9790-7a39f46355e6'
33
RootModule = './Az.Authorization.psm1'
44
ModuleVersion = '0.1.0'
55
CompatiblePSEditions = 'Core', 'Desktop'

src/Resources/Authorization.Autorest/help/Az.Authorization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
Module Name: Az.Authorization
3-
Module Guid: 35a9c347-856c-41c9-9843-5dbaed8e4ef4
3+
Module Guid: 4e102780-308c-4967-9790-7a39f46355e6
44
Download Help Link: https://learn.microsoft.com/powershell/module/az.authorization
55
Help Version: 1.0.0.0
66
Locale: en-US

src/Resources/MSGraph.Autorest/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ In this directory, run AutoRest:
4949
``` yaml
5050
version: "3.9.5"
5151
use-extension:
52-
"@autorest/powershell": "4.0.0-dev.13"
52+
"@autorest/powershell": "4.0.0-dev.14"
5353

5454
require:
5555
- $(this-folder)/../../readme.azure.noprofile.md

src/Resources/MSGraph.Autorest/build-module.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,4 @@ if (-not $DisableAfterBuildTasks){
181181
}
182182
}
183183

184-
185184
Write-Host -ForegroundColor Green '-------------Done-------------'

src/Resources/MSGraph.Autorest/custom/New-AzADAppCredential.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ function New-AzADAppCredential {
107107
[System.DateTime]
108108
${EndDate},
109109

110-
[Parameter(ParameterSetName = 'ApplicationObjectIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")]
111-
[Parameter(ParameterSetName = 'ApplicationIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")]
112-
[Parameter(ParameterSetName = 'DisplayNameWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")]
113-
[Parameter(ParameterSetName = 'ApplicationObjectWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")]
114-
[Parameter(ParameterSetName = 'ApplicationObjectIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")]
115-
[Parameter(ParameterSetName = 'ApplicationIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")]
116-
[Parameter(ParameterSetName = 'DisplayNameWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")]
117-
[Parameter(ParameterSetName = 'ApplicationObjectWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")]
118-
[Parameter()]
110+
[Parameter(ParameterSetName = 'ApplicationObjectIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
111+
[Parameter(ParameterSetName = 'ApplicationIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
112+
[Parameter(ParameterSetName = 'DisplayNameWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
113+
[Parameter(ParameterSetName = 'ApplicationObjectWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
114+
[Parameter(ParameterSetName = 'ApplicationObjectIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
115+
[Parameter(ParameterSetName = 'ApplicationIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
116+
[Parameter(ParameterSetName = 'DisplayNameWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
117+
[Parameter(ParameterSetName = 'ApplicationObjectWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
118+
[Parameter(HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")]
119119
[Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Category('Body')]
120120
[System.String]
121121
${CustomKeyIdentifier},

src/Resources/MSGraph.Autorest/exports/New-AzADAppCredential.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,8 @@ param(
356356
[Parameter()]
357357
[Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Category('Body')]
358358
[System.String]
359+
# Custom Key Identifier.
360+
# The format should be base64: `$Bytes=[System.Text.Encoding]::Unicode.GetBytes($key);$key=[Convert]::ToBase64String($Bytes)`
359361
${CustomKeyIdentifier},
360362

361363
[Parameter(ParameterSetName='ApplicationObjectIdWithPasswordCredentialParameterSet', Mandatory)]

src/Resources/MSGraph.Autorest/exports/ProxyCmdletDefinitions.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6257,6 +6257,8 @@ param(
62576257
[Parameter()]
62586258
[Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Category('Body')]
62596259
[System.String]
6260+
# Custom Key Identifier.
6261+
# The format should be base64: `$Bytes=[System.Text.Encoding]::Unicode.GetBytes($key);$key=[Convert]::ToBase64String($Bytes)`
62606262
${CustomKeyIdentifier},
62616263

62626264
[Parameter(ParameterSetName='ApplicationObjectIdWithPasswordCredentialParameterSet', Mandatory)]

src/Resources/MSGraph.Autorest/help/New-AzADAppCredential.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Accept wildcard characters: False
193193
```
194194
195195
### -CustomKeyIdentifier
196-
196+
Custom Key Identifier.
197+
The format should be base64: `$Bytes=[System.Text.Encoding]::Unicode.GetBytes($key);$key=[Convert]::ToBase64String($Bytes)`
197198

198199
```yaml
199200
Type: System.String

src/Resources/Policy.Autorest/build-module.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ if(-not $NotIsolated -and -not $Debugger) {
7575
$binFolder = Join-Path $PSScriptRoot 'bin'
7676
$objFolder = Join-Path $PSScriptRoot 'obj'
7777

78+
$isAzure = [System.Convert]::ToBoolean('true')
79+
7880
if(-not $Debugger) {
7981
Write-Host -ForegroundColor Green 'Cleaning build folders...'
8082
$null = Remove-Item -Recurse -ErrorAction SilentlyContinue -Path $binFolder, $objFolder
@@ -151,7 +153,7 @@ if($NoDocs) {
151153
$null = Get-ChildItem -Path $docsFolder -Recurse -Exclude 'README.md' | Remove-Item -Recurse -ErrorAction SilentlyContinue
152154
}
153155
$null = New-Item -ItemType Directory -Force -Path $docsFolder
154-
$addComplexInterfaceInfo = ![System.Convert]::ToBoolean('true')
156+
$addComplexInterfaceInfo = !$isAzure
155157
Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ModuleDescription $moduleDescription -DocsFolder $docsFolder -ExamplesFolder $examplesFolder -ModuleGuid $guid -AddComplexInterfaceInfo:$addComplexInterfaceInfo
156158
}
157159

@@ -186,5 +188,4 @@ if (-not $DisableAfterBuildTasks){
186188
}
187189
}
188190

189-
190-
Write-Host -ForegroundColor Green '-------------Done-------------'
191+
Write-Host -ForegroundColor Green '-------------Done-------------'

src/Resources/Policy.Autorest/custom/Remove-AzPolicyAssignment.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ process {
160160
# Id can be a parameter or from the input object
161161
if ($Id) {
162162
$thisId = $Id
163-
} else {
163+
}
164+
elseif (!$Scope) {
164165
$thisId = $_.Id
165166
}
166167

0 commit comments

Comments
 (0)