From 9b224b11705c017efdb553ac793aa16deb71b446 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 16 Jul 2018 12:24:29 +0000 Subject: [PATCH] Fix up storage to use slice instead of map for WithLatests --- probe/kubernetes/persistentvolume.go | 14 ++++---- probe/kubernetes/persistentvolumeclaim.go | 12 +++---- probe/kubernetes/pod.go | 2 +- probe/kubernetes/storageclass.go | 10 +++--- render/expected/expected.go | 40 +++++++++++------------ test/fixture/report_fixture.go | 40 +++++++++++------------ 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/probe/kubernetes/persistentvolume.go b/probe/kubernetes/persistentvolume.go index 66a413b27..9547af0d0 100644 --- a/probe/kubernetes/persistentvolume.go +++ b/probe/kubernetes/persistentvolume.go @@ -47,11 +47,11 @@ func (p *persistentVolume) GetVolume() string { // GetNode returns Persistent Volume as Node func (p *persistentVolume) GetNode() report.Node { - return p.MetaNode(report.MakePersistentVolumeNodeID(p.UID())).WithLatests(map[string]string{ - NodeType: "Persistent Volume", - VolumeClaim: p.GetVolume(), - StorageClassName: p.Spec.StorageClassName, - Status: string(p.Status.Phase), - AccessModes: p.GetAccessMode(), - }) + return p.MetaNode(report.MakePersistentVolumeNodeID(p.UID())).WithLatests( + NodeType, "Persistent Volume", + VolumeClaim, p.GetVolume(), + StorageClassName, p.Spec.StorageClassName, + Status, string(p.Status.Phase), + AccessModes, p.GetAccessMode(), + ) } diff --git a/probe/kubernetes/persistentvolumeclaim.go b/probe/kubernetes/persistentvolumeclaim.go index 665ef4404..0eeb16a4e 100644 --- a/probe/kubernetes/persistentvolumeclaim.go +++ b/probe/kubernetes/persistentvolumeclaim.go @@ -49,12 +49,12 @@ func (p *persistentVolumeClaim) GetStorageClass() string { // GetNode returns Persistent Volume Claim as Node func (p *persistentVolumeClaim) GetNode() report.Node { - return p.MetaNode(report.MakePersistentVolumeClaimNodeID(p.UID())).WithLatests(map[string]string{ - NodeType: "Persistent Volume Claim", - Status: string(p.Status.Phase), - VolumeName: p.Spec.VolumeName, - StorageClassName: p.GetStorageClass(), - }) + return p.MetaNode(report.MakePersistentVolumeClaimNodeID(p.UID())).WithLatests( + NodeType, "Persistent Volume Claim", + Status, string(p.Status.Phase), + VolumeName, p.Spec.VolumeName, + StorageClassName, p.GetStorageClass(), + ) } // Selector returns all Persistent Volume Claim selector diff --git a/probe/kubernetes/pod.go b/probe/kubernetes/pod.go index faf434b46..80bda9869 100644 --- a/probe/kubernetes/pod.go +++ b/probe/kubernetes/pod.go @@ -95,7 +95,7 @@ func (p *pod) GetNode(probeID string) report.Node { } if p.VolumeClaimName() != "" { - latests[VolumeClaim] = p.VolumeClaimName() + latests = append(latests, VolumeClaim, p.VolumeClaimName()) } if p.Pod.Spec.HostNetwork { diff --git a/probe/kubernetes/storageclass.go b/probe/kubernetes/storageclass.go index 832248528..ca4114766 100644 --- a/probe/kubernetes/storageclass.go +++ b/probe/kubernetes/storageclass.go @@ -24,9 +24,9 @@ func NewStorageClass(p *storagev1.StorageClass) StorageClass { // GetNode returns StorageClass as Node func (p *storageClass) GetNode() report.Node { - return p.MetaNode(report.MakeStorageClassNodeID(p.UID())).WithLatests(map[string]string{ - NodeType: "Storage Class", - Name: p.GetName(), - Provisioner: p.Provisioner, - }) + return p.MetaNode(report.MakeStorageClassNodeID(p.UID())).WithLatests( + NodeType, "Storage Class", + Name, p.GetName(), + Provisioner, p.Provisioner, + ) } diff --git a/render/expected/expected.go b/render/expected/expected.go index 0ff5f7fd9..fadb67ba7 100644 --- a/render/expected/expected.go +++ b/render/expected/expected.go @@ -273,30 +273,30 @@ var ( )), fixture.PersistentVolumeClaimNodeID: persistentVolumeClaim(fixture.PersistentVolumeClaimNodeID, fixture.PersistentVolumeNodeID). - WithLatests(map[string]string{ - kubernetes.Name: "pvc-6124", - kubernetes.Namespace: "ping", - kubernetes.Status: "bound", - kubernetes.VolumeName: "pongvolume", - kubernetes.AccessModes: "ReadWriteOnce", - kubernetes.StorageClassName: "standard", - }).WithChild(report.MakeNode(fixture.PersistentVolumeNodeID).WithTopology(report.PersistentVolume)), + WithLatests( + kubernetes.Name, "pvc-6124", + kubernetes.Namespace, "ping", + kubernetes.Status, "bound", + kubernetes.VolumeName, "pongvolume", + kubernetes.AccessModes, "ReadWriteOnce", + kubernetes.StorageClassName, "standard", + ).WithChild(report.MakeNode(fixture.PersistentVolumeNodeID).WithTopology(report.PersistentVolume)), fixture.PersistentVolumeNodeID: persistentVolume(fixture.PersistentVolumeNodeID). - WithLatests(map[string]string{ - kubernetes.Name: "pongvolume", - kubernetes.Namespace: "ping", - kubernetes.Status: "bound", - kubernetes.VolumeClaim: "pvc-6124", - kubernetes.AccessModes: "ReadWriteOnce", - kubernetes.StorageClassName: "standard", - }), + WithLatests( + kubernetes.Name, "pongvolume", + kubernetes.Namespace, "ping", + kubernetes.Status, "bound", + kubernetes.VolumeClaim, "pvc-6124", + kubernetes.AccessModes, "ReadWriteOnce", + kubernetes.StorageClassName, "standard", + ), fixture.StorageClassNodeID: StorageClass(fixture.StorageClassNodeID, fixture.PersistentVolumeClaimNodeID). - WithLatests(map[string]string{ - kubernetes.Name: "standard", - kubernetes.Provisioner: "pong", - }).WithChild(report.MakeNode(fixture.PersistentVolumeClaimNodeID).WithTopology(report.PersistentVolumeClaim)), + WithLatests( + kubernetes.Name, "standard", + kubernetes.Provisioner, "pong", + ).WithChild(report.MakeNode(fixture.PersistentVolumeClaimNodeID).WithTopology(report.PersistentVolumeClaim)), UnmanagedServerID: unmanagedServerNode, render.IncomingInternetID: theIncomingInternetNode(fixture.ServerPodNodeID), diff --git a/test/fixture/report_fixture.go b/test/fixture/report_fixture.go index f7b6e1889..6ecd28c77 100644 --- a/test/fixture/report_fixture.go +++ b/test/fixture/report_fixture.go @@ -358,14 +358,14 @@ var ( Nodes: report.Nodes{ PersistentVolumeClaimNodeID: report.MakeNodeWith( - PersistentVolumeClaimNodeID, map[string]string{ - kubernetes.Name: "pvc-6124", - kubernetes.Namespace: "ping", - kubernetes.Status: "bound", - kubernetes.VolumeName: "pongvolume", - kubernetes.AccessModes: "ReadWriteOnce", - kubernetes.StorageClassName: "standard", - }). + PersistentVolumeClaimNodeID, + kubernetes.Name, "pvc-6124", + kubernetes.Namespace, "ping", + kubernetes.Status, "bound", + kubernetes.VolumeName, "pongvolume", + kubernetes.AccessModes, "ReadWriteOnce", + kubernetes.StorageClassName, "standard", + ). WithTopology(report.PersistentVolumeClaim), }, }.WithShape(report.DottedCylinder).WithLabel("persistent volume claim", "persistent volume claims"), @@ -373,14 +373,14 @@ var ( Nodes: report.Nodes{ PersistentVolumeNodeID: report.MakeNodeWith( - PersistentVolumeNodeID, map[string]string{ - kubernetes.Name: "pongvolume", - kubernetes.Namespace: "ping", - kubernetes.Status: "bound", - kubernetes.VolumeClaim: "pvc-6124", - kubernetes.AccessModes: "ReadWriteOnce", - kubernetes.StorageClassName: "standard", - }). + PersistentVolumeNodeID, + kubernetes.Name, "pongvolume", + kubernetes.Namespace, "ping", + kubernetes.Status, "bound", + kubernetes.VolumeClaim, "pvc-6124", + kubernetes.AccessModes, "ReadWriteOnce", + kubernetes.StorageClassName, "standard", + ). WithTopology(report.PersistentVolume), }, }.WithShape(report.Cylinder).WithLabel("persistent volume", "persistent volumes"), @@ -388,10 +388,10 @@ var ( Nodes: report.Nodes{ StorageClassNodeID: report.MakeNodeWith( - StorageClassNodeID, map[string]string{ - kubernetes.Name: "standard", - kubernetes.Provisioner: "pong", - }). + StorageClassNodeID, + kubernetes.Name, "standard", + kubernetes.Provisioner, "pong", + ). WithTopology(report.StorageClass), }, }.WithShape(report.StorageSheet).WithLabel("storage class", "storage classes"),