@autorest/powershell 4.0.685 → 4.0.686

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.
@@ -21,7 +21,7 @@
21
21
  "powershell/generators/nuspec.ts": "a290cb054b420d209091ec79e59103b7b7ab321f",
22
22
  "powershell/generators/psm1.custom.ts": "68ad4aa17f5b867d4e471ef570f196e77ea23999",
23
23
  "powershell/generators/psm1.internal.ts": "98829f795fb438d13780eb78bf84a97f473772cd",
24
- "powershell/generators/psm1.ts": "f1096bdf4f42a87a5d6c8bf35ea9fc4a91c0a679",
24
+ "powershell/generators/psm1.ts": "b8de87fac32b95bf60efa4efc86352ce0babb879",
25
25
  "powershell/generators/readme.ts": "7b6bd39f2b2984209d1bf4eab6a4f7707b1dc354",
26
26
  "powershell/generators/script-cmdlet.ts": "bf8a72600f7fc351176ff510cb85bc5f38378bfb",
27
27
  "powershell/internal/name-inferrer.ts": "8270005536a5462b6f3e998a3df4c1f112b221ec",
@@ -75,7 +75,7 @@
75
75
  "powershell/models/model-extensions.ts": "f0c617b9bfb04b4424a853e1b1eecba9059ba788",
76
76
  "powershell/module/module-class.ts": "2f8b0b4d28f59761dbe9a95bf7555c8ec0585387",
77
77
  "powershell/module/module-namespace.ts": "f6afc90087e8d733f0323b0de8ba41d923955732",
78
- "powershell/package.json": "4553acc8154bb308a20b99ffacbe55b722feb944",
78
+ "powershell/package.json": "a6e2094a1f9641d8fb4334c9d7d109f972642c62",
79
79
  "powershell/plugins/add-azure-completers-v2.ts": "3b1ddf7a067dbac2f07561fb3f6cbf1b66e555aa",
80
80
  "powershell/plugins/create-commands-v2.ts": "2ad0265c6a8fe77faaccb22da437754747947aaf",
81
81
  "powershell/plugins/cs-namer-v2.ts": "1b64031416f18b604950012b5683758adefce535",
@@ -110,9 +110,9 @@
110
110
  "powershell/resources/assets/pack-module.ps1": "3a263c5fd58c6f124693c3004db4b960ed579f39",
111
111
  "powershell/resources/assets/resources/README.md": "c532566d4700f25121ebf7cd78071002f888d096",
112
112
  "powershell/resources/assets/run-module.ps1": "1ddd04852650ade2491a9e6b80b449d609d54105",
113
- "powershell/resources/assets/test-module.ps1": "858e37dce7a31a49833b5ae4fd1e0744806c0d14",
113
+ "powershell/resources/assets/test-module.ps1": "8d35a592b9d4782dfebee554b11822f5d9119531",
114
114
  "powershell/resources/assets/test/README.md": "bef2317f03ce8baf52bff238510e27a0ffe79aaa",
115
- "powershell/resources/assets/test/loadEnv.ps1": "079c89ae2f53e8f9be1489838594b6bc0c555602",
115
+ "powershell/resources/assets/test/loadEnv.ps1": "1d350fe78c673fb88c577c04f61277ab75bdcf25",
116
116
  "powershell/resources/assets/tools/Resources/.gitattributes": "2125666142eb661091cc5f32af2ed2f3fc65571d",
117
117
  "powershell/resources/assets/tools/Resources/.gitignore": "8b93ac424812ec6872783420ed87e82d10f2242b",
118
118
  "powershell/resources/assets/tools/Resources/README.md": "cdaf3a995a725177a11845056d23cfd14e2bb5c2",
@@ -217,7 +217,7 @@
217
217
  "powershell/resources/psruntime/BuildTime/Cmdlets/ExportModelSurface.cs": "e4af60bd7ad7b57a036474c5aed7c4cab4b1997d",
218
218
  "powershell/resources/psruntime/BuildTime/Cmdlets/ExportProxyCmdlet.cs": "f36346b8291eef621d487b090bd184cbd9fa3a9e",
219
219
  "powershell/resources/psruntime/BuildTime/Cmdlets/ExportPsd1.cs": "b3833ffb92514646dc99611eaf5aab4e4a232664",
