Skip to content

Commit dac565d

Browse files
committed
Accept List of Strings Separated by Comma
1 parent 364fe79 commit dac565d

File tree

2 files changed

+40
-9
lines changed

2 files changed

+40
-9
lines changed

src/ResourceManager/Compute/Commands.Compute/Generated/cli.js

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5554,7 +5554,10 @@ exports.init = function (cli) {
55545554
vmInstanceIdsObj = JSON.parse(fileContent);
55555555
}
55565556
else {
5557-
vmInstanceIdsObj = JSON.parse(options.vmInstanceIds);
5557+
var vmInstanceIdsValArr = options.vmInstanceIds.split(",");
5558+
cli.output.info('vmInstanceIdsValArr : ' + vmInstanceIdsValArr);
5559+
vmInstanceIdsObj = {};
5560+
vmInstanceIdsObj.instanceIDs = vmInstanceIdsValArr;
55585561
}
55595562
cli.output.info('vmInstanceIdsObj = ' + JSON.stringify(vmInstanceIdsObj));
55605563
var subscription = profile.current.getSubscription(options.subscription);
@@ -5615,7 +5618,10 @@ exports.init = function (cli) {
56155618
vmInstanceIdsObj = JSON.parse(fileContent);
56165619
}
56175620
else {
5618-
vmInstanceIdsObj = JSON.parse(options.vmInstanceIds);
5621+
var vmInstanceIdsValArr = options.vmInstanceIds.split(",");
5622+
cli.output.info('vmInstanceIdsValArr : ' + vmInstanceIdsValArr);
5623+
vmInstanceIdsObj = {};
5624+
vmInstanceIdsObj.instanceIDs = vmInstanceIdsValArr;
56195625
}
56205626
cli.output.info('vmInstanceIdsObj = ' + JSON.stringify(vmInstanceIdsObj));
56215627
var subscription = profile.current.getSubscription(options.subscription);
@@ -5949,7 +5955,10 @@ exports.init = function (cli) {
59495955
vmInstanceIdsObj = JSON.parse(fileContent);
59505956
}
59515957
else {
5952-
vmInstanceIdsObj = JSON.parse(options.vmInstanceIds);
5958+
var vmInstanceIdsValArr = options.vmInstanceIds.split(",");
5959+
cli.output.info('vmInstanceIdsValArr : ' + vmInstanceIdsValArr);
5960+
vmInstanceIdsObj = {};
5961+
vmInstanceIdsObj.instanceIDs = vmInstanceIdsValArr;
59535962
}
59545963
cli.output.info('vmInstanceIdsObj = ' + JSON.stringify(vmInstanceIdsObj));
59555964
var subscription = profile.current.getSubscription(options.subscription);
@@ -6010,7 +6019,10 @@ exports.init = function (cli) {
60106019
vmInstanceIdsObj = JSON.parse(fileContent);
60116020
}
60126021
else {
6013-
vmInstanceIdsObj = JSON.parse(options.vmInstanceIds);
6022+
var vmInstanceIdsValArr = options.vmInstanceIds.split(",");
6023+
cli.output.info('vmInstanceIdsValArr : ' + vmInstanceIdsValArr);
6024+
vmInstanceIdsObj = {};
6025+
vmInstanceIdsObj.instanceIDs = vmInstanceIdsValArr;
60146026
}
60156027
cli.output.info('vmInstanceIdsObj = ' + JSON.stringify(vmInstanceIdsObj));
60166028
var subscription = profile.current.getSubscription(options.subscription);
@@ -6071,7 +6083,10 @@ exports.init = function (cli) {
60716083
vmInstanceIdsObj = JSON.parse(fileContent);
60726084
}
60736085
else {
6074-
vmInstanceIdsObj = JSON.parse(options.vmInstanceIds);
6086+
var vmInstanceIdsValArr = options.vmInstanceIds.split(",");
6087+
cli.output.info('vmInstanceIdsValArr : ' + vmInstanceIdsValArr);
6088+
vmInstanceIdsObj = {};
6089+
vmInstanceIdsObj.instanceIDs = vmInstanceIdsValArr;
60756090
}
60766091
cli.output.info('vmInstanceIdsObj = ' + JSON.stringify(vmInstanceIdsObj));
60776092
var subscription = profile.current.getSubscription(options.subscription);
@@ -6111,7 +6126,10 @@ exports.init = function (cli) {
61116126
vmInstanceIdsObj = JSON.parse(fileContent);
61126127
}
61136128
else {
6114-
vmInstanceIdsObj = JSON.parse(options.vmInstanceIds);
6129+
var vmInstanceIdsValArr = options.vmInstanceIds.split(",");
6130+
cli.output.info('vmInstanceIdsValArr : ' + vmInstanceIdsValArr);
6131+
vmInstanceIdsObj = {};
6132+
vmInstanceIdsObj.instanceIDs = vmInstanceIdsValArr;
61156133
}
61166134
cli.output.info('vmInstanceIdsObj = ' + JSON.stringify(vmInstanceIdsObj));
61176135
var subscription = profile.current.getSubscription(options.subscription);

