small fixes and refactors

Author: jasonhawkharris

internal/scout/advise/k8s.go

@@ -55,7 +55,6 @@ func K8s(
 	}
 
 	for _, pod := range pods {
-		fmt.Println(scout.EmojiFingerPointRight, pod.Name)
 		err = Advise(ctx, cfg, pod)
 		if err != nil {
 			return errors.Wrap(err, "could not advise")
@@ -84,6 +83,7 @@ func Advise(ctx context.Context, cfg *scout.Config, pod v1.Pod) error {
 			advice = append(advice, storageAdvice)
 		}
 
+		fmt.Println(scout.EmojiFingerPointRight, pod.Name)
 		for _, msg := range advice {
 			fmt.Println(msg)
 		}
@@ -105,7 +105,7 @@ func getUsageMetrics(ctx context.Context, cfg *scout.Config, pod v1.Pod) ([]scou
 		Limits:  map[string]scout.Resources{},
 	}
 
-	if err = kube.GetLimits(ctx, cfg, &pod, containerMetrics); err != nil {
+	if err = kube.AddLimits(ctx, cfg, &pod, containerMetrics); err != nil {
 		return usages, errors.Wrap(err, "failed to get get container metrics")
 	}
 

internal/scout/constants.go

@@ -3,9 +3,7 @@ package scout
 const (
 	ABillion              float64 = 1_000_000_000
 	EmojiFingerPointRight         = "👉"
-	FailureEmoji                  = "🛑"
 	FlashingLightEmoji            = "🚨"
-	HourglassEmoji                = "⌛"
 	SuccessEmoji                  = "✅"
 	WarningSign                   = "⚠️ " // why does this need an extra space to align?!?!
 )

internal/scout/kube/kube.go

@@ -90,7 +90,7 @@ func GetPodMetrics(ctx context.Context, cfg *scout.Config, pod corev1.Pod) (*met
 //
 // It returns:
 // - Any error that occurred while fetching resource limits
-func GetLimits(ctx context.Context, cfg *scout.Config, pod *corev1.Pod, containerMetrics *scout.ContainerMetrics) error {
+func AddLimits(ctx context.Context, cfg *scout.Config, pod *corev1.Pod, containerMetrics *scout.ContainerMetrics) error {
 	for _, container := range pod.Spec.Containers {
 		containerName := container.Name
 		capacity, err := GetPvcCapacity(ctx, cfg, container, pod)

internal/scout/usage/k8s.go

@@ -58,17 +58,12 @@ func renderSinglePodUsageTable(ctx context.Context, cfg *scout.Config, pods []co
 		return errors.Wrapf(err, "could not get pod with name %s", cfg.Pod)
 	}
 
-	podMetrics, err := kube.GetPodMetrics(ctx, cfg, pod)
-	if err != nil {
-		return errors.Wrap(err, "while attempting to fetch pod metrics")
-	}
-
 	containerMetrics := &scout.ContainerMetrics{
 		PodName: cfg.Pod,
 		Limits:  map[string]scout.Resources{},
 	}
-	if err = kube.GetLimits(ctx, cfg, &pod, containerMetrics); err != nil {
-		return errors.Wrap(err, "failed to get get container metrics")
+	if err = kube.AddLimits(ctx, cfg, &pod, containerMetrics); err != nil {
+		return errors.Wrap(err, "failed to add limits to container metrics")
 	}
 
 	columns := []table.Column{
@@ -82,6 +77,11 @@ func renderSinglePodUsageTable(ctx context.Context, cfg *scout.Config, pods []co
 	}
 	var rows []table.Row
 
+	podMetrics, err := kube.GetPodMetrics(ctx, cfg, pod)
+	if err != nil {
+		return errors.Wrap(err, "while attempting to fetch pod metrics")
+	}
+
 	for _, container := range podMetrics.Containers {
 		stats, err := kube.GetUsage(ctx, cfg, *containerMetrics, pod, container)
 		if err != nil {
@@ -114,15 +114,16 @@ func renderUsageTable(ctx context.Context, cfg *scout.Config, pods []corev1.Pod)
 			PodName: pod.Name,
 			Limits:  map[string]scout.Resources{},
 		}
+
+		if err := kube.AddLimits(ctx, cfg, &pod, containerMetrics); err != nil {
+			return errors.Wrap(err, "failed to get get container metrics")
+		}
+
 		podMetrics, err := kube.GetPodMetrics(ctx, cfg, pod)
 		if err != nil {
 			return errors.Wrap(err, "while attempting to fetch pod metrics")
 		}
 
-		if err = kube.GetLimits(ctx, cfg, &pod, containerMetrics); err != nil {
-			return errors.Wrap(err, "failed to get get container metrics")
-		}
-
 		for _, container := range podMetrics.Containers {
 			stats, err := kube.GetUsage(ctx, cfg, *containerMetrics, pod, container)
 			if err != nil {