Deduplicate getSecret function

The ensureSecret function is already a common function that can be used
in both Ceilometer and Autoscaling controllers. This patch removes the
existing getSecret function, defined twice, and invoke the underlying
ensureSecret directly. It also enhance its functionality by passing the
configMapVars to properly update the input hash within the function.

Signed-off-by: Francesco Pantano <fpantano@redhat.com>

Author: fmount

internal/controller/autoscaling_controller.go

@@ -375,13 +375,19 @@ func (r *AutoscalingReconciler) reconcileNormal(
 	validateFields := map[string]secret.Validator{
 		instance.Spec.Aodh.PasswordSelectors.AodhService: secret.PasswordValidator{},
 	}
-	ctrlResult, err := r.getSecret(
+
+	_, ctrlResult, err := ensureSecret(
 		ctx,
-		helper,
-		instance,
-		instance.Spec.Aodh.Secret,
+		types.NamespacedName{
+			Namespace: instance.Namespace,
+			Name:      instance.Spec.Aodh.Secret,
+		},
 		validateFields,
-		&configMapVars)
+		helper.GetClient(),
+		&instance.Status.Conditions,
+		&configMapVars,
+		time.Duration(10)*time.Second,
+	)
 	if err != nil {
 		return ctrlResult, err
 	}
@@ -491,16 +497,23 @@ func (r *AutoscalingReconciler) reconcileNormal(
 	transportValidateFields := map[string]secret.Validator{
 		"transport_url": secret.NoOpValidator{},
 	}
-	ctrlResult, err = r.getSecret(
+
+	_, ctrlResult, err = ensureSecret(
 		ctx,
-		helper,
-		instance,
-		*instance.Status.NotificationsURLSecret,
+		types.NamespacedName{
+			Namespace: instance.Namespace,
+			Name:      *instance.Status.NotificationsURLSecret,
+		},
 		transportValidateFields,
-		&configMapVars)
+		helper.GetClient(),
+		&instance.Status.Conditions,
+		&configMapVars,
+		time.Duration(10)*time.Second,
+	)
 	if err != nil {
 		return ctrlResult, err
 	}
+
 	// run check TransportURL secret - end
 
 	//
@@ -898,34 +911,6 @@ func (r *AutoscalingReconciler) getAutoscalingHeat(
 	return heat, err
 }
 
-// getSecret - get the specified secret, and add its hash to envVars
-func (r *AutoscalingReconciler) getSecret(
-	ctx context.Context,
-	h *helper.Helper,
-	instance *telemetryv1.Autoscaling,
-	secretName string,
-	expectedFields map[string]secret.Validator,
-	envVars *map[string]env.Setter,
-) (ctrl.Result, error) {
-	secretHash, result, err := ensureSecret(
-		ctx,
-		types.NamespacedName{Namespace: instance.Namespace, Name: secretName},
-		expectedFields,
-		h.GetClient(),
-		&instance.Status.Conditions,
-		time.Duration(10)*time.Second,
-	)
-	if err != nil {
-		return result, err
-	}
-
-	// Add a prefix to the var name to avoid accidental collision with other non-secret
-	// vars. The secret names themselves will be unique.
-	(*envVars)["secret-"+secretName] = env.SetValue(secretHash)
-
-	return ctrl.Result{}, nil
-}
-
 func (r *AutoscalingReconciler) transportURLCreateOrUpdate(
 	ctx context.Context,
 	instance *telemetryv1.Autoscaling,

internal/controller/ceilometer_controller.go

@@ -576,16 +576,23 @@ func (r *CeilometerReconciler) reconcileCeilometer(
 	validateFields := map[string]secret.Validator{
 		instance.Spec.PasswordSelectors.CeilometerService: secret.PasswordValidator{},
 	}
-	ctrlResult, err := r.getSecret(
+
+	_, ctrlResult, err := ensureSecret(
 		ctx,
-		helper,
-		instance,
-		instance.Spec.Secret,
+		types.NamespacedName{
+			Namespace: instance.Namespace,
+			Name:      instance.Spec.Secret,
+		},
 		validateFields,
-		&configMapVars)
+		helper.GetClient(),
+		&instance.Status.Conditions,
+		&configMapVars,
+		time.Duration(10)*time.Second,
+	)
 	if err != nil {
 		return ctrlResult, err
 	}
+
 	// run check OpenStack secret - end
 
 	//
@@ -1218,34 +1225,6 @@ func (r *CeilometerReconciler) reconcileKSM(
 	return ctrl.Result{}, nil
 }
 
-// getSecret - get the specified secret, and add its hash to envVars
-func (r *CeilometerReconciler) getSecret(
-	ctx context.Context,
-	h *helper.Helper,
-	instance *telemetryv1.Ceilometer,
-	secretName string,
-	expectedFields map[string]secret.Validator,
-	envVars *map[string]env.Setter,
-) (ctrl.Result, error) {
-	secretHash, result, err := ensureSecret(
-		ctx,
-		types.NamespacedName{Namespace: instance.Namespace, Name: secretName},
-		expectedFields,
-		h.GetClient(),
-		&instance.Status.Conditions,
-		time.Duration(10)*time.Second,
-	)
-	if err != nil {
-		return result, err
-	}
-
-	// Add a prefix to the var name to avoid accidental collision with other non-secret
-	// vars. The secret names themselves will be unique.
-	(*envVars)["secret-"+secretName] = env.SetValue(secretHash)
-
-	return ctrl.Result{}, nil
-}
-
 func (r *CeilometerReconciler) generateServiceConfig(
 	ctx context.Context,
 	h *helper.Helper,

internal/controller/telemetry_common.go

@@ -24,6 +24,7 @@ import (
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
+	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	secret "github.com/openstack-k8s-operators/lib-common/modules/common/secret"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -112,6 +113,7 @@ func ensureSecret(
 	expectedFields map[string]secret.Validator,
 	reader client.Reader,
 	conditionUpdater conditionUpdater,
+	envVars *map[string]env.Setter,
 	requeueTimeout time.Duration,
 ) (string, ctrl.Result, error) {
 
@@ -137,5 +139,8 @@ func ensureSecret(
 		return "", res, nil
 	}
 
+	// Add a prefix to the var name to avoid accidental collision with other non-secret
+	// vars. The secret names themselves will be unique.
+	(*envVars)["secret-"+secretName.Name] = env.SetValue(hash)
 	return hash, ctrl.Result{}, nil
 }