From 3e31668eb0096f8dbee8a2ba7bdfb6232aec1360 Mon Sep 17 00:00:00 2001
From: aram price <pricear@vmware.com>
Date: Fri, 11 Dec 2020 20:48:45 -0800
Subject: [PATCH] Refactor some utilitiy methods for sharing.

---
 .../generator/supervisor_secrets.go           | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/internal/controller/supervisorconfig/generator/supervisor_secrets.go b/internal/controller/supervisorconfig/generator/supervisor_secrets.go
index 7313340d..24d177d7 100644
--- a/internal/controller/supervisorconfig/generator/supervisor_secrets.go
+++ b/internal/controller/supervisorconfig/generator/supervisor_secrets.go
@@ -87,14 +87,14 @@ func (c *supervisorSecretsController) Sync(ctx controllerlib.Context) error {
 		return fmt.Errorf("failed to list secret %s/%s: %w", ctx.Key.Namespace, ctx.Key.Name, err)
 	}
 
-	secretNeedsUpdate := isNotFound || !c.isValid(secret)
+	secretNeedsUpdate := isNotFound || !isValid(secret)
 	if !secretNeedsUpdate {
 		plog.Debug("secret is up to date", "secret", klog.KObj(secret))
 		c.setCache(secret.Data[symmetricKeySecretDataKey])
 		return nil
 	}
 
-	newSecret, err := c.generateSecret(ctx.Key.Namespace, ctx.Key.Name)
+	newSecret, err := generateSecret(ctx.Key.Namespace, ctx.Key.Name, secretDataFunc, c.owner)
 	if err != nil {
 		return fmt.Errorf("failed to generate secret: %w", err)
 	}
@@ -113,7 +113,7 @@ func (c *supervisorSecretsController) Sync(ctx controllerlib.Context) error {
 	return nil
 }
 
-func (c *supervisorSecretsController) isValid(secret *corev1.Secret) bool {
+func isValid(secret *corev1.Secret) bool {
 	if secret.Type != symmetricKeySecretType {
 		return false
 	}
@@ -129,12 +129,23 @@ func (c *supervisorSecretsController) isValid(secret *corev1.Secret) bool {
 	return true
 }
 
-func (c *supervisorSecretsController) generateSecret(namespace, name string) (*corev1.Secret, error) {
+func secretDataFunc() (map[string][]byte, error) {
 	symmetricKey, err := generateKey()
 	if err != nil {
 		return nil, err
 	}
 
+	return map[string][]byte{
+		symmetricKeySecretDataKey: symmetricKey,
+	}, nil
+}
+
+func generateSecret(namespace, name string, secretDataFunc func() (map[string][]byte, error), owner metav1.Object) (*corev1.Secret, error) {
+	secretData, err := secretDataFunc()
+	if err != nil {
+		return nil, err
+	}
+
 	deploymentGVK := schema.GroupVersionKind{
 		Group:   appsv1.SchemeGroupVersion.Group,
 		Version: appsv1.SchemeGroupVersion.Version,
@@ -145,13 +156,11 @@ func (c *supervisorSecretsController) generateSecret(namespace, name string) (*c
 			Name:      name,
 			Namespace: namespace,
 			OwnerReferences: []metav1.OwnerReference{
-				*metav1.NewControllerRef(c.owner, deploymentGVK),
+				*metav1.NewControllerRef(owner, deploymentGVK),
 			},
 		},
 		Type: symmetricKeySecretType,
-		Data: map[string][]byte{
-			symmetricKeySecretDataKey: symmetricKey,
-		},
+		Data: secretData,
 	}, nil
 }
 
@@ -176,7 +185,7 @@ func (c *supervisorSecretsController) updateSecret(ctx context.Context, newSecre
 			return nil
 		}
 
-		if c.isValid(currentSecret) {
+		if isValid(currentSecret) {
 			*newSecret = currentSecret
 			return nil
 		}