@autorest/powershell 3.0.515 → 3.0.517

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -72,7 +72,7 @@
72
72
  "powershell/models/model-extensions.ts": "92f57419e2bb8aec5272d62742ad528caebb66f4",
73
73
  "powershell/module/module-class.ts": "c792f01e3bfecb7c22efd953feb175f6b8394c78",
74
74
  "powershell/module/module-namespace.ts": "f6afc90087e8d733f0323b0de8ba41d923955732",
75
- "powershell/package.json": "347370f980371be1c233e783589743c1e4491fb0",
75
+ "powershell/package.json": "596b1dd9e1583b7e490041592c33f1ddd7d0eb53",
76
76
  "powershell/plugins/add-azure-completers-v2.ts": "557ce4326318c82f91445490a162f20fa029fed3",
77
77
  "powershell/plugins/create-commands-v2.ts": "0190353c046a386a6458d2394377da59ae271643",
78
78
  "powershell/plugins/cs-namer-v2.ts": "e294a2f5ac3db421d030a3bba8343a3d4a9ea6ab",
@@ -101,9 +101,9 @@
101
101
  "powershell/resources/assets/pack-module.ps1": "3a263c5fd58c6f124693c3004db4b960ed579f39",
102
102
  "powershell/resources/assets/resources/README.md": "c532566d4700f25121ebf7cd78071002f888d096",
103
103
  "powershell/resources/assets/run-module.ps1": "eb6557320316b6de2c2ec3ab39f9c10c54fcd9cd",
104
- "powershell/resources/assets/test-module.ps1": "517b9d1e7b781a2b47a058645cce3ab1c991ab36",
104
+ "powershell/resources/assets/test-module.ps1": "3a1055f2c698041d3b4234383c1e77efa211a57d",
105
105
  "powershell/resources/assets/test/README.md": "bef2317f03ce8baf52bff238510e27a0ffe79aaa",
106
- "powershell/resources/assets/test/loadEnv.ps1": "1d350fe78c673fb88c577c04f61277ab75bdcf25",
106
+ "powershell/resources/assets/test/loadEnv.ps1": "079c89ae2f53e8f9be1489838594b6bc0c555602",
107
107
  "powershell/resources/assets/tools/Resources/.gitattributes": "2125666142eb661091cc5f32af2ed2f3fc65571d",
108
108
  "powershell/resources/assets/tools/Resources/.gitignore": "8b93ac424812ec6872783420ed87e82d10f2242b",
109
109
  "powershell/resources/assets/tools/Resources/README.md": "cdaf3a995a725177a11845056d23cfd14e2bb5c2",
@@ -216,7 +216,7 @@
216
216
  "powershell/resources/psruntime/BuildTime/Models/PsHelpMarkdownOutputs.cs": "056be554968d76667c0659d169f674ef5dbb74ed",
217
217
  "powershell/resources/psruntime/BuildTime/Models/PsHelpTypes.cs": "34d832146757eab7d8e1bd3feba5d411577f388a",
218
218
  "powershell/resources/psruntime/BuildTime/Models/PsMarkdownTypes.cs": "04c8ab64ab6269ee2cf7193494425d869bb6b94d",
219
- "powershell/resources/psruntime/BuildTime/Models/PsProxyOutputs.cs": "9ed5b71113bf747288c8d96e44b94da3c83029b4",
219
+ "powershell/resources/psruntime/BuildTime/Models/PsProxyOutputs.cs": "0871e8e8889a3cd10b338d3508f8ffdf4ca3e91e",
220
220
  "powershell/resources/psruntime/BuildTime/Models/PsProxyTypes.cs": "d12d48f864b20004aa129623ebd032e8f16cdee2",
221
221
  "powershell/resources/psruntime/BuildTime/PsAttributes.cs": "6e9782492bcc53aec43e807ca6c24969771b772b",
222
222
  "powershell/resources/psruntime/BuildTime/PsExtensions.cs": "a816496e5ec66952ba2f8f3709f665b02e24020a",
@@ -320,6 +320,7 @@
320
320
  "powershell/resources/runtime/csharp/pipeline/delegates.cs": "3abbd1354807e026f0d05a72e7d538533d775984",
321
321
  "powershell/resources/runtime/csharp/xml/IXmlSerializable.cs": "4ec8c13c3edc40460647700ab83cd5c632caa1e7",
322
322
  "powershell/resources/signing/MSSharedLibKey.snk": "695f1b38774e839e5b90059bfb7f32df1dff4223",
323
+ "powershell/resources/utils/Get-SubscriptionIdTestSafe.ps1": "5319862d3372af080cc563328c861f4378d66f4e",
323
324
  "powershell/resources/utils/Unprotect-SecureString.ps1": "cb05b51a6220840d617a439a947a359f8685a05d",
324
325
  "powershell/test/noun-cleaning.ts": "417bad4010ba2831134b54f7bf4070ca00919944",