220
- "powershell/resources/psruntime/BuildTime/Cmdlets/ExportTestStub.cs": "57f53b7abccf6edf11bfa822224452ace2506b74",
220
+ "powershell/resources/psruntime/BuildTime/Cmdlets/ExportTestStub.cs": "7402e85a799d19cba3eb2ad563ca792647ef9578",
221
221
  "powershell/resources/psruntime/BuildTime/Cmdlets/GetCommonParameter.cs": "bf5c757829449599eee8ff1786b3198d703ed7a6",
222
222
  "powershell/resources/psruntime/BuildTime/Cmdlets/GetModuleGuid.cs": "e8d5baed5d143fc557c4a3b0aefd14308f32fac2",
223
223
  "powershell/resources/psruntime/BuildTime/Cmdlets/GetScriptCmdlet.cs": "1b136635ba83a4df5990669d0094092692b49b12",
@@ -227,7 +227,7 @@
227
227
  "powershell/resources/psruntime/BuildTime/Models/PsHelpMarkdownOutputs.cs": "056be554968d76667c0659d169f674ef5dbb74ed",
228
228
  "powershell/resources/psruntime/BuildTime/Models/PsHelpTypes.cs": "34d832146757eab7d8e1bd3feba5d411577f388a",
229
229
  "powershell/resources/psruntime/BuildTime/Models/PsMarkdownTypes.cs": "c2c068932d2e4ab31a46d566e7b24f357f68c6f8",
230
- "powershell/resources/psruntime/BuildTime/Models/PsProxyOutputs.cs": "25f37c92ba224330e089911b71512a6762397ed0",
230
+ "powershell/resources/psruntime/BuildTime/Models/PsProxyOutputs.cs": "7c04bdae14142b93a1ddde2afefa36a85585b00e",
231
231
  "powershell/resources/psruntime/BuildTime/Models/PsProxyTypes.cs": "02649181d9f3223a04c050c5480d07a751ba7a1e",
232
232
  "powershell/resources/psruntime/BuildTime/PsAttributes.cs": "06d994f77ab1052048edccf0d2b6ba7e6021ce0a",
233
233
  "powershell/resources/psruntime/BuildTime/PsExtensions.cs": "52083232ddc161a0f41496cbdf979d709c490194",
@@ -349,7 +349,6 @@
349
349
  "powershell/resources/templates/page.ejs": "657e785359b8255e84e8d81d0cf33340578ff654",
350
350
  "powershell/resources/templates/serviceClientBody.ejs": "419df180f7d011df4de547c86008b586f9da693a",
351
351
  "powershell/resources/templates/serviceClientInterface.ejs": "b529b14d48b4adc7b0e08de4668f0faaeed6a8a5",
352
- "powershell/resources/utils/Get-SubscriptionIdTestSafe.ps1": "5319862d3372af080cc563328c861f4378d66f4e",
353
352
  "powershell/resources/utils/Unprotect-SecureString.ps1": "cb05b51a6220840d617a439a947a359f8685a05d",
354
353
  "powershell/sdk/project.ts": "063b21d84e9acf5fd5da69f710cb7f0c9ce18b1a",
355
354
  "powershell/sdk/state.ts": "841874bde0a6b674660f812e68b68c7e2b13a47f",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autorest/powershell",
3
- "version": "4.0.685",
3
+ "version": "4.0.686",
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=@{"*:Tenant"=$env.Tenant}
17
+ $PSDefaultParameterValues=@{"*:SubscriptionId"=$env.SubscriptionId; "*:Tenant"=$env.Tenant}
18
18
  }
@@ -63,14 +63,13 @@ try
63
63
  if ($TestMode -ne 'playback')
64
64
  {
65
65
  setupEnv
66
- } else {
67
- $env:AzPSAutorestTestPlaybackMode = $true
68
66
  }
69
67
  $testFolder = Join-Path $PSScriptRoot '${$lib.path.relative($project.baseFolder, $project.testFolder)}'
70
68
  if ($null -ne $TestName)
71
69
  {
72
70
  Invoke-Pester -Script @{ Path = $testFolder } -TestName $TestName -ExcludeTag $ExcludeTag -EnableExit -OutputFile (Join-Path $testFolder "$moduleName-TestResults.xml")
73
- } else {
71
+ } else
72
+ {
74
73
  Invoke-Pester -Script @{ Path = $testFolder } -ExcludeTag $ExcludeTag -EnableExit -OutputFile (Join-Path $testFolder "$moduleName-TestResults.xml")
75
74
  }
