Merge pull request #31 from britive/develop

v0.5.2

Author: twratl

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All changes to the package starting with v0.3.1 will be logged here.
 
+## v0.5.2 [2022-10-24]
+#### What's New
+* None
+
+#### Enhancements
+* None
+
+#### Bug Fixes
+* Allow local machine DNS to resolve (e.g. /etc/hosts) for tenant url
+
+#### Dependencies
+* `britive~=2.11.1` from `britive~=2.11.0`
+
+#### Other
+* None
+
 ## v0.5.1 [2022-10-21]
 #### What's New
 * None

requirements.txt

@@ -1,4 +1,4 @@
-britive~=2.11.0
+britive~=2.11.1
 certifi==2022.6.15
 charset-normalizer==2.1.0
 click==8.1.3

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pybritive
-version = 0.5.1
+version = 0.5.2
 author = Britive Inc.
 author_email = support@britive.com
 description = A pure Python CLI for Britive
@@ -25,7 +25,7 @@ install_requires =
     tabulate
     toml
     cryptography
-    britive
+    britive>=2.11.1
 
 [options.packages.find]
 where = src

src/pybritive/britive_cli.py

@@ -35,23 +35,6 @@ def __init__(self, tenant_name: str = None, token: str = None, silent: bool = Fa
     def set_output_format(self, output_format: str):
         self.output_format = self.config.get_output_format(output_format)
 
-    # it is preferable to do this in the sdk as a static method
-    # as this will eliminate the duplicate code
-    def parse_tenant(self):
-        domain = self.tenant_name.replace('https://', '').replace('http://', '')  # remove scheme
-        domain = domain.split('/')[0]  # remove any paths as they will not be needed
-        try:
-            domain_without_port = domain.split(':')[0]
-            socket.gethostbyname_ex(domain_without_port)  # if success then a full domain was provided
-            return domain
-        except socket.gaierror:  # assume just the tenant name was provided (originally the only supported method)
-            domain = f'{self.tenant_name}.britive-app.com'
-            try:
-                socket.gethostbyname_ex(domain)  # validate the hostname is real
-                return domain
-            except socket.gaierror:
-                raise Exception(f'Invalid tenant provided: {self.tenant_name}')
-
     def set_credential_manager(self):
         if self.credential_manager:
             return
@@ -113,7 +96,7 @@ def logout(self):
         if self.token:
             raise click.ClickException('Logout not available when using an API token.')
         self.login()
-        self.b.delete(f'https://{self.parse_tenant()}/api/auth')
+        self.b.delete(f'https://{Britive.parse_tenant(self.tenant_name)}/api/auth')
         self._cleanup_credentials()
 
     # will take a list of dicts and print to the screen based on the format specified in the config file

src/pybritive/helpers/config.py

@@ -6,6 +6,7 @@
 import toml
 from ..choices.output_format import output_format_choices
 from ..choices.backend import backend_choices
+from britive.britive import Britive
 
 
 def extract_tenant(tenant_key):
@@ -259,6 +260,11 @@ def validate_tenant(self, section, fields):
         for field, value in fields.items():
             if field not in tenant_fields:
                 self.validation_error_messages.append(f'Invalid {section} field {field} provided.')
+            if field == 'name':
+                try:
+                    Britive.parse_tenant(value)
+                except Exception as e:
+                    raise click.ClickException(f'Error validating tenant name: {str(e)}')
             if field == 'output_format' and value not in output_format_choices.choices:
                 error = f'Invalid {section} field {field} value {value} provided. Invalid value choice.'
                 self.validation_error_messages.append(error)

src/pybritive/helpers/credentials.py

@@ -10,6 +10,7 @@
 import json
 import os
 from .encryption import StringEncryption, InvalidPassphraseException
+from britive.britive import Britive
 
 
 interactive_login_fields_to_pop = [
@@ -45,7 +46,7 @@ def __init__(self, tenant_name: str, tenant_alias: str, cli):
         self.cli = cli
         self.tenant = tenant_name
         self.alias = tenant_alias
-        self.base_url = f'https://{cli.parse_tenant()}'
+        self.base_url = f'https://{Britive.parse_tenant(tenant_name)}'
 
         # not sure if we really need 32 random bytes or if any random string would work
         # but the current britive-cli in node.js does it this way so it will be done the same