From 13f78c9f9be8ff71afffbe76b21c7b0687b70ea8 Mon Sep 17 00:00:00 2001 From: Tejaswini Duggaraju Date: Thu, 27 Sep 2018 17:02:12 -0700 Subject: [PATCH 1/2] Add ContextPath and source location URL for encode task and run type, add support for pull request based trigger. --- .../2018-09-01/containerregistry_build.json | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json index e303023fa2b7..6dccd3221145 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json @@ -716,7 +716,9 @@ "description": "The type of run.", "enum": [ "QuickBuild", - "AutoBuild" + "QuickRun", + "AutoBuild", + "AutoRun" ], "type": "string", "x-ms-enum": { @@ -740,7 +742,7 @@ "type": "string" }, "outputImages": { - "description": "The list of all images that were generated from the run. This is applicable if the run is of type Build.", + "description": "The list of all images that were generated from the run. This is applicable if the run generates base image dependencies.", "type": "array", "items": { "$ref": "#/definitions/ImageDescriptor" @@ -752,7 +754,7 @@ }, "imageUpdateTrigger": { "$ref": "#/definitions/ImageUpdateTrigger", - "description": "The image update trigger that caused the run. This is applicable if the task is of build type." + "description": "The image update trigger that caused the run. This is applicable if the task has base image trigger configured." }, "sourceTrigger": { "$ref": "#/definitions/SourceTriggerDescriptor", @@ -968,7 +970,9 @@ "description": "The type of run.", "enum": [ "QuickBuild", - "AutoBuild" + "QuickRun", + "AutoBuild", + "AutoRun" ], "type": "string", "x-ms-enum": { @@ -1165,12 +1169,16 @@ "$ref": "#/definitions/BaseImageDependency" }, "readOnly": true + }, + "contextPath": { + "description": "The URL(absolute or relative) of the source context for the task step.", + "type": "string" } }, "discriminator": "type" }, "TriggerProperties": { - "description": "The properties of a build trigger.", + "description": "The properties of a trigger.", "type": "object", "properties": { "sourceTriggers": { @@ -1238,7 +1246,8 @@ "type": "array", "items": { "enum": [ - "commit" + "commit", + "pullrequest" ], "type": "string", "x-ms-enum": { @@ -1248,7 +1257,7 @@ } }, "status": { - "description": "The current status of build trigger.", + "description": "The current status of trigger.", "enum": [ "Disabled", "Enabled" @@ -1286,7 +1295,7 @@ } }, "status": { - "description": "The current status of build trigger.", + "description": "The current status of trigger.", "enum": [ "Disabled", "Enabled" @@ -1494,12 +1503,16 @@ "name": "StepType", "modelAsString": true } + }, + "contextPath": { + "description": "The URL(absolute or relative) of the source context for the task step.", + "type": "string" } }, "discriminator": "type" }, "TriggerUpdateParameters": { - "description": "The properties for updating build triggers.", + "description": "The properties for updating triggers.", "type": "object", "properties": { "sourceTriggers": { @@ -1531,7 +1544,8 @@ "type": "array", "items": { "enum": [ - "commit" + "commit", + "pullrequest" ], "type": "string", "x-ms-enum": { @@ -1541,7 +1555,7 @@ } }, "status": { - "description": "The current status of build trigger.", + "description": "The current status of trigger.", "enum": [ "Disabled", "Enabled" @@ -1578,7 +1592,7 @@ } }, "status": { - "description": "The current status of build trigger.", + "description": "The current status of trigger.", "enum": [ "Disabled", "Enabled" @@ -1725,7 +1739,6 @@ "required": [ "type", "dockerFilePath", - "sourceLocation", "platform" ], "type": "object", @@ -1763,13 +1776,9 @@ "$ref": "#/definitions/Argument" } }, - "sourceLocation": { - "description": "The URL(absolute or relative) of the source that needs to be built. For Docker build, it can be an URL to a tar or github repoistory as supported by Docker.\r\nIf it is relative URL, the relative path should be obtained from calling getSourceUploadUrl API.", - "type": "string" - }, "timeout": { "format": "int32", - "description": "Build timeout in seconds.", + "description": "Run timeout in seconds.", "default": 3600, "maximum": 28800, "minimum": 300, @@ -1777,11 +1786,15 @@ }, "platform": { "$ref": "#/definitions/PlatformProperties", - "description": "The platform properties against which the build will happen." + "description": "The platform properties against which the run has to happen." }, "agentConfiguration": { "$ref": "#/definitions/AgentProperties", - "description": "The machine configuration of the build agent." + "description": "The machine configuration of the run agent." + }, + "sourceLocation": { + "description": "The URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.\r\nIf it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.", + "type": "string" } }, "x-ms-discriminator-value": "DockerBuildRequest" @@ -1814,7 +1827,6 @@ "required": [ "type", "taskFilePath", - "sourceLocation", "platform" ], "type": "object", @@ -1839,13 +1851,9 @@ "$ref": "#/definitions/SetValue" } }, - "sourceLocation": { - "description": "The URL(absolute or relative) of the source that needs to be built. For Docker build, it can be an URL to a tar or github repoistory as supported by Docker.\r\nIf it is relative URL, the relative path should be obtained from calling getSourceUploadUrl API.", - "type": "string" - }, "timeout": { "format": "int32", - "description": "Build timeout in seconds.", + "description": "Run timeout in seconds.", "default": 3600, "maximum": 28800, "minimum": 300, @@ -1853,11 +1861,15 @@ }, "platform": { "$ref": "#/definitions/PlatformProperties", - "description": "The platform properties against which the build will happen." + "description": "The platform properties against which the run has to happen." }, "agentConfiguration": { "$ref": "#/definitions/AgentProperties", - "description": "The machine configuration of the build agent." + "description": "The machine configuration of the run agent." + }, + "sourceLocation": { + "description": "The URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.\r\nIf it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.", + "type": "string" } }, "x-ms-discriminator-value": "FileTaskRunRequest" @@ -1943,7 +1955,7 @@ }, "timeout": { "format": "int32", - "description": "Build timeout in seconds.", + "description": "Run timeout in seconds.", "default": 3600, "maximum": 28800, "minimum": 300, @@ -1951,11 +1963,15 @@ }, "platform": { "$ref": "#/definitions/PlatformProperties", - "description": "The platform properties against which the build will happen." + "description": "The platform properties against which the run has to happen." }, "agentConfiguration": { "$ref": "#/definitions/AgentProperties", - "description": "The machine configuration of the build agent." + "description": "The machine configuration of the run agent." + }, + "sourceLocation": { + "description": "The URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.\r\nIf it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.", + "type": "string" } }, "x-ms-discriminator-value": "EncodedTaskRunRequest" @@ -1999,10 +2015,6 @@ "items": { "$ref": "#/definitions/Argument" } - }, - "contextPath": { - "description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.", - "type": "string" } }, "x-ms-discriminator-value": "Docker" @@ -2033,10 +2045,6 @@ "items": { "$ref": "#/definitions/SetValue" } - }, - "contextPath": { - "description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.", - "type": "string" } }, "x-ms-discriminator-value": "FileTask" @@ -2105,10 +2113,6 @@ "items": { "$ref": "#/definitions/Argument" } - }, - "contextPath": { - "description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.", - "type": "string" } }, "x-ms-discriminator-value": "Docker" @@ -2136,10 +2140,6 @@ "items": { "$ref": "#/definitions/SetValue" } - }, - "contextPath": { - "description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.", - "type": "string" } }, "x-ms-discriminator-value": "FileTask" From 13e400bf6069741a145f5eaf00650cbd52cc7afc Mon Sep 17 00:00:00 2001 From: Tejaswini Duggaraju Date: Fri, 28 Sep 2018 09:09:20 -0700 Subject: [PATCH 2/2] Update readme to fix the name conflict in autorest codegen --- specification/containerregistry/resource-manager/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/containerregistry/resource-manager/readme.md b/specification/containerregistry/resource-manager/readme.md index 73fb9fbb2d47..5fc2ee1df085 100644 --- a/specification/containerregistry/resource-manager/readme.md +++ b/specification/containerregistry/resource-manager/readme.md @@ -34,6 +34,12 @@ tag: package-2018-09 These settings apply only when `--tag=package-2018-09` is specified on the command line. ``` yaml $(tag) == 'package-2018-09' + +csharp: + # stop the simplifier from making Task conflict: + skip-simplifier-on-namespace: + - System.Threading.Tasks + input-file: - Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json - Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json