yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-02 18:46:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: Use clean url in clients (#19978)

Browse Source 
(cherry picked from commit 73876a9122a85197fa093def9fa885ab0174f51b)
This commit is contained in:
Mayur Singal 2025-02-27 12:18:50 +05:30 committed by OpenMetadata Release Bot
parent 5b624e1088
commit bce851372f
8 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ingestion/src/metadata/clients/domo_client.py
View File

@ -30,6 +30,7 @@ from metadata.generated.schema.entity.services.connections.pipeline.domoPipeline
DomoPipelineConnection,
)
from metadata.ingestion.ometa.client import REST, ClientConfig
from metadata.utils.helpers import clean_uri
from metadata.utils.logger import ingestion_logger
logger = ingestion_logger()
@ -103,8 +104,7 @@ class DomoClient:
self.config = config
HEADERS.update({"X-DOMO-Developer-Token": self.config.accessToken})
client_config: ClientConfig = ClientConfig(
# AnyUrl string ends with / and the domo API does not respond properly if it has 2 // at the end
base_url=str(self.config.instanceDomain)[:-1],
base_url=clean_uri(self.config.instanceDomain),
api_version="api/",
auth_header="Authorization",
auth_token=lambda: ("no_token", 0),

3
ingestion/src/metadata/ingestion/source/dashboard/lightdash/client.py
View File

@ -19,6 +19,7 @@ from metadata.ingestion.source.dashboard.lightdash.models import (
LightdashChart,
LightdashDashboard,
)
from metadata.utils.helpers import clean_uri
from metadata.utils.logger import utils_logger
logger = utils_logger()
@ -34,7 +35,7 @@ class LightdashApiClient:
def __init__(self, config):
self.config = config
client_config = ClientConfig(
base_url=str(self.config.hostPort),
base_url=clean_uri(self.config.hostPort),
api_version="",
access_token=self.config.apiKey.get_secret_value(),
auth_header="Authorization",

3
ingestion/src/metadata/ingestion/source/dashboard/mode/client.py
View File

@ -18,6 +18,7 @@ from typing import Optional
from requests._internal_utils import to_native_string
from metadata.ingestion.ometa.client import REST, ClientConfig
from metadata.utils.helpers import clean_uri
from metadata.utils.logger import utils_logger
logger = utils_logger()
@ -50,7 +51,7 @@ class ModeApiClient:
def __init__(self, config):
self.config = config
client_config = ClientConfig(
base_url=str(config.hostPort),
base_url=clean_uri(config.hostPort),
api_version="api",
auth_header="Authorization",
auth_token_mode="Basic",

2
ingestion/src/metadata/ingestion/source/dashboard/qlikcloud/client.py
View File

@ -59,7 +59,7 @@ class QlikCloudClient:
self.socket_connection = None
client_config: ClientConfig = ClientConfig(
base_url=str(self.config.hostPort),
base_url=clean_uri(self.config.hostPort),
api_version=API_VERSION,
auth_header=AUTHORIZATION_HEADER,
auth_token=lambda: (self.config.token.get_secret_value(), 0),

5
ingestion/src/metadata/ingestion/source/dashboard/superset/client.py
View File

@ -25,6 +25,7 @@ from metadata.ingestion.source.dashboard.superset.models import (
SupersetDashboardCount,
SupersetDatasource,
)
from metadata.utils.helpers import clean_uri
from metadata.utils.logger import ometa_logger
from metadata.utils.ssl_registry import get_verify_ssl_fn
@ -41,7 +42,7 @@ class SupersetAuthenticationProvider(AuthenticationProvider):
self.service_connection = self.config
get_verify_ssl = get_verify_ssl_fn(config.connection.verifySSL)
client_config = ClientConfig(
base_url=str(config.hostPort),
base_url=clean_uri(config.hostPort),
api_version="api/v1",
auth_token=lambda: ("no_token", 0),
auth_header="Authorization",
@ -90,7 +91,7 @@ class SupersetAPIClient:
self._auth_provider = SupersetAuthenticationProvider.create(config)
get_verify_ssl = get_verify_ssl_fn(config.connection.verifySSL)
client_config = ClientConfig(
base_url=str(config.hostPort),
base_url=clean_uri(config.hostPort),
api_version="api/v1",
auth_token=self._auth_provider.get_access_token,
auth_header="Authorization",

3
ingestion/src/metadata/ingestion/source/database/dbt/dbt_config.py
View File

@ -48,6 +48,7 @@ from metadata.ingestion.source.database.dbt.constants import (
from metadata.ingestion.source.database.dbt.models import DbtFiles
from metadata.readers.file.config_source_factory import get_reader
from metadata.utils.credentials import set_google_credentials
from metadata.utils.helpers import clean_uri
from metadata.utils.logger import ometa_logger
from metadata.utils.s3_utils import list_s3_objects
@ -163,7 +164,7 @@ def _(config: DbtCloudConfig): # pylint: disable=too-many-locals
expiry = 0
auth_token = config.dbtCloudAuthToken.get_secret_value(), expiry
client_config = ClientConfig(
base_url=str(config.dbtCloudUrl),
base_url=clean_uri(config.dbtCloudUrl),
api_version="api/v2",
auth_token=lambda: auth_token,
auth_header="Authorization",

3
ingestion/src/metadata/ingestion/source/database/sas/client.py
View File

@ -19,6 +19,7 @@ from metadata.generated.schema.entity.services.connections.database.sasConnectio
SASConnection,
)
from metadata.ingestion.ometa.client import REST, APIError, ClientConfig
from metadata.utils.helpers import clean_uri
from metadata.utils.logger import ingestion_logger
logger = ingestion_logger()
@ -35,7 +36,7 @@ class SASClient:
config.serverHost, config.username, config.password.get_secret_value()
)
client_config: ClientConfig = ClientConfig(
base_url=str(config.serverHost),
base_url=clean_uri(config.serverHost),
auth_header="Authorization",
auth_token=self.get_auth_token,
api_version="",

3
ingestion/src/metadata/ingestion/source/metadata/atlas/client.py
View File

@ -18,6 +18,7 @@ from metadata.generated.schema.entity.services.connections.metadata.atlasConnect
AtlasConnection,
)
from metadata.ingestion.ometa.client import REST, APIError, ClientConfig
from metadata.utils.helpers import clean_uri
class AtlasClient:
@ -31,7 +32,7 @@ class AtlasClient:
config.username, config.password.get_secret_value()
)
client_config: ClientConfig = ClientConfig(
base_url=str(config.hostPort),
base_url=clean_uri(config.hostPort),
auth_header="Authorization",
api_version="api",
auth_token=self.get_auth_token,