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

ARSN-184 type check s3routes #1878

Merged
merged 19 commits into from
May 25, 2022

Conversation

ghivert
Copy link
Contributor

@ghivert ghivert commented May 6, 2022

No description provided.

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Hello ghivert,

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Branches have diverged

This pull request's source branch feature/ARSN-184-type-check-s3routes has diverged from
development/8.1 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/8.1 into feature/ARSN-184-type-check-s3routes
  • Rebase feature/ARSN-184-type-check-s3routes onto origin/development/8.1

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@ghivert ghivert changed the base branch from development/8.1 to development/7.10 May 6, 2022 12:48
@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/feature/ARSN-184-type-check-s3routes with contents from feature/ARSN-184-type-check-s3routes
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/feature/ARSN-184-type-check-s3routes origin/development/8.1
 $ git merge origin/feature/ARSN-184-type-check-s3routes
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/feature/ARSN-184-type-check-s3routes

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

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

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Waiting for approval

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

  • the author

  • 2 peers

Copy link
Contributor

@nicolas2bert nicolas2bert left a comment

Choose a reason for hiding this comment

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

Looking good :)

log.end().addDefaultFields({
contentLength: request.parsedContentLength,
});
// TODO What's happening?
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the issue here? Do we have a ticket number related to this that we can add to the comments?

Choose a reason for hiding this comment

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

Perhaps we can blanket-add ARSN-174 references to these TODOs. These all to track the second pass required to understand the business logic to type these accurately.

const parsedUrl = url.parse(request.url!, true);
// @ts-expect-error
request.query = parsedUrl.query;
// TODO: make the namespace come from a config variable.
Copy link
Contributor

Choose a reason for hiding this comment

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

It is a good practice to have TODO attached with a JIRA ticket number to track todos :)

Choose a reason for hiding this comment

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

This one comes from existing code 😬

@bert-e
Copy link
Contributor

bert-e commented May 24, 2022

Conflict

There is a conflict between your branch feature/ARSN-184-type-check-s3routes and the
destination branch development/7.10.

Please resolve the conflict on the feature branch (feature/ARSN-184-type-check-s3routes).

git fetch && \
git checkout origin/feature/ARSN-184-type-check-s3routes && \
git merge origin/development/7.10

Resolve merge conflicts and commit

git push origin HEAD:feature/ARSN-184-type-check-s3routes

@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

Conflict

A conflict has been raised during the update of
integration branch w/8.1/feature/ARSN-184-type-check-s3routes with contents from feature/ARSN-184-type-check-s3routes
and development/8.1.

Please resolve the conflict on the integration branch (w/8.1/feature/ARSN-184-type-check-s3routes).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.1/feature/ARSN-184-type-check-s3routes
 $ git pull  # or "git reset --hard origin/w/8.1/feature/ARSN-184-type-check-s3routes"
 $ git merge origin/development/8.1
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/feature/ARSN-184-type-check-s3routes
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/feature/ARSN-184-type-check-s3routes

@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

Waiting for approval

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

  • the author

  • 2 peers

@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

Conflict

A conflict has been raised during the update of
integration branch w/8.1/feature/ARSN-184-type-check-s3routes with contents from feature/ARSN-184-type-check-s3routes
and development/8.1.

Please resolve the conflict on the integration branch (w/8.1/feature/ARSN-184-type-check-s3routes).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.1/feature/ARSN-184-type-check-s3routes
 $ git pull  # or "git reset --hard origin/w/8.1/feature/ARSN-184-type-check-s3routes"
 $ git merge origin/development/8.1
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/feature/ARSN-184-type-check-s3routes
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/feature/ARSN-184-type-check-s3routes

@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

Waiting for approval

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

  • the author

  • 2 peers

@scality scality deleted a comment from bert-e May 25, 2022
@scality scality deleted a comment from bert-e May 25, 2022
@ghivert
Copy link
Contributor Author

ghivert commented May 25, 2022

/approve

@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

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.10

  • ✔️ development/8.1

The following branches will NOT be impacted:

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

@bert-e
Copy link
Contributor

bert-e commented May 25, 2022

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

  • ✔️ development/7.10

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • development/7.4

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

Goodbye ghivert.

@bert-e bert-e merged commit 571128e into development/7.10 May 25, 2022
@bert-e bert-e deleted the feature/ARSN-184-type-check-s3routes branch May 25, 2022 10:06
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