Skip to content

fix: Remove context passed to MinIO's NewSSEKMS #1428

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

Open
lbeckman314 wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

fix: Remove context passed to MinIO's NewSSEKMS #1428

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55585ef
fix: Remove context passed to MinIO's `NewSSEKMS`
lbeckman314 Jun 9, 2026
1711eeb
Merge branch 'develop' into fix/minio-header
lbeckman314 Jun 9, 2026
6f8f17f
Merge branch 'develop' into fix/minio-header
lbeckman314 Jun 10, 2026
e9b28eb
Update generic_s3.go
lbeckman314 Jun 10, 2026
9855ded
Merge branch 'develop' into fix/minio-header
lbeckman314 Jun 10, 2026
af87c00
Merge branch 'develop' into fix/minio-header
lbeckman314 Jun 17, 2026
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
6 changes: 4 additions & 2 deletions storage/generic_s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@ func download(ctx context.Context, client *minio.Client, bucket, objectPath, fil
opts := minio.GetObjectOptions{}
if kmskeyId != "" {
logger.Debug("genericS3: using KMS encryption", "kmsKeyId", kmskeyId)
SSEKMS, err := encrypt.NewSSEKMS(kmskeyId, ctx)
// Updated to avoid passing in erroneous context
// https://github.com/minio/minio-go/issues/2235
SSEKMS, err := encrypt.NewSSEKMS(kmskeyId, nil)
if err != nil {
return fmt.Errorf("genericS3: download(): creating SSEKMS: %v", err)
}
Expand Down Expand Up @@ -264,7 +266,7 @@ func (s3 *GenericS3) Put(ctx context.Context, url, path string) (*Object, error)
opts := minio.PutObjectOptions{}
if s3.kmskeyId != "" {
logger.Debug("genericS3: using KMS encryption for upload", "kmsKeyId", s3.kmskeyId)
SSEKMS, err := encrypt.NewSSEKMS(s3.kmskeyId, ctx)
SSEKMS, err := encrypt.NewSSEKMS(s3.kmskeyId, nil)
if err != nil {
return nil, fmt.Errorf("genericS3: Put(): creating SSEKMS: %v", err)
}
Expand Down
Loading