add name property back to agent schema in ember mirage

The name property had to be added back to the agent schema
in the Agent Factory because the /agent/monitor endpoint in
the config finds agents by their names and since member is not
a proper entity in our Mirage Config we can't just findBy name
of the member. So although we're following the correct schema
we're set-up to rely on this.

ui/mirage/config.js

@@ -9,7 +9,7 @@ import formatHost from 'nomad-ui/utils/format-host';
 
 export function findLeader(schema) {
   const agent = schema.agents.first();
-  return formatHost(agent.member.Address, agent.member.Tags.port); // do we need to change this?
+  return formatHost(agent.member.Address, agent.member.Tags.port);
 }
 
 export function filesForPath(allocFiles, filterPath) {

ui/mirage/factories/agent.js

@@ -9,6 +9,8 @@ const AGENT_STATUSES = ['alive', 'leaving', 'left', 'failed'];
 export default Factory.extend({
   id: i => (i / 100 >= 1 ? `${UUIDS[i]}-${i}` : UUIDS[i]),
 
+  name: () => generateName(),
+
   config: {
     Version: {
       Version: '1.1.0',
@@ -17,14 +19,13 @@ export default Factory.extend({
     },
   },
 
-  member: () => {
-    const name = generateName();
+  member() {
     const serfPort = faker.random.number({ min: 4000, max: 4999 });
     return {
-      Name: name,
+      Name: this.name,
       Port: serfPort,
       Status: faker.helpers.randomize(AGENT_STATUSES),
-      Address: generateAddress(name),
+      Address: generateAddress(this.name),
       Tags: generateTags(serfPort),
     };
   },

ui/tests/acceptance/server-detail-test.js

@@ -15,7 +15,7 @@ module('Acceptance | server detail', function(hooks) {
   hooks.beforeEach(async function() {
     server.createList('agent', 3);
     agent = server.db.agents[0];
-    await ServerDetail.visit({ name: agent.member.Name });
+    await ServerDetail.visit({ name: agent.name });
   });
 
   test('it passes an accessibility audit', async function(assert) {
@@ -23,13 +23,12 @@ module('Acceptance | server detail', function(hooks) {
   });
 
   test('visiting /servers/:server_name', async function(assert) {
-    console.log('agent:  ', agent);
-    assert.equal(currentURL(), `/servers/${encodeURIComponent(agent.member.Name)}`);
-    assert.equal(document.title, `Server ${agent.member.Name} - Nomad`);
+    assert.equal(currentURL(), `/servers/${encodeURIComponent(agent.name)}`);
+    assert.equal(document.title, `Server ${agent.name} - Nomad`);
   });
 
   test('when the server is the leader, the title shows a leader badge', async function(assert) {
-    assert.ok(ServerDetail.title.includes(agent.member.Name));
+    assert.ok(ServerDetail.title.includes(agent.name));
     assert.ok(ServerDetail.hasLeaderBadge);
   });
 
@@ -55,7 +54,7 @@ module('Acceptance | server detail', function(hooks) {
   });
 
   test('when the server is not the leader, there is no leader badge', async function(assert) {
-    await ServerDetail.visit({ name: server.db.agents[1].member.Name });
+    await ServerDetail.visit({ name: server.db.agents[1].name });
     assert.notOk(ServerDetail.hasLeaderBadge);
   });
 

ui/tests/acceptance/server-monitor-test.js

@@ -27,22 +27,22 @@ module('Acceptance | server monitor', function(hooks) {
   });
 
   test('it passes an accessibility audit', async function(assert) {
-    await ServerMonitor.visit({ name: agent.member.Name });
+    await ServerMonitor.visit({ name: agent.name });
     await a11yAudit(assert);
   });
 
   test('/servers/:id/monitor should have a breadcrumb trail linking back to servers', async function(assert) {
-    await ServerMonitor.visit({ name: agent.member.Name });
+    await ServerMonitor.visit({ name: agent.name });
 
     assert.equal(Layout.breadcrumbFor('servers.index').text, 'Servers');
-    assert.equal(Layout.breadcrumbFor('servers.server').text, agent.member.name);
+    assert.equal(Layout.breadcrumbFor('servers.server').text, agent.name);
 
     await Layout.breadcrumbFor('servers.index').visit();
     assert.equal(currentURL(), '/servers');
   });
 
   test('the monitor page immediately streams agent monitor output at the info level', async function(assert) {
-    await ServerMonitor.visit({ name: agent.member.Name });
+    await ServerMonitor.visit({ name: agent.name });
 
     const logRequest = server.pretender.handledRequests.find(req =>
       req.url.startsWith('/v1/agent/monitor')
@@ -53,16 +53,15 @@ module('Acceptance | server monitor', function(hooks) {
   });
 
   test('switching the log level persists the new log level as a query param', async function(assert) {
-    const name = agent.member.Name;
-    await ServerMonitor.visit({ name: agent.member.Name });
+    await ServerMonitor.visit({ name: agent.name });
     await ServerMonitor.selectLogLevel('Debug');
-    assert.equal(currentURL(), `/servers/${name}/monitor?level=debug`);
+    assert.equal(currentURL(), `/servers/${agent.name}/monitor?level=debug`);
   });
 
   test('when the current access token does not include the agent:read rule, a descriptive error message is shown', async function(assert) {
     window.localStorage.nomadTokenSecret = clientToken.secretId;
 
-    await ServerMonitor.visit({ name: agent.member.Name });
+    await ServerMonitor.visit({ name: agent.name });
     assert.notOk(ServerMonitor.logsArePresent);
     assert.ok(ServerMonitor.error.isShown);
     assert.equal(ServerMonitor.error.title, 'Not Authorized');

ui/tests/acceptance/servers-list-test.js

@@ -43,7 +43,7 @@ module('Acceptance | servers list', function(hooks) {
     assert.equal(ServersList.servers.length, ServersList.pageSize, 'List is stopped at pageSize');
 
     ServersList.servers.forEach((server, index) => {
-      assert.equal(server.name, sortedAgents[index].member.Name, 'Servers are ordered');
+      assert.equal(server.name, sortedAgents[index].name, 'Servers are ordered');
     });
 
     assert.equal(document.title, 'Servers - Nomad');
@@ -57,7 +57,7 @@ module('Acceptance | servers list', function(hooks) {
 
     const agentRow = ServersList.servers.objectAt(0);
 
-    assert.equal(agentRow.name, agent.member.Name, 'Name');
+    assert.equal(agentRow.name, agent.name, 'Name');
     assert.equal(agentRow.status, agent.member.Status, 'Status');
     assert.equal(agentRow.leader, 'True', 'Leader?');
     assert.equal(agentRow.address, agent.member.Address, 'Address');
@@ -72,7 +72,7 @@ module('Acceptance | servers list', function(hooks) {
     await ServersList.visit();
     await ServersList.servers.objectAt(0).clickRow();
 
-    assert.equal(currentURL(), `/servers/${agent.member.Name}`, 'Now at the server detail page');
+    assert.equal(currentURL(), `/servers/${agent.name}`, 'Now at the server detail page');
   });
 
   test('when accessing servers is forbidden, show a message with a link to the tokens page', async function(assert) {