diff --git a/ui/app/adapters/deployment.js b/ui/app/adapters/deployment.js new file mode 100644 index 00000000000..6dbc20dbd38 --- /dev/null +++ b/ui/app/adapters/deployment.js @@ -0,0 +1,29 @@ +import Watchable from './watchable'; + +export default Watchable.extend({ + promote(deployment) { + const id = deployment.get('id'); + const url = urlForAction(this.urlForFindRecord(id, 'deployment'), '/promote'); + return this.ajax(url, 'POST', { + data: { + DeploymentId: id, + All: true, + }, + }); + }, +}); + +// The deployment action API endpoints all end with the ID +// /deployment/:action/:deployment_id instead of /deployment/:deployment_id/:action +function urlForAction(url, extension = '') { + const [path, params] = url.split('?'); + const pathParts = path.split('/'); + const idPart = pathParts.pop(); + let newUrl = `${pathParts.join('/')}${extension}/${idPart}`; + + if (params) { + newUrl += `?${params}`; + } + + return newUrl; +} diff --git a/ui/app/components/job-page/parts/latest-deployment.js b/ui/app/components/job-page/parts/latest-deployment.js index 72ea12f8ec8..b68978520d1 100644 --- a/ui/app/components/job-page/parts/latest-deployment.js +++ b/ui/app/components/job-page/parts/latest-deployment.js @@ -1,8 +1,27 @@ import Component from '@ember/component'; +import { task } from 'ember-concurrency'; +import messageFromAdapterError from 'nomad-ui/utils/message-from-adapter-error'; export default Component.extend({ job: null, tagName: '', + handleError() {}, + isShowingDeploymentDetails: false, + + promote: task(function*() { + try { + yield this.get('job.latestDeployment.content').promote(); + } catch (err) { + let message = messageFromAdapterError(err); + if (!message || message === 'Forbidden') { + message = 'Your ACL token does not grant permission to promote deployments.'; + } + this.get('handleError')({ + title: 'Could Not Promote Deployment', + description: message, + }); + } + }), }); diff --git a/ui/app/models/deployment.js b/ui/app/models/deployment.js index 5d86e9296e7..e3fefb94fb9 100644 --- a/ui/app/models/deployment.js +++ b/ui/app/models/deployment.js @@ -1,5 +1,6 @@ import { alias, equal } from '@ember/object/computed'; import { computed } from '@ember/object'; +import { assert } from '@ember/debug'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo, hasMany } from 'ember-data/relationships'; @@ -58,4 +59,9 @@ export default Model.extend({ return classMap[this.get('status')] || 'is-dark'; }), + + promote() { + assert('A deployment needs to requirePromotion to be promoted', this.get('requiresPromotion')); + return this.store.adapterFor('deployment').promote(this); + }, }); diff --git a/ui/app/templates/components/job-page/parts/latest-deployment.hbs b/ui/app/templates/components/job-page/parts/latest-deployment.hbs index b67f0bd0b84..a2a3aef3e6e 100644 --- a/ui/app/templates/components/job-page/parts/latest-deployment.hbs +++ b/ui/app/templates/components/job-page/parts/latest-deployment.hbs @@ -13,7 +13,12 @@ {{job.latestDeployment.status}} {{#if job.latestDeployment.requiresPromotion}} - Deployment is running but requires promotion + {{/if}} diff --git a/ui/app/templates/components/job-page/service.hbs b/ui/app/templates/components/job-page/service.hbs index 6a921beb8bb..cbef54c1f24 100644 --- a/ui/app/templates/components/job-page/service.hbs +++ b/ui/app/templates/components/job-page/service.hbs @@ -17,7 +17,7 @@ {{job-page/parts/placement-failures job=job}} - {{job-page/parts/latest-deployment job=job}} + {{job-page/parts/latest-deployment job=job handleError=(action "handleError")}} {{job-page/parts/task-groups job=job diff --git a/ui/mirage/config.js b/ui/mirage/config.js index d573ed6de28..3cc92a434dc 100644 --- a/ui/mirage/config.js +++ b/ui/mirage/config.js @@ -170,6 +170,9 @@ export default function() { }); this.get('/deployment/:id'); + this.post('/deployment/promote/:id', function() { + return new Response(204, {}, ''); + }); this.get('/job/:id/evaluations', function({ evaluations }, { params }) { return this.serialize(evaluations.where({ jobId: params.id })); diff --git a/ui/mirage/factories/deployment-task-group-summary.js b/ui/mirage/factories/deployment-task-group-summary.js index addc4c8aa48..b08f02fa87a 100644 --- a/ui/mirage/factories/deployment-task-group-summary.js +++ b/ui/mirage/factories/deployment-task-group-summary.js @@ -8,6 +8,8 @@ export default Factory.extend({ autoRevert: () => Math.random() > 0.5, promoted: () => Math.random() > 0.5, + requiresPromotion: false, + requireProgressBy: () => faker.date.past(0.5 / 365, REF_TIME), desiredTotal: faker.random.number({ min: 1, max: 10 }), diff --git a/ui/mirage/factories/deployment.js b/ui/mirage/factories/deployment.js index 8f26f086f72..e6800b0a4ee 100644 --- a/ui/mirage/factories/deployment.js +++ b/ui/mirage/factories/deployment.js @@ -27,6 +27,8 @@ export default Factory.extend({ server.create('deployment-task-group-summary', { deployment, name: server.db.taskGroups.find(id).name, + desiredCanaries: 1, + promoted: false, }) ); diff --git a/ui/tests/integration/job-page/service-test.js b/ui/tests/integration/job-page/service-test.js index aef698a149c..64c4b73edca 100644 --- a/ui/tests/integration/job-page/service-test.js +++ b/ui/tests/integration/job-page/service-test.js @@ -1,16 +1,19 @@ import { getOwner } from '@ember/application'; import { assign } from '@ember/polyfills'; import { test, moduleForComponent } from 'ember-qunit'; +import { click, find } from 'ember-native-dom-helpers'; import wait from 'ember-test-helpers/wait'; import hbs from 'htmlbars-inline-precompile'; import { startMirage } from 'nomad-ui/initializers/ember-cli-mirage'; import { stopJob, expectStopError, expectDeleteRequest } from './helpers'; import Job from 'nomad-ui/tests/pages/jobs/detail'; +import { initialize as fragmentSerializerInitializer } from 'nomad-ui/initializers/fragment-serializer'; moduleForComponent('job-page/service', 'Integration | Component | job-page/service', { integration: true, beforeEach() { Job.setContext(this); + fragmentSerializerInitializer(getOwner(this)); window.localStorage.clear(); this.store = getOwner(this).lookup('service:store'); this.server = startMirage(); @@ -165,3 +168,77 @@ test('Recent allocations shows an empty message when the job has no allocations' ); }); }); + +test('Active deployment can be promoted', function(assert) { + let job; + let deployment; + + this.server.create('node'); + const mirageJob = makeMirageJob(this.server, { activeDeployment: true }); + + this.store.findAll('job'); + + return wait() + .then(() => { + job = this.store.peekAll('job').findBy('plainId', mirageJob.id); + deployment = job.get('latestDeployment'); + + this.setProperties(commonProperties(job)); + this.render(commonTemplate); + + return wait(); + }) + .then(() => { + click('[data-test-promote-canary]'); + return wait(); + }) + .then(() => { + const requests = this.server.pretender.handledRequests; + assert.ok( + requests + .filterBy('method', 'POST') + .findBy('url', `/v1/deployment/promote/${deployment.get('id')}`), + 'A promote POST request was made' + ); + }); +}); + +test('When promoting the active deployment fails, an error is shown', function(assert) { + this.server.pretender.post('/v1/deployment/promote/:id', () => [403, {}, null]); + + let job; + + this.server.create('node'); + const mirageJob = makeMirageJob(this.server, { activeDeployment: true }); + + this.store.findAll('job'); + + return wait() + .then(() => { + job = this.store.peekAll('job').findBy('plainId', mirageJob.id); + + this.setProperties(commonProperties(job)); + this.render(commonTemplate); + + return wait(); + }) + .then(() => { + click('[data-test-promote-canary]'); + return wait(); + }) + .then(() => { + assert.equal( + find('[data-test-job-error-title]').textContent, + 'Could Not Promote Deployment', + 'Appropriate error is shown' + ); + assert.ok( + find('[data-test-job-error-body]').textContent.includes('ACL'), + 'The error message mentions ACLs' + ); + + click('[data-test-job-error-close]'); + assert.notOk(find('[data-test-job-error-title]'), 'Error message is dismissable'); + return wait(); + }); +});