From 49181cf68d6753319dfae3dbe9f896f21fbd1034 Mon Sep 17 00:00:00 2001 From: Samuel Wan Date: Mon, 8 Dec 2025 08:49:14 -0800 Subject: [PATCH 1/3] fix slash --- src/britive/access_broker/pools.py | 2 +- .../application_management/profiles/permissions.py | 9 +++------ src/britive/my_approvals.py | 2 +- src/britive/my_requests.py | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/britive/access_broker/pools.py b/src/britive/access_broker/pools.py index 0692c94..309c659 100644 --- a/src/britive/access_broker/pools.py +++ b/src/britive/access_broker/pools.py @@ -174,7 +174,7 @@ def add_label(self, pool_id: str, key: str, values: list) -> dict: params = {'key': key, 'label-values': values} - return self.britive.post(f'{self.base_url}/{pool_id}/labels/', json=params) + return self.britive.post(f'{self.base_url}/{pool_id}/labels', json=params) def list_labels(self, pool_id: str) -> list: """ diff --git a/src/britive/application_management/profiles/permissions.py b/src/britive/application_management/profiles/permissions.py index 9360ee2..daf4bd9 100644 --- a/src/britive/application_management/profiles/permissions.py +++ b/src/britive/application_management/profiles/permissions.py @@ -99,8 +99,7 @@ def get(self, profile_id: str, permission_name: str, constraint_type: str, permi """ url = ( - f'{self.base_url}/{profile_id}/permissions/{permission_name}/' - f'{permission_type}/constraints/{constraint_type}' + f'{self.base_url}/{profile_id}/permissions/{permission_name}{permission_type}/constraints/{constraint_type}' ) return self.britive.get(url).get('result') @@ -147,8 +146,7 @@ def add( """ url = ( - f'{self.base_url}/{profile_id}/permissions/{permission_name}/' - f'{permission_type}/constraints/{constraint_type}' + f'{self.base_url}/{profile_id}/permissions/{permission_name}{permission_type}/constraints/{constraint_type}' ) params = {'operation': 'add'} @@ -176,8 +174,7 @@ def remove( """ url = ( - f'{self.base_url}/{profile_id}/permissions/{permission_name}/' - f'{permission_type}/constraints/{constraint_type}' + f'{self.base_url}/{profile_id}/permissions/{permission_name}{permission_type}/constraints/{constraint_type}' ) params = {'operation': 'remove'} if constraint is None: diff --git a/src/britive/my_approvals.py b/src/britive/my_approvals.py index 62fae38..d06b20c 100644 --- a/src/britive/my_approvals.py +++ b/src/britive/my_approvals.py @@ -52,4 +52,4 @@ def list(self) -> dict: params = {'requestType': 'myApprovals'} - return self.britive.get(f'{self.base_url}/', params=params) + return self.britive.get(f'{self.base_url}', params=params) diff --git a/src/britive/my_requests.py b/src/britive/my_requests.py index 657c64d..fc607b1 100644 --- a/src/britive/my_requests.py +++ b/src/britive/my_requests.py @@ -34,7 +34,7 @@ def list(self) -> list: :return: List of My Requests. """ - return self.britive.get(f'{self.base_url}/', params={'requestType': 'myRequests'}) + return self.britive.get(f'{self.base_url}', params={'requestType': 'myRequests'}) def approval_request_status(self, request_id: str) -> dict: """ @@ -78,7 +78,7 @@ def _request_approval( f'{self.britive.base_url}/access/{profile_id}/{entity_type}/{entity_id}/approvalRequest' if entity_type == 'environments' else ( - f'{self.britive.base_url}/resource-manager/my-resources/profiles/' + f'{self.britive.base_url}/resource-manager/my-resources/profiles' f'{profile_id}/resources/{entity_id}/approvalRequest' ) ) From 1a8e57d876909732055f97a3298d0ba0723a2cdb Mon Sep 17 00:00:00 2001 From: Samuel Wan Date: Mon, 8 Dec 2025 08:51:12 -0800 Subject: [PATCH 2/3] undo fix --- .../application_management/profiles/permissions.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/britive/application_management/profiles/permissions.py b/src/britive/application_management/profiles/permissions.py index daf4bd9..9360ee2 100644 --- a/src/britive/application_management/profiles/permissions.py +++ b/src/britive/application_management/profiles/permissions.py @@ -99,7 +99,8 @@ def get(self, profile_id: str, permission_name: str, constraint_type: str, permi """ url = ( - f'{self.base_url}/{profile_id}/permissions/{permission_name}{permission_type}/constraints/{constraint_type}' + f'{self.base_url}/{profile_id}/permissions/{permission_name}/' + f'{permission_type}/constraints/{constraint_type}' ) return self.britive.get(url).get('result') @@ -146,7 +147,8 @@ def add( """ url = ( - f'{self.base_url}/{profile_id}/permissions/{permission_name}{permission_type}/constraints/{constraint_type}' + f'{self.base_url}/{profile_id}/permissions/{permission_name}/' + f'{permission_type}/constraints/{constraint_type}' ) params = {'operation': 'add'} @@ -174,7 +176,8 @@ def remove( """ url = ( - f'{self.base_url}/{profile_id}/permissions/{permission_name}{permission_type}/constraints/{constraint_type}' + f'{self.base_url}/{profile_id}/permissions/{permission_name}/' + f'{permission_type}/constraints/{constraint_type}' ) params = {'operation': 'remove'} if constraint is None: From 3549707a27934d85279a30c89077904a1e113177 Mon Sep 17 00:00:00 2001 From: Samuel Wan Date: Mon, 8 Dec 2025 08:51:55 -0800 Subject: [PATCH 3/3] undo fix --- src/britive/my_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/britive/my_requests.py b/src/britive/my_requests.py index fc607b1..851a1cc 100644 --- a/src/britive/my_requests.py +++ b/src/britive/my_requests.py @@ -78,7 +78,7 @@ def _request_approval( f'{self.britive.base_url}/access/{profile_id}/{entity_type}/{entity_id}/approvalRequest' if entity_type == 'environments' else ( - f'{self.britive.base_url}/resource-manager/my-resources/profiles' + f'{self.britive.base_url}/resource-manager/my-resources/profiles/' f'{profile_id}/resources/{entity_id}/approvalRequest' ) )