Skip to content

bugfix: CLDSRV-290 fix PUT /_/backbeat/metadata versioning logic#4844

Merged
bert-e merged 2 commits intodevelopment/7.10from
bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData
Oct 26, 2022
Merged

bugfix: CLDSRV-290 fix PUT /_/backbeat/metadata versioning logic#4844
bert-e merged 2 commits intodevelopment/7.10from
bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData

Conversation

@jonathan-gramain
Copy link
Contributor

  • fix PUT /_/backbeat/metadata versioning logic
    • Fix the logic by always using the provided versionId in the query string as the version to put, instead of relying on the version stored in the metadata. Not passing a versionId now amounts to creating a new version. The previous logic was causing a possible confusion when no versionId was passed in the query string, that allowed valid data locations to be removed as if it was an overwrite.
  • update PUT /_/backbeat/metadata tests
    • modify existing PUT /_/backbeat/metadata tests to always pass the versionId in the query string, as it should be with the updated API contract
    • create a new test that does not pass the versionId in the query string on an update, and expects a new version to be created (and both versions to be readable to ensure no cleanup occurred)
    • general tech debt cleanup: update the test versionId to be in the new base64 format when encoded by removing the extra info, making it exactly 27 characters long

- modify existing `PUT /_/backbeat/metadata` tests to always pass the
  `versionId` in the query string, as it should be with the updated
  API contract

- create a new test that does not pass the `versionId` in the query
  string on an update, and expects a new version to be created (and
  both versions to be readable to ensure no cleanup occurred)

- general tech debt cleanup: update the test `versionId` to be in the
  new base64 format when encoded by removing the extra info, making it
  exactly 27 characters long
Fix the logic by always using the provided `versionId` in the query
string as the version to put, instead of relying on the version stored
in the metadata. Not passing a `versionId` now amounts to creating a
new version.

The previous logic was causing a possible confusion when no
`versionId` was passed in the query string, that allowed valid data
locations to be removed as if it was an overwrite.
@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2022

Hello jonathan-gramain,

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 Oct 25, 2022

Incorrect fix version

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

  • None

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

  • 7.10.18

  • 7.70.9

  • 8.4.15

  • 8.5.17

  • 8.6.1

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

@jonathan-gramain
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.4/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData with contents from w/7.70/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData
and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData origin/development/8.4
 $ git merge origin/w/7.70/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData with contents from w/8.4/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData origin/development/8.5
 $ git merge origin/w/8.4/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 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

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

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2022

Waiting for approval

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

  • the author

  • 2 peers

@jonathan-gramain
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 26, 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/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

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 Oct 26, 2022

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/6.4
  • development/7.4

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

Goodbye jonathan-gramain.

@bert-e bert-e merged commit 7cdb395 into development/7.10 Oct 26, 2022
@bert-e bert-e deleted the bugfix/CLDSRV-290-putMetadataRouteShouldNotRemoveValidData branch October 26, 2022 18:25
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