Move exported Build and Update functions to the top

and helper functions to the bottom

Author: ansd

internal/resource/admin_secret.go

@@ -12,6 +12,7 @@ package resource
 import (
 	"bytes"
 	"fmt"
+
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
@@ -38,33 +39,34 @@ func (builder *RabbitmqResourceBuilder) AdminSecret() *AdminSecretBuilder {
 	}
 }
 
-func generateDefaultUserConf(username, password string) ([]byte, error) {
-
-	ini.PrettySection = false // Remove trailing new line because default_user.conf has only a default section.
-	cfg, err := ini.Load([]byte{})
+func (builder *AdminSecretBuilder) Build() (runtime.Object, error) {
+	username, err := randomEncodedString(24)
 	if err != nil {
 		return nil, err
 	}
-	defaultSection := cfg.Section("")
-
-	if _, err := defaultSection.NewKey("default_user", username); err != nil {
-		return nil, err
-	}
 
-	if _, err := defaultSection.NewKey("default_pass", password); err != nil {
+	password, err := randomEncodedString(24)
+	if err != nil {
 		return nil, err
 	}
 
-	var userConfBuffer bytes.Buffer
-	if _, err := cfg.WriteTo(&userConfBuffer); err != nil {
+	defaultUserConf, err := generateDefaultUserConf(username, password)
+	if err != nil {
 		return nil, err
 	}
 
-	return userConfBuffer.Bytes(), nil
-}
-
-func (builder *AdminSecretBuilder) UpdateRequiresStsRestart() bool {
-	return false
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      builder.Instance.ChildResourceName(AdminSecretName),
+			Namespace: builder.Instance.Namespace,
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{
+			"username":          []byte(username),
+			"password":          []byte(password),
+			"default_user.conf": defaultUserConf,
+		},
+	}, nil
 }
 
 func (builder *AdminSecretBuilder) Update(object runtime.Object) error {
@@ -79,32 +81,30 @@ func (builder *AdminSecretBuilder) Update(object runtime.Object) error {
 	return nil
 }
 
-func (builder *AdminSecretBuilder) Build() (runtime.Object, error) {
-	username, err := randomEncodedString(24)
+func (builder *AdminSecretBuilder) UpdateRequiresStsRestart() bool {
+	return false
+}
+
+func generateDefaultUserConf(username, password string) ([]byte, error) {
+	ini.PrettySection = false // Remove trailing new line because default_user.conf has only a default section.
+	cfg, err := ini.Load([]byte{})
 	if err != nil {
 		return nil, err
 	}
+	defaultSection := cfg.Section("")
 
-	password, err := randomEncodedString(24)
-	if err != nil {
+	if _, err := defaultSection.NewKey("default_user", username); err != nil {
 		return nil, err
 	}
 
-	defaultUserConf, err := generateDefaultUserConf(username, password)
-	if err != nil {
+	if _, err := defaultSection.NewKey("default_pass", password); err != nil {
 		return nil, err
 	}
 
-	return &corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      builder.Instance.ChildResourceName(AdminSecretName),
-			Namespace: builder.Instance.Namespace,
-		},
-		Type: corev1.SecretTypeOpaque,
-		Data: map[string][]byte{
-			"username":          []byte(username),
-			"password":          []byte(password),
-			"default_user.conf": defaultUserConf,
-		},
-	}, nil
+	var userConfBuffer bytes.Buffer
+	if _, err := cfg.WriteTo(&userConfBuffer); err != nil {
+		return nil, err
+	}
+
+	return userConfBuffer.Bytes(), nil
 }