Skip to content
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.

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

CLDSRV-565 Global default SSE configuration #5684

Merged
merged 4 commits into from
Oct 17, 2024

Conversation

nicolas2bert
Copy link
Contributor

@nicolas2bert nicolas2bert commented Oct 15, 2024

This PR:

  • CLDSRV-565 introduces a new configuration variable, globalEncryptionEnabled, which enables global encryption. When set to true, all newly created buckets will automatically use the default encryption configuration, AES256.

  • CLDSRV-566 fixes issue where repeatedly calling S3.putBucketEncryption could unintentionally remove the isAccountEncryptionEnabled flag.

@bert-e
Copy link
Contributor

bert-e commented Oct 15, 2024

Hello nicolas2bert,

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.

@bert-e
Copy link
Contributor

bert-e commented Oct 15, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-565 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.70.53

  • 8.6.29

  • 8.7.50

  • 8.8.34

Please check the Fix Version/s of CLDSRV-565, or the target
branch of this pull request.

@nicolas2bert
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Oct 15, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@nicolas2bert nicolas2bert force-pushed the improvement/CLDSRV-565/global-sse branch from 8863867 to bd6c899 Compare October 16, 2024 13:02
@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-565/global-sse with contents from improvement/CLDSRV-565/global-sse
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-565/global-sse origin/development/8.6
 $ git merge origin/improvement/CLDSRV-565/global-sse
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-565/global-sse

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2024

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2024

Build failed

The build for commit did not succeed in branch w/8.6/improvement/CLDSRV-565/global-sse.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2024

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2024

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-565 contains:

  • 7.70.53

  • 8.6.29

  • 8.7.50

  • 8.8.34

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.70.54

  • 8.6.29

  • 8.7.50

  • 8.8.34

Please check the Fix Version/s of CLDSRV-565, or the target
branch of this pull request.

The following options are set: approve

@nicolas2bert nicolas2bert force-pushed the improvement/CLDSRV-565/global-sse branch from 1dab997 to 0b29e79 Compare October 17, 2024 07:35
@nicolas2bert
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@nicolas2bert
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@nicolas2bert
Copy link
Contributor Author

@bert-e force_reset

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Partial merge

Apparently, new commits were added to the source branch after I had queued this
Pull Request. As a result, I have merged only part of it into the targetted
development branches:

  • ✔️ development/7.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

I will now work on the following commits:

  • #0b29e7914f2061a3ae44b3cd3480ea53aa9bab97

  • #d9fe1e4ef43a9d5d13d8c083da32ccd8c05b3185

  • #fc972e2839c561bbd70851932cf1a0d327c9f813

Please avoid this situation next time.

As a friendly reminder, you can use the wait command to prevent me from processing your
pull-request while your work is still in progress.

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Conflict

There is a conflict between your branch improvement/CLDSRV-565/global-sse and the
destination branch development/7.70.

Please resolve the conflict on the feature branch (improvement/CLDSRV-565/global-sse).

git fetch && \
git checkout origin/improvement/CLDSRV-565/global-sse && \
git merge origin/development/7.70

Resolve merge conflicts and commit

git push origin HEAD:improvement/CLDSRV-565/global-sse

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-565/global-sse with contents from improvement/CLDSRV-565/global-sse
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-565/global-sse origin/development/8.6
 $ git merge origin/improvement/CLDSRV-565/global-sse
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-565/global-sse

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

Build failed

The build for commit did not succeed in branch w/8.6/improvement/CLDSRV-565/global-sse.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 17, 2024

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

  • ✔️ development/7.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches have NOT changed:

  • development/7.10
  • development/7.4

Please check the status of the associated issue CLDSRV-565.

Goodbye nicolas2bert.

The following options are set: approve

@bert-e bert-e merged commit 9c8bff3 into development/7.70 Oct 17, 2024
11 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-565/global-sse branch October 17, 2024 13:27
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