Improvement/arsn 363 retention day condition #2191

KazToozs · 2023-12-08T16:03:25Z

In conjunction with CLDSRV-436 this PR adds bucket policy condition handling for IP limiting and Object lock retention day limiting.

bert-e · 2023-12-08T16:03:29Z

Hello kaztoozs,

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-12-08T16:03:35Z

Incorrect fix version

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

7.70.13

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

7.10.51
7.70.15
8.1.116

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

bert-e · 2023-12-13T16:43:05Z

Incorrect fix version

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

7.10.50
7.70.13

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

7.10.51
7.70.15
8.1.116

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

bert-e · 2023-12-13T16:47:19Z

Incorrect fix version

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

7.10.51
7.70.14
8.1.116

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

7.10.51
7.70.15
8.1.116

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

bert-e · 2023-12-14T13:15:00Z

Incorrect fix version

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

7.10.52
7.70.14
8.1.117

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

7.10.52
7.70.16
8.1.117

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

benzekrimaha

LGTM

anurag4DSB

LGTM, worth updating package.json
Feel free to message me once you have it, I will review that as well.

anurag4DSB · 2023-12-15T10:26:08Z

ping

bert-e · 2023-12-15T10:28:03Z

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.

anurag4DSB · 2023-12-15T10:28:32Z

/create_integration_branches

bert-e · 2023-12-15T10:28:41Z

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/improvement/ARSN-363-retention-day-condition with contents from improvement/ARSN-363-retention-day-condition
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/improvement/ARSN-363-retention-day-condition origin/development/7.70
 $ git merge origin/improvement/ARSN-363-retention-day-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/improvement/ARSN-363-retention-day-condition

The following options are set: create_integration_branches

KazToozs · 2023-12-15T10:34:28Z

ping

bert-e · 2023-12-15T10:34:39Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/improvement/ARSN-363-retention-day-condition with contents from w/7.70/improvement/ARSN-363-retention-day-condition
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/improvement/ARSN-363-retention-day-condition origin/development/8.1
 $ git merge origin/w/7.70/improvement/ARSN-363-retention-day-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-363-retention-day-condition

The following options are set: create_integration_branches

KazToozs · 2023-12-15T11:58:38Z

ping

bert-e · 2023-12-15T11:58:47Z

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

KazToozs · 2023-12-15T12:20:41Z

/create_pull_requests

bert-e · 2023-12-15T12:20:54Z

Integration data created

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

