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

Support extracting the http scheme from the requests #2278

Open
wants to merge 3 commits into
base: development/7.10
Choose a base branch
from

Conversation

williamlardier
Copy link
Contributor

Currently, behind a proxy, we cannot detect the right scheme. Also, we use the request.connection.encrypted variable, that is (1) deprecated and (2) already removed since Node 16, so the whole thing end up being undefined.

We introduce a proper function to detect that the scheme provided by the trusted header is http or https, or we dynamically detect if the socket is a TLS instance, and check if it's secure.

Needed to ensure we can apply the aws:SecureTransport S3 condition

Issue: ARSN-456
@bert-e
Copy link
Contributor

bert-e commented Jan 6, 2025

Hello williamlardier,

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 Jan 6, 2025

Incorrect fix version

The Fix Version/s in issue ARSN-456 contains:

  • None

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

  • 7.10.65

  • 7.70.37

  • 8.1.145

  • 8.2.0

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

@williamlardier
Copy link
Contributor Author

/create_integration_branches

@scality scality deleted a comment from bert-e Jan 6, 2025
@scality scality deleted a comment from bert-e Jan 6, 2025
@bert-e
Copy link
Contributor

bert-e commented Jan 6, 2025

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • 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: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 6, 2025

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

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2025

History mismatch

Merge commit #3756a7008743e4fe59f15d30e32a864b97f75657 on the integration branch
w/7.70/bugfix/ARSN-456 is merging a branch which is neither the current
branch bugfix/ARSN-456 nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/ARSN-456 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

@williamlardier
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2025

Reset complete

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/ARSN-456 with contents from bugfix/ARSN-456
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/bugfix/ARSN-456 origin/development/7.70
 $ git merge origin/bugfix/ARSN-456
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/ARSN-456

The following options are set: create_integration_branches

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