Rename some methods

open-telemetry · Aug 1, 2023 · 3d903c0 · 3d903c0
1 parent 8736351
commit 3d903c0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/internal/manifests/collector/collector.go b/internal/manifests/collector/collector.go
@@ -24,31 +24,31 @@ import (
 
 func Build(params reconcileutil.Params) ([]client.Object, error) {
 	var manifests []client.Object
-	var objects []reconcileutil.ObjectCreator
+	var manifestFactories []reconcileutil.K8sManifestFactory
 	switch params.Instance.Spec.Mode {
 	case v1alpha1.ModeDeployment:
-		objects = append(objects, reconcileutil.CreatorWithoutError(Deployment))
+		manifestFactories = append(manifestFactories, reconcileutil.FactoryWithoutError(Deployment))
 	case v1alpha1.ModeStatefulSet:
-		objects = append(objects, reconcileutil.CreatorWithoutError(StatefulSet))
+		manifestFactories = append(manifestFactories, reconcileutil.FactoryWithoutError(StatefulSet))
 	case v1alpha1.ModeDaemonSet:
-		objects = append(objects, reconcileutil.CreatorWithoutError(DaemonSet))
+		manifestFactories = append(manifestFactories, reconcileutil.FactoryWithoutError(DaemonSet))
 	case v1alpha1.ModeSidecar:
 		params.Log.V(5).Info("not building sidecar...")
 	}
-	objects = append(objects, []reconcileutil.ObjectCreator{
-		reconcileutil.CreatorWithoutError(ConfigMap),
-		reconcileutil.CreatorWithoutError(HorizontalPodAutoscaler),
-		reconcileutil.CreatorWithoutError(ServiceAccount),
-		reconcileutil.CreatorWithoutError(Service),
-		reconcileutil.CreatorWithoutError(HeadlessService),
-		reconcileutil.CreatorWithoutError(MonitoringService),
-		reconcileutil.CreatorWithoutError(Ingress),
+	manifestFactories = append(manifestFactories, []reconcileutil.K8sManifestFactory{
+		reconcileutil.FactoryWithoutError(ConfigMap),
+		reconcileutil.FactoryWithoutError(HorizontalPodAutoscaler),
+		reconcileutil.FactoryWithoutError(ServiceAccount),
+		reconcileutil.FactoryWithoutError(Service),
+		reconcileutil.FactoryWithoutError(HeadlessService),
+		reconcileutil.FactoryWithoutError(MonitoringService),
+		reconcileutil.FactoryWithoutError(Ingress),
 	}...)
 	if params.Instance.Spec.Observability.Metrics.EnableMetrics && featuregate.PrometheusOperatorIsAvailable.IsEnabled() {
-		objects = append(objects, reconcileutil.Creator(ServiceMonitor))
+		manifestFactories = append(manifestFactories, reconcileutil.Factory(ServiceMonitor))
 	}
-	for _, object := range objects {
-		res, err := object(params.Config, params.Log, params.Instance)
+	for _, factory := range manifestFactories {
+		res, err := factory(params.Config, params.Log, params.Instance)
 		if err != nil {
 			return nil, err
 		} else if res != nil && res.DeepCopyObject() != nil {

diff --git a/internal/manifests/targetallocator/targetallocator.go b/internal/manifests/targetallocator/targetallocator.go
@@ -23,16 +23,16 @@ import (
 func Build(params reconcileutil.Params) ([]client.Object, error) {
 	var manifests []client.Object
 	if !params.Instance.Spec.TargetAllocator.Enabled {
-		return nil, nil
+		return manifests, nil
 	}
-	objects := []reconcileutil.ObjectCreator{
-		reconcileutil.Creator(ConfigMap),
-		reconcileutil.CreatorWithoutError(Deployment),
-		reconcileutil.CreatorWithoutError(ServiceAccount),
-		reconcileutil.CreatorWithoutError(Service),
+	resourceFactories := []reconcileutil.K8sManifestFactory{
+		reconcileutil.Factory(ConfigMap),
+		reconcileutil.FactoryWithoutError(Deployment),
+		reconcileutil.FactoryWithoutError(ServiceAccount),
+		reconcileutil.FactoryWithoutError(Service),
 	}
-	for _, object := range objects {
-		res, err := object(params.Config, params.Log, params.Instance)
+	for _, factory := range resourceFactories {
+		res, err := factory(params.Config, params.Log, params.Instance)
 		if err != nil {
 			return nil, err
 		} else if res != nil && res.DeepCopyObject() != nil {

diff --git a/internal/reconcileutil/util.go b/internal/reconcileutil/util.go
@@ -24,18 +24,17 @@ import (
 
 type Builder func(params Params) ([]client.Object, error)
 
-type Manifest[T client.Object] func(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelemetryCollector) (T, error)
-type SimpleManifest[T client.Object] func(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelemetryCollector) T
+type ManifestFactory[T client.Object] func(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelemetryCollector) (T, error)
+type SimpleManifestFactory[T client.Object] func(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelemetryCollector) T
+type K8sManifestFactory ManifestFactory[client.Object]
 
-type ObjectCreator Manifest[client.Object]
-
-func CreatorWithoutError[T client.Object](f SimpleManifest[T]) ObjectCreator {
+func FactoryWithoutError[T client.Object](f SimpleManifestFactory[T]) K8sManifestFactory {
 	return func(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelemetryCollector) (client.Object, error) {
 		return f(cfg, logger, otelcol), nil
 	}
 }
 
-func Creator[T client.Object](f Manifest[T]) ObjectCreator {
+func Factory[T client.Object](f ManifestFactory[T]) K8sManifestFactory {
 	return func(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelemetryCollector) (client.Object, error) {
 		return f(cfg, logger, otelcol)
 	}