Merge pull request #110 from britive/develop

v1.6.0rc2

Author: twratl

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 * 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.6.0rc2 [2023-10-27]
+#### What's New
+* None
+
+#### Enhancements
+* None
+
+#### Bug Fixes
+* Fixed bug with auto generated kube config when no alias existed for a profile.
+
+#### Dependencies
+* None
+
+#### Other
+* None
+
+
+
 ## v1.6.0rc1 [2023-10-25]
 #### What's New
 * Initial support for Kubernetes - this functionality is not yet available publicly on the Britive Platform - this is a beta feature for internal use only

setup.cfg

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

src/pybritive/britive_cli.py

@@ -386,13 +386,17 @@ def construct_kube_config(self, from_cache_command=False):
                         'url': url,
                         'cert': cert,
                     })
-        from .helpers.kube_config_builder import build_kube_config  # lazy import as not everyone will want this
-        build_kube_config(
-            profiles=profiles,
-            config=self.config,
-            username=self.b.my_access.whoami()['username'],
-            cli=self
-        )
+
+        try:
+            from .helpers.kube_config_builder import build_kube_config  # lazy import as not everyone will want this
+            build_kube_config(
+                profiles=profiles,
+                config=self.config,
+                username=self.b.my_access.whoami()['username'],
+                cli=self
+            )
+        except Exception as e:  # do NOT fail the CLI invocation because of this
+            self.print(f'error auto-generating the Britive managed kube config file: {str(e)}')
 
     def _get_app_type(self, application_id):
         self._set_available_profiles()

src/pybritive/helpers/kube_config_builder.py

@@ -136,7 +136,7 @@ def build_tenant_config(tenant, cluster_names, username):
                             {
                                 'name': 'client.authentication.k8s.io/exec',
                                 'extension': {
-                                    'britive-profile': details.get('alias', details['escaped_profile'])
+                                    'britive-profile': details.get('alias') or details['escaped_profile']
                                 }
                             }
                         ]
@@ -146,7 +146,7 @@ def build_tenant_config(tenant, cluster_names, username):
 
             contexts.append(
                 {
-                    'name': details.get('alias', f'{tenant}-{name}'),
+                    'name': details.get('alias') or f'{tenant}-{name}',
                     'context': {
                         'cluster': f'{tenant}-{name}',
                         'user': username