7b42bb0e2d
This closes #10513, thanks to @bastelfreak for the report. GET /status/leader returns an IPv6 host with square brackets around the IP address as expected, but the rpcAddr property on the agent model does not. This fixes rpcAddr, updates the Mirage /status/leader mock to properly format an IPv6 host, and changes the agent factory to sometimes produce IPv6 addresses. I added a formatHost utility function to centralise the conditional square bracket-wrapping that would have otherwise been further scattered around.
28 lines
915 B
JavaScript
28 lines
915 B
JavaScript
import { Factory } from 'ember-cli-mirage';
|
|
import faker from 'nomad-ui/mirage/faker';
|
|
import { provide } from '../utils';
|
|
import { DATACENTERS } from '../common';
|
|
|
|
const UUIDS = provide(100, faker.random.uuid.bind(faker.random));
|
|
const AGENT_STATUSES = ['alive', 'leaving', 'left', 'failed'];
|
|
|
|
export default Factory.extend({
|
|
id: i => (i / 100 >= 1 ? `${UUIDS[i]}-${i}` : UUIDS[i]),
|
|
name: () => `nomad@${faker.random.boolean() ? faker.internet.ip() : faker.internet.ipv6()}`,
|
|
|
|
status: () => faker.helpers.randomize(AGENT_STATUSES),
|
|
serfPort: () => faker.random.number({ min: 4000, max: 4999 }),
|
|
|
|
address() {
|
|
return this.name.split('@')[1];
|
|
},
|
|
|
|
tags() {
|
|
const rpcPortCandidate = faker.random.number({ min: 4000, max: 4999 });
|
|
return {
|
|
port: rpcPortCandidate === this.serfPort ? rpcPortCandidate + 1 : rpcPortCandidate,
|
|
dc: faker.helpers.randomize(DATACENTERS),
|
|
};
|
|
},
|
|
});
|