Bugfix/cldsrv 505 ip handling fix #5534

KazToozs · 2024-02-16T15:26:39Z

Pull request template

Description

Motivation and context

Why is this change required? What problem does it solve?

Related issues

Please use the following link syntaxes #600 to reference issues in the
current repository

Checklist

Add tests to cover the changes

New tests added or existing tests modified to cover all changes

Code conforms with the style guide

Sign your work

In order to contribute to the project, you must sign your work
https://github.com/scality/Guidelines/blob/master/CONTRIBUTING.md#sign-your-work

Thank you again for contributing! We will try to test and integrate the change
as soon as we can.

bert-e · 2024-02-16T15:26:42Z

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 · 2024-02-16T15:26:47Z

Incorrect fix version

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

7.10.45
7.70.44

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

7.10.45
7.70.44
8.6.25
8.7.45
8.8.18

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

bert-e · 2024-02-19T10:35:10Z

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.

williamlardier · 2024-02-19T10:22:29Z

tests/unit/auth/permissionChecks.js

+                        IpAddress: {
+                            'aws:SourceIp': [
+                                '10.0.11.0/24',
+                                '10.0.1.0/24',
+                            ],


Can we have a test that checks we properly authorize an ip given a range in the policy? (and on the other hand, deny if it doesn't match the range). As this condition specifically might be used a lot in production, I would feel more confident). It can be done in the Integration test suite.

Yes yes can add a test to Integration

williamlardier · 2024-02-19T10:24:34Z

lib/api/apiUtils/authorization/permissionChecks.js

-    if (validateIpRegex(value) === true) {
-        return null;
+        if (validateIpRegex(values[i]) !== true) {
+            return errString; // Return immediately if an invalid IP is found


I would say this specific comment is not mandatory as it says what the code does

KazToozs · 2024-02-19T11:15:07Z

/help

bert-e · 2024-02-19T11:15:11Z

Help page

The following options and commands are available at this time.

Options

name	description	privileged	authored
➡️ after_pull_request	Wait for the given pull request id to be merged before continuing with the current one.
➡️ bypass_author_approval	Bypass the pull request author's approval	⭐
➡️ bypass_build_status	Bypass the build and test status	⭐
➡️ bypass_commit_size	Bypass the check on the size of the changeset `TBA`	⭐
➡️ bypass_incompatible_branch	Bypass the check on the source branch prefix	⭐
➡️ bypass_jira_check	Bypass the Jira issue check	⭐
➡️ bypass_peer_approval	Bypass the pull request peers' approval	⭐
➡️ bypass_leader_approval	Bypass the pull request leaders' approval	⭐
➡️ approve	Instruct Bert-E that the author has approved the pull request.		✍️
➡️ create_pull_requests	Allow the creation of integration pull requests.
➡️ create_integration_branches	Allow the creation of integration branches.
➡️ no_octopus	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
➡️ unanimity	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
➡️ wait	Instruct Bert-E not to run until further notice.

Commands

name	description	privileged
➡️ help	Print Bert-E's manual in the pull request.
➡️ status	Print Bert-E's current status in the pull request `TBA`
➡️ clear	Remove all comments from Bert-E from the history `TBA`
➡️ retry	Re-start a fresh build `TBA`
➡️ build	Re-start a fresh build `TBA`
➡️ force_reset	Delete integration branches & pull requests, and restart merge process from the beginning.
➡️ reset	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

bert-e · 2024-02-19T11:15:21Z

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.

KazToozs · 2024-02-19T11:15:31Z

/create_pull_requests

bert-e · 2024-02-19T11:15:40Z

Conflict

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

The following options are set: create_pull_requests

benzekrimaha

LGTM

bert-e · 2024-02-19T13:45:13Z

Conflict

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

The following options are set: create_pull_requests

bert-e · 2024-02-19T14:19:36Z

Conflict

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

The following options are set: create_pull_requests

bert-e · 2024-02-19T14:35:39Z

Conflict

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

The following options are set: create_pull_requests

bert-e · 2024-02-19T14:42:02Z

Integration data created

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

this pull request will merge bugfix/CLDSRV-505-ip-handling-fix into
development/7.10
w/7.70/bugfix/CLDSRV-505-ip-handling-fix will be merged into development/7.70 (pull request INTEGRATION [PR#5534 > development/7.70] Bugfix/cldsrv 505 ip handling fix #5535)
w/8.6/bugfix/CLDSRV-505-ip-handling-fix will be merged into development/8.6 (pull request INTEGRATION [PR#5534 > development/8.6] Bugfix/cldsrv 505 ip handling fix #5536)
w/8.7/bugfix/CLDSRV-505-ip-handling-fix will be merged into development/8.7 (pull request INTEGRATION [PR#5534 > development/8.7] Bugfix/cldsrv 505 ip handling fix #5537)
w/8.8/bugfix/CLDSRV-505-ip-handling-fix will be merged into development/8.8 (pull request INTEGRATION [PR#5534 > development/8.8] Bugfix/cldsrv 505 ip handling fix #5538)

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 · 2024-02-19T14:42:03Z

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

KazToozs · 2024-02-19T15:00:38Z

/approve

bert-e · 2024-02-19T15:01:02Z

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 · 2024-02-19T16:07:01Z

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

Goodbye kaztoozs.

KazToozs marked this pull request as ready for review February 16, 2024 16:02

williamlardier approved these changes Feb 19, 2024

View reviewed changes

Will Toozs added 3 commits February 19, 2024 12:00

CLDSRV-505: update ip check for arrays

9d74ced

CLDSRV-505: update ip check tests for arrays

f2ca37b

CLDSRV-505: bump CS version

aa646ce

KazToozs force-pushed the bugfix/CLDSRV-505-ip-handling-fix branch from 820c8a7 to aa646ce Compare February 19, 2024 11:01

benzekrimaha approved these changes Feb 19, 2024

View reviewed changes

This was referenced Feb 19, 2024

INTEGRATION [PR#5534 > development/7.70] Bugfix/cldsrv 505 ip handling fix #5535

Merged

INTEGRATION [PR#5534 > development/8.6] Bugfix/cldsrv 505 ip handling fix #5536

Merged

INTEGRATION [PR#5534 > development/8.7] Bugfix/cldsrv 505 ip handling fix #5537

Merged

bert-e mentioned this pull request Feb 19, 2024

INTEGRATION [PR#5534 > development/8.8] Bugfix/cldsrv 505 ip handling fix #5538

Merged

bert-e merged commit 3b93094 into development/7.10 Feb 19, 2024
10 checks passed

bert-e deleted the bugfix/CLDSRV-505-ip-handling-fix branch February 19, 2024 16:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bugfix/cldsrv 505 ip handling fix #5534

Bugfix/cldsrv 505 ip handling fix #5534

KazToozs commented Feb 16, 2024

bert-e commented Feb 16, 2024

bert-e commented Feb 16, 2024

bert-e commented Feb 19, 2024

williamlardier Feb 19, 2024

KazToozs Feb 19, 2024

williamlardier Feb 19, 2024

KazToozs commented Feb 19, 2024

bert-e commented Feb 19, 2024

bert-e commented Feb 19, 2024

KazToozs commented Feb 19, 2024

bert-e commented Feb 19, 2024

benzekrimaha left a comment

bert-e commented Feb 19, 2024

bert-e commented Feb 19, 2024

bert-e commented Feb 19, 2024

bert-e commented Feb 19, 2024

bert-e commented Feb 19, 2024

KazToozs commented Feb 19, 2024

bert-e commented Feb 19, 2024

bert-e commented Feb 19, 2024

Bugfix/cldsrv 505 ip handling fix #5534

Bugfix/cldsrv 505 ip handling fix #5534

Conversation

KazToozs commented Feb 16, 2024

Pull request template

Description

Motivation and context

Related issues

Checklist

Add tests to cover the changes

Code conforms with the style guide

Sign your work

bert-e commented Feb 16, 2024

Hello kaztoozs,

bert-e commented Feb 16, 2024

Incorrect fix version

bert-e commented Feb 19, 2024

Request integration branches

williamlardier Feb 19, 2024

Choose a reason for hiding this comment

KazToozs Feb 19, 2024

Choose a reason for hiding this comment

williamlardier Feb 19, 2024

Choose a reason for hiding this comment

KazToozs commented Feb 19, 2024

bert-e commented Feb 19, 2024

Help page

Options

Commands

bert-e commented Feb 19, 2024

Request integration branches

KazToozs commented Feb 19, 2024

bert-e commented Feb 19, 2024

Conflict

benzekrimaha left a comment

Choose a reason for hiding this comment

bert-e commented Feb 19, 2024

Conflict

bert-e commented Feb 19, 2024

Conflict

bert-e commented Feb 19, 2024

Conflict

bert-e commented Feb 19, 2024

Integration data created

bert-e commented Feb 19, 2024

Waiting for approval

KazToozs commented Feb 19, 2024

bert-e commented Feb 19, 2024

In the queue

bert-e commented Feb 19, 2024