pybritive 2.2.0__tar.gz → 2.2.2__tar.gz

{pybritive-2.2.0/src/pybritive.egg-info → pybritive-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybritive
-Version: 2.2.0
+Version: 2.2.2
 Summary: A pure Python CLI for Britive
 Author-email: "Britive Inc." <support@britive.com>
 License: MIT License

pybritive-2.2.2/src/pybritive/__init__.py

@@ -0,0 +1 @@
+__version__ = '2.2.2'

{pybritive-2.2.0 → pybritive-2.2.2}/src/pybritive/britive_cli.py

@@ -350,7 +350,12 @@ class BritiveCli:
             name = item['resourceName']
             if name not in found_resource_names:
                 resources.append(
-                    {'resourceId': item['resourceId'], 'resourceName': name, 'resourceLabels': item['resourceLabels']}
+                    {
+                        'resourceId': item['resourceId'],
+                        'resourceName': name,
+                        'resourceLabels': item['resourceLabels'],
+                        'responseTemplates': item['responseTemplates'],
+                    }
                 )
                 found_resource_names.append(name)
         self.print(resources, ignore_silent=True)
@@ -460,26 +465,20 @@ class BritiveCli:
             data.append(row)
         self.print(data, ignore_silent=True)
 
-    # temporary fix till the new API is updated to return `profileEnvironmentProperties`
-    def _get_missing_env_properties(
-        self, app_id: str, app_type: str, env_id: str, profile_id: str, from_cache_command: bool
-    ) -> dict:
-        if app_type.lower() == 'kubernetes' and (from_cache_command or self.config.auto_refresh_kube_config()):
-            if not self.listed_profiles:
-                self.listed_profiles = self.b.my_access.list_profiles()
-            return next(
-                (
-                    env['profileEnvironmentProperties']
-                    for app in self.listed_profiles
-                    if app['appContainerId'] == app_id
-                    for profile in app.get('profiles', [])
-                    if profile['profileId'] == profile_id
-                    for env in profile.get('environments', [])
-                    if env['environmentId'] == env_id
-                ),
-                {},
-            )
-        return {}
+    # temporary fix till the new API is updated to return `sessionAttributes`
+    def _get_missing_session_attributes(self, app_id: str, profile_id: str) -> dict:
+        if not self.listed_profiles:
+            self.listed_profiles = self.b.my_access.list_profiles()
+        return next(
+            (
+                profile['sessionAttributes']
+                for app in self.listed_profiles
+                if app['appContainerId'] == app_id
+                for profile in app.get('profiles', [])
+                if profile['profileId'] == profile_id
+            ),
+            [],
+        )
 
     def _set_available_profiles(self, from_cache_command=False, profile_type: Optional[str] = None):
         if not self.available_profiles:
@@ -504,23 +503,23 @@ class BritiveCli:
                     env = envs[env_id]
                     profile = profiles[profile_id]
                     row = {
-                        'app_name': app['catalogAppDisplayName'],
+                        '2_part_profile_format_allowed': app['requiresHierarchicalModel'],
+                        'app_description': app['appDescription'],
                         'app_id': app_id,
+                        'app_name': app['catalogAppDisplayName'],
                         'app_type': app['catalogAppName'],
-                        'app_description': app['appDescription'],
-                        'env_name': env['environmentName'],
+                        'env_description': env['environmentDescription'],
                         'env_id': env_id,
+                        'env_name': env['environmentName'],
+                        'env_properties': env['profileEnvironmentProperties'],
                         'env_short_name': env['alternateEnvironmentName'],
-                        'env_description': env['environmentDescription'],
-                        'profile_name': profile['papName'],
-                        'profile_id': profile_id,
                         'profile_allows_console': app.get('consoleAccess', False),
                         'profile_allows_programmatic': app.get('programmaticAccess', False),
                         'profile_description': profile['papDescription'],
-                        '2_part_profile_format_allowed': app['requiresHierarchicalModel'],
-                        'env_properties': env['profileEnvironmentProperties']
-                        or self._get_missing_env_properties(
-                            app_id, app['catalogAppName'], env_id, profile_id, from_cache_command
+                        'profile_id': profile_id,
+                        'profile_name': profile['papName'],
+                        'session_attributes': profile.get(
+                            'sessionAttributes', self._get_missing_session_attributes(app_id, profile_id)
                         ),
                     }
                     if row not in access_output:
@@ -534,21 +533,21 @@ class BritiveCli:
                     profiles = profiles['data']
                 for item in profiles:
                     row = {
-                        'app_name': None,
+                        '2_part_profile_format_allowed': False,
+                        'app_description': None,
                         'app_id': None,
+                        'app_name': None,
                         'app_type': 'Resources',
-                        'app_description': None,
-                        'env_name': item['resourceName'],
+                        'env_description': None,
                         'env_id': item['resourceId'],
+                        'env_name': item['resourceName'],
+                        'env_properties': item.get('resourceLabels', {}),
                         'env_short_name': item['resourceName'],
-                        'env_description': None,
-                        'profile_name': item['profileName'],
-                        'profile_id': item['profileId'],
                         'profile_allows_console': False,
                         'profile_allows_programmatic': True,
                         'profile_description': None,
-                        '2_part_profile_format_allowed': False,
-                        'env_properties': item.get('resourceLabels', {}),
+                        'profile_id': item['profileId'],
+                        'profile_name': item['profileName'],
                     }
                     data.append(row)
             self.available_profiles = data
@@ -579,6 +578,7 @@ class BritiveCli:
                             'profile': p['profile_name'],
                             'url': url,
                             'cert': cert,
+                            'session_attributes': p['session_attributes'],
                         }
                     )
 
