Skip to content

Fix user policies attaching #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Donatien26 merged 2 commits into from
Sep 12, 2025
Merged

Fix user policies attaching #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb459ac
fix and enhance logging message on policy deletion
graindcafe Sep 9, 2025
1680635
try to delete possible whitespaces so that empty result return an emp…
graindcafe Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/controller/user/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ func (r *S3UserReconciler) handleUpdate(
policyFound := slices.Contains(userResource.Spec.Policies, policy)
if !policyFound {
logger.Info(
fmt.Sprintf("S3User policy definition doesn't contain policy %s", policy),
fmt.Sprintf("S3User has unexpected policy not in definition: %s", policy),
"userResource",
userResource.Name,
"NamespacedName",
Expand All @@ -391,7 +391,7 @@ func (r *S3UserReconciler) handleUpdate(
policyFound := slices.Contains(userPolicies, policy)
if !policyFound {
logger.Info(
fmt.Sprintf("S3User policy definition must contain policy %s", policy),
fmt.Sprintf("S3User is missing policy from definition: %s", policy),
"userResource",
userResource.Name,
"NamespacedName",
Expand Down
7 changes: 4 additions & 3 deletions internal/s3/client/impl/minioS3Client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,11 @@ func (minioS3Client *MinioS3Client) GetUserPolicies(accessKey string) ([]string,

return []string{}, err
}
if len(strings.Split(userInfo.PolicyName, ",")) == 1 && slices.Contains(strings.Split(userInfo.PolicyName, ","), "") {
userPolicies := strings.Split(strings.TrimSpace(userInfo.PolicyName), ",")
if len(userPolicies) == 1 && slices.Contains(userPolicies, "") {
return []string{}, nil
}
return strings.Split(userInfo.PolicyName, ","), nil
return userPolicies, nil
}

func (minioS3Client *MinioS3Client) CheckUserCredentialsValid(
Expand Down Expand Up @@ -539,7 +540,7 @@ func (minioS3Client *MinioS3Client) RemovePoliciesFromUser(
}
s3Logger.Error(
err,
"an error occurred when attaching a policy to the user",
"an error occurred when detaching a policy to the user",
"code",
errAsResp.Code,
)
Expand Down
Loading