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

Resume MI on timeout. #3778

Merged
merged 9 commits into from
Mar 16, 2017
Merged

Resume MI on timeout. #3778

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4da1419
Added email notification to manual intervention
vithati Nov 12, 2016
47fb249
Revert "Added email notification to manual intervention"
vithati Dec 7, 2016
391f1fc
Merge branch 'master' of https://github.com/Microsoft/vsts-tasks
vithati Dec 7, 2016
2aabf1f
Merge branch 'master' of https://github.com/Microsoft/vsts-tasks
vithati Mar 11, 2017
059101a
Added Resume on timeout input.
vithati Mar 13, 2017
3412296
Changed help text.
vithati Mar 14, 2017
99b2694
1 Revert "Changed help text."
vithati Mar 15, 2017
f7ca40a
Added onTimeout input.
vithati Mar 15, 2017
311bc5b
changed required field.
vithati Mar 16, 2017
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
4 changes: 3 additions & 1 deletion Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"loc.input.label.instructions": "Instructions",
"loc.input.help.instructions": "These instructions will be shown to the user for resuming or rejecting the manual intervention. Based on these instructions the user will take an informed decision about this manual intervention.",
"loc.input.label.emailRecipients": "Notify users",
"loc.input.help.emailRecipients": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention."
"loc.input.help.emailRecipients": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention.",
"loc.input.label.onTimeout": "On timeout",
"loc.input.help.onTimeout": "Reject or resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier."
}
14 changes: 13 additions & 1 deletion Tasks/ManualIntervention/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"version": {
"Major": 8,
"Minor": 1,
"Minor": 2,
"Patch": 3
},
"inputs": [
Expand All @@ -38,6 +38,18 @@
"defaultValue": "",
"required": false,
"helpMarkDown": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention."
},
{
"name": "onTimeout",
"type": "radio",
"label": "On timeout",
"defaultValue": "Reject",
"required": true,
Copy link
Contributor

Choose a reason for hiding this comment

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

make it an optional parameter and file a bug on task editor team to show the default value in the UI for optional parameters

"options": {
"Reject": "Reject",
"Resume": "Resume"
},
"helpMarkDown": "Reject or resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier."
}
],
"instanceNameFormat": "Manual Intervention",
Expand Down
14 changes: 13 additions & 1 deletion Tasks/ManualIntervention/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"version": {
"Major": 8,
"Minor": 1,
"Minor": 2,
"Patch": 3
},
"inputs": [
Expand All @@ -38,6 +38,18 @@
"defaultValue": "",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.emailRecipients"
},
{
"name": "onTimeout",
"type": "radio",
"label": "ms-resource:loc.input.label.onTimeout",
"defaultValue": "Reject",
"required": true,
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as above

"options": {
"Reject": "Reject",
"Resume": "Resume"
},
"helpMarkDown": "ms-resource:loc.input.help.onTimeout"
}
],
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down