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

[ACR] Populate Task Timer Trigger in Run Response #6221

Merged
merged 11 commits into from
Jun 10, 2019
Merged

[ACR] Populate Task Timer Trigger in Run Response #6221

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ccba4a
add timer trigger to run response
jaysterp Jun 5, 2019
1d0896f
update examples, remove seconds field from cron, use timer trigger in…
jaysterp Jun 5, 2019
7e359e7
link examples
jaysterp Jun 5, 2019
29e493c
empty commit to trigger new CI build
jaysterp Jun 5, 2019
e9d745a
fix model validation error
jaysterp Jun 5, 2019
9b2b7e9
empty commit to trigger new ci build
jaysterp Jun 5, 2019
4ae5cce
fix KnownType serialization
jaysterp Jun 6, 2019
0c4d728
revert
jaysterp Jun 6, 2019
f1acb17
put timerTrigger at the end of properties
jaysterp Jun 6, 2019
39a8022
remove unrelated change
jaysterp Jun 6, 2019
74e1d64
remove unused property
jaysterp Jun 10, 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
37 changes: 33 additions & 4 deletions ...source-manager/Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@
"x-ms-examples": {
"Runs_List": {
"$ref": "./examples/RunsList.json"
},
"Runs_List_WithTimerTrigger": {
"$ref": "./examples/RunsList_WithTimerTrigger.json"
}
}
}
Expand Down Expand Up @@ -222,7 +225,10 @@
"x-ms-examples": {
"Runs_Get": {
"$ref": "./examples/RunsGet.json"
}
},
"Runs_Get_WithTimerTrigger": {
"$ref": "./examples/RunsGet_WithTimerTrigger.json"
}
}
},
"patch": {
Expand Down Expand Up @@ -793,6 +799,10 @@
"$ref": "#/definitions/SourceTriggerDescriptor",
"description": "The source trigger that caused the run."
},
"timerTrigger": {
jaysterp marked this conversation as resolved.
Show resolved Hide resolved
"$ref": "#/definitions/TimerTriggerDescriptor",
"description": "The timer trigger that caused the run."
},
"platform": {
"$ref": "#/definitions/PlatformProperties",
"description": "The platform properties against which the run will happen."
Expand All @@ -817,6 +827,10 @@
"type": "string",
"readOnly": true
},
"updateTriggerToken": {
jaysterp marked this conversation as resolved.
Show resolved Hide resolved
"description": "The update trigger token passed for the Run.",
"type": "string"
},
"provisioningState": {
"description": "The provisioning state of a run.",
"enum": [
Expand Down Expand Up @@ -918,6 +932,19 @@
}
}
},
"TimerTriggerDescriptor": {
"type": "object",
"properties": {
"timerTriggerName": {
"description": "The timer trigger name that caused the run.",
"type": "string"
},
"scheduleOccurrence": {
"description": "The occurrence that triggered the run.",
"type": "string"
}
}
},
"PlatformProperties": {
"description": "The platform properties against which the run has to happen.",
"required": [
Expand All @@ -942,7 +969,8 @@
"enum": [
"amd64",
"x86",
"arm"
"arm",
"arm64"
],
"type": "string",
"x-ms-enum": {
Expand Down Expand Up @@ -1695,7 +1723,8 @@
"enum": [
"amd64",
"x86",
"arm"
"arm",
"arm64"
],
"type": "string",
"x-ms-enum": {
Expand Down Expand Up @@ -2536,4 +2565,4 @@
]
}
]
}
}
7 changes: 3 additions & 4 deletions ...y/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemAndUserIdentities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"cpu": 2
},
"step": {
"type": "Docker",
"imageNames": [
"azurerest:testtag"
],
Expand All @@ -41,7 +40,7 @@
"timerTriggers": [
{
"name": "myTimerTrigger",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -115,7 +114,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -194,7 +193,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down
7 changes: 3 additions & 4 deletions ...erRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithSystemIdentity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"cpu": 2
},
"step": {
"type": "Docker",
"imageNames": [
"azurerest:testtag"
],
Expand All @@ -41,7 +40,7 @@
"timerTriggers": [
{
"name": "myTimerTrigger",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -112,7 +111,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -185,7 +184,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down
7 changes: 3 additions & 4 deletions ...erRegistry/stable/2019-04-01/examples/ManagedIdentity/TasksCreate_WithUserIdentities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"cpu": 2
},
"step": {
"type": "Docker",
"imageNames": [
"azurerest:testtag"
],
Expand All @@ -41,7 +40,7 @@
"timerTriggers": [
{
"name": "myTimerTrigger",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -116,7 +115,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -197,7 +196,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down
5 changes: 2 additions & 3 deletions ...stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithKeyVaultCustomCredentials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cpu": 3
},
"step": {
"type": "Docker",
"imageNames": [
"azurerest:testtag1"
],
Expand Down Expand Up @@ -91,7 +90,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -170,7 +169,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down
5 changes: 2 additions & 3 deletions ...stry/stable/2019-04-01/examples/ManagedIdentity/TasksUpdate_WithMSICustomCredentials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cpu": 3
},
"step": {
"type": "Docker",
"imageNames": [
"azurerest:testtag1"
],
Expand Down Expand Up @@ -83,7 +82,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -162,7 +161,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down
49 changes: 49 additions & 0 deletions ...ager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsGet_WithTimerTrigger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"parameters": {
"subscriptionId": "4385cf00-2d3a-425a-832f-f4285b1c9dce",
"resourceGroupName": "myResourceGroup",
"registryName": "myRegistry",
"api-version": "2019-04-01",
"runId": "0accec26-d6de-4757-8e74-d080f38eaaab"
},
"responses": {
"200": {
"body": {
"properties": {
"provisioningState": "Succeeded",
"runId": "0accec26-d6de-4757-8e74-d080f38eaaab",
"status": "Succeeded",
"lastUpdatedTime": "2018-01-25T05:13:51.617Z",
"runType": "AutoBuild",
"createTime": "2018-01-25T05:13:51.618Z",
"startTime": "2018-01-25T05:50:51.618Z",
"finishTime": "2018-01-25T06:13:51.618Z",
"outputImages": [
{
"registry": "myregistry.azurecr.io",
"repository": "myimage",
"tag": "latest",
"digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0"
}
],
"task": "myTask",
"timerTrigger": {
"timerTriggerName": "myTimerTrigger",
"scheduleOccurrence": "6/4/2019 9:30 AM"
},
"isArchiveEnabled": true,
"platform": {
"os": "Linux",
"architecture": "amd64"
},
"agentConfiguration": {
"cpu": 2
}
},
"id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab",
"name": "0accec26-d6de-4757-8e74-d080f38eaaab",
"type": "Microsoft.ContainerRegistry/registries/runs"
}
}
}
}
54 changes: 54 additions & 0 deletions ...ger/Microsoft.ContainerRegistry/stable/2019-04-01/examples/RunsList_WithTimerTrigger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"subscriptionId": "4385cf00-2d3a-425a-832f-f4285b1c9dce",
"resourceGroupName": "myResourceGroup",
"registryName": "myRegistry",
"api-version": "2019-04-01",
"$filter": "",
"$top": 10
},
"responses": {
"200": {
"body": {
"value": [
{
"properties": {
"provisioningState": "Succeeded",
"runId": "0accec26-d6de-4757-8e74-d080f38eaaab",
"status": "Succeeded",
"lastUpdatedTime": "2018-01-25T05:13:51.617Z",
"runType": "AutoBuild",
"createTime": "2018-01-25T05:13:51.618Z",
"startTime": "2018-01-25T05:50:51.618Z",
"finishTime": "2018-01-25T06:13:51.618Z",
"outputImages": [
{
"registry": "myregistry.azurecr.io",
"repository": "myimage",
"tag": "latest",
"digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0"
}
],
"task": "myTask",
"timerTrigger": {
"timerTriggerName": "myTimerTrigger",
"scheduleOccurrence": "6/4/2019 9:30 AM"
},
"isArchiveEnabled": true,
"platform": {
"os": "Linux",
"architecture": "amd64"
},
"agentConfiguration": {
"cpu": 2
}
},
"id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab",
"name": "0accec26-d6de-4757-8e74-d080f38eaaab",
"type": "Microsoft.ContainerRegistry/registries/runs"
}
]
}
}
}
}
7 changes: 3 additions & 4 deletions .../resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"cpu": 2
},
"step": {
"type": "Docker",
"imageNames": [
"azurerest:testtag"
],
Expand All @@ -41,7 +40,7 @@
"timerTriggers": [
{
"name": "myTimerTrigger",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -112,7 +111,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down Expand Up @@ -185,7 +184,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down
2 changes: 1 addition & 1 deletion ...try/resource-manager/Microsoft.ContainerRegistry/stable/2019-04-01/examples/TasksGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{
"name": "myTimerTrigger",
"status": "Enabled",
"schedule": "0 30 9 * * 1-5"
"schedule": "30 9 * * 1-5"
}
],
"sourceTriggers": [
Expand Down
Loading