325
326
  "powershell/test/operationId-inferring.ts": "81d8c4ad530768e911901868fea21bdfba836dd7",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autorest/powershell",
3
- "version": "3.0.515",
3
+ "version": "3.0.517",
4
4
  "description": "AutoRest PowerShell Cmdlet Generator",
5
5
  "main": "dist/exports.js",
6
6
  "typings": "dist/exports.d.ts",
@@ -14,5 +14,5 @@ if (Test-Path -Path (Join-Path $PSScriptRoot $envFile)) {
14
14
  $env = @{}
15
15
  if (Test-Path -Path $envFilePath) {
16
16
  $env = Get-Content (Join-Path $PSScriptRoot $envFile) | ConvertFrom-Json
17
- $PSDefaultParameterValues=@{"*:SubscriptionId"=$env.SubscriptionId; "*:Tenant"=$env.Tenant}
17
+ $PSDefaultParameterValues=@{"*:Tenant"=$env.Tenant}
18
18
  }
@@ -63,13 +63,14 @@ try
63
63
  if ($TestMode -ne 'playback')
64
64
  {
65
65
  setupEnv
66
+ } else {
67
+ $env:AzPSAutorestTestPlaybackMode = $true
66
68
  }
67
69
  $testFolder = Join-Path $PSScriptRoot '${$lib.path.relative($project.baseFolder, $project.testFolder)}'
68
70
  if ($null -ne $TestName)
69
71
  {
70
72
  Invoke-Pester -Script @{ Path = $testFolder } -TestName $TestName -ExcludeTag $ExcludeTag -EnableExit -OutputFile (Join-Path $testFolder "$moduleName-TestResults.xml")
71
- } else
72
- {
73
+ } else {
73
74
  Invoke-Pester -Script @{ Path = $testFolder } -ExcludeTag $ExcludeTag -EnableExit -OutputFile (Join-Path $testFolder "$moduleName-TestResults.xml")
74
75
  }
75
76
  } Finally
@@ -78,6 +79,9 @@ try
78
79
  {
79
80
  cleanupEnv
80
81
  }
82
+ else {
83
+ $env:AzPSAutorestTestPlaybackMode = ''
84
+ }
81
85
  }
82
86
 
83
87
  Write-Host -ForegroundColor Green '-------------Done-------------'
@@ -269,9 +269,26 @@ namespace Microsoft.Rest.ClientRuntime.PowerShell
269
269
  var variantListString = defaultInfo.ParameterGroup.VariantNames.ToPsList();
270
270
  var parameterName = defaultInfo.ParameterGroup.ParameterName;
271
271
  sb.AppendLine();
272
- sb.AppendLine($"{Indent}{Indent}if (({variantListString}) -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('{parameterName}')) {{");
273
- sb.AppendLine($"{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = {defaultInfo.Script}");
274
- sb.Append($"{Indent}{Indent}}}");
272
+ //Yabo: this is bad to hard code the subscription id, but autorest load input README.md reversely (entry readme -> required readme), there are no other way to
273
+ //override default value set in required readme
274
+ if ("SubscriptionId".Equals(parameterName))
275
+ {
276
+ sb.AppendLine($"{Indent}{Indent}if (({variantListString}) -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('{parameterName}')) {{");
277
+ sb.AppendLine($"{Indent}{Indent}{Indent}$testPlayback = $false");
278
+ sb.AppendLine($"{Indent}{Indent}{Indent}$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object {{ if ($_) {{ $testPlayback = $testPlayback -or ('Microsoft.Message.ClientRuntime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) }} }}");
279
+ sb.AppendLine($"{Indent}{Indent}{Indent}if ($testPlayback) {{");
280
+ sb.AppendLine($"{Indent}{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = . (Join-Path $PSScriptRoot '..' 'utils' 'Get-SubscriptionIdTestSafe.ps1')");
281
+ sb.AppendLine($"{Indent}{Indent}{Indent}}} else {{");
282
+ sb.AppendLine($"{Indent}{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = {defaultInfo.Script}");
283
+ sb.AppendLine($"{Indent}{Indent}{Indent}}}");
284
+ sb.Append($"{Indent}{Indent}}}");
285
+ }
286
+ else
287
+ {
288
+ sb.AppendLine($"{Indent}{Indent}if (({variantListString}) -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('{parameterName}')) {{");
289
+ sb.AppendLine($"{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = {defaultInfo.Script}");
290
+ sb.Append($"{Indent}{Indent}}}");
291
+ }
275
292
  }
276
293
  return sb.ToString();
277
294
  }
@@ -0,0 +1,7 @@
1
+ param()
2
+ if ($env:AzPSAutorestTestPlaybackMode) {
3
+ $loadEnvPath = Join-Path $PSScriptRoot '..' 'test' 'loadEnv.ps1'
4
+ . ($loadEnvPath)
5
+ return $env.SubscriptionId
6
+ }
7
+ return (Get-AzContext).Subscription.Id