fix: Removed unused tenant in auth interface

micmurawski · Jul 26, 2024 · 519f2f3 · 519f2f3
1 parent 8ab7642
commit 519f2f3
Show file tree

Hide file tree

Showing 23 changed files with 16 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ from osdu_client.auth import AuthBackendInterface
 class AuthSession(AuthBackendInterface):
     base_url = "https://base.url"
     default_data_partition_id = "osdu"
-    default_tenant = "osdu"
+
     authorization_header = {"Authorization": "Bearer access_token"}
 
     def get_sd_connection_params(self):

diff --git a/gen/tests_generator.py b/gen/tests_generator.py
@@ -32,7 +32,7 @@
 def create_conftest(module_path: str, name: str):
     module = import_module(f"osdu_client.services.{name.lower()}")
     versions = getattr(module, "VERSIONS", {})
-    
+
     import_lines = [
         "import pytest",
         "import os",
@@ -51,7 +51,7 @@ def create_conftest(module_path: str, name: str):
         f"{INDENT}class AuthSession(AuthBackendInterface):",
         f'{INDENT*2}base_url = "https://base.url"',
         f'{INDENT*2}default_data_partition_id = "osdu"',
-        f'{INDENT*2}default_tenant = "osdu"',
+        f'{INDENT*2}',
         '%sauthorization_header = {"Authorization": "Bearer access_token"}' % (INDENT*2),
         "\n",
         f"{INDENT*2}def get_sd_connection_params(self):",

diff --git a/osdu_client/auth.py b/osdu_client/auth.py
@@ -8,19 +8,10 @@ class AuthBackendInterface(metaclass=ABCMeta):
     def get_headers(self) -> dict:
         headers = {}
         headers.update(self.authorization_header)
-        headers.update(
-            {
-                "tenant": self.default_tenant,
-                "data-partition-id": self.default_data_partition_id
-            }
-        )
+        headers["data-partition-id"] = self.default_data_partition_id
+
         return headers
 
-    @property
-    @abstractmethod
-    def default_tenant(self) -> str:
-        pass
-
     @property
     @abstractmethod
     def default_data_partition_id(self) -> str:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "osdu-client"
-version = "1.2.0"
+version = "1.3.0"
 description = "OSDU API Client"
 authors = ["Michal Murawski <[email protected]>"]
 readme = "README.md"

diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/dataset/conftest.py b/tests/dataset/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/entitlements/conftest.py b/tests/entitlements/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/file/conftest.py b/tests/file/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/indexer/conftest.py b/tests/indexer/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"  
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/legal/conftest.py b/tests/legal/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"      
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/notification/conftest.py b/tests/notification/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/partition/conftest.py b/tests/partition/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"      
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/policy/conftest.py b/tests/policy/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"   
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/pws/conftest.py b/tests/pws/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/rafs/conftest.py b/tests/rafs/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"     
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/register/conftest.py b/tests/register/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"       
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/schema/conftest.py b/tests/schema/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"       
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/sdms/conftest.py b/tests/sdms/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"     
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/search/conftest.py b/tests/search/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"   
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/secret/conftest.py b/tests/secret/conftest.py
@@ -14,8 +14,7 @@
 def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
-        default_data_partition_id = "osdu"
-        default_tenant = "osdu"
+        default_data_partition_id = "osdu"  
         authorization_header = {"Authorization": "Bearer access_token"}
 
         def get_sd_connection_params(self):

diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/wellbore/conftest.py b/tests/wellbore/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}
 
 

diff --git a/tests/welldelivery/conftest.py b/tests/welldelivery/conftest.py
@@ -15,7 +15,6 @@ def auth_backend() -> AuthBackendInterface:
     class AuthSession(AuthBackendInterface):
         base_url = "https://base.url"
         default_data_partition_id = "osdu"
-        default_tenant = "osdu"
         authorization_header = {"Authorization": "Bearer access_token"}