CLDSRV-462 Expiration header is not compatible with legacy object md #5396

nicolas2bert · 2023-10-25T12:03:33Z

Before the Object Metadata refactor done around May 31, 2017 (c22e44f), if no tags were set, the object tag was stored as undefined.

After the commit, if no tags are set, the object tag is stored as an empty object '{}'.

When the expiration response headers were implemented on 812b09a around Nov 22, 2021, the empty object was handled, but not the undefined tag logic, which made the expiration response headers not backward compatible.

We need to address both cases: the undefined property and the empty object '{}'.

bert-e · 2023-10-25T12:03:37Z

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.

Status report is not available.

bert-e · 2023-10-25T12:37:34Z

Incorrect fix version

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

None

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

7.10.32
7.70.29
8.6.12
8.7.31
8.8.5

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

nicolas2bert · 2023-10-25T12:38:42Z

ping

bert-e · 2023-10-25T12:38:50Z

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 · 2023-10-25T12:40:46Z

/create_integration_branches

bert-e · 2023-10-25T12:40:58Z

Integration data created

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

this pull request will merge bugfix/CLDSRV-462/tags into
development/7.10
w/7.70/bugfix/CLDSRV-462/tags will be merged into development/7.70
w/8.6/bugfix/CLDSRV-462/tags will be merged into development/8.6
w/8.7/bugfix/CLDSRV-462/tags will be merged into development/8.7
w/8.8/bugfix/CLDSRV-462/tags will be merged into development/8.8

The following branches will NOT be impacted:

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 · 2023-10-25T12:41:01Z

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 · 2023-10-25T12:42:33Z

History mismatch

Merge commit #4d3ceaabcff1578bbf1556da45909ce912bc17d5 on the integration branch
w/7.70/bugfix/CLDSRV-462/tags is merging a branch which is neither the current
branch bugfix/CLDSRV-462/tags nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-462/tags 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

nicolas2bert · 2023-10-25T12:44:59Z

@bert-e reset

bert-e · 2023-10-25T12:45:11Z

Reset complete

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

The following options are set: create_integration_branches

bert-e · 2023-10-25T12:45:21Z

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/CLDSRV-462/tags with contents from bugfix/CLDSRV-462/tags
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/CLDSRV-462/tags origin/development/7.70
 $ git merge origin/bugfix/CLDSRV-462/tags
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-462/tags

The following options are set: create_integration_branches

bert-e · 2023-10-25T13:12:23Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-462/tags with contents from w/7.70/bugfix/CLDSRV-462/tags
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/bugfix/CLDSRV-462/tags origin/development/8.6
 $ git merge origin/w/7.70/bugfix/CLDSRV-462/tags
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-462/tags

The following options are set: create_integration_branches

benzekrimaha

LGTM

bert-e · 2023-10-25T14:58:18Z

Integration data created

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

this pull request will merge bugfix/CLDSRV-462/tags into
development/7.10
w/7.70/bugfix/CLDSRV-462/tags will be merged into development/7.70
w/8.6/bugfix/CLDSRV-462/tags will be merged into development/8.6
w/8.7/bugfix/CLDSRV-462/tags will be merged into development/8.7
w/8.8/bugfix/CLDSRV-462/tags will be merged into development/8.8

The following branches will NOT be impacted:

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 · 2023-10-25T14:58:19Z

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

jonathan-gramain · 2023-10-25T17:18:46Z

lib/api/apiUtils/object/expirationHeaders.js

+            ? Object.keys(params.tags)
+                .map(key => ({ Key: key, Value: params.tags[key] }))


Small enhancement suggestion, not related to this PR's change (feel free to ignore):

Suggested change

? Object.keys(params.tags)

.map(key => ({ Key: key, Value: params.tags[key] }))

? Object.entries(params.tags)

.map(([key, value]) => ({ Key: key, Value: value }))

jonathan-gramain · 2023-10-25T17:20:25Z

package.json

