simplify getNGFReplicaData

Author: salonichf5

internal/mode/static/telemetry/collector.go

@@ -102,11 +102,21 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 		return Data{}, fmt.Errorf("failed to collect NGF resource counts: %w", err)
 	}
 
-	ngfReplicaCount, deploymentID, err := collectNGFReplicaData(ctx, c.cfg.K8sClientReader, c.cfg.PodNSName)
+	replicaSet, err := getPodReplicaSet(ctx, c.cfg.K8sClientReader, c.cfg.PodNSName)
+	if err != nil {
+		return Data{}, fmt.Errorf("failed to collect pod/replica set: %w", err)
+	}
+
+	replicaCount, err := getReplicas(replicaSet)
 	if err != nil {
 		return Data{}, fmt.Errorf("failed to collect NGF replica count: %w", err)
 	}
 
+	deploymentID, err := getDeploymentID(replicaSet)
+	if err != nil {
+		return Data{}, fmt.Errorf("failed to get NGF deploymentID: %w", err)
+	}
+
 	var clusterID string
 	if clusterID, err = CollectClusterID(ctx, c.cfg.K8sClientReader); err != nil {
 		return Data{}, fmt.Errorf("failed to collect clusterID: %w", err)
@@ -119,7 +129,7 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 			Name:    "NGF",
 			Version: c.cfg.Version,
 		},
-		NGFReplicaCount: ngfReplicaCount,
+		NGFReplicaCount: replicaCount,
 		ClusterID:       clusterID,
 		ImageSource:     c.cfg.ImageSource,
 		Arch:            runtime.GOARCH,
@@ -177,31 +187,27 @@ func collectGraphResourceCount(
 	return ngfResourceCounts, nil
 }
 
-func collectNGFReplicaData(
+func getPodReplicaSet(
 	ctx context.Context,
 	k8sClient client.Reader,
 	podNSName types.NamespacedName,
-) (int, string, error) {
+) (*appsv1.ReplicaSet, error) {
 	var pod v1.Pod
 	if err := k8sClient.Get(
 		ctx,
 		types.NamespacedName{Namespace: podNSName.Namespace, Name: podNSName.Name},
 		&pod,
 	); err != nil {
-		return 0, "", fmt.Errorf("failed to get NGF Pod: %w", err)
+		return nil, fmt.Errorf("failed to get NGF Pod: %w", err)
 	}
 
 	podOwnerRefs := pod.GetOwnerReferences()
 	if len(podOwnerRefs) != 1 {
-		return 0, "", fmt.Errorf("expected one owner reference of the NGF Pod, got %d", len(podOwnerRefs))
+		return nil, fmt.Errorf("expected one owner reference of the NGF Pod, got %d", len(podOwnerRefs))
 	}
 
 	if podOwnerRefs[0].Kind != "ReplicaSet" {
-		return 0, "", fmt.Errorf("expected pod owner reference to be ReplicaSet, got %s", podOwnerRefs[0].Kind)
-	}
-
-	if podOwnerRefs[0].UID == "" {
-		return 0, "", fmt.Errorf("expected pod owner reference to have a UID: %v", podOwnerRefs[0])
+		return nil, fmt.Errorf("expected pod owner reference to be ReplicaSet, got %s", podOwnerRefs[0].Kind)
 	}
 
 	var replicaSet appsv1.ReplicaSet
@@ -210,14 +216,26 @@ func collectNGFReplicaData(
 		types.NamespacedName{Namespace: podNSName.Namespace, Name: podOwnerRefs[0].Name},
 		&replicaSet,
 	); err != nil {
-		return 0, "", fmt.Errorf("failed to get NGF Pod's ReplicaSet: %w", err)
+		return nil, fmt.Errorf("failed to get NGF Pod's ReplicaSet: %w", err)
 	}
 
+	return &replicaSet, nil
+}
+
+func getReplicas(replicaSet *appsv1.ReplicaSet) (int, error) {
 	if replicaSet.Spec.Replicas == nil {
-		return 0, "", errors.New("replica set replicas was nil")
+		return 0, errors.New("replica set replicas was nil")
+	}
+
+	return int(*replicaSet.Spec.Replicas), nil
+}
+
+func getDeploymentID(replicaSet *appsv1.ReplicaSet) (string, error) {
+	if replicaSet.GetUID() == "" {
+		return "", fmt.Errorf("expected replicaSet to have a UID")
 	}
 
-	return int(*replicaSet.Spec.Replicas), string(podOwnerRefs[0].UID), nil
+	return string(replicaSet.GetUID()), nil
 }
 
 // CollectClusterID gets the UID of the kube-system namespace.

internal/mode/static/telemetry/collector_test.go

@@ -92,7 +92,6 @@ var _ = Describe("Collector", Ordered, func() {
 					{
 						Kind: "ReplicaSet",
 						Name: "replicaset1",
-						UID:  "test-pod-owner-uid",
 					},
 				},
 			},
@@ -103,6 +102,9 @@ var _ = Describe("Collector", Ordered, func() {
 			Spec: appsv1.ReplicaSetSpec{
 				Replicas: &replicas,
 			},
+			ObjectMeta: metav1.ObjectMeta{
+				UID: "test-pod-owner-uid",
+			},
 		}
 
 		podNSName = types.NamespacedName{
@@ -587,7 +589,7 @@ var _ = Describe("Collector", Ordered, func() {
 					_, err := dataCollector.Collect(ctx)
 					Expect(err).To(MatchError(expectedErr))
 				})
-				It("should error if the Pod's owner reference UID is empty", func() {
+				It("should error if the replicaSet's UID is empty", func() {
 					ngfPod = &v1.Pod{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "pod1",
@@ -608,9 +610,9 @@ var _ = Describe("Collector", Ordered, func() {
 					}
 					k8sClientReader.GetCalls(createGetCallsFunc(ngfPod, ngfReplicaSet))
 
-					expectedErr := fmt.Sprintf("expected pod owner reference to have a UID: %v", ngfPod.OwnerReferences[0])
+					expectedErr := errors.New("expected replicaSet to have a UID")
 					_, err := dataCollector.Collect(ctx)
-					Expect(err).To(MatchError(ContainSubstring(expectedErr)))
+					Expect(err).To(MatchError(expectedErr))
 				})
 			})
 		})