CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5353

benzekrimaha · 2023-09-25T13:22:35Z

Description

Motivation and context

In this PR :

New unit tests were added to test the support of the Id definition
The principal item user arn length issue is solved to match with vault's

Tickets Links : https://scality.atlassian.net/browse/CLDSRV-447
https://scality.atlassian.net/browse/CLDSRV-444

Checklist

Add tests to cover the changes

New tests added

bert-e · 2023-09-25T13:22:37Z

Hello benzekrimaha,

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-09-25T13:22:45Z

Conflict

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

benzekrimaha · 2023-09-25T13:25:22Z

ping

KazToozs

LGTM otherwise

tests/functional/aws-node-sdk/test/bucket/putBucketPolicy.js

williamlardier

LGTM, just a small comment on an additional unit test

tests/functional/aws-node-sdk/test/bucket/putBucketPolicy.js

fixes after reviews

benzekrimaha · 2023-09-27T08:04:25Z

pring

bert-e · 2023-09-27T08:04:37Z

History mismatch

Merge commit #00c4fb3bc36e52d2b7e30ab71dac5fe6ff6f530d on the integration branch
w/7.70/bugfix/CLDSRV-444-id-resource-policy is merging a branch which is neither the current
branch bugfix/CLDSRV-444-id-resource-policy nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-444-id-resource-policy 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.

benzekrimaha · 2023-09-27T08:05:12Z

/reset

bert-e · 2023-09-27T08:05:21Z

Reset complete

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

bert-e · 2023-09-27T08:05:31Z

Conflict

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

benzekrimaha · 2023-09-27T08:16:01Z

ping

bert-e · 2023-09-27T08:16:15Z

Conflict

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

benzekrimaha · 2023-09-27T08:28:06Z

ping

bert-e · 2023-09-27T08:28:19Z

Integration data created

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

this pull request will merge bugfix/CLDSRV-444-id-resource-policy into
development/7.10
w/7.70/bugfix/CLDSRV-444-id-resource-policy will be merged into development/7.70
w/8.6/bugfix/CLDSRV-444-id-resource-policy will be merged into development/8.6
w/8.7/bugfix/CLDSRV-444-id-resource-policy will be merged into development/8.7
w/8.8/bugfix/CLDSRV-444-id-resource-policy 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

bert-e · 2023-09-27T08:28:20Z

Waiting for approval

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

the author
2 peers

benzekrimaha · 2023-09-27T09:06:16Z

@bert-e create_pull_requests

bert-e · 2023-09-27T09:06:36Z

Integration data created

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

