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

Bugfix/arsn 385/fully align with aws on lifecycle configuration dates #2208

Conversation

fredmnl
Copy link
Contributor

@fredmnl fredmnl commented Jan 11, 2024

Best reviewed as two commits.

One change is about the parsing of dates for lifecycle configurations, we wanted to align closely to AWS.
The other change is what was needed to make the tests works in cloudserver, both against cloudserver and against AWS.

@bert-e
Copy link
Contributor

bert-e commented Jan 11, 2024

Hello fredmnl,

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 Jan 11, 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.

lib/auth/auth.ts Outdated Show resolved Hide resolved
lib/auth/auth.ts Outdated Show resolved Hide resolved
lib/auth/auth.ts Outdated Show resolved Hide resolved
lib/auth/auth.ts Outdated Show resolved Hide resolved
lib/models/LifecycleConfiguration.ts Outdated Show resolved Hide resolved
lib/models/LifecycleConfiguration.ts Outdated Show resolved Hide resolved
lib/models/LifecycleConfiguration.ts Outdated Show resolved Hide resolved
@fredmnl fredmnl force-pushed the bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates branch from 40f57fc to 6057399 Compare January 12, 2024 17:46
@fredmnl
Copy link
Contributor Author

fredmnl commented Jan 12, 2024

Reviewers, as I commented during the retro, I'm removing the signed headers stuff from this PR so it only tackles the lifecycle config date part of it. I'll pick up that work in a subsequent PR.
Hence the PR got even simpler.

@fredmnl
Copy link
Contributor Author

fredmnl commented Jan 16, 2024

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 16, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates with contents from bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
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-385/fully-align-with-aws-on-lifecycle-configuration-dates origin/development/7.70
 $ git merge origin/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 16, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates with contents from w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
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/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates origin/development/8.1
 $ git merge origin/w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 16, 2024

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

@fredmnl
Copy link
Contributor Author

fredmnl commented Jan 16, 2024

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 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.10

  • ✔️ development/7.70

  • ✔️ 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, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 16, 2024

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • development/7.4

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

Goodbye fredmnl.

@bert-e bert-e merged commit 4da5976 into development/7.10 Jan 16, 2024
7 checks passed
@bert-e bert-e deleted the bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates branch January 16, 2024 17:09
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