wip

Author: blackjid

go.mod

@@ -197,6 +197,7 @@ require (
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

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,10 @@ func ParseReference(ctx context.Context, c client.Client, rmq topology.RabbitmqC
 		return nil, false, err
 	}
 
-	endpoint, err := managementURI(svc, cluster.TLSEnabled(), clusterDomain)
+	var pathPrefix string
+	pathPrefix = readClusterPathPrefix(cluster)
+
+	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 +165,19 @@ func readCredentialsFromKubernetesSecret(secret *corev1.Secret) (ConnectionCrede
 	}, tlsEnabled, nil
 }
 
+func readClusterPathPrefix(cluster *rabbitmqv1beta1.RabbitmqCluster) string {
+	additionalConfig := cluster.Spec.Rabbitmq.AdditionalConfig
+
+	if additionalConfig == "" {
+		return ""
+	}
+	cfg, _ := ini.Load(
+		[]byte(additionalConfig),
+	)
+
+	return cfg.Section("management").Key("path_prefix").String()
+}
+
 func readUsernamePassword(secret *corev1.Secret) (string, string, error) {
 	if secret == nil {
 		return "", "", errors.New("unable to extract data from nil secret")
@@ -169,7 +186,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 +207,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

@@ -283,6 +283,77 @@ var _ = Describe("ParseReference", func() {
 		})
 	})
 
+	When("the RabbitmqCluster is configured with management path_prefix", 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() {