github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename LabelMajor to Label

Browse Source
This commit is contained in:
Paul Bellamy
2016-03-14 13:26:42 +00:00
parent 43547fae32
commit 80dc714c1e
17 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/scripts/charts/nodes-chart.js
View File

@@ -244,7 +244,7 @@ export default class NodesChart extends React.Component {
// copy relevant fields to state nodes
return topology.map((node, id) => makeMap({
id,
label: node.get('label_major'),
label: node.get('label'),
pseudo: node.get('pseudo'),
subLabel: node.get('label_minor'),
nodeCount: node.get('node_count'),

2
client/app/scripts/components/debug-toolbar.js
View File

@@ -21,7 +21,7 @@ const deltaAdd = (name, adjacency = [], shape = 'circle', stack = false, nodeCou
stack,
node_count: nodeCount,
id: name,
label_major: name,
label: name,
label_minor: 'weave-1',
latest: {},
metadata: {},

6
client/app/scripts/components/embedded-terminal.js
View File

@@ -8,9 +8,9 @@ import { DETAILS_PANEL_WIDTH, DETAILS_PANEL_MARGINS,
export default function EmeddedTerminal({pipe, nodeId, details}) {
const node = details.get(nodeId);
const d = node && node.details;
const titleBarColor = d && getNodeColorDark(d.rank, d.label_major);
const statusBarColor = d && getNodeColor(d.rank, d.label_major);
const title = d && d.label_major;
const titleBarColor = d && getNodeColorDark(d.rank, d.label);
const statusBarColor = d && getNodeColor(d.rank, d.label);
const title = d && d.label;
const style = {
right: DETAILS_PANEL_MARGINS.right + DETAILS_PANEL_WIDTH + 10 +

2
client/app/scripts/components/node-details.js
View File

@@ -54,7 +54,7 @@ export default class NodeDetails extends React.Component {
renderLoading() {
const node = this.props.nodes.get(this.props.nodeId);
const label = node ? node.get('label_major') : this.props.label;
const label = node ? node.get('label') : this.props.label;
const nodeColor = (node ?
getNodeColorDark(node.get('rank'), label, node.get('pseudo')) :
getNeutralColor());

4
client/app/scripts/stores/__tests__/app-store-test.js
View File

@@ -17,7 +17,7 @@ describe('AppStore', () => {
rank: undefined,
adjacency: ['n1', 'n2'],
pseudo: undefined,
label_major: undefined,
label: undefined,
label_minor: undefined
},
n2: {
@@ -25,7 +25,7 @@ describe('AppStore', () => {
rank: undefined,
adjacency: undefined,
pseudo: undefined,
label_major: undefined,
label: undefined,
label_minor: undefined
}
};

2
client/app/scripts/stores/app-store.js
View File

@@ -22,7 +22,7 @@ const error = debug('scope:error');
function makeNode(node) {
return {
id: node.id,
label_major: node.label_major,
label: node.label,
label_minor: node.label_minor,
node_count: node.node_count,
rank: node.rank,

2
experimental/graphviz/handlers.go
View File

@@ -21,7 +21,7 @@ func dot(w io.Writer, t render.RenderableNodes) {
fmt.Fprintf(w, "\tnode [style=filled];\n")
fmt.Fprintf(w, "\t\n")
for id, rn := range t {
label := rn.LabelMajor
label := rn.Label
if len(label) > 20 {
label = label[:20] + "..."
}

6
integration/config.sh
View File

@@ -39,7 +39,7 @@ has() {
local host=$2
local name=$3
local count=${4:-1}
assert "curl -s http://${host}:4040/api/topology/${view}?system=show | jq -r '[.nodes[] | select(.label_major == \"${name}\")] | length'" $count
assert "curl -s http://${host}:4040/api/topology/${view}?system=show | jq -r '[.nodes[] | select(.label == \"${name}\")] | length'" $count
}
# this checks we have a named container
@@ -51,7 +51,7 @@ node_id() {
local view="$1"
local host="$2"
local name="$3"
echo $(curl -s http://${host}:4040/api/topology/${view}?system=show | jq -r ".nodes[] | select(.label_major == \"${name}\") | .id")
echo $(curl -s http://${host}:4040/api/topology/${view}?system=show | jq -r ".nodes[] | select(.label == \"${name}\") | .id")
}
container_id() {
@@ -103,7 +103,7 @@ wait_for() {
local nodes="$(curl -s http://$host:4040/api/topology/${view}?system=show)"
local found=0
for name in "$@"; do
local count=$(echo "${nodes}" | jq -r "[.nodes[] | select(.label_major == \"${name}\")] | length")
local count=$(echo "${nodes}" | jq -r "[.nodes[] | select(.label == \"${name}\")] | length")
if [ -n "${count}" ] && [ "${count}" -ge 1 ]; then
found=$(( found + 1 ))
fi

2
render/detailed/connections.go
View File

@@ -160,7 +160,7 @@ func isInternetNode(n render.RenderableNode) bool {
func connectionRows(in map[connectionsRow]int, includeLocal bool) []NodeSummary {
nodes := []NodeSummary{}
for row, count := range in {
id, label, linkable := row.remoteNode.ID, row.remoteNode.LabelMajor, true
id, label, linkable := row.remoteNode.ID, row.remoteNode.Label, true
if row.remoteAddr != "" {
id, label, linkable = row.remoteAddr+":"+row.port, row.remoteAddr, false
}

2
render/detailed/node.go
View File

@@ -82,7 +82,7 @@ func (c *ControlInstance) CodecDecodeSelf(decoder *codec.Decoder) {
func MakeNode(topologyID string, r report.Report, ns render.RenderableNodes, n render.RenderableNode) Node {
summary, _ := MakeNodeSummary(n)
summary.ID = n.ID
summary.Label = n.LabelMajor
summary.Label = n.Label
return Node{
NodeSummary: summary,

64
render/expected/expected.go
View File

@@ -112,11 +112,11 @@ var (
unknownPseudoNode1 = func(adjacent string) render.RenderableNode {
return render.RenderableNode{
ID: unknownPseudoNode1ID,
LabelMajor: fixture.UnknownClient1IP,
Pseudo: true,
Shape: circle,
Node: report.MakeNode().WithAdjacent(adjacent),
ID: unknownPseudoNode1ID,
Label: fixture.UnknownClient1IP,
Pseudo: true,
Shape: circle,
Node: report.MakeNode().WithAdjacent(adjacent),
Children: render.MakeRenderableNodeSet(
RenderedEndpoints[UnknownClient1EndpointID],
RenderedEndpoints[UnknownClient2EndpointID],
@@ -129,11 +129,11 @@ var (
}
unknownPseudoNode2 = func(adjacent string) render.RenderableNode {
return render.RenderableNode{
ID: unknownPseudoNode2ID,
LabelMajor: fixture.UnknownClient3IP,
Pseudo: true,
Shape: circle,
Node: report.MakeNode().WithAdjacent(adjacent),
ID: unknownPseudoNode2ID,
Label: fixture.UnknownClient3IP,
Pseudo: true,
Shape: circle,
Node: report.MakeNode().WithAdjacent(adjacent),
Children: render.MakeRenderableNodeSet(
RenderedEndpoints[UnknownClient3EndpointID],
),
@@ -146,7 +146,7 @@ var (
theIncomingInternetNode = func(adjacent string) render.RenderableNode {
return render.RenderableNode{
ID: render.IncomingInternetID,
LabelMajor: render.InboundMajor,
Label: render.InboundMajor,
LabelMinor: render.InboundMinor,
Pseudo: true,
Shape: cloud,
@@ -162,7 +162,7 @@ var (
}
theOutgoingInternetNode = render.RenderableNode{
ID: render.OutgoingInternetID,
LabelMajor: render.OutboundMajor,
Label: render.OutboundMajor,
LabelMinor: render.OutboundMinor,
Pseudo: true,
Shape: cloud,
@@ -176,7 +176,7 @@ var (
RenderedProcesses = (render.RenderableNodes{
ClientProcess1ID: {
ID: ClientProcess1ID,
LabelMajor: fixture.Client1Name,
Label: fixture.Client1Name,
LabelMinor: fmt.Sprintf("%s (%s)", fixture.ClientHostID, fixture.Client1PID),
Rank: fixture.Client1Name,
Shape: square,
@@ -191,7 +191,7 @@ var (
},
ClientProcess2ID: {
ID: ClientProcess2ID,
LabelMajor: fixture.Client2Name,
Label: fixture.Client2Name,
LabelMinor: fmt.Sprintf("%s (%s)", fixture.ClientHostID, fixture.Client2PID),
Rank: fixture.Client2Name,
Shape: square,
@@ -206,7 +206,7 @@ var (
},
ServerProcessID: {
ID: ServerProcessID,
LabelMajor: fixture.ServerName,
Label: fixture.ServerName,
LabelMinor: fmt.Sprintf("%s (%s)", fixture.ServerHostID, fixture.ServerPID),
Rank: fixture.ServerName,
Shape: square,
@@ -221,7 +221,7 @@ var (
},
nonContainerProcessID: {
ID: nonContainerProcessID,
LabelMajor: fixture.NonContainerName,
Label: fixture.NonContainerName,
LabelMinor: fmt.Sprintf("%s (%s)", fixture.ServerHostID, fixture.NonContainerPID),
Rank: fixture.NonContainerName,
Shape: square,
@@ -240,7 +240,7 @@ var (
RenderedProcessNames = (render.RenderableNodes{
fixture.Client1Name: {
ID: fixture.Client1Name,
LabelMajor: fixture.Client1Name,
Label: fixture.Client1Name,
LabelMinor: "2 processes",
Rank: fixture.Client1Name,
Shape: square,
@@ -259,7 +259,7 @@ var (
},
fixture.ServerName: {
ID: fixture.ServerName,
LabelMajor: fixture.ServerName,
Label: fixture.ServerName,
LabelMinor: "1 process",
Rank: fixture.ServerName,
Shape: square,
@@ -276,7 +276,7 @@ var (
},
fixture.NonContainerName: {
ID: fixture.NonContainerName,
LabelMajor: fixture.NonContainerName,
Label: fixture.NonContainerName,
LabelMinor: "1 process",
Rank: fixture.NonContainerName,
Shape: square,
@@ -301,7 +301,7 @@ var (
RenderedContainers = (render.RenderableNodes{
ClientContainerID: {
ID: ClientContainerID,
LabelMajor: "client",
Label: "client",
LabelMinor: fixture.ClientHostName,
Shape: hexagon,
Children: render.MakeRenderableNodeSet(
@@ -319,7 +319,7 @@ var (
},
ServerContainerID: {
ID: ServerContainerID,
LabelMajor: "server",
Label: "server",
LabelMinor: fixture.ServerHostName,
Shape: hexagon,
Children: render.MakeRenderableNodeSet(
@@ -335,7 +335,7 @@ var (
},
uncontainedServerID: {
ID: uncontainedServerID,
LabelMajor: render.UncontainedMajor,
Label: render.UncontainedMajor,
LabelMinor: fixture.ServerHostName,
Shape: square,
Stack: true,
@@ -359,7 +359,7 @@ var (
RenderedContainerImages = (render.RenderableNodes{
ClientContainerImageID: {
ID: ClientContainerImageID,
LabelMajor: fixture.ClientContainerImageName,
Label: fixture.ClientContainerImageName,
LabelMinor: "1 container",
Rank: fixture.ClientContainerImageName,
Shape: hexagon,
@@ -379,7 +379,7 @@ var (
},
ServerContainerImageID: {
ID: ServerContainerImageID,
LabelMajor: fixture.ServerContainerImageName,
Label: fixture.ServerContainerImageName,
LabelMinor: "1 container",
Rank: fixture.ServerContainerImageName,
Shape: hexagon,
@@ -397,7 +397,7 @@ var (
},
uncontainedServerID: {
ID: uncontainedServerID,
LabelMajor: render.UncontainedMajor,
Label: render.UncontainedMajor,
LabelMinor: fixture.ServerHostName,
Shape: square,
Stack: true,
@@ -421,7 +421,7 @@ var (
RenderedPods = (render.RenderableNodes{
ClientPodRenderedID: {
ID: ClientPodRenderedID,
LabelMajor: "pong-a",
Label: "pong-a",
LabelMinor: "1 container",
Rank: "ping/pong-a",
Shape: heptagon,
@@ -440,7 +440,7 @@ var (
},
ServerPodRenderedID: {
ID: ServerPodRenderedID,
LabelMajor: "pong-b",
Label: "pong-b",
LabelMinor: "1 container",
Rank: "ping/pong-b",
Shape: heptagon,
@@ -457,7 +457,7 @@ var (
},
uncontainedServerID: {
ID: uncontainedServerID,
LabelMajor: render.UncontainedMajor,
Label: render.UncontainedMajor,
LabelMinor: fixture.ServerHostName,
Pseudo: true,
Shape: square,
@@ -481,7 +481,7 @@ var (
RenderedHosts = (render.RenderableNodes{
ClientHostID: {
ID: ClientHostID,
LabelMajor: "client", // before first .
Label: "client", // before first .
LabelMinor: "hostname.com", // after first .
Rank: "hostname.com",
Shape: circle,
@@ -502,7 +502,7 @@ var (
},
ServerHostID: {
ID: ServerHostID,
LabelMajor: "server", // before first .
Label: "server", // before first .
LabelMinor: "hostname.com", // after first .
Rank: "hostname.com",
Shape: circle,
@@ -532,7 +532,7 @@ var (
RenderedPodServices = (render.RenderableNodes{
ServiceRenderedID: {
ID: ServiceRenderedID,
LabelMajor: "pongservice",
Label: "pongservice",
LabelMinor: "2 pods",
Rank: fixture.ServiceID,
Shape: heptagon,
@@ -559,7 +559,7 @@ var (
},
uncontainedServerID: {
ID: uncontainedServerID,
LabelMajor: render.UncontainedMajor,
Label: render.UncontainedMajor,
LabelMinor: fixture.ServerHostName,
Pseudo: true,
Shape: square,

40
render/mapping.go
View File

@@ -49,11 +49,11 @@ func theInternetNode(m RenderableNode) RenderableNode {
// emit one internet node for incoming, one for outgoing
if len(m.Adjacency) > 0 {
node.ID = IncomingInternetID
node.LabelMajor = InboundMajor
node.Label = InboundMajor
node.LabelMinor = InboundMinor
} else {
node.ID = OutgoingInternetID
node.LabelMajor = OutboundMajor
node.Label = OutboundMajor
node.LabelMinor = OutboundMinor
}
return node
@@ -95,12 +95,12 @@ func MapProcessIdentity(m RenderableNode, _ report.Networks) RenderableNodes {
var (
id = MakeProcessID(report.ExtractHostID(m.Node), pid)
major, _ = m.Latest.Lookup(process.Name)
label, _ = m.Latest.Lookup(process.Name)
minor = fmt.Sprintf("%s (%s)", report.ExtractHostID(m.Node), pid)
rank, _ = m.Latest.Lookup(process.Name)
)
node := NewRenderableNodeWith(id, major, minor, rank, m)
node := NewRenderableNodeWith(id, label, minor, rank, m)
node.Shape = Square
return RenderableNodes{id: node}
}
@@ -116,11 +116,11 @@ func MapContainerIdentity(m RenderableNode, _ report.Networks) RenderableNodes {
var (
id = MakeContainerID(containerID)
major, _ = GetRenderableContainerName(m.Node)
label, _ = GetRenderableContainerName(m.Node)
minor = report.ExtractHostID(m.Node)
)
node := NewRenderableNodeWith(id, major, minor, "", m)
node := NewRenderableNodeWith(id, label, minor, "", m)
node.ControlNode = m.ID
node.Shape = Hexagon
return RenderableNodes{id: node}
@@ -161,11 +161,11 @@ func MapContainerImageIdentity(m RenderableNode, _ report.Networks) RenderableNo
var (
id = MakeContainerImageID(imageID)
major, _ = m.Latest.Lookup(docker.ImageName)
label, _ = m.Latest.Lookup(docker.ImageName)
rank = imageID
)
node := NewRenderableNodeWith(id, major, "", rank, m)
node := NewRenderableNodeWith(id, label, "", rank, m)
node.Shape = Hexagon
node.Stack = true
return RenderableNodes{id: node}
@@ -182,11 +182,11 @@ func MapPodIdentity(m RenderableNode, _ report.Networks) RenderableNodes {
var (
id = MakePodID(podID)
major, _ = m.Latest.Lookup(kubernetes.PodName)
label, _ = m.Latest.Lookup(kubernetes.PodName)
rank, _ = m.Latest.Lookup(kubernetes.PodID)
)
node := NewRenderableNodeWith(id, major, "", rank, m)
node := NewRenderableNodeWith(id, label, "", rank, m)
node.Shape = Heptagon
return RenderableNodes{id: node}
}
@@ -202,11 +202,11 @@ func MapServiceIdentity(m RenderableNode, _ report.Networks) RenderableNodes {
var (
id = MakeServiceID(serviceID)
major, _ = m.Latest.Lookup(kubernetes.ServiceName)
label, _ = m.Latest.Lookup(kubernetes.ServiceName)
rank, _ = m.Latest.Lookup(kubernetes.ServiceID)
)
node := NewRenderableNodeWith(id, major, "", rank, m)
node := NewRenderableNodeWith(id, label, "", rank, m)
node.Shape = Heptagon
node.Stack = true
return RenderableNodes{id: node}
@@ -220,16 +220,16 @@ func MapHostIdentity(m RenderableNode, _ report.Networks) RenderableNodes {
id = MakeHostID(report.ExtractHostID(m.Node))
hostname, _ = m.Latest.Lookup(host.HostName)
parts = strings.SplitN(hostname, ".", 2)
major, minor, rank = "", "", ""
label, minor, rank = "", "", ""
)
if len(parts) == 2 {
major, minor, rank = parts[0], parts[1], parts[1]
label, minor, rank = parts[0], parts[1], parts[1]
} else {
major = hostname
label = hostname
}
node := NewRenderableNodeWith(id, major, minor, rank, m)
node := NewRenderableNodeWith(id, label, minor, rank, m)
node.Shape = Circle
return RenderableNodes{id: node}
}
@@ -450,7 +450,7 @@ func MapProcess2Name(n RenderableNode, _ report.Networks) RenderableNodes {
}
node := NewDerivedNode(name, n)
node.LabelMajor = name
node.Label = name
node.Rank = name
node.Counters = node.Node.Counters.Add(processesKey, 1)
node.Node.Topology = "process_name"
@@ -549,7 +549,7 @@ func MapContainerImage2Name(n RenderableNode, _ report.Networks) RenderableNodes
id := MakeContainerImageID(name)
node := NewDerivedNode(id, n)
node.LabelMajor = name
node.Label = name
node.Rank = name
node.Node = n.Node.Copy() // Propagate NMD for container counting.
node.Shape = Hexagon
@@ -632,7 +632,7 @@ func MapContainer2Pod(n RenderableNode, _ report.Networks) RenderableNodes {
// from the API. This is a workaround until
// https://github.com/kubernetes/kubernetes/issues/14738 is fixed.
if s := strings.SplitN(podID, "/", 2); len(s) == 2 {
result.LabelMajor = s[1]
result.Label = s[1]
result.Node = result.Node.WithLatests(map[string]string{
kubernetes.Namespace: s[0],
kubernetes.PodName: s[1],
@@ -695,7 +695,7 @@ func MapContainer2Hostname(n RenderableNode, _ report.Networks) RenderableNodes
}
result := NewDerivedNode(id, n)
result.LabelMajor = id
result.Label = id
result.Rank = id
// Add container id key to the counters, which will later be counted to produce the minor label

20
render/renderable_node.go
View File

@@ -13,7 +13,7 @@ import (
// to rendering a node when there are many nodes visible at once.
type RenderableNode struct {
ID string `json:"id"` //
LabelMajor string `json:"label_major"` // e.g. "process", human-readable
Label string `json:"label"` // e.g. "process", human-readable
LabelMinor string `json:"label_minor,omitempty"` // e.g. "hostname", human-readable, optional
Rank string `json:"rank"` // to help the layout engine
Pseudo bool `json:"pseudo,omitempty"` // sort-of a placeholder node, for rendering purposes
@@ -39,7 +39,7 @@ const (
func NewRenderableNode(id string) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: "",
Label: "",
LabelMinor: "",
Rank: "",
Pseudo: false,
@@ -50,10 +50,10 @@ func NewRenderableNode(id string) RenderableNode {
}
// NewRenderableNodeWith makes a new RenderableNode with some fields filled in
func NewRenderableNodeWith(id, major, minor, rank string, node RenderableNode) RenderableNode {
func NewRenderableNodeWith(id, label, minor, rank string, node RenderableNode) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: major,
Label: label,
LabelMinor: minor,
Rank: rank,
Pseudo: false,
@@ -68,7 +68,7 @@ func NewRenderableNodeWith(id, major, minor, rank string, node RenderableNode) R
func NewDerivedNode(id string, node RenderableNode) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: "",
Label: "",
LabelMinor: "",
Rank: "",
Pseudo: node.Pseudo,
@@ -80,10 +80,10 @@ func NewDerivedNode(id string, node RenderableNode) RenderableNode {
}
}
func newDerivedPseudoNode(id, major string, node RenderableNode) RenderableNode {
func newDerivedPseudoNode(id, label string, node RenderableNode) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: major,
Label: label,
LabelMinor: "",
Rank: "",
Pseudo: true,
@@ -112,8 +112,8 @@ func (rn RenderableNode) WithParents(p report.Sets) RenderableNode {
func (rn RenderableNode) Merge(other RenderableNode) RenderableNode {
result := rn.Copy()
if result.LabelMajor == "" {
result.LabelMajor = other.LabelMajor
if result.Label == "" {
result.Label = other.Label
}
if result.LabelMinor == "" {
@@ -144,7 +144,7 @@ func (rn RenderableNode) Merge(other RenderableNode) RenderableNode {
func (rn RenderableNode) Copy() RenderableNode {
return RenderableNode{
ID: rn.ID,
LabelMajor: rn.LabelMajor,
Label: rn.Label,
LabelMinor: rn.LabelMinor,
Rank: rn.Rank,
Pseudo: rn.Pseudo,

6
render/renderable_node_test.go
View File

@@ -32,7 +32,7 @@ func TestMergeRenderableNodes(t *testing.T) {
func TestMergeRenderableNode(t *testing.T) {
node1 := render.RenderableNode{
ID: "foo",
LabelMajor: "",
Label: "",
LabelMinor: "minor",
Rank: "",
Pseudo: false,
@@ -41,7 +41,7 @@ func TestMergeRenderableNode(t *testing.T) {
}
node2 := render.RenderableNode{
ID: "foo",
LabelMajor: "major",
Label: "label",
LabelMinor: "",
Rank: "rank",
Pseudo: false,
@@ -50,7 +50,7 @@ func TestMergeRenderableNode(t *testing.T) {
}
want := render.RenderableNode{
ID: "foo",
LabelMajor: "major",
Label: "label",
LabelMinor: "minor",
Rank: "rank",
Pseudo: false,

4
render/short_lived_connections_test.go
View File

@@ -72,7 +72,7 @@ var (
want = (render.RenderableNodes{
render.IncomingInternetID: {
ID: render.IncomingInternetID,
LabelMajor: render.InboundMajor,
Label: render.InboundMajor,
LabelMinor: render.InboundMinor,
Pseudo: true,
Shape: "cloud",
@@ -80,7 +80,7 @@ var (
},
render.MakeContainerID(containerID): {
ID: render.MakeContainerID(containerID),
LabelMajor: containerName,
Label: containerName,
LabelMinor: serverHostID,
Rank: "",
Pseudo: false,

4
render/topologies.go
View File

@@ -58,7 +58,7 @@ func (r processWithContainerNameRenderer) Render(rpt report.Report) RenderableNo
continue
}
output := p.Copy()
output.LabelMinor = fmt.Sprintf("%s (%s:%s)", report.ExtractHostID(p.Node), container.LabelMajor, pid)
output.LabelMinor = fmt.Sprintf("%s (%s:%s)", report.ExtractHostID(p.Node), container.Label, pid)
outputs[id] = output
}
return outputs
@@ -191,7 +191,7 @@ func (r containerWithImageNameRenderer) Render(rpt report.Report) RenderableNode
continue
}
output := c.Copy()
output.Rank = ImageNameWithoutVersion(image.LabelMajor)
output.Rank = ImageNameWithoutVersion(image.Label)
output.Latest = image.Latest.Merge(c.Latest)
outputs[id] = output
}

6
render/topology_diff_test.go
View File

@@ -20,7 +20,7 @@ func (r ByID) Less(i, j int) bool { return r[i].ID < r[j].ID }
func TestTopoDiff(t *testing.T) {
nodea := render.RenderableNode{
ID: "nodea",
LabelMajor: "Node A",
Label: "Node A",
LabelMinor: "'ts an a",
Pseudo: false,
Node: report.MakeNode().WithAdjacent("nodeb"),
@@ -31,8 +31,8 @@ func TestTopoDiff(t *testing.T) {
"nodeq", // not the same anymore
}
nodeb := render.RenderableNode{
ID: "nodeb",
LabelMajor: "Node B",
ID: "nodeb",
Label: "Node B",
}
// Helper to make RenderableNode maps.