Fix double-encoding of config file and update README with min RMQ

version

Author: coro

README.md

@@ -6,7 +6,7 @@ Manage [RabbitMQ](https://www.rabbitmq.com/) clusters deployed to [Kubernetes](h
 
 ## Supported Versions
 
-The operator deploys RabbitMQ `3.8.8`, and requires a Kubernetes cluster of `1.16` or above.
+The operator deploys RabbitMQ `3.8.8` by default, and supports versions from `3.8.4` upwards. The operator requires a Kubernetes cluster of `1.16` or above.
 
 ## Versioning
 

internal/resource/admin_secret.go

@@ -11,7 +11,6 @@ package resource
 
 import (
 	"bytes"
-	"encoding/base64"
 
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
@@ -35,7 +34,7 @@ func (builder *RabbitmqResourceBuilder) AdminSecret() *AdminSecretBuilder {
 	}
 }
 
-func generateDefaultUserConf(username, password []byte) ([]byte, error) {
+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{})
@@ -44,11 +43,11 @@ func generateDefaultUserConf(username, password []byte) ([]byte, error) {
 	}
 	defaultSection := cfg.Section("")
 
-	if _, err := defaultSection.NewKey("default_user", string(username)); err != nil {
+	if _, err := defaultSection.NewKey("default_user", username); err != nil {
 		return nil, err
 	}
 
-	if _, err := defaultSection.NewKey("default_pass", string(password)); err != nil {
+	if _, err := defaultSection.NewKey("default_pass", password); err != nil {
 		return nil, err
 	}
 
@@ -72,12 +71,12 @@ func (builder *AdminSecretBuilder) Update(object runtime.Object) error {
 }
 
 func (builder *AdminSecretBuilder) Build() (runtime.Object, error) {
-	username, err := randomBytes(24)
+	username, err := randomEncodedString(24)
 	if err != nil {
 		return nil, err
 	}
 
-	password, err := randomBytes(24)
+	password, err := randomEncodedString(24)
 	if err != nil {
 		return nil, err
 	}
@@ -94,9 +93,9 @@ func (builder *AdminSecretBuilder) Build() (runtime.Object, error) {
 		},
 		Type: corev1.SecretTypeOpaque,
 		Data: map[string][]byte{
-			"username":          []byte(base64.URLEncoding.EncodeToString(username)),
-			"password":          []byte(base64.URLEncoding.EncodeToString(password)),
-			"default_user.conf": []byte(base64.URLEncoding.EncodeToString(defaultUserConf)),
+			"username":          []byte(username),
+			"password":          []byte(password),
+			"default_user.conf": defaultUserConf,
 		},
 	}, nil
 }

internal/resource/admin_secret_test.go

@@ -46,9 +46,9 @@ var _ = Describe("AdminSecret", func() {
 
 	Context("Build with defaults", func() {
 		It("creates the necessary admin secret", func() {
-			var decodedUsername []byte
-			var decodedPassword []byte
-			var err error
+			var username []byte
+			var password []byte
+			var ok bool
 
 			obj, err := adminSecretBuilder.Build()
 			Expect(err).NotTo(HaveOccurred())
@@ -64,18 +64,18 @@ var _ = Describe("AdminSecret", func() {
 			})
 
 			By("creating a rabbitmq username that is base64 encoded and 24 characters in length", func() {
-				username, ok := secret.Data["username"]
+				username, ok = secret.Data["username"]
 				Expect(ok).NotTo(BeFalse())
-				decodedUsername, err = b64.URLEncoding.DecodeString(string(username))
+				decodedUsername, err := b64.URLEncoding.DecodeString(string(username))
 				Expect(err).NotTo(HaveOccurred())
 				Expect(len(decodedUsername)).To(Equal(24))
 
 			})
 
 			By("creating a rabbitmq password that is base64 encoded and 24 characters in length", func() {
-				password, ok := secret.Data["password"]
+				password, ok = secret.Data["password"]
 				Expect(ok).NotTo(BeFalse())
-				decodedPassword, err = b64.URLEncoding.DecodeString(string(password))
+				decodedPassword, err := b64.URLEncoding.DecodeString(string(password))
 				Expect(err).NotTo(HaveOccurred())
 				Expect(len(decodedPassword)).To(Equal(24))
 			})
@@ -84,17 +84,14 @@ var _ = Describe("AdminSecret", func() {
 				defaultUserConf, ok := secret.Data["default_user.conf"]
 				Expect(ok).NotTo(BeFalse())
 
-				decodedDefaultUserConf, err := b64.URLEncoding.DecodeString(string(defaultUserConf))
-				Expect(err).NotTo(HaveOccurred())
-
-				cfg, err := ini.Load(decodedDefaultUserConf)
+				cfg, err := ini.Load(defaultUserConf)
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(cfg.Section("").HasKey("default_user")).To(BeTrue())
 				Expect(cfg.Section("").HasKey("default_pass")).To(BeTrue())
 
-				Expect(cfg.Section("").Key("default_user").Value()).To(Equal(string(decodedUsername)))
-				Expect(cfg.Section("").Key("default_pass").Value()).To(Equal(string(decodedPassword)))
+				Expect(cfg.Section("").Key("default_user").Value()).To(Equal(string(username)))
+				Expect(cfg.Section("").Key("default_pass").Value()).To(Equal(string(password)))
 			})
 		})
 	})

internal/resource/erlang_cookie.go

@@ -63,18 +63,10 @@ func (builder *ErlangCookieBuilder) Update(object runtime.Object) error {
 	return nil
 }
 
-func randomBytes(dataLen int) ([]byte, error) {
+func randomEncodedString(dataLen int) (string, error) {
 	randomBytes := make([]byte, dataLen)
 	if _, err := rand.Read(randomBytes); err != nil {
-		return nil, err
-	}
-	return randomBytes, nil
-}
-
-func randomEncodedString(dataLen int) (string, error) {
-	generatedBytes, err := randomBytes(dataLen)
-	if err != nil {
 		return "", err
 	}
-	return base64.URLEncoding.EncodeToString(generatedBytes), nil
+	return base64.URLEncoding.EncodeToString(randomBytes), nil
 }