Username stored in credential secret.

Author: MirahImage

controllers/user_controller.go

@@ -228,7 +228,7 @@ func (r *UserReconciler) DeclareFunc(ctx context.Context, client rabbitmqclient.
 
 	userLimits := internal.GenerateUserLimits(user.Spec.UserLimits)
 	logger.Info("Generated user limits", "user", user.Name, "limits", userLimits)
-	return validateResponse(client.PutUserLimits(user.Name, userLimits))
+	return validateResponse(client.PutUserLimits(string(credentials.Data["username"]), userLimits))
 }
 
 func (r *UserReconciler) getUserCredentials(ctx context.Context, user *topology.User) (*corev1.Secret, error) {

controllers/user_controller_test.go

@@ -194,8 +194,7 @@ var _ = Describe("UserController", func() {
 					})))
 				By("calling PutUserLimits with the correct user limits")
 				Expect(fakeRabbitMQClient.PutUserLimitsCallCount()).To(BeNumerically(">", 0))
-				username, userLimitsValues := fakeRabbitMQClient.PutUserLimitsArgsForCall(0)
-				Expect(username).To(Equal(userName))
+				_, userLimitsValues := fakeRabbitMQClient.PutUserLimitsArgsForCall(0)
 				connectionLimit, ok := userLimitsValues["max-connections"]
 				Expect(ok).To(BeTrue())
 				Expect(connectionLimit).To(Equal(5))

system_tests/user_system_test.go

@@ -395,7 +395,20 @@ var _ = Describe("Users", func() {
 
 	When("providing user limits", func() {
 		const username = "limits-user"
+		var credentialSecret corev1.Secret
 		BeforeEach(func() {
+			credentialSecret = corev1.Secret{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "user-limit-secret",
+					Namespace: namespace,
+				},
+				Type: corev1.SecretTypeOpaque,
+				Data: map[string][]byte{
+					"username": []byte(username),
+				},
+			}
+			Expect(k8sClient.Create(ctx, &credentialSecret, &client.CreateOptions{})).To(Succeed())
+
 			user = &topology.User{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      username,
@@ -405,6 +418,9 @@ var _ = Describe("Users", func() {
 					RabbitmqClusterReference: topology.RabbitmqClusterReference{
 						Name: rmq.Name,
 					},
+					ImportCredentialsSecret: &corev1.LocalObjectReference{
+						Name: credentialSecret.Name,
+					},
 					UserLimits: topology.UserLimits{
 						Connections: 4,
 						Channels:    6,
@@ -413,6 +429,10 @@ var _ = Describe("Users", func() {
 			}
 		})
 
+		AfterEach(fucn() {
+			Expect(k8sClient.Delete(ctx, &credentialSecret)).To(Succeed())
+		})
+
 		It("Creates and deletes a user with the specified limits", func() {
 			var err error
 			By("declaring user")