@@ -762,19 +762,22 @@ class BritiveCli:
                 # attempt to automatically checkout console access instead
                 # this is a cli only feature - not available in the sdk
                 self.print('no programmatic access available - checking out console access instead')
-                return self._checkout(
-                    app_name,
-                    blocktime,
-                    env_name,
-                    justification,
-                    maxpolltime,
-                    otp,
-                    profile_name,
-                    False,
-                    ticket_id,
-                    ticket_type,
-                    mode,
-                )
+                return {
+                    **self._checkout(
+                        app_name,
+                        blocktime,
+                        env_name,
+                        justification,
+                        maxpolltime,
+                        otp,
+                        profile_name,
+                        False,
+                        ticket_id,
+                        ticket_type,
+                        mode,
+                    ),
+                    'console-fallback': True,
+                }
             raise e
 
     @staticmethod
@@ -861,11 +864,12 @@ class BritiveCli:
             self._extend_checkout(profile, console)
             return None
 
-        credentials = None
+        self.verbose_checkout = verbose
         app_type = None
         cached_credentials_found = False
+        console_fallback = False
+        credentials = None
         k8s_processor = None
-        self.verbose_checkout = verbose
 
         # handle kube-exec since the profile is actually going to be passed in via another method
         # and perform some basic validation so we don't waste time performing a checkout when we
@@ -924,6 +928,7 @@ class BritiveCli:
             response = self._checkout(**params)
             app_type = self._get_app_type(response['appContainerId'])
             credentials = response['credentials']
+            console_fallback = response.get('console-fallback')
 
         # this handles the --force-renew flag
         # lets check to see if we should checkin this profile first and check it out again
@@ -937,12 +942,13 @@ class BritiveCli:
                 response = self._checkout(**params)
                 cached_credentials_found = False  # need to write new creds to cache
                 credentials = response['credentials']
+                console_fallback = response.get('console-fallback')
 
         if mode in self.cachable_modes and not cached_credentials_found:
             Cache(passphrase=passphrase).save_credentials(
                 profile_name=alias or profile, credentials=credentials, mode=mode
             )