src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/Generate-FunctionCommand.ps1

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function Generate-CliFunctionCommandImpl
134134
$code += " .usage('[options]')" + $NEW_LINE;
135135
for ($index = 0; $index -lt $methodParamNameList.Count; $index++)
136136
{
137-
# For Each Method Parameter
137+
# Parameter Declaration - For Each Method Parameter
138138
[string]$optionParamName = $methodParamNameList[$index];
139139
if ($allStringFieldCheck[$optionParamName])
140140
{
@@ -157,7 +157,7 @@ function Generate-CliFunctionCommandImpl
157157
$code += " .execute(function(options, _) {" + $NEW_LINE;
158158
for ($index = 0; $index -lt $methodParamNameList.Count; $index++)
159159
{
160-
# For Each Method Parameter
160+
# Parameter Assignment - For Each Method Parameter
161161
[string]$optionParamName = $methodParamNameList[$index];
162162
if ($allStringFieldCheck[$optionParamName])
163163
{
@@ -197,7 +197,19 @@ function Generate-CliFunctionCommandImpl
197197
$code += " ${cli_param_name}Obj = JSON.parse(fileContent);" + $NEW_LINE;
198198
$code += " }" + $NEW_LINE;
199199
$code += " else {" + $NEW_LINE;
200-
$code += " ${cli_param_name}Obj = JSON.parse(options.${cli_param_name});" + $NEW_LINE;
200+
201+
if ($oneStringListCheck[$optionParamName])
202+
{
203+
$code += " var ${cli_param_name}ValArr = options.${cli_param_name}.split(`",`");" + $NEW_LINE;
204+
$code += " cli.output.info(`'${cli_param_name}ValArr : `' + ${cli_param_name}ValArr);" + $NEW_LINE;
205+
$code += " ${cli_param_name}Obj = {};" + $NEW_LINE;
206+
$code += " ${cli_param_name}Obj.instanceIDs = ${cli_param_name}ValArr;" + $NEW_LINE;
207+
}
208+
else
209+
{
210+
$code += " ${cli_param_name}Obj = JSON.parse(options.${cli_param_name});" + $NEW_LINE;
211+
}
212+
201213
$code += " }" + $NEW_LINE;
202214
$code += " cli.output.info('${cli_param_name}Obj = ' + JSON.stringify(${cli_param_name}Obj));" + $NEW_LINE;
203215
}
@@ -208,6 +220,7 @@ function Generate-CliFunctionCommandImpl
208220
$code += " var result = computeManagementClient.${cliOperationName}s.${cliMethodName}(";
209221
for ($index = 0; $index -lt $methodParamNameList.Count; $index++)
210222
{
223+
# Function Call - For Each Method Parameter
211224
if ($index -gt 0) { $code += ", "; }
212225

213226
$cli_param_name = Get-CliNormalizedName $methodParamNameList[$index];

0 commit comments

Comments
 (0)