Add support for path_prefix configuration in the cluster

Author: blackjid

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/onsi/gomega v1.20.0
 	github.com/rabbitmq/cluster-operator v1.14.0
 	github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
+	gopkg.in/ini.v1 v1.66.6
 	k8s.io/api v0.24.3
 	k8s.io/apimachinery v0.24.3
 	k8s.io/client-go v0.24.3

go.sum

@@ -1966,6 +1966,7 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
 gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=

rabbitmqclient/cluster_reference.go

@@ -9,6 +9,7 @@ import (
 
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	topology "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
+	"gopkg.in/ini.v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -99,7 +100,12 @@ func ParseReference(ctx context.Context, c client.Client, rmq topology.RabbitmqC
 		return nil, false, err
 	}
 
-	endpoint, err := managementURI(svc, cluster.TLSEnabled(), clusterDomain)
+	pathPrefix, err := readClusterPathPrefix(cluster)
+	if err != nil {
+		return nil, false, fmt.Errorf("unable to parse additionconfig setting from the rabbitmqcluster resource: %w", err)
+	}
+
+	endpoint, err := managementURI(svc, cluster.TLSEnabled(), clusterDomain, pathPrefix)
 	if err != nil {
 		return nil, false, fmt.Errorf("failed to get endpoint from specified rabbitmqcluster: %w", err)
 	}
@@ -161,6 +167,33 @@ func readCredentialsFromKubernetesSecret(secret *corev1.Secret) (ConnectionCrede
 	}, tlsEnabled, nil
 }
 
+func readClusterPathPrefix(cluster *rabbitmqv1beta1.RabbitmqCluster) (string, error) {
+	additionalConfig := cluster.Spec.Rabbitmq.AdditionalConfig
+
+	var err error
+	if additionalConfig == "" {
+		return "", err
+	}
+
+	path_prefix, err := readIniConfig(additionalConfig, "management", "path_prefix")
+	if err != nil {
+		return "", err
+	}
+
+	return path_prefix, nil
+}
+
+func readIniConfig(config string, section string, key string) (string, error) {
+	cfg, err := ini.LoadSources(ini.LoadOptions{
+		SkipUnrecognizableLines: false,
+	}, []byte(config))
+	if err != nil {
+		return "", err
+	}
+
+	return cfg.Section(section).Key(key).String(), nil
+}
+
 func readUsernamePassword(secret *corev1.Secret) (string, string, error) {
 	if secret == nil {
 		return "", "", errors.New("unable to extract data from nil secret")
@@ -169,7 +202,7 @@ func readUsernamePassword(secret *corev1.Secret) (string, string, error) {
 	return string(secret.Data["username"]), string(secret.Data["password"]), nil
 }
 
-func managementURI(svc *corev1.Service, tlsEnabled bool, clusterDomain string) (string, error) {
+func managementURI(svc *corev1.Service, tlsEnabled bool, clusterDomain string, pathPrefix string) (string, error) {
 	var managementUiPort int
 	for _, port := range svc.Spec.Ports {
 		if port.Name == "management-tls" {
@@ -190,5 +223,11 @@ func managementURI(svc *corev1.Service, tlsEnabled bool, clusterDomain string) (
 	if tlsEnabled {
 		scheme = "https"
 	}
-	return fmt.Sprintf("%s://%s.%s.svc%s:%d", scheme, svc.Name, svc.Namespace, clusterDomain, managementUiPort), nil
+	url := url.URL{
+		Scheme: scheme,
+		Host:   fmt.Sprintf("%s.%s.svc%s:%d", svc.Name, svc.Namespace, clusterDomain, managementUiPort),
+		Path:   pathPrefix,
+	}
+	return url.String(), nil
+	// return fmt.Sprintf("%s://%s.%s.svc%s:%d", scheme, svc.Name, svc.Namespace, clusterDomain, pathPrefix, managementUiPort), nil
 }

rabbitmqclient/cluster_reference_test.go

@@ -3,6 +3,7 @@ package rabbitmqclient_test
 import (
 	"context"
 	"fmt"
+
 	"github.com/rabbitmq/messaging-topology-operator/rabbitmqclient"
 	"github.com/rabbitmq/messaging-topology-operator/rabbitmqclient/rabbitmqclientfakes"
 
@@ -283,6 +284,77 @@ var _ = Describe("ParseReference", func() {
 		})
 	})
 
+	When("the RabbitmqCluster is configured with management path_prefix using ini", func() {
+		BeforeEach(func() {
+			existingRabbitMQCluster = &rabbitmqv1beta1.RabbitmqCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "rmq",
+					Namespace: namespace,
+				},
+				Spec: rabbitmqv1beta1.RabbitmqClusterSpec{
+					Rabbitmq: rabbitmqv1beta1.RabbitmqClusterConfigurationSpec{
+						AdditionalConfig: `
+							[management]
+							path_prefix = /my/prefix
+						`,
+					},
+				},
+				Status: rabbitmqv1beta1.RabbitmqClusterStatus{
+					Binding: &corev1.LocalObjectReference{
+						Name: "rmq-default-user-credentials",
+					},
+					DefaultUser: &rabbitmqv1beta1.RabbitmqClusterDefaultUser{
+						ServiceReference: &rabbitmqv1beta1.RabbitmqClusterServiceReference{
+							Name:      "rmq",
+							Namespace: namespace,
+						},
+					},
+				},
+			}
+			existingCredentialSecret = &corev1.Secret{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "rmq-default-user-credentials",
+					Namespace: namespace,
+				},
+				Data: map[string][]byte{
+					"username": []byte(existingRabbitMQUsername),
+					"password": []byte(existingRabbitMQPassword),
+				},
+			}
+			existingService = &corev1.Service{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "rmq",
+					Namespace: namespace,
+				},
+				Spec: corev1.ServiceSpec{
+					ClusterIP: "1.2.3.4",
+					Ports: []corev1.ServicePort{
+						{
+							Name: "management-tls",
+							Port: int32(15671),
+						},
+					},
+				},
+			}
+			objs = []runtime.Object{existingRabbitMQCluster, existingCredentialSecret, existingService}
+		})
+
+		It("returns correct creds in connectionCredentials", func() {
+			credsProvider, _, err := rabbitmqclient.ParseReference(ctx, fakeClient,
+				topology.RabbitmqClusterReference{Name: existingRabbitMQCluster.Name},
+				existingRabbitMQCluster.Namespace,
+				"")
+			Expect(err).NotTo(HaveOccurred())
+
+			usernameBytes, _ := credsProvider.Data("username")
+			passwordBytes, _ := credsProvider.Data("password")
+			uriBytes, _ := credsProvider.Data("uri")
+			Expect(usernameBytes).To(Equal([]byte(existingRabbitMQUsername)))
+			Expect(passwordBytes).To(Equal([]byte(existingRabbitMQPassword)))
+			Expect(uriBytes).To(Equal([]byte("http://rmq.rabbitmq-system.svc:15671/my/prefix")))
+		})
+	})
+
 	Context("spec.rabbitmqClusterReference.connectionSecret is set", func() {
 		When("uri has no scheme defined", func() {
 			BeforeEach(func() {