@autorest/powershell 4.0.687 → 4.0.688
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.
- package/.rush/temp/package-deps_build.json +7 -6
- package/package.json +1 -1
- package/resources/assets/test/loadEnv.ps1 +1 -1
- package/resources/assets/test-module.ps1 +6 -2
- package/resources/psruntime/BuildTime/Cmdlets/ExportTestStub.cs +105 -81
- package/resources/psruntime/BuildTime/Models/PsProxyOutputs.cs +21 -3
- package/resources/utils/Get-SubscriptionIdTestSafe.ps1 +7 -0
|
@@ -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": "
|
|
24
|
+
"powershell/generators/psm1.ts": "01985a80f31586d45f83ab3a91e702752591d05f",
|
|
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": "ffef6105f5566125c72dc525dd33ed0ddd05b910",
|
|
77
77
|
"powershell/module/module-namespace.ts": "f6afc90087e8d733f0323b0de8ba41d923955732",
|
|
78
|
-
"powershell/package.json": "
|
|
78
|
+
"powershell/package.json": "cf93af13036abd54138253a2bb0ce676004a778c",
|
|
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": "
|
|
113
|
+
"powershell/resources/assets/test-module.ps1": "858e37dce7a31a49833b5ae4fd1e0744806c0d14",
|
|
114
114
|
"powershell/resources/assets/test/README.md": "bef2317f03ce8baf52bff238510e27a0ffe79aaa",
|
|
115
|
-
"powershell/resources/assets/test/loadEnv.ps1": "
|
|
115
|
+
"powershell/resources/assets/test/loadEnv.ps1": "079c89ae2f53e8f9be1489838594b6bc0c555602",
|
|
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": "
|
|
220
|
+
"powershell/resources/psruntime/BuildTime/Cmdlets/ExportTestStub.cs": "57f53b7abccf6edf11bfa822224452ace2506b74",
|
|
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": "
|
|
230
|
+
"powershell/resources/psruntime/BuildTime/Models/PsProxyOutputs.cs": "c665653b5bb339a0c12f82878ea9a79c92d0d1d2",
|
|
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,6 +349,7 @@
|
|
|
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",
|
|
352
353
|
"powershell/resources/utils/Unprotect-SecureString.ps1": "cb05b51a6220840d617a439a947a359f8685a05d",
|
|
353
354
|
"powershell/sdk/project.ts": "063b21d84e9acf5fd5da69f710cb7f0c9ce18b1a",
|
|
354
355
|
"powershell/sdk/state.ts": "841874bde0a6b674660f812e68b68c7e2b13a47f",
|
package/package.json
CHANGED
|
@@ -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=@{"*:
|
|
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-------------'
|
|
@@ -12,44 +12,65 @@ using static Microsoft.Rest.ClientRuntime.PowerShell.PsHelpers;
|
|
|
12
12
|
|
|
13
13
|
namespace Microsoft.Rest.ClientRuntime.PowerShell
|
|
14
14
|
{
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
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()
|
|
15
|
+
[Cmdlet(VerbsData.Export, "TestStub")]
|
|
16
|
+
[DoNotExport]
|
|
17
|
+
public class ExportTestStub : PSCmdlet
|
|
35
18
|
{
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
{
|
|
40
|
-
throw new ArgumentException($"Exports folder '{ExportsFolder}' does not exist");
|
|
41
|
-
}
|
|
19
|
+
[Parameter(Mandatory = true)]
|
|
20
|
+
[ValidateNotNullOrEmpty]
|
|
21
|
+
public string ModuleName { get; set; }
|
|
42
22
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
{
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
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()
|
|
50
35
|
{
|
|
51
|
-
|
|
52
|
-
|
|
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
|
+
}
|
|
57
|
+
|
|
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) {
|
|
53
74
|
if ($allChars) {
|
|
54
75
|
return -join ((33..126) | Get-Random -Count $len | % {[char]$_})
|
|
55
76
|
} else {
|
|
@@ -105,37 +126,40 @@ function cleanupEnv() {
|
|
|
105
126
|
# Clean resources you create for testing
|
|
106
127
|
}
|
|
107
128
|
");
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
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(@"{
|
|
131
155
|
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
|
|
132
156
|
if (-Not (Test-Path -Path $loadEnvPath)) {
|
|
133
157
|
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
|
|
134
158
|
}
|
|
135
159
|
. ($loadEnvPath)"
|
|
136
|
-
);
|
|
137
|
-
|
|
138
|
-
|
|
160
|
+
);
|
|
161
|
+
sb.AppendLine($@" $TestRecordingFile = Join-Path $PSScriptRoot '{variantGroup.CmdletName}.Recording.json'");
|
|
162
|
+
sb.AppendLine(@" $currentPath = $PSScriptRoot
|
|
139
163
|
while(-not $mockingPath) {
|
|
140
164
|
$mockingPath = Get-ChildItem -Path $currentPath -Recurse -Include 'HttpPipelineMocking.ps1' -File
|
|
141
165
|
$currentPath = Split-Path -Path $currentPath -Parent
|
|
@@ -145,29 +169,29 @@ function cleanupEnv() {
|
|
|
145
169
|
");
|
|
146
170
|
|
|
147
171
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
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("}");
|
|
152
185
|
|
|
153
|
-
|
|
186
|
+
File.WriteAllText(variantGroup.FilePath, sb.ToString());
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
catch (Exception ee)
|
|
154
191
|
{
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
var variantSeparator = variants.IndexOf(variant) == variants.Count - 1 ? String.Empty : Environment.NewLine;
|
|
158
|
-
sb.AppendLine($"{Indent}}}{variantSeparator}");
|
|
192
|
+
Console.WriteLine($"${ee.GetType().Name}/{ee.StackTrace}");
|
|
193
|
+
throw ee;
|
|
159
194
|
}
|
|
160
|
-
sb.AppendLine("}");
|
|
161
|
-
|
|
162
|
-
File.WriteAllText(variantGroup.FilePath, sb.ToString());
|
|
163
|
-
}
|
|
164
195
|
}
|
|
165
|
-
}
|
|
166
|
-
catch (Exception ee)
|
|
167
|
-
{
|
|
168
|
-
Console.WriteLine($"${ee.GetType().Name}/{ee.StackTrace}");
|
|
169
|
-
throw ee;
|
|
170
|
-
}
|
|
171
196
|
}
|
|
172
|
-
}
|
|
173
197
|
}
|
|
@@ -290,9 +290,27 @@ namespace Microsoft.Rest.ClientRuntime.PowerShell
|
|
|
290
290
|
{
|
|
291
291
|
setCondition = $" -and {defaultInfo.SetCondition}";
|
|
292
292
|
}
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
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 -and 'Playback' -eq $_.Target.Mode) }}");
|
|
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
|
+
|
|
296
314
|
}
|
|
297
315
|
return sb.ToString();
|
|
298
316
|
}
|