Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Hub Generated] Review request for Microsoft.VirtualMachineImages to add version preview/2019-02-01-preview #5512

Merged
merged 2 commits into from
Apr 1, 2019
Merged

[Hub Generated] Review request for Microsoft.VirtualMachineImages to add version preview/2019-02-01-preview #5512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e07bfd
Add inline scripts
paulmey Mar 29, 2019
344f1d7
Fix bug: "artifactLocation" -> "artifactUri"
paulmey Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions ...ource-manager/Microsoft.VirtualMachineImages/preview/2019-02-01-preview/imagebuilder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@
]
},
"ImageTemplateShellCustomizer": {
"description": "Runs a shell script during the customization phase (Linux)",
"description": "Runs a shell script during the customization phase (Linux). Corresponds to Packer shell provisioner. Exactly one of 'script' or 'inline' can be specified.",
"x-ms-discriminator-value": "Shell",
"allOf": [
{
Expand All @@ -603,6 +603,13 @@
"script": {
"type": "string",
"description": "The shell script to be run for customizing. It can be a github link, SAS URI for Azure Storage, etc"
},
"inline": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: a better command would be inlineCommands or commands. Not blocking on this.

"type": "array",
"description": "Array of shell commands to execute",
"items": {
"type": "string"
}
}
}
},
Expand Down Expand Up @@ -630,7 +637,7 @@
}
},
"ImageTemplatePowerShellCustomizer": {
"description": "Runs the specified PowerShell on the VM (Windows). Corresponds to Packer powershell provisioner",
"description": "Runs the specified PowerShell on the VM (Windows). Corresponds to Packer powershell provisioner. Exactly one of 'script' or 'inline' can be specified.",
"x-ms-discriminator-value": "PowerShell",
"allOf": [
{
Expand All @@ -642,8 +649,16 @@
"type": "string",
"description": "The PowerShell script to be run for customizing. It can be a github link, SAS URI for Azure Storage, etc"
},
"inline": {
"type": "array",
"description": "Array of PowerShell commands to execute",
"items": {
"type": "string"
}
},
"validExitCodes" : {
"type": "array",
"description": "Valid exit codes for the PowerShell script. [Default: 0]",
"items": {
"type": "integer"
}
Expand Down Expand Up @@ -857,9 +872,9 @@
"type": "string",
"description": "The resource id of the artifact."
},
"artifactLocation": {
"artifactUri": {
"type": "string",
"description": "The URL location of the artifact."
"description": "The location URI of the artifact."
},
"provisioningState": {
"$ref": "#/definitions/ProvisioningState",
Expand Down