this pull request will merge improvement/ARSN-363-retention-day-condition into
development/7.10
w/7.70/improvement/ARSN-363-retention-day-condition will be merged into development/7.70 (pull request INTEGRATION [PR#2191 > development/7.70] Improvement/arsn 363 retention day condition #2196)
w/8.1/improvement/ARSN-363-retention-day-condition will be merged into development/8.1 (pull request INTEGRATION [PR#2191 > development/8.1] Improvement/arsn 363 retention day condition #2197)

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.

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2023-12-15T12:20:55Z

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_pull_requests, create_integration_branches

lib/models/ObjectLockConfiguration.ts

nicolas2bert · 2023-12-21T13:19:48Z

lib/models/ObjectLockConfiguration.ts

+
+                return days;
+            }
+            this._days = validTime.timeType === 'years' ? getDaysForYears(validTime.timeValue) : validTime.timeValue;


Can it be tested?

nicolas2bert · 2023-12-21T13:24:45Z

lib/models/ObjectLockConfiguration.ts

@@ -36,6 +36,7 @@ export type ParsedRetention =
 export default class ObjectLockConfiguration {
    _parsedXml: any;
    _config: Config;
+    _days: number | null;


how/where _days is being used?

This was initially added for cases where the object lock configuration retention length would need to be checked, such as the intended epic objective:

Update putBucketObjectLockConfig to check for the bucket policy and prevent setting retention period outside of the allowed limit of bucket policy

This proved to not be AWS standard, and as such this addition is indeed not used anywhere. I have removed the changes to this file, and updated the CS PR. It is passing, both in CI and hand testing.
Good catch!

bert-e · 2023-12-21T16:25:40Z

History mismatch

Merge commit #9ec66b779b811f624408cb4487516554a8179979 on the integration branch
w/7.70/improvement/ARSN-363-retention-day-condition is merging a branch which is neither the current
branch improvement/ARSN-363-retention-day-condition nor the development branch
development/7.70.

It is likely due to a rebase of the branch improvement/ARSN-363-retention-day-condition 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_pull_requests, create_integration_branches

KazToozs · 2023-12-26T10:31:11Z

/reset

bert-e · 2023-12-26T10:31:21Z

Reset complete

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

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2023-12-26T10:31:29Z

Incorrect fix version

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

7.10.53
7.70.17
8.1.118

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

7.10.53
7.70.18
8.1.118

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

The following options are set: create_pull_requests, create_integration_branches

KazToozs · 2023-12-26T10:38:50Z

ping

bert-e · 2023-12-26T10:38:59Z

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/improvement/ARSN-363-retention-day-condition with contents from improvement/ARSN-363-retention-day-condition
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/improvement/ARSN-363-retention-day-condition origin/development/7.70
 $ git merge origin/improvement/ARSN-363-retention-day-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/improvement/ARSN-363-retention-day-condition

The following options are set: create_pull_requests, create_integration_branches

KazToozs · 2023-12-26T10:48:15Z

ping

bert-e · 2023-12-26T10:48:26Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/improvement/ARSN-363-retention-day-condition with contents from w/7.70/improvement/ARSN-363-retention-day-condition
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/improvement/ARSN-363-retention-day-condition origin/development/8.1
 $ git merge origin/w/7.70/improvement/ARSN-363-retention-day-condition
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-363-retention-day-condition

The following options are set: create_pull_requests, create_integration_branches

KazToozs · 2023-12-26T10:49:45Z

ping

bert-e · 2023-12-26T10:49:57Z

Integration data created

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

this pull request will merge improvement/ARSN-363-retention-day-condition into
development/7.10
w/7.70/improvement/ARSN-363-retention-day-condition will be merged into development/7.70 (pull request INTEGRATION [PR#2191 > development/7.70] Improvement/arsn 363 retention day condition #2200)
w/8.1/improvement/ARSN-363-retention-day-condition will be merged into development/8.1 (pull request INTEGRATION [PR#2191 > development/8.1] Improvement/arsn 363 retention day condition #2201)

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.

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2023-12-26T10:49:59Z

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_pull_requests, create_integration_branches

KazToozs · 2023-12-26T10:54:35Z

/approve

bert-e · 2023-12-26T10:56:01Z

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_pull_requests, create_integration_branches

KazToozs · 2023-12-26T10:56:05Z

ping

bert-e · 2023-12-26T11:02:36Z

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

Goodbye kaztoozs.

KazToozs marked this pull request as ready for review December 13, 2023 16:42

KazToozs requested a review from anurag4DSB December 13, 2023 16:47

anurag4DSB requested a review from tmacro December 14, 2023 13:14

benzekrimaha approved these changes Dec 15, 2023

View reviewed changes

anurag4DSB approved these changes Dec 15, 2023

View reviewed changes

KazToozs force-pushed the improvement/ARSN-363-retention-day-condition branch 2 times, most recently from c4c9b0d to fac2d1d Compare December 15, 2023 10:23

This was referenced Dec 15, 2023

INTEGRATION [PR#2191 > development/7.70] Improvement/arsn 363 retention day condition #2196

Closed

INTEGRATION [PR#2191 > development/8.1] Improvement/arsn 363 retention day condition #2197

Closed

jonathan-gramain reviewed Dec 21, 2023

View reviewed changes

lib/models/ObjectLockConfiguration.ts Outdated Show resolved Hide resolved

nicolas2bert reviewed Dec 21, 2023

View reviewed changes

Will Toozs added 2 commits December 21, 2023 17:24

ARSN-363: add object retention days logic to structures

5a84a8c

ARSN-363: update test

97118f0

ARSN-363: update package version

62736ab

KazToozs force-pushed the improvement/ARSN-363-retention-day-condition branch from feb89ea to 62736ab Compare December 21, 2023 16:25

KazToozs requested review from jonathan-gramain and nicolas2bert December 21, 2023 17:10

jonathan-gramain approved these changes Dec 21, 2023

View reviewed changes

bert-e mentioned this pull request Dec 26, 2023

INTEGRATION [PR#2191 > development/7.70] Improvement/arsn 363 retention day condition #2200

Merged

bert-e mentioned this pull request Dec 26, 2023

INTEGRATION [PR#2191 > development/8.1] Improvement/arsn 363 retention day condition #2201

Merged

bert-e merged commit 45cc4aa into development/7.10 Dec 26, 2023
5 checks passed

bert-e deleted the improvement/ARSN-363-retention-day-condition branch December 26, 2023 11:02

Improvement/arsn 363 retention day condition #2191

Improvement/arsn 363 retention day condition #2191

Conversation

KazToozs commented Dec 8, 2023 • edited by jira bot Loading

bert-e commented Dec 8, 2023

Hello kaztoozs,

bert-e commented Dec 8, 2023

Incorrect fix version

bert-e commented Dec 13, 2023

Incorrect fix version

bert-e commented Dec 13, 2023

Incorrect fix version

bert-e commented Dec 14, 2023

Incorrect fix version

benzekrimaha left a comment

Choose a reason for hiding this comment

anurag4DSB left a comment

Choose a reason for hiding this comment

anurag4DSB commented Dec 15, 2023

bert-e commented Dec 15, 2023

Request integration branches

anurag4DSB commented Dec 15, 2023

bert-e commented Dec 15, 2023

Conflict

KazToozs commented Dec 15, 2023

bert-e commented Dec 15, 2023

Conflict

KazToozs commented Dec 15, 2023

bert-e commented Dec 15, 2023

Waiting for approval

KazToozs commented Dec 15, 2023

bert-e commented Dec 15, 2023

Integration data created

bert-e commented Dec 15, 2023

Waiting for approval

nicolas2bert Dec 21, 2023

Choose a reason for hiding this comment

KazToozs Dec 22, 2023

Choose a reason for hiding this comment

nicolas2bert Dec 21, 2023

Choose a reason for hiding this comment

KazToozs Dec 21, 2023 • edited Loading

Choose a reason for hiding this comment

bert-e commented Dec 21, 2023

History mismatch

KazToozs commented Dec 26, 2023

bert-e commented Dec 26, 2023

Reset complete

bert-e commented Dec 26, 2023

Incorrect fix version

KazToozs commented Dec 26, 2023

bert-e commented Dec 26, 2023

Conflict

KazToozs commented Dec 26, 2023

bert-e commented Dec 26, 2023

Conflict

KazToozs commented Dec 26, 2023

bert-e commented Dec 26, 2023

Integration data created

bert-e commented Dec 26, 2023

Waiting for approval

KazToozs commented Dec 26, 2023

bert-e commented Dec 26, 2023

In the queue

KazToozs commented Dec 26, 2023

bert-e commented Dec 26, 2023

KazToozs commented Dec 8, 2023 •

edited by jira bot

Loading

KazToozs Dec 21, 2023 •

edited

Loading