this pull request will merge bugfix/CLDSRV-444-id-resource-policy into
development/7.10
w/7.70/bugfix/CLDSRV-444-id-resource-policy will be merged into development/7.70 (pull request INTEGRATION [PR#5353 > development/7.70] CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5357)
w/8.6/bugfix/CLDSRV-444-id-resource-policy will be merged into development/8.6 (pull request INTEGRATION [PR#5353 > development/8.6] CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5358)
w/8.7/bugfix/CLDSRV-444-id-resource-policy will be merged into development/8.7 (pull request INTEGRATION [PR#5353 > development/8.7] CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5359)
w/8.8/bugfix/CLDSRV-444-id-resource-policy will be merged into development/8.8 (pull request INTEGRATION [PR#5353 > development/8.8] CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5360)

The following branches will NOT be impacted:

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

bert-e · 2023-09-27T09:06:37Z

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

bert-e · 2023-09-27T09:23:58Z

Conflict

A conflict has been raised during the update of
integration branch w/7.70/bugfix/CLDSRV-444-id-resource-policy with contents from bugfix/CLDSRV-444-id-resource-policy
and development/7.70.

Please resolve the conflict on the integration branch (w/7.70/bugfix/CLDSRV-444-id-resource-policy).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/7.70/bugfix/CLDSRV-444-id-resource-policy
 $ git pull  # or "git reset --hard origin/w/7.70/bugfix/CLDSRV-444-id-resource-policy"
 $ git merge origin/development/7.70
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/CLDSRV-444-id-resource-policy
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-444-id-resource-policy

The following options are set: create_pull_requests

benzekrimaha · 2023-09-27T09:43:41Z

ping

bert-e · 2023-09-27T09:43:48Z

Conflict

A conflict has been raised during the update of
integration branch w/8.6/bugfix/CLDSRV-444-id-resource-policy with contents from w/7.70/bugfix/CLDSRV-444-id-resource-policy
and development/8.6.

Please resolve the conflict on the integration branch (w/8.6/bugfix/CLDSRV-444-id-resource-policy).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.6/bugfix/CLDSRV-444-id-resource-policy
 $ git pull  # or "git reset --hard origin/w/8.6/bugfix/CLDSRV-444-id-resource-policy"
 $ git merge origin/development/8.6
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/7.70/bugfix/CLDSRV-444-id-resource-policy
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-444-id-resource-policy

The following options are set: create_pull_requests

benzekrimaha · 2023-09-27T09:45:41Z

ping

bert-e · 2023-09-27T09:49:31Z

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

benzekrimaha · 2023-09-27T12:07:40Z

/approve

bert-e · 2023-09-27T12:08: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.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_pull_requests

bert-e · 2023-09-27T12:08:19Z

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

Goodbye benzekrimaha.

benzekrimaha added 2 commits September 12, 2023 22:51

CLDSRV-444: unit test with Id and arsenal version

feefd13

CLDSRV-447:Test add for principal && arsn bump

4195b6a

benzekrimaha changed the title ~~Bugfix/cldsrv 444 id resource policy~~ CLDSRV-444/CLDSRV447: test with Id and prinsipal item and arsenal version bump Sep 25, 2023

benzekrimaha changed the title ~~CLDSRV-444/CLDSRV447: test with Id and prinsipal item and arsenal version bump~~ CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump Sep 25, 2023

benzekrimaha marked this pull request as ready for review September 25, 2023 14:33

KazToozs approved these changes Sep 25, 2023

View reviewed changes

tests/functional/aws-node-sdk/test/bucket/putBucketPolicy.js Outdated Show resolved Hide resolved

williamlardier reviewed Sep 26, 2023

View reviewed changes

tests/functional/aws-node-sdk/test/bucket/putBucketPolicy.js Outdated Show resolved Hide resolved

benzekrimaha requested a review from williamlardier September 26, 2023 13:58

williamlardier approved these changes Sep 26, 2023

View reviewed changes

CLDSRV-447:ARSN version bump

4795859

fixes after reviews

benzekrimaha force-pushed the bugfix/CLDSRV-444-id-resource-policy branch from c8a06a1 to 4795859 Compare September 26, 2023 14:14

CLDSRV-447:CLDSRV version bump

67e5694

scality deleted a comment from bert-e Sep 27, 2023

bert-e merged commit 67e5694 into development/7.10 Sep 27, 2023

bert-e deleted the bugfix/CLDSRV-444-id-resource-policy branch September 27, 2023 12:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5353

CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5353

benzekrimaha commented Sep 25, 2023 •

edited

Loading

bert-e commented Sep 25, 2023

bert-e commented Sep 25, 2023

benzekrimaha commented Sep 25, 2023

KazToozs left a comment

williamlardier left a comment

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

bert-e commented Sep 27, 2023

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

bert-e commented Sep 27, 2023

CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5353

CLDSRV-444/CLDSRV447: test with Id and principal item and arsenal version bump #5353

Conversation

benzekrimaha commented Sep 25, 2023 • edited Loading

Description

Motivation and context

Checklist

Add tests to cover the changes

bert-e commented Sep 25, 2023

Hello benzekrimaha,

bert-e commented Sep 25, 2023

Conflict

benzekrimaha commented Sep 25, 2023

KazToozs left a comment

Choose a reason for hiding this comment

williamlardier left a comment

Choose a reason for hiding this comment

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

History mismatch

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

Reset complete

bert-e commented Sep 27, 2023

Conflict

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

Conflict

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

Integration data created

bert-e commented Sep 27, 2023

Waiting for approval

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

Integration data created

bert-e commented Sep 27, 2023

Waiting for approval

bert-e commented Sep 27, 2023

Conflict

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

Conflict

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

Waiting for approval

benzekrimaha commented Sep 27, 2023

bert-e commented Sep 27, 2023

In the queue

bert-e commented Sep 27, 2023

benzekrimaha commented Sep 25, 2023 •

edited

Loading