Review fixes.

weaveworks · Dec 19, 2023 · 9ed0317 · 9ed0317
1 parent fa8744a
commit 9ed0317
Show file tree

Hide file tree

Showing 3 changed files with 225 additions and 237 deletions.
diff --git a/pkg/query/configuration/fluxobject_test.go b/pkg/query/configuration/fluxobject_test.go
diff --git a/pkg/query/configuration/objectkind.go b/pkg/query/configuration/objectkind.go
@@ -108,10 +108,6 @@ func (o ObjectKind) Validate() error {
 	return nil
 }
 
-type FluxObject interface {
-	client.Object
-}
-
 var (
 	HelmReleaseObjectKind = ObjectKind{
 		Gvk: helmv2beta1.GroupVersion.WithKind(helmv2beta1.HelmReleaseKind),
@@ -133,8 +129,8 @@ var (
 			}
 			return hr.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategoryAutomation,
 	}
 
@@ -158,8 +154,8 @@ var (
 			}
 			return ks.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategoryAutomation,
 	}
 
@@ -183,8 +179,8 @@ var (
 			}
 			return hr.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategorySource,
 	}
 
@@ -208,8 +204,8 @@ var (
 			}
 			return chart.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategorySource,
 	}
 
@@ -233,8 +229,8 @@ var (
 			}
 			return repo.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategorySource,
 	}
 
@@ -258,8 +254,8 @@ var (
 			}
 			return repo.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategorySource,
 	}
 
@@ -283,8 +279,8 @@ var (
 			}
 			return b.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategorySource,
 	}
 
@@ -342,7 +338,7 @@ var (
 		StatusFunc: func(obj client.Object, _ ObjectKind) (ObjectStatus, error) {
 			e, ok := obj.(*corev1.Event)
 			if !ok {
-				return nil, fmt.Errorf("object is not an Event")
+				return "", fmt.Errorf("object is not an Event")
 			}
 
 			if e.Type == "Normal" {
@@ -382,8 +378,8 @@ var (
 			}
 			return gs.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategoryGitopsSet,
 	}
 
@@ -449,8 +445,8 @@ var (
 			}
 			return acd.Spec.Suspend, nil
 		},
-		StatusFunc:  defaultFluxObjectStatusFunc,
-		MessageFunc: defaultFluxObjectMessageFunc,
+		StatusFunc:  defaultStatusFunc,
+		MessageFunc: defaultMessageFunc,
 		Category:    CategoryClusterDiscovery,
 	}
 )
@@ -483,12 +479,12 @@ var SupportedRbacKinds = []ObjectKind{
 	ClusterRoleBindingObjectKind,
 }
 
-// defaultFluxObjectStatusFunc is the default status function for Flux objects.
+// defaultStatusFunc is the default status function for Flux objects.
 // The status of Flux objects is computed based on the values of the Conditions and Spec.Suspend fields,
 // so we can standardize on that, based on the current object statuses, computed in non-Explorer UI:
 // https://github.com/weaveworks/weave-gitops/blob/cc3c17632334ffa56838c4765e68ce388bde6b2f/ui/components/KubeStatusIndicator.tsx#L18-L25
 // TODO: Remove the reference to non-Explorer UI logic once we move computing all object statuses to the backend.
-func defaultFluxObjectStatusFunc(obj client.Object, objectKind ObjectKind) (ObjectStatus, error) {
+func defaultStatusFunc(obj client.Object, objectKind ObjectKind) (ObjectStatus, error) {
 	if objectKind.GetConditionsFunc == nil {
 		return "", fmt.Errorf("missing get conditions func")
 	}
@@ -537,7 +533,7 @@ func defaultFluxObjectStatusFunc(obj client.Object, objectKind ObjectKind) (Obje
 	return Failed, nil
 }
 
-func defaultFluxObjectMessageFunc(obj client.Object, objectKind ObjectKind) (string, error) {
+func defaultMessageFunc(obj client.Object, objectKind ObjectKind) (string, error) {
 	if objectKind.GetConditionsFunc == nil {
 		return "", fmt.Errorf("missing get conditions func")
 	}