Merge pull request #83 from dpguthrie/fix/default-domain

Fix default domain logic
dpguthrie · Apr 4, 2023 · eaddd47 · eaddd47
2 parents 5c6203b + 64384d6
commit eaddd47
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.4.2] - 2023-04-03
+
+### Fixed
+- How the base URL was constructed as it was not properly accounting for other regions, single tenant instances properly
+
 ## [0.4.1] - 2023-04-02
 
 ### Added

diff --git a/dbtc/_version.py b/dbtc/_version.py
@@ -1 +1 @@
-__version__ = '0.4.1'
+__version__ = '0.4.2'
diff --git a/dbtc/client/admin.py b/dbtc/client/admin.py
@@ -99,7 +99,6 @@ def __init__(self, **kwargs):
                 *flags, **{k: v for k, v in arg_specs.items() if k != 'flags'}
             )
 
-    _default_domain = 'cloud.getdbt.com'
     _path = None
 
     @property

diff --git a/dbtc/client/base.py b/dbtc/client/base.py
@@ -30,17 +30,14 @@ def __init__(
             'DBT_CLOUD_SERVICE_TOKEN', None
         )
         self._host: Optional[str] = host or os.getenv(
-            'DBT_CLOUD_HOST', self._default_domain
+            'DBT_CLOUD_HOST', self.DEFAULT_DOMAIN
         )
         self.do_not_track: bool = do_not_track
         self._anonymous_id: str = str(uuid.uuid4())
         self._called_from: Optional[str] = None
         self.console = err_console
 
-    @property
-    @abc.abstractmethod
-    def _default_domain(self):
-        """Default used when host is not provided by a user"""
+    DEFAULT_DOMAIN = 'cloud.getdbt.com'
 
     @property
     @abc.abstractmethod

diff --git a/dbtc/client/metadata.py b/dbtc/client/metadata.py
@@ -20,9 +20,12 @@ def __init__(self, **kwargs):
         self.session.headers = self.headers
 
     _header_property = 'service_token'
-    _default_domain = 'metadata.cloud.getdbt.com'
     _path = '/graphql'
 
+    @property
+    def _base_url(self):
+        return f'https://metadata.{self._host}{self._path}'
+
     @property
     def _endpoint(self) -> HTTPEndpoint:
         return HTTPEndpoint(self.full_url(), self.headers)

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.4.2] - 2023-04-03
+
+### Fixed
+- How the base URL was constructed as it was not properly accounting for other regions, single tenant instances properly
+
 ## [0.4.1] - 2023-04-02
 
 ### Added

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dbtc"
-version = "0.4.1"
+version = "0.4.2"
 description = "An unaffiliated python wrapper for dbt Cloud APIs"
 authors = ["Doug Guthrie <douglas.p.guthrie@gmail.com>"]
 documentation = "https://dbtc.dpguthrie.com"