-        return app_type, credentials, k8s_processor
+        return app_type, console_fallback, credentials, k8s_processor
 
     def checkout(
         self,
@@ -967,6 +973,7 @@ class BritiveCli:
         if self._profile_is_for_resource(profile=profile, profile_type=profile_type):
             app_type = 'Resources'
             k8s_processor = None
+            console_fallback = False
             credentials = self._resource_checkout(
                 blocktime=blocktime,
                 justification=justification,
@@ -976,7 +983,7 @@ class BritiveCli:
                 ticket_type=ticket_type,
             )
         else:
-            app_type, credentials, k8s_processor = self._access_checkout(
+            app_type, console_fallback, credentials, k8s_processor = self._access_checkout(
                 alias=alias,
                 blocktime=blocktime,
                 console=console,
@@ -998,7 +1005,7 @@ class BritiveCli:
 
         self.__get_cloud_credential_printer(
             app_type,
-            console,
+            console or console_fallback,
             mode,
             alias or profile,
             self.silent,

{pybritive-2.2.0 → pybritive-2.2.2}/src/pybritive/helpers/cloud_credential_printer.py

@@ -253,11 +253,12 @@ class GcpCloudCredentialPrinter(CloudCredentialPrinter):
     def print_json(self):
         self.cli.print(json.dumps(self.credentials, indent=2), ignore_silent=True)
         self.cli.print('', ignore_silent=True)
-        self.cli.print(
-            f"Run command: gcloud auth activate-service-account {self.credentials['client_email']} "
-            "--key-file <path-where-above-json-is-stored>",
-            ignore_silent=True,
-        )
+        if not self.console:
+            self.cli.print(
+                f'Run command: gcloud auth activate-service-account {self.credentials.get("client_email")} '
+                '--key-file <path-where-above-json-is-stored>',
+                ignore_silent=True,
+            )
 
     def print_gcloudauth(self):
         # get path to gcloud key file
@@ -271,7 +272,7 @@ class GcpCloudCredentialPrinter(CloudCredentialPrinter):
         path.write_text(json.dumps(self.credentials, indent=2), encoding='utf-8')
 
         self.cli.print(
-            f"gcloud auth activate-service-account {self.credentials['client_email']} --key-file {path!s}",
+            f'gcloud auth activate-service-account {self.credentials["client_email"]} --key-file {path!s}',
             ignore_silent=True,
         )
 

{pybritive-2.2.0 → pybritive-2.2.2}/src/pybritive/helpers/kube_config_builder.py

@@ -69,7 +69,7 @@ def parse_profiles(profiles, aliases):
     cluster_names = {}
     assigned_aliases = []
     for profile in profiles:
-        env_profile = f"{sanitize(profile['env'])}-{sanitize(profile['profile'].lower())}"
+        env_profile = f'{sanitize(profile["env"])}-{sanitize(profile["profile"].lower())}'
         if env_profile not in cluster_names:
             app = BritiveCli.escape_profile_element(profile['app'])
             env = BritiveCli.escape_profile_element(profile['env'])
@@ -84,8 +84,9 @@ def parse_profiles(profiles, aliases):
                 'url': profile['url'],
                 'cert': profile['cert'],
                 'escaped_profile': escaped_profile_str,
-                'profile': f"{profile['app']}/{profile['env']}/{profile['profile']}".lower(),
+                'profile': f'{profile["app"]}/{profile["env"]}/{profile["profile"]}'.lower(),
                 'alias': alias,
+                'session_attributes': profile['session_attributes'],
             }
         cluster_names[env_profile]['apps'].append(sanitize(profile['app']))
     return [cluster_names, assigned_aliases]
@@ -129,7 +130,6 @@ def build_tenant_config(tenant, cluster_names, username, cli: BritiveCli):
     )
     contexts = []
     clusters = []
-
     for env_profile, details in cluster_names.items():
         if len(details['apps']) == 1:
             names = [env_profile]
@@ -162,7 +162,11 @@ def build_tenant_config(tenant, cluster_names, username, cli: BritiveCli):
             contexts.append(
                 {
                     'name': details.get('alias') or f'{tenant}-{name}',
-                    'context': {'cluster': f'{tenant}-{name}', 'user': username},
+                    'context': {
+                        'cluster': f'{tenant}-{name}',
+                        'user': username,
+                        **{attr['mappingName']: attr['attributeValue'] for attr in details['session_attributes']},
+                    },
                 }
             )
     return [clusters, contexts, users]

{pybritive-2.2.0 → pybritive-2.2.2/src/pybritive.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybritive
-Version: 2.2.0
+Version: 2.2.2
 Summary: A pure Python CLI for Britive
 Author-email: "Britive Inc." <support@britive.com>
 License: MIT License

pybritive-2.2.0/src/pybritive/__init__.py

@@ -1 +0,0 @@
-__version__ = '2.2.0'