76
75
  } Finally
@@ -79,9 +78,6 @@ try
79
78
  {
80
79
  cleanupEnv
81
80
  }
82
- else {
83
- $env:AzPSAutorestTestPlaybackMode = ''
84
- }
85
81
  }
86
82
 
87
83
  Write-Host -ForegroundColor Green '-------------Done-------------'
@@ -12,65 +12,44 @@ using static Microsoft.Rest.ClientRuntime.PowerShell.PsHelpers;
12
12
 
13
13
  namespace Microsoft.Rest.ClientRuntime.PowerShell
14
14
  {
15
- [Cmdlet(VerbsData.Export, "TestStub")]
16
- [DoNotExport]
17
- public class ExportTestStub : PSCmdlet
15
+ [Cmdlet(VerbsData.Export, "TestStub")]
16
+ [DoNotExport]
17
+ public class ExportTestStub : PSCmdlet
18
+ {
19
+ [Parameter(Mandatory = true)]
20
+ [ValidateNotNullOrEmpty]
21
+ public string ModuleName { get; set; }
22
+
23
+ [Parameter(Mandatory = true)]
24
+ [ValidateNotNullOrEmpty]
25
+ public string ExportsFolder { get; set; }
26
+
27
+ [Parameter(Mandatory = true)]
28
+ [ValidateNotNullOrEmpty]
29
+ public string OutputFolder { get; set; }
30
+
31
+ [Parameter]
32
+ public SwitchParameter IncludeGenerated { get; set; }
33
+
34
+ protected override void ProcessRecord()
18
35
  {
19
- [Parameter(Mandatory = true)]
20
- [ValidateNotNullOrEmpty]
21
- public string ModuleName { get; set; }
22
-
23
- [Parameter(Mandatory = true)]
24
- [ValidateNotNullOrEmpty]
25
- public string ExportsFolder { get; set; }
26
-
27
- [Parameter(Mandatory = true)]
28
- [ValidateNotNullOrEmpty]
29
- public string OutputFolder { get; set; }
30
-
31
- [Parameter]
32
- public SwitchParameter IncludeGenerated { get; set; }
33
-
34
- protected override void ProcessRecord()
36
+ try
37
+ {
38
+ if (!Directory.Exists(ExportsFolder))
35
39
  {
36
- try
37
- {
38
- if (!Directory.Exists(ExportsFolder))
39
- {
40
- throw new ArgumentException($"Exports folder '{ExportsFolder}' does not exist");
41
- }
42
-
43
- var exportDirectories = Directory.GetDirectories(ExportsFolder);
44
- if (!exportDirectories.Any())
45
- {
46
- exportDirectories = new[] { ExportsFolder };
47
- }
48
- /*var loadEnvFile = Path.Combine(OutputFolder, "loadEnv.ps1");
49
- if (!File.Exists(loadEnvFile))
50
- {
51
- var sc = new StringBuilder();
52
- sc.AppendLine(@"
53
- $envFile = 'env.json'
54
- if ($TestMode -eq 'live') {
55
- $envFile = 'localEnv.json'
56
- }
40
+ throw new ArgumentException($"Exports folder '{ExportsFolder}' does not exist");
41
+ }
57
42
 
58
- if (Test-Path -Path (Join-Path $PSScriptRoot $envFile)) {
59
- $envFilePath = Join-Path $PSScriptRoot $envFile
60
- } else {
61
- $envFilePath = Join-Path $PSScriptRoot '..\$envFile'
62
- }
63
- $env = @{}
64
- if (Test-Path -Path $envFilePath) {
65
- $env = Get-Content (Join-Path $PSScriptRoot $envFile) | ConvertFrom-Json
66
- }");
67
- File.WriteAllText(loadEnvFile, sc.ToString());
68
- }*/
69
- var utilFile = Path.Combine(OutputFolder, "utils.ps1");
70
- if (!File.Exists(utilFile))
71
- {
72
- var sc = new StringBuilder();
73
- sc.AppendLine(@"function RandomString([bool]$allChars, [int32]$len) {
43
+ var exportDirectories = Directory.GetDirectories(ExportsFolder);
44
+ if (!exportDirectories.Any())
45
+ {
46
+ exportDirectories = new[] { ExportsFolder };
47
+ }
48
+ var utilFile = Path.Combine(OutputFolder, "utils.ps1");
49
+ if (!File.Exists(utilFile))
50
+ {
51
+ var sc = new StringBuilder();
52
+ sc.AppendLine(@"function RandomString([bool]$allChars, [int32]$len) {
74
53
  if ($allChars) {
75
54
  return -join ((33..126) | Get-Random -Count $len | % {[char]$_})
76
55
  } else {
@@ -126,40 +105,37 @@ function cleanupEnv() {
126
105
  # Clean resources you create for testing
127
106
  }
128
107
  ");
129
- File.WriteAllText(utilFile, sc.ToString());
130
- }
131
-
132
-
133
-
134
- foreach (var exportDirectory in exportDirectories)
135
- {
136
- var outputFolder = OutputFolder;
137
- if (exportDirectory != ExportsFolder)
138
- {
139
- outputFolder = Path.Combine(OutputFolder, Path.GetFileName(exportDirectory));
140
- Directory.CreateDirectory(outputFolder);
141
- }
142
-
143
- var variantGroups = GetScriptCmdlets(exportDirectory)
144
- .SelectMany(fi => fi.ToVariants())
145
- .Where(v => !v.IsDoNotExport)
146
- .GroupBy(v => v.CmdletName)
147
- .Select(vg => new VariantGroup(ModuleName, vg.Key, vg.Select(v => v).ToArray(), outputFolder, isTest: true))
148
- .Where(vtg => !File.Exists(vtg.FilePath) && (IncludeGenerated || !vtg.IsGenerated));
149
-
150
- foreach (var variantGroup in variantGroups)
151
- {
152
- var sb = new StringBuilder();
153
- sb.AppendLine($"if(($null -eq $TestName) -or ($TestName -contains '{variantGroup.CmdletName}'))");
154
- sb.AppendLine(@"{
108
+ File.WriteAllText(utilFile, sc.ToString());
109
+ }
110
+ foreach (var exportDirectory in exportDirectories)
111
+ {
112
+ var outputFolder = OutputFolder;
113
+ if (exportDirectory != ExportsFolder)
114
+ {
115
+ outputFolder = Path.Combine(OutputFolder, Path.GetFileName(exportDirectory));
116
+ Directory.CreateDirectory(outputFolder);
117
+ }
118
+
119
+ var variantGroups = GetScriptCmdlets(exportDirectory)
120
+ .SelectMany(fi => fi.ToVariants())
121
+ .Where(v => !v.IsDoNotExport)
122
+ .GroupBy(v => v.CmdletName)
123
+ .Select(vg => new VariantGroup(ModuleName, vg.Key, vg.Select(v => v).ToArray(), outputFolder, isTest: true))
124
+ .Where(vtg => !File.Exists(vtg.FilePath) && (IncludeGenerated || !vtg.IsGenerated));
125
+
126
+ foreach (var variantGroup in variantGroups)
127
+ {
128
+ var sb = new StringBuilder();
129
+ sb.AppendLine($"if(($null -eq $TestName) -or ($TestName -contains '{variantGroup.CmdletName}'))");
130
+ sb.AppendLine(@"{
155
131
  $loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
156
132
  if (-Not (Test-Path -Path $loadEnvPath)) {
157
133
  $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
158
134
  }
159
135
  . ($loadEnvPath)"
160
- );
161
- sb.AppendLine($@" $TestRecordingFile = Join-Path $PSScriptRoot '{variantGroup.CmdletName}.Recording.json'");
162
- sb.AppendLine(@" $currentPath = $PSScriptRoot
136
+ );
137
+ sb.AppendLine($@" $TestRecordingFile = Join-Path $PSScriptRoot '{variantGroup.CmdletName}.Recording.json'");
138
+ sb.AppendLine(@" $currentPath = $PSScriptRoot
163
139
  while(-not $mockingPath) {
164
140
  $mockingPath = Get-ChildItem -Path $currentPath -Recurse -Include 'HttpPipelineMocking.ps1' -File
165
141
  $currentPath = Split-Path -Path $currentPath -Parent
@@ -169,29 +145,29 @@ function cleanupEnv() {
169
145
  ");
170
146
 
171
147
 
172
- sb.AppendLine($"Describe '{variantGroup.CmdletName}' {{");
173
- var variants = variantGroup.Variants
174
- .Where(v => IncludeGenerated || !v.Attributes.OfType<GeneratedAttribute>().Any())
175
- .ToList();
176
-
177
- foreach (var variant in variants)
178
- {
179
- sb.AppendLine($"{Indent}It '{variant.VariantName}' -skip {{");
180
- sb.AppendLine($"{Indent}{Indent}{{ throw [System.NotImplementedException] }} | Should -Not -Throw");
181
- var variantSeparator = variants.IndexOf(variant) == variants.Count - 1 ? String.Empty : Environment.NewLine;
182
- sb.AppendLine($"{Indent}}}{variantSeparator}");
183
- }
184
- sb.AppendLine("}");
148
+ sb.AppendLine($"Describe '{variantGroup.CmdletName}' {{");
149
+ var variants = variantGroup.Variants
150
+ .Where(v => IncludeGenerated || !v.Attributes.OfType<GeneratedAttribute>().Any())
151
+ .ToList();
185
152
 
186
- File.WriteAllText(variantGroup.FilePath, sb.ToString());
187
- }
188
- }
189
- }
190
- catch (Exception ee)
153
+ foreach (var variant in variants)
191
154
  {
192
- Console.WriteLine($"${ee.GetType().Name}/{ee.StackTrace}");
193
- throw ee;
155
+ sb.AppendLine($"{Indent}It '{variant.VariantName}' -skip {{");
156
+ sb.AppendLine($"{Indent}{Indent}{{ throw [System.NotImplementedException] }} | Should -Not -Throw");
157
+ var variantSeparator = variants.IndexOf(variant) == variants.Count - 1 ? String.Empty : Environment.NewLine;
158
+ sb.AppendLine($"{Indent}}}{variantSeparator}");
194
159
  }
160
+ sb.AppendLine("}");
161
+
162
+ File.WriteAllText(variantGroup.FilePath, sb.ToString());
163
+ }
195
164
  }
165
+ }
166
+ catch (Exception ee)
167
+ {
168
+ Console.WriteLine($"${ee.GetType().Name}/{ee.StackTrace}");
169
+ throw ee;
170
+ }
196
171
  }
172
+ }
197
173
  }
@@ -290,27 +290,9 @@ namespace Microsoft.Rest.ClientRuntime.PowerShell
290
290
  {
291
291
  setCondition = $" -and {defaultInfo.SetCondition}";
292
292
  }
293
- //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
294
- //override default value set in required readme
295
- if ("SubscriptionId".Equals(parameterName))
296
- {
297
- sb.AppendLine($"{Indent}{Indent}if (({variantListString}) -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('{parameterName}'){setCondition}) {{");
298
- sb.AppendLine($"{Indent}{Indent}{Indent}$testPlayback = $false");
299
- sb.AppendLine($"{Indent}{Indent}{Indent}$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object {{ $testPlayback = $testPlayback -or ('Microsoft.Message.ClientRuntime.PipelineMock' -eq $_.Target.GetType().FullName) }}");
300
- sb.AppendLine($"{Indent}{Indent}{Indent}if ($testPlayback) {{");
301
- sb.AppendLine($"{Indent}{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = . (Join-Path $PSScriptRoot '..' 'utils' 'Get-SubscriptionIdTestSafe.ps1')");
302
- sb.AppendLine($"{Indent}{Indent}{Indent}}} else {{");
303
- sb.AppendLine($"{Indent}{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = {defaultInfo.Script}");
304
- sb.AppendLine($"{Indent}{Indent}{Indent}}}");
305
- sb.Append($"{Indent}{Indent}}}");
306
- }
307
- else
308
- {
309
- sb.AppendLine($"{Indent}{Indent}if (({variantListString}) -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('{parameterName}'){setCondition}) {{");
310
- sb.AppendLine($"{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = {defaultInfo.Script}");
311
- sb.Append($"{Indent}{Indent}}}");
312
- }
313
-
293
+ sb.AppendLine($"{Indent}{Indent}if (({variantListString}) -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('{parameterName}'){setCondition}) {{");
294
+ sb.AppendLine($"{Indent}{Indent}{Indent}$PSBoundParameters['{parameterName}'] = {defaultInfo.Script}");
295
+ sb.Append($"{Indent}{Indent}}}");
314
296
  }
315
297
  return sb.ToString();
316
298
  }
@@ -1,7 +0,0 @@
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