Skip to content

add tests for server side encryption, file backend encryption only#2369

Open
SylvainSenechal wants to merge 1 commit intodevelopment/2.14from
improvement/ZENKO-5239
Open

add tests for server side encryption, file backend encryption only#2369
SylvainSenechal wants to merge 1 commit intodevelopment/2.14from
improvement/ZENKO-5239

Conversation

@SylvainSenechal
Copy link
Copy Markdown
Contributor

@SylvainSenechal SylvainSenechal commented Mar 30, 2026

Issue: ZENKO-5239

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 30, 2026

Hello sylvainsenechal,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Mar 30, 2026
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 30, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@SylvainSenechal SylvainSenechal force-pushed the improvement/ZENKO-5239 branch from ac52225 to 7914467 Compare March 31, 2026 09:58
And bucket encryption is set to "<bucketAlgo>" with key "<bucketKeyId>"
Then the bucket encryption is verified for algorithm "<bucketAlgo>" and key "<bucketKeyId>"
When an object "<objectName>" is uploaded with SSE algorithm "<objectAlgo>" and key "<objectKeyId>"
# TODO: uncomment when CloudServer returns SSE headers in PutObject response https://github.com/scality/cloudserver/pull/6122
Copy link
Copy Markdown
Contributor Author

@SylvainSenechal SylvainSenechal Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have other pr coming later, I can wait now, or uncomment later in another pr, because we need to wait for a cloudserver release

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this PR before before cloudserver PR, or does it need to be updated?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the cloudserver pr is merged, but cloudserver is not bumped yet, we need a new version of cloudserver

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cloudserver is released, no need to comment this anymore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then you need to rebase on top of https://github.com/scality/Zenko/tree/refs/heads/w/2.14/improvement/ZENKO-5242, otherwise you don't have the bump yet...

@PreMerge
@ServerSideEncryption
@ServerSideEncryptionFileBackend
Scenario Outline: PutObject with invalid SSE parameters returns an error: <objectName>
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These last 3 scenarios are maybe not so relevant for functional tests, test in cloudserver would probably be enough but I guess its fine

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double check we have the tests in Cloudserver, though?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

half of them are covered, so yeah it's very moderately useful

Copy link
Copy Markdown
Contributor

@francoisferrand francoisferrand Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so half are not covered : can you create a ticket in cloudserver?

import Zenko from 'world/Zenko';
import assert from 'assert';

// We use the AWS SDK directly instead of cli-testing for PutObject and GetObject
Copy link
Copy Markdown
Contributor Author

@SylvainSenechal SylvainSenechal Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is more annoying than I thought, even later if we wanna parallelize coldStorage test, one of the test is using getObject..

@SylvainSenechal SylvainSenechal marked this pull request as ready for review March 31, 2026 10:09
@SylvainSenechal SylvainSenechal requested review from a team, delthas and francoisferrand March 31, 2026 10:09
And bucket encryption is set to "<bucketAlgo>" with key "<bucketKeyId>"
Then the bucket encryption is verified for algorithm "<bucketAlgo>" and key "<bucketKeyId>"
When an object "<objectName>" is uploaded with SSE algorithm "<objectAlgo>" and key "<objectKeyId>"
# TODO: uncomment when CloudServer returns SSE headers in PutObject response https://github.com/scality/cloudserver/pull/6122
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this PR before before cloudserver PR, or does it need to be updated?

@PreMerge
@ServerSideEncryption
@ServerSideEncryptionFileBackend
Scenario Outline: PutObject with invalid SSE parameters returns an error: <objectName>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double check we have the tests in Cloudserver, though?

Comment on lines +151 to +165
// TODO: uncomment when merged and released : https://github.com/scality/cloudserver/pull/6122
// => CloudServer will return SSE headers in PutObject response
// if (expectedAlgo) {
// assert.strictEqual(result.serverSideEncryption, expectedAlgo,
// `PutObject SSE: expected "${expectedAlgo}", got "${result.serverSideEncryption}"`);
// } else {
// assert.strictEqual(result.serverSideEncryption, undefined,
// `PutObject SSE: expected absent, got "${result.serverSideEncryption}"`);
// }
// if (expectedKey === 'present') {
// assert.ok(result.sseKmsKeyId, 'PutObject: SSEKMSKeyId should be present');
// } else {
// assert.strictEqual(result.sseKmsKeyId, undefined,
// `PutObject: SSEKMSKeyId should be absent, got "${result.sseKmsKeyId}"`);
// }
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opening a review thread so we remember to uncomment before merging.

@francoisferrand
Copy link
Copy Markdown
Contributor

/after_pull_request=2370

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 3, 2026

Waiting for other pull request(s)

The current pull request is locked by the after_pull_request option.

In order for me to merge this pull request, run the following actions first:

➡️ Merge the OPEN pull request:

Alternatively, delete all the after_pull_request comments from this pull request.

The following options are set: after_pull_request

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants