Skip to content

Commit 2ccb8ea

Browse files
committed
Update
1 parent 10302f5 commit 2ccb8ea

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6100,18 +6100,7 @@ exports.init = function (cli) {
61006100
nextPageLink = pageResult.nextPageLink;
61016101
}
61026102

6103-
if (cli.output.format().json) {
6104-
cli.output.json(result);
6105-
}
6106-
else {
6107-
cli.output.table(result, function (row, item) {
6108-
var rgName = item.id ? utils.parseResourceReferenceUri(item.id).resourceGroupName : null;
6109-
row.cell($('ResourceGroupName'), rgName);
6110-
row.cell($('Name'), item.name);
6111-
row.cell($('ProvisioningState'), item.provisioningState);
6112-
row.cell($('Location'), item.location);
6113-
});
6114-
}
6103+
cli.output.json(result);
61156104
});
61166105
/*
61176106
VirtualMachineScaleSets PowerOff

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,10 @@ function Generate-CliFunctionCommandImpl
12961296
$code += " nextPageLink = pageResult.nextPageLink;" + $NEW_LINE;
12971297
$code += " }" + $NEW_LINE;
12981298
$code += "" + $NEW_LINE;
1299+
}
1300+
1301+
if ($PageMethodInfo -ne $null -and $methodName -ne 'ListSkus')
1302+
{
12991303
$code += " if (cli.output.format().json) {" + $NEW_LINE;
13001304
$code += " cli.output.json(result);" + $NEW_LINE;
13011305
$code += " }" + $NEW_LINE;
@@ -1308,7 +1312,7 @@ function Generate-CliFunctionCommandImpl
13081312
$code += " row.cell(`$('Location'), item.location);" + $NEW_LINE;
13091313
$code += " });" + $NEW_LINE;
13101314
$code += " }" + $NEW_LINE;
1311-
}
1315+
}
13121316
else
13131317
{
13141318
$code += " cli.output.json(result);" + $NEW_LINE;

0 commit comments

Comments
 (0)