@@ -40,18 +40,6 @@ const (
40
40
// +kubebuilder:rbac:groups=rabbitmq.com,resources=users/status,verbs=get;update;patch
41
41
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create
42
42
43
- // UserCredentials describes the credentials that can be provided in ImportCredentialsSecret for a User.
44
- // If the secret is not provided, a random username and password will be generated.
45
- type UserCredentials struct {
46
- // Must be present if ImportCredentialsSecret is provided.
47
- Username string
48
- // If PasswordHash is an empty string, a passwordless user is created.
49
- // If PasswordHash is nil, Password is used instead.
50
- PasswordHash * string
51
- // If Password is empty and PasswordHash is nil, a random password is generated.
52
- Password string
53
- }
54
-
55
43
type UserReconciler struct {
56
44
client.Client
57
45
Scheme * runtime.Scheme
@@ -124,7 +112,7 @@ func (r *UserReconciler) declareCredentials(ctx context.Context, user *topology.
124
112
return credentials .Username , nil
125
113
}
126
114
127
- func (r * UserReconciler ) generateCredentials (ctx context.Context , user * topology.User ) (UserCredentials , error ) {
115
+ func (r * UserReconciler ) generateCredentials (ctx context.Context , user * topology.User ) (internal. UserCredentials , error ) {
128
116
logger := ctrl .LoggerFrom (ctx )
129
117
130
118
var err error
@@ -136,7 +124,7 @@ func (r *UserReconciler) generateCredentials(ctx context.Context, user *topology
136
124
return r .importCredentials (ctx , user .Spec .ImportCredentialsSecret .Name , user .Namespace )
137
125
}
138
126
139
- credentials := UserCredentials {}
127
+ credentials := internal. UserCredentials {}
140
128
141
129
credentials .Username , err = internal .RandomEncodedString (24 )
142
130
if err != nil {
@@ -149,11 +137,11 @@ func (r *UserReconciler) generateCredentials(ctx context.Context, user *topology
149
137
return credentials , nil
150
138
}
151
139
152
- func (r * UserReconciler ) importCredentials (ctx context.Context , secretName , secretNamespace string ) (UserCredentials , error ) {
140
+ func (r * UserReconciler ) importCredentials (ctx context.Context , secretName , secretNamespace string ) (internal. UserCredentials , error ) {
153
141
logger := ctrl .LoggerFrom (ctx )
154
142
logger .Info ("Importing user credentials from provided Secret" , "secretName" , secretName , "secretNamespace" , secretNamespace )
155
143
156
- var credentials UserCredentials
144
+ var credentials internal. UserCredentials
157
145
var credentialsSecret corev1.Secret
158
146
159
147
err := r .Client .Get (ctx , types.NamespacedName {Name : secretName , Namespace : secretNamespace }, & credentialsSecret )
0 commit comments