moved RDS Config to AWS Utils

feat: Adding utilities to connect AWS services like RDS adding AWS Dataservices connectors utilities ---- Signed-off-by: Saisharath <srsharathreddy@gmail.com> Signed-off-by: skondakindi <saisharathreddy_kondakindi@intuit.com>
numaproj · Apr 9, 2024 · 49e5bab · 49e5bab
1 parent 8560a07
commit 49e5bab
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 8 deletions.
diff --git a/numalogic/connectors/rds/__init__.py b/numalogic/connectors/rds/__init__.py
@@ -0,0 +1,3 @@
+from numalogic.connectors.rds._rds import RDSFetcher
+
+__all__ = ["RDSFetcher"]
diff --git a/numalogic/connectors/rds/_base.py b/numalogic/connectors/rds/_base.py
@@ -1,6 +1,6 @@
 from typing import Optional
 import pandas as pd
-from numalogic.connectors.rds._config import DatabaseServiceProvider, RDSConfig
+from numalogic.connectors.utils.aws.config import DatabaseServiceProvider, RDSConfig
 from numalogic.connectors.utils.aws.boto3_client_manager import Boto3ClientManager
 import logging
 from numalogic.connectors._config import Pivot

diff --git a/numalogic/connectors/rds/_rds.py b/numalogic/connectors/rds/_rds.py
@@ -1,7 +1,7 @@
 from typing import Optional
 from numalogic.connectors._base import DataFetcher
 from numalogic.connectors._config import Pivot
-from numalogic.connectors.rds._config import RDSConfig
+from numalogic.connectors.utils.aws.config import RDSConfig
 import logging
 import pandas as pd
 from numalogic.connectors.rds.db.factory import RdsFactory

diff --git a/numalogic/connectors/rds/db/mysql_fetcher.py b/numalogic/connectors/rds/db/mysql_fetcher.py
@@ -4,7 +4,7 @@
 import pandas as pd
 import logging
 
-from numalogic.connectors.rds._config import DatabaseTypes, RDSConfig
+from numalogic.connectors.utils.aws.config import DatabaseTypes, RDSConfig
 
 _LOGGER = logging.getLogger(__name__)
 

diff --git a/numalogic/connectors/utils/aws/boto3_client_manager.py b/numalogic/connectors/utils/aws/boto3_client_manager.py
@@ -1,7 +1,7 @@
 from boto3 import Session
 import logging
 
-from numalogic.connectors.rds._config import DatabaseServiceProvider
+from numalogic.connectors.utils.aws.config import DatabaseServiceProvider
 from numalogic.connectors.utils.aws.exceptions import UnRecognizedAWSClientException
 from numalogic.connectors.utils.aws.sts_client_manager import STSClientManager
 

diff --git a/numalogic/connectors/rds/_config.py → numalogic/connectors/utils/aws/config.py b/numalogic/connectors/rds/_config.py → numalogic/connectors/utils/aws/config.py
diff --git a/numalogic/connectors/utils/aws/db_configurations.py b/numalogic/connectors/utils/aws/db_configurations.py
@@ -2,7 +2,7 @@
 
 from numalogic.tools.exceptions import ConfigNotFoundError
 from omegaconf import OmegaConf
-from numalogic.connectors.rds._config import RDSConfig
+from numalogic.connectors.utils.aws.config import RDSConfig
 
 _LOGGER = logging.getLogger(__name__)
 

diff --git a/tests/connectors/rds/db/test_mysql_fetcher.py b/tests/connectors/rds/db/test_mysql_fetcher.py
@@ -1,6 +1,6 @@
 from unittest.mock import patch, Mock, MagicMock
 
-from numalogic.connectors.rds._config import RDSConfig
+from numalogic.connectors.utils.aws.config import RDSConfig
 from numalogic.connectors.rds.db.mysql_fetcher import MysqlFetcher
 
 

diff --git a/tests/connectors/rds/test_rds.py b/tests/connectors/rds/test_rds.py
@@ -3,7 +3,7 @@
 import pytest
 from pandas import DataFrame
 
-from numalogic.connectors.rds._config import RDSConfig
+from numalogic.connectors.utils.aws.config import RDSConfig
 from numalogic.connectors.rds._rds import RDSFetcher
 import pandas as pd
 

diff --git a/tests/connectors/rds/test_config.py → tests/connectors/utils/aws/test_config.py b/tests/connectors/rds/test_config.py → tests/connectors/utils/aws/test_config.py
@@ -1,4 +1,4 @@
-from numalogic.connectors.rds._config import (
+from numalogic.connectors.utils.aws.config import (
     DatabaseTypes,
     AWSConfig,
     SSLConfig,