Merge pull request #160 from britive/develop

v1.8.0rc4

CHANGELOG.md

@@ -3,6 +3,29 @@
 * As of v1.4.0 release candidates will be published in an effort to get new features out faster while still allowing
 time for full QA testing before moving the release candidate to a full release.
 
+## v1.8.0rc4 [2024-06-07]
+
+__What's New:__
+
+* None
+
+__Enhancements:__
+
+* None
+
+__Bug Fixes:__
+
+* missing `profile_type` kwarg in `ls profiles`.
+* `None` type handling for `my-resources` profiles.
+
+__Dependencies:__
+
+* None
+
+__Other:__
+
+* None
+
 ## v1.8.0rc3 [2024-06-07]
 
 __What's New:__

src/pybritive/__init__.py

@@ -1 +1 @@
-__version__ = '1.8.0rc3'
+__version__ = '1.8.0rc4'

src/pybritive/britive_cli.py

@@ -346,9 +346,9 @@ def list_resources(self):
                 found_resource_names.append(name)
         self.print(resources, ignore_silent=True)
 
-    def list_profiles(self, checked_out: bool = False):
+    def list_profiles(self, checked_out: bool = False, profile_type: str = None):
         self.login()
-        self._set_available_profiles()
+        self._set_available_profiles(profile_type=profile_type)
         data = []
         checked_out_profiles = {}
         if checked_out:  # only make this call if we have to
@@ -368,10 +368,10 @@ def list_profiles(self, checked_out: bool = False):
             profile_is_checked_out = key in checked_out_profiles
             if not checked_out or profile_is_checked_out:
                 row = {
-                    'Application': profile['app_name'],
+                    'Application': profile['app_name'] or 'Resources',
                     'Environment': profile['env_name'],
                     'Profile': profile['profile_name'],
-                    'Description': profile['profile_description'],
+                    'Description': profile['profile_description'] or 'Resource',
                     'Type': profile['app_type'],
                 }
 
@@ -986,6 +986,8 @@ def cache_profiles(self, from_cache_command=False):
 
     @staticmethod
     def escape_profile_element(element):
+        if element is None:
+            element = 'resources'
         return element.replace('/', '\\/')
 
     @staticmethod