From e6d163a30d94df07494d1e3e06d0ac80b1956f68 Mon Sep 17 00:00:00 2001
From: Sebastian Soto <ssoto@redhat.com>
Date: Tue, 2 Aug 2022 16:00:59 -0400
Subject: [PATCH] [services] Move service manifest gen to new pkg

Introduces a new package `services` which will contain functions related
to service manifest generation.
---
 controllers/configmap_controller.go | 20 ++------------------
 pkg/services/services.go            | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 pkg/services/services.go

diff --git a/controllers/configmap_controller.go b/controllers/configmap_controller.go
index 09b2bce9a..291fa8f69 100644
--- a/controllers/configmap_controller.go
+++ b/controllers/configmap_controller.go
@@ -46,9 +46,9 @@ import (
 	"github.com/openshift/windows-machine-config-operator/pkg/metrics"
 	"github.com/openshift/windows-machine-config-operator/pkg/nodeconfig"
 	"github.com/openshift/windows-machine-config-operator/pkg/secrets"
+	"github.com/openshift/windows-machine-config-operator/pkg/services"
 	"github.com/openshift/windows-machine-config-operator/pkg/servicescm"
 	"github.com/openshift/windows-machine-config-operator/pkg/signer"
-	"github.com/openshift/windows-machine-config-operator/pkg/windows"
 	"github.com/openshift/windows-machine-config-operator/pkg/wiparser"
 	"github.com/openshift/windows-machine-config-operator/version"
 )
@@ -88,7 +88,7 @@ func NewConfigMapReconciler(mgr manager.Manager, clusterConfig cluster.Config, w
 	}
 
 	// Get expected state of the Windows service ConfigMap
-	svcData, err := generateServicesManifest()
+	svcData, err := services.GenerateManifest()
 	if err != nil {
 		return nil, errors.Wrap(err, "error generating expected Windows service state")
 	}
@@ -474,19 +474,3 @@ func (r *ConfigMapReconciler) isKubeAPIServerServingCAConfigMap(obj client.Objec
 	return obj.GetNamespace() == certificates.KubeApiServerOperatorNamespace &&
 		obj.GetName() == certificates.KubeAPIServerServingCAConfigMapName
 }
-
-// generateServicesManifest returns the expected state of the Windows service configmap
-func generateServicesManifest() (*servicescm.Data, error) {
-	services := &[]servicescm.Service{{
-		Name:                         windows.WindowsExporterServiceName,
-		Command:                      windows.WindowsExporterServiceCommand,
-		NodeVariablesInCommand:       nil,
-		PowershellVariablesInCommand: nil,
-		Dependencies:                 nil,
-		Bootstrap:                    false,
-		Priority:                     1,
-	}}
-	// TODO: All payload filenames and checksums must be added here https://issues.redhat.com/browse/WINC-847
-	files := &[]servicescm.FileInfo{}
-	return servicescm.NewData(services, files)
-}
diff --git a/pkg/services/services.go b/pkg/services/services.go
new file mode 100644
index 000000000..6859540f2
--- /dev/null
+++ b/pkg/services/services.go
@@ -0,0 +1,22 @@
+package services
+
+import (
+	"github.com/openshift/windows-machine-config-operator/pkg/servicescm"
+	"github.com/openshift/windows-machine-config-operator/pkg/windows"
+)
+
+// GenerateManifest returns the expected state of the Windows service configmap
+func GenerateManifest() (*servicescm.Data, error) {
+	services := &[]servicescm.Service{{
+		Name:                         windows.WindowsExporterServiceName,
+		Command:                      windows.WindowsExporterServiceCommand,
+		NodeVariablesInCommand:       nil,
+		PowershellVariablesInCommand: nil,
+		Dependencies:                 nil,
+		Bootstrap:                    false,
+		Priority:                     1,
+	}}
+	// TODO: All payload filenames and checksums must be added here https://issues.redhat.com/browse/WINC-847
+	files := &[]servicescm.FileInfo{}
+	return servicescm.NewData(services, files)
+}