@@ -1,6 +1,6 @@
 {
  "name": "s3",
-  "version": "7.10.31",
+  "version": "7.10.32",


Can you do a separate commit for the version bump? It helps when it comes to backporting things (as well as keeping track of version changes more easily).

Done, I agree. I usually split it.

Before the Object Metadata refactor done around May 31, 2017 (c22e44f), if no tags were set, the object tag was stored as undefined. After the commit, if no tags are set, the object tag is stored as an empty object '{}'. When the expiration response headers were implemented on 812b09a around Nov 22, 2021, the empty object was handled, but not the undefined tag logic, which made the expiration response headers not backward compatible. We need to address both cases: the undefined property and the empty object '{}'.

bert-e · 2023-10-25T18:00:22Z

History mismatch

Merge commit #4d91687ca5a7cfce6c29fee510eb6d5c0dbc70b4 on the integration branch
w/7.70/bugfix/CLDSRV-462/tags is merging a branch which is neither the current
branch bugfix/CLDSRV-462/tags nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-462/tags 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

bert-e · 2023-10-25T18:02:12Z

History mismatch

Merge commit #4d91687ca5a7cfce6c29fee510eb6d5c0dbc70b4 on the integration branch
w/7.70/bugfix/CLDSRV-462/tags is merging a branch which is neither the current
branch bugfix/CLDSRV-462/tags nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-462/tags 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: approve, create_integration_branches

nicolas2bert · 2023-10-25T18:02:16Z

@bert-e reset

bert-e · 2023-10-25T18:02:20Z

History mismatch

Merge commit #4d91687ca5a7cfce6c29fee510eb6d5c0dbc70b4 on the integration branch
w/7.70/bugfix/CLDSRV-462/tags is merging a branch which is neither the current
branch bugfix/CLDSRV-462/tags nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-462/tags 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

nicolas2bert · 2023-10-25T18:03:26Z

@bert-e reset

bert-e · 2023-10-25T18:03:39Z

Reset complete

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

The following options are set: create_integration_branches

bert-e · 2023-10-25T18:03:49Z

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/CLDSRV-462/tags with contents from bugfix/CLDSRV-462/tags
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/CLDSRV-462/tags origin/development/7.70
 $ git merge origin/bugfix/CLDSRV-462/tags
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-462/tags

The following options are set: create_integration_branches

bert-e · 2023-10-25T18:35:44Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-462/tags with contents from w/7.70/bugfix/CLDSRV-462/tags
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/bugfix/CLDSRV-462/tags origin/development/8.6
 $ git merge origin/w/7.70/bugfix/CLDSRV-462/tags
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-462/tags

The following options are set: create_integration_branches

bert-e · 2023-10-25T18:44:19Z

Integration data created

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

this pull request will merge bugfix/CLDSRV-462/tags into
development/7.10
w/7.70/bugfix/CLDSRV-462/tags will be merged into development/7.70
w/8.6/bugfix/CLDSRV-462/tags will be merged into development/8.6
w/8.7/bugfix/CLDSRV-462/tags will be merged into development/8.7
w/8.8/bugfix/CLDSRV-462/tags will be merged into development/8.8

The following branches will NOT be impacted:

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 · 2023-10-25T18:44:20Z

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

nicolas2bert · 2023-10-26T08:02:46Z

@bert-e approve

bert-e · 2023-10-26T08:03:02Z

Build failed

The build for commit did not succeed in branch w/8.7/bugfix/CLDSRV-462/tags.

The following options are set: approve, create_integration_branches

bert-e · 2023-10-26T08:18:06Z

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.6
✔️ development/8.7
✔️ development/8.8

The following branches will NOT be impacted:

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 · 2023-10-26T08:18:22Z

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

✔️ development/7.10
✔️ development/7.70
✔️ development/8.6
✔️ development/8.7
✔️ development/8.8

The following branches have NOT changed:

development/7.4

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

Goodbye nicolas2bert.

nicolas2bert changed the base branch from development/8.7 to development/7.10 October 25, 2023 12:37

scality deleted a comment from bert-e Oct 25, 2023

nicolas2bert force-pushed the bugfix/CLDSRV-462/tags branch from 4d3ceaa to 4d91687 Compare October 25, 2023 12:42

benzekrimaha approved these changes Oct 25, 2023

View reviewed changes

jonathan-gramain reviewed Oct 25, 2023

View reviewed changes

nicolas2bert added 2 commits October 25, 2023 19:59

CLDSRV-462 bump project version

4431505

nicolas2bert force-pushed the bugfix/CLDSRV-462/tags branch from 4d91687 to 4431505 Compare October 25, 2023 18:00

jonathan-gramain approved these changes Oct 25, 2023

View reviewed changes

bert-e merged commit 4431505 into development/7.10 Oct 26, 2023
10 checks passed

bert-e deleted the bugfix/CLDSRV-462/tags branch October 26, 2023 08:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CLDSRV-462 Expiration header is not compatible with legacy object md #5396

CLDSRV-462 Expiration header is not compatible with legacy object md #5396

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

benzekrimaha left a comment

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

jonathan-gramain Oct 25, 2023

jonathan-gramain Oct 25, 2023

nicolas2bert Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 26, 2023

bert-e commented Oct 26, 2023

bert-e commented Oct 26, 2023

bert-e commented Oct 26, 2023

		? Object.keys(params.tags)
		.map(key => ({ Key: key, Value: params.tags[key] }))

CLDSRV-462 Expiration header is not compatible with legacy object md #5396

CLDSRV-462 Expiration header is not compatible with legacy object md #5396

Conversation

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Hello nicolas2bert,

bert-e commented Oct 25, 2023

Incorrect fix version

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Request integration branches

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Integration data created

bert-e commented Oct 25, 2023

Waiting for approval

bert-e commented Oct 25, 2023

History mismatch

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Reset complete

bert-e commented Oct 25, 2023

Conflict

bert-e commented Oct 25, 2023

Conflict

benzekrimaha left a comment

Choose a reason for hiding this comment

bert-e commented Oct 25, 2023

Integration data created

bert-e commented Oct 25, 2023

Waiting for approval

jonathan-gramain Oct 25, 2023

Choose a reason for hiding this comment

jonathan-gramain Oct 25, 2023

Choose a reason for hiding this comment

nicolas2bert Oct 25, 2023

Choose a reason for hiding this comment

bert-e commented Oct 25, 2023

History mismatch

bert-e commented Oct 25, 2023

History mismatch

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

History mismatch

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Reset complete

bert-e commented Oct 25, 2023

Conflict

bert-e commented Oct 25, 2023

Conflict

bert-e commented Oct 25, 2023

Integration data created

bert-e commented Oct 25, 2023

Waiting for approval

nicolas2bert commented Oct 26, 2023

bert-e commented Oct 26, 2023

Build failed

bert-e commented Oct 26, 2023

In the queue

bert-e commented Oct 26, 2023