Merge pull request #66 from britive/develop

v1.1.1

Author: twratl

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All changes to the package starting with v0.3.1 will be logged here.
 
+## v1.1.1 [2023-02-16]
+#### What's New
+* None
+
+#### Enhancements
+* None
+
+#### Bug Fixes
+* fix issue with `checkin`, `request submit`, `request withdrawl` due to `PROFILE` parameter changes
+
+#### Dependencies
+* None
+
+#### Other
+* None
+
 ## v1.1.0 [2023-02-16]
 #### What's New
 * Allowing 2 part `PROFILE` parameters (see documentation for details)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pybritive
-version = 1.1.0
+version = 1.1.1
 author = Britive Inc.
 author_email = support@britive.com
 description = A pure Python CLI for Britive

src/pybritive/britive_cli.py

@@ -343,12 +343,24 @@ def checkin(self, profile):
         self.login()
         parts = self._split_profile_into_parts(profile)
 
-        self.b.my_access.checkin_by_name(
+        ids = self._convert_names_to_ids(
             profile_name=parts['profile'],
             environment_name=parts['env'],
             application_name=parts['app']
         )
 
+        transaction_id = None
+        for profile in self.b.my_access.list_checked_out_profiles():
+            if profile['environmentId'] == ids['environment_id'] and profile['papId'] == ids['profile_id']:
+                transaction_id = profile['transactionId']
+                break
+        if not transaction_id:
+            raise ValueError(f'no checked out profile found for the given profile')
+
+        self.b.my_access.checkin(
+            transaction_id=transaction_id
+        )
+
     def _checkout(self, profile_name, env_name, app_name, programmatic, blocktime, maxpolltime, justification):
         try:
             self.login()
@@ -608,10 +620,15 @@ def request_submit(self, profile, justification):
         self.login()
         parts = self._split_profile_into_parts(profile)
 
-        self.b.my_access.request_approval_by_name(
+        ids = self._convert_names_to_ids(
             profile_name=parts['profile'],
             environment_name=parts['env'],
-            application_name=parts['app'],
+            application_name=parts['app']
+        )
+
+        self.b.my_access.request_approval(
+            profile_id=ids['profile_id'],
+            environment_id=ids['environment_id'],
             block_until_disposition=False,
             justification=justification
         )
@@ -620,12 +637,17 @@ def request_withdraw(self, profile):
         self.login()
         parts = self._split_profile_into_parts(profile)
 
-        self.b.my_access.withdraw_approval_request_by_name(
+        ids = self._convert_names_to_ids(
             profile_name=parts['profile'],
             environment_name=parts['env'],
             application_name=parts['app']
         )
 
+        self.b.my_access.withdraw_approval_request(
+            profile_id=ids['profile_id'],
+            environment_id=ids['environment_id']
+        )
+
     def clear_gcloud_auth_key_files(self):
         self.config.clear_gcloud_auth_key_files()