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

Renamed BuildTask to FileTask and RunTask to EncodedTask in Azure Container registry Build GA swagger #3746

Merged
merged 1 commit into from
Aug 28, 2018
Merged

Renamed BuildTask to FileTask and RunTask to EncodedTask in Azure Container registry Build GA swagger #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
77 changes: 38 additions & 39 deletions ...source-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,8 +870,7 @@
"PlatformProperties": {
"description": "The platform properties against which the run has to happen.",
"required": [
"os",
"architecture"
"os"
],
"type": "object",
"properties": {
Expand Down Expand Up @@ -1149,8 +1148,8 @@
"description": "The type of the step.",
"enum": [
"Docker",
"BuildTask",
"RunTask"
"FileTask",
"EncodedTask"
],
"type": "string",
"readOnly": true,
Expand Down Expand Up @@ -1486,8 +1485,8 @@
"description": "The type of the step.",
"enum": [
"Docker",
"BuildTask",
"RunTask"
"FileTask",
"EncodedTask"
],
"type": "string",
"readOnly": true,
Expand Down Expand Up @@ -1810,11 +1809,11 @@
}
}
},
"BuildTaskRequest": {
"description": "The request parameters for a quick task build.",
"FileTaskRunRequest": {
"description": "The request parameters for a scheduling run against a task file.",
"required": [
"type",
"definitionFilePath",
"taskFilePath",
"sourceLocation",
"platform"
],
Expand All @@ -1825,7 +1824,7 @@
}
],
"properties": {
"definitionFilePath": {
"taskFilePath": {
"description": "The template/definition file path relative to the source.",
"type": "string"
},
Expand Down Expand Up @@ -1861,7 +1860,7 @@
"description": "The machine configuration of the build agent."
}
},
"x-ms-discriminator-value": "BuildTaskRequest"
"x-ms-discriminator-value": "FileTaskRunRequest"
},
"SetValue": {
"description": "The properties of a overridable value that can be passed to a task template.",
Expand Down Expand Up @@ -1913,11 +1912,11 @@
},
"x-ms-discriminator-value": "TaskRunRequest"
},
"QuickTaskRunRequest": {
"EncodedTaskRunRequest": {
"description": "The parameters for a quick task run request.",
"required": [
"type",
"taskDefinitionContent",
"encodedTaskContent",
"platform"
],
"type": "object",
Expand All @@ -1927,11 +1926,11 @@
}
],
"properties": {
"taskDefinitionContent": {
"encodedTaskContent": {
"description": "Base64 encoded value of the template/definition file content.",
"type": "string"
},
"valuesContent": {
"encodedValuesContent": {
"description": "Base64 encoded value of the parameters/values file content.",
"type": "string"
},
Expand Down Expand Up @@ -1959,7 +1958,7 @@
"description": "The machine configuration of the build agent."
}
},
"x-ms-discriminator-value": "QuickTaskRunRequest"
"x-ms-discriminator-value": "EncodedTaskRunRequest"
},
"DockerBuildStep": {
"description": "The Docker build step.",
Expand Down Expand Up @@ -2008,10 +2007,10 @@
},
"x-ms-discriminator-value": "Docker"
},
"BuildTaskStep": {
"description": "The properties of a build task step.",
"FileTaskStep": {
"description": "The properties of a task step.",
"required": [
"definitionFilePath"
"taskFilePath"
],
"type": "object",
"allOf": [
Expand All @@ -2020,8 +2019,8 @@
}
],
"properties": {
"definitionFilePath": {
"description": "The build task template/definition file path relative to the source context.",
"taskFilePath": {
"description": "The task template/definition file path relative to the source context.",
"type": "string"
},
"valuesFilePath": {
Expand All @@ -2040,12 +2039,12 @@
"type": "string"
}
},
"x-ms-discriminator-value": "BuildTask"
"x-ms-discriminator-value": "FileTask"
},
"RunTaskStep": {
"description": "The properties of a generic task run step.",
"EncodedTaskStep": {
"description": "The properties of a encoded task step.",
"required": [
"taskDefinitionContent"
"encodedTaskContent"
],
"type": "object",
"allOf": [
Expand All @@ -2054,11 +2053,11 @@
}
],
"properties": {
"taskDefinitionContent": {
"encodedTaskContent": {
"description": "Base64 encoded value of the template/definition file content.",
"type": "string"
},
"valuesContent": {
"encodedValuesContent": {
"description": "Base64 encoded value of the parameters/values file content.",
"type": "string"
},
Expand All @@ -2070,7 +2069,7 @@
}
}
},
"x-ms-discriminator-value": "RunTask"
"x-ms-discriminator-value": "EncodedTask"
},
"DockerBuildStepUpdateParameters": {
"description": "The properties for updating a docker build step.",
Expand Down Expand Up @@ -2114,21 +2113,21 @@
},
"x-ms-discriminator-value": "Docker"
},
"BuildTaskStepUpdateParameters": {
"description": "The properties of updating a build task step.",
"FileTaskStepUpdateParameters": {
"description": "The properties of updating a task step.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/TaskStepUpdateParameters"
}
],
"properties": {
"definitionFilePath": {
"description": "The build task template/definition file path relative to the source context.",
"taskFilePath": {
"description": "The task template/definition file path relative to the source context.",
"type": "string"
},
"valuesFilePath": {
"description": "The task values/parameters file path relative to the source context.",
"description": "The values/parameters file path relative to the source context.",
"type": "string"
},
"values": {
Expand All @@ -2143,22 +2142,22 @@
"type": "string"
}
},
"x-ms-discriminator-value": "BuildTask"
"x-ms-discriminator-value": "FileTask"
},
"RunTaskStepUpdateParameters": {
"description": "The properties for updating generic task run step.",
"EncodedTaskStepUpdateParameters": {
"description": "The properties for updating encoded task step.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/TaskStepUpdateParameters"
}
],
"properties": {
"taskDefinitionContent": {
"encodedTaskContent": {
"description": "Base64 encoded value of the template/definition file content.",
"type": "string"
},
"valuesContent": {
"encodedValuesContent": {
"description": "Base64 encoded value of the parameters/values file content.",
"type": "string"
},
Expand All @@ -2170,7 +2169,7 @@
}
}
},
"x-ms-discriminator-value": "RunTask"
"x-ms-discriminator-value": "EncodedTask"
}
},
"parameters": {
Expand Down
9 changes: 4 additions & 5 deletions ...s/RegistriesScheduleRun_QuickTaskRun.json → ...RegistriesScheduleRun_EncodedTaskRun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"registryName": "myRegistry",
"api-version": "2018-09-01",
"runRequest": {
"type": "QuickTaskRunRequest",
"type": "EncodedTaskRunRequest",
"values": [
{
"name": "mytestargument",
Expand All @@ -19,14 +19,13 @@
}
],
"platform": {
"os": "Linux",
"architecture": "amd64"
"os": "Linux"
},
"agentConfiguration": {
"cpu": 2
},
"taskDefinitionContent": "c3RlcHM6Cnt7IGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAncHJvZCcgfX0KICAtIHJ1bjogcHJvZCBzZXR1cAp7eyBlbHNlIGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAnc3RhZ2luZycgfX0KICAtIHJ1bjogc3RhZ2luZyBzZXR1cAp7eyBlbHNlIH19CiAgLSBydW46IGRlZmF1bHQgc2V0dXAKe3sgZW5kIH19CgogIC0gcnVuOiBidWlsZCAtdCBGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0gLgoKcHVzaDogWydGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0nXQ==",
"valuesContent":"ZW52aXJvbm1lbnQ6IHByb2QKdmVyc2lvbjogMQ=="
"encodedTaskContent": "c3RlcHM6Cnt7IGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAncHJvZCcgfX0KICAtIHJ1bjogcHJvZCBzZXR1cAp7eyBlbHNlIGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAnc3RhZ2luZycgfX0KICAtIHJ1bjogc3RhZ2luZyBzZXR1cAp7eyBlbHNlIH19CiAgLSBydW46IGRlZmF1bHQgc2V0dXAKe3sgZW5kIH19CgogIC0gcnVuOiBidWlsZCAtdCBGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0gLgoKcHVzaDogWydGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0nXQ==",
"encodedValuesContent":"ZW52aXJvbm1lbnQ6IHByb2QKdmVyc2lvbjogMQ=="
}
},
"responses": {
Expand Down
7 changes: 3 additions & 4 deletions ...ples/RegistriesScheduleRun_BuildTask.json → ...es/RegistriesScheduleRun_FileTaskRun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"registryName": "myRegistry",
"api-version": "2018-09-01",
"runRequest": {
"type": "BuildTaskRequest",
"type": "FileTaskRunRequest",
"sourceLocation": "https://myaccount.blob.core.windows.net/sascontainer/source.zip?sv=2015-04-05&st=2015-04-29T22%3A18%3A26Z&se=2015-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=Z%2FRHIX5Xcg0Mq2rqI3OlWTjEg2tYkboXr1P9ZUXDtkk%3D",
"values": [
{
Expand All @@ -20,13 +20,12 @@
}
],
"platform": {
"os": "Linux",
"architecture": "amd64"
"os": "Linux"
},
"agentConfiguration": {
"cpu": 2
},
"templateFilePath": "acb.yaml",
"taskFilePath": "acb.yaml",
"valuesFilePath":"prod-values.yaml"
}
},
Expand Down