Skip to content

ARSN-503: Return the kms error without warning - #2432

Merged
bert-e merged 4 commits into
development/7.70from
improvement/ARSN-503-kms-err
Jun 24, 2025
Merged

ARSN-503: Return the kms error without warning#2432
bert-e merged 4 commits into
development/7.70from
improvement/ARSN-503-kms-err

Conversation

@BourgoisMickael

@BourgoisMickael BourgoisMickael commented Jun 23, 2025

Copy link
Copy Markdown
Contributor

objectCopy and objectPutCopyPart use these functions from dataWrapper and they both catch the error to return it to the client

The KMS implementation should take care of hidding sensitive internal information

Rework error message for AWS KMS to match the output from AWS and hide some non KMS related message such as Network errors to prevent leaking sensitive information like hostnames, ip, ..

objectCopy and objectPutCopyPart use these functions
and they both catch the error to return it to the client

The KMS implementation should take care of hidding
sensitive internal information
@bert-e

bert-e commented Jun 23, 2025

Copy link
Copy Markdown
Contributor

Hello bourgoismickael,

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 Jun 23, 2025
@bert-e

This comment was marked as resolved.

@BourgoisMickael
BourgoisMickael requested a review from Copilot June 23, 2025 23:03

This comment was marked as outdated.

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e

bert-e commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/improvement/ARSN-503-kms-err with contents from improvement/ARSN-503-kms-err
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/ARSN-503-kms-err origin/development/8.1
 $ git merge origin/improvement/ARSN-503-kms-err
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-503-kms-err

The following options are set: create_integration_branches

@bert-e

bert-e commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/improvement/ARSN-503-kms-err with contents from w/8.1/improvement/ARSN-503-kms-err
and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/improvement/ARSN-503-kms-err origin/development/8.2
 $ git merge origin/w/8.1/improvement/ARSN-503-kms-err
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/improvement/ARSN-503-kms-err

The following options are set: create_integration_branches

@bert-e

bert-e commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

Comment thread lib/network/utils.ts Outdated

@anurag4DSB anurag4DSB left a comment

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.

I am approving the PR, your call on my comment

@BourgoisMickael
BourgoisMickael force-pushed the improvement/ARSN-503-kms-err branch from 1be2bbb to fed2726 Compare June 24, 2025 22:46
@bert-e

This comment was marked as outdated.

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

/approve

@BourgoisMickael
BourgoisMickael force-pushed the improvement/ARSN-503-kms-err branch from fed2726 to 418249b Compare June 24, 2025 22:58
Always return aws error code as is prefixed with KMS

For some error return the same error code and message
For others hide potentially sensitive message
@BourgoisMickael
BourgoisMickael force-pushed the improvement/ARSN-503-kms-err branch from 418249b to bf27689 Compare June 24, 2025 23:12
@scality scality deleted a comment from bert-e Jun 24, 2025
@scality scality deleted a comment from bert-e Jun 24, 2025
@scality scality deleted a comment from bert-e Jun 24, 2025
@scality scality deleted a comment from bert-e Jun 24, 2025
@bert-e

bert-e commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.70

  • ✔️ development/8.1

  • ✔️ development/8.2

The following branches have NOT changed:

  • development/6.4
  • development/7.10
  • development/7.4

Please check the status of the associated issue ARSN-503.

Goodbye bourgoismickael.

The following options are set: approve, create_integration_branches

@bert-e
bert-e merged commit bf27689 into development/7.70 Jun 24, 2025
5 checks passed
@bert-e
bert-e deleted the improvement/ARSN-503-kms-err branch June 24, 2025 23:22
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.

5 participants