Cleanup and refactoring based on review comments

Signed-off-by: Milan Klanjsek <[email protected]>
vmware-archive · May 27, 2021 · bfc1189 · bfc1189
1 parent 71e10a0
commit bfc1189
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 40 deletions.
diff --git a/internal/objectstatus/daemonset.go b/internal/objectstatus/daemonset.go
@@ -36,9 +36,7 @@ func daemonSet(_ context.Context, object runtime.Object, _ store.Store, _ link.I
 
 	var properties []component.Property
 
-	if selector := ds.Spec.Selector; selector != nil {
-		properties = append(properties, component.Property{Label: "Selectors", Value: getSelectors(selector)})
-	}
+	properties = append(properties, component.Property{Label: "Selectors", Value: GetSelectors(ds.Spec.Selector)})
 
 	if nodeSelector := ds.Spec.Template.Spec.NodeSelector; nodeSelector != nil {
 		properties = append(properties, component.Property{Label: "Node Selectors", Value: getSelectorMap(nodeSelector)})
@@ -66,21 +64,24 @@ func daemonSet(_ context.Context, object runtime.Object, _ store.Store, _ link.I
 	}
 }
 
-func getSelectors(selector *metav1.LabelSelector) component.Component {
-	selectorComponent := component.NewSelectors(nil)
-	if selector == nil {
+func GetSelectors(selector *metav1.LabelSelector) component.Component {
+	if selector != nil {
+		selectorComponent := component.NewSelectors(nil)
+		if selector == nil {
+			return selectorComponent
+		}
+
+		for k, v := range selector.MatchLabels {
+			selectorComponent.Add(component.NewLabelSelector(k, v))
+		}
+
+		for _, e := range selector.MatchExpressions {
+			es := component.NewExpressionSelector(e.Key, component.Operator(e.Operator), e.Values)
+			selectorComponent.Add(es)
+		}
 		return selectorComponent
 	}
-
-	for k, v := range selector.MatchLabels {
-		selectorComponent.Add(component.NewLabelSelector(k, v))
-	}
-
-	for _, e := range selector.MatchExpressions {
-		es := component.NewExpressionSelector(e.Key, component.Operator(e.Operator), e.Values)
-		selectorComponent.Add(es)
-	}
-	return selectorComponent
+	return component.NewText("None")
 }
 
 func getSelectorMap(selector map[string]string) *component.Selectors {

diff --git a/internal/objectstatus/deployment.go b/internal/objectstatus/deployment.go
@@ -35,7 +35,7 @@ func deploymentAppsV1(_ context.Context, object runtime.Object, _ store.Store, _
 
 	status := deployment.Status
 	properties := []component.Property{{Label: "Deployment Strategy", Value: component.NewText(string(deployment.Spec.Strategy.Type))},
-		{Label: "Selectors", Value: getSelector(deployment)}}
+		{Label: "Selectors", Value: GetSelectors(deployment.Spec.Selector)}}
 
 	switch {
 	case status.Replicas == status.UnavailableReplicas:
@@ -61,24 +61,3 @@ func deploymentAppsV1(_ context.Context, object runtime.Object, _ store.Store, _
 		}, nil
 	}
 }
-
-func getSelector(deployment *appsv1.Deployment) component.Component {
-	if selector := deployment.Spec.Selector; selector != nil {
-		var selectors []component.Selector
-
-		for _, lsr := range selector.MatchExpressions {
-			o, _ := component.MatchOperator(string(lsr.Operator))
-
-			es := component.NewExpressionSelector(lsr.Key, o, lsr.Values)
-			selectors = append(selectors, es)
-		}
-
-		for k, v := range selector.MatchLabels {
-			ls := component.NewLabelSelector(k, v)
-			selectors = append(selectors, ls)
-		}
-
-		return component.NewSelectors(selectors)
-	}
-	return component.NewText("None")
-}
diff --git a/internal/objectstatus/pod.go b/internal/objectstatus/pod.go
@@ -58,7 +58,7 @@ func pod(ctx context.Context, object runtime.Object, o store.Store, link link.In
 
 		if nodeName := pod.Spec.NodeName; nodeName != "" {
 			nodeLink, _ := link.ForGVK("", "v1", "Node", pod.Spec.NodeName, pod.Spec.NodeName)
-			status.Properties = append(status.Properties, component.Property{Label: "Node", Value: nodeLink})
+			status.AddProperty("Node", nodeLink)
 		}
 
 		ownerReference := metav1.GetControllerOf(pod)
@@ -71,7 +71,7 @@ func pod(ctx context.Context, object runtime.Object, o store.Store, link link.In
 				ownerReference.Name,
 			)
 			if err == nil {
-				status.Properties = append(status.Properties, component.Property{Label: "Controlled By", Value: controlledBy})
+				status.AddProperty("Controlled By", controlledBy)
 			}
 		}
 	}