CLDSRV-429: update get apis with impDeny logic by benzekrimaha · Pull Request #5462 · scality/cloudserver

benzekrimaha · 2023-11-30T16:18:23Z

Bucket policies are not correctly interpreted, this is part of the following epic to fix that: scality/Arsenal#2181

This PR is aiming to update get apis since object and bucket authorisations are made at API level and need to support implicit denies, ticket linked to this issue here : https://scality.atlassian.net/browse/CLDSRV-429

PRs providing implicit Deny logic to CS for processing in this PR
scality/Arsenal#2181
https://github.com/scality/Vault/pull/2135
#5322
#5420
#5432
#5456

Here CI links for zenko tests :
https://github.com/scality/Zenko/actions/runs/7084077460
https://github.com/scality/Zenko/actions/runs/7084088277
https://github.com/scality/Zenko/actions/runs/7084102967

bert-e · 2023-11-30T16:18:28Z

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-11-30T16:18:34Z

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.

benzekrimaha · 2023-12-01T10:23:14Z

/create_integration_branches

bert-e · 2023-12-01T10:23:24Z

Conflict

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

The following options are set: create_integration_branches

benzekrimaha · 2023-12-01T10:25:29Z

ping

bert-e · 2023-12-01T10:25:39Z

Conflict

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

The following options are set: create_integration_branches

benzekrimaha · 2023-12-01T10:27:59Z

ping

bert-e · 2023-12-01T10:28:16Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny with contents from w/8.6/improvement/CLDSRV-429-get-apis-implicitDeny
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny origin/development/8.7
 $ git merge origin/w/8.6/improvement/CLDSRV-429-get-apis-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny

The following options are set: create_integration_branches

benzekrimaha · 2023-12-01T10:29:32Z

ping

bert-e · 2023-12-01T10:29:42Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny with contents from w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny origin/development/8.8
 $ git merge origin/w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny

The following options are set: create_integration_branches

benzekrimaha · 2023-12-01T10:49:02Z

ping

bert-e · 2023-12-01T10:49:10Z

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

benzekrimaha · 2023-12-01T10:49:49Z

/create_pull_requests

bert-e · 2023-12-01T10:50:07Z

Integration data created

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

this pull request will merge improvement/CLDSRV-429-get-apis-implicitDeny into
development/7.10
w/7.70/improvement/CLDSRV-429-get-apis-implicitDeny will be merged into development/7.70 (pull request INTEGRATION [PR#5462 > development/7.70] CLDSRV-429: update get apis with impDeny logic #5465)
w/8.6/improvement/CLDSRV-429-get-apis-implicitDeny will be merged into development/8.6 (pull request INTEGRATION [PR#5462 > development/8.6] CLDSRV-429: update get apis with impDeny logic #5466)
w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny will be merged into development/8.7 (pull request INTEGRATION [PR#5462 > development/8.7] CLDSRV-429: update get apis with impDeny logic #5467)
w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny will be merged into development/8.8 (pull request INTEGRATION [PR#5462 > development/8.8] CLDSRV-429: update get apis with impDeny logic #5468)

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

bert-e · 2023-12-01T10:50:09Z

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

bert-e · 2023-12-05T09:56:02Z

Conflict

A conflict has been raised during the update of
integration branch w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny with contents from w/8.6/improvement/CLDSRV-429-get-apis-implicitDeny
and development/8.7.

Please resolve the conflict on the integration branch (w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny
 $ git pull  # or "git reset --hard origin/w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny"
 $ git merge origin/development/8.7
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/8.6/improvement/CLDSRV-429-get-apis-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny

The following options are set: create_pull_requests, create_integration_branches

benzekrimaha · 2023-12-05T09:58:55Z

ping

bert-e · 2023-12-05T09:59:04Z

Conflict

A conflict has been raised during the update of
integration branch w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny with contents from w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny
and development/8.8.

Please resolve the conflict on the integration branch (w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny
 $ git pull  # or "git reset --hard origin/w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny"
 $ git merge origin/development/8.8
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/8.7/improvement/CLDSRV-429-get-apis-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/improvement/CLDSRV-429-get-apis-implicitDeny

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2023-12-05T11:01: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_pull_requests, create_integration_branches

KazToozs

LGTM

benzekrimaha · 2023-12-07T07:47:34Z

/approve

bert-e · 2023-12-07T07:48:03Z

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

bert-e · 2023-12-07T07:48:18Z

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

Goodbye benzekrimaha.

CLDSRV-429: update get apis with impDeny logic

e18f83e

CLDSRV-429: version bump

b4f0d34

scality deleted a comment from bert-e Dec 1, 2023

benzekrimaha marked this pull request as ready for review December 1, 2023 17:10

benzekrimaha mentioned this pull request Dec 5, 2023

Improvement/cldsrv 430 delete api implicit deny #5470

Merged

KazToozs approved these changes Dec 5, 2023

View reviewed changes

benzekrimaha requested a review from anurag4DSB December 6, 2023 08:33

anurag4DSB approved these changes Dec 6, 2023

View reviewed changes

bert-e merged commit b4f0d34 into development/7.10 Dec 7, 2023

bert-e deleted the improvement/CLDSRV-429-get-apis-implicitDeny branch December 7, 2023 07:48

This was referenced Dec 14, 2023

Improvement/cldsrv 431 misc api implicit deny #5479

Merged

improvement/CLDSRV-451-specific-7.70-apis-update #5495

Merged

Conversation

benzekrimaha commented Nov 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bert-e commented Nov 30, 2023

Hello benzekrimaha,

Uh oh!

bert-e commented Nov 30, 2023

Request integration branches

Uh oh!

benzekrimaha commented Dec 1, 2023

Uh oh!

bert-e commented Dec 1, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 1, 2023

Uh oh!

bert-e commented Dec 1, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 1, 2023

Uh oh!

bert-e commented Dec 1, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 1, 2023

Uh oh!

bert-e commented Dec 1, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 1, 2023

Uh oh!

bert-e commented Dec 1, 2023

Waiting for approval

Uh oh!

benzekrimaha commented Dec 1, 2023

Uh oh!

bert-e commented Dec 1, 2023

Integration data created

Uh oh!

bert-e commented Dec 1, 2023

Waiting for approval

Uh oh!

bert-e commented Dec 5, 2023

Conflict

Uh oh!

benzekrimaha commented Dec 5, 2023

Uh oh!

bert-e commented Dec 5, 2023

Conflict

Uh oh!

bert-e commented Dec 5, 2023

Waiting for approval

Uh oh!

KazToozs left a comment

Choose a reason for hiding this comment

Uh oh!

benzekrimaha commented Dec 7, 2023

Uh oh!

bert-e commented Dec 7, 2023

In the queue

Uh oh!

bert-e commented Dec 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

benzekrimaha commented Nov 30, 2023 •

edited

Loading