Merge pull request #119 from hkad98/NAS-4105

NAS-4105 extend import from the gooddata_sdk Reviewed-by: https://github.com/pcerny
gooddata · Jul 14, 2022 · 668dd3f · 668dd3f
2 parents 8edeb24 + 7c0168b
commit 668dd3f
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 21 deletions.
diff --git a/gooddata-sdk/gooddata_sdk/__init__.py b/gooddata-sdk/gooddata_sdk/__init__.py
@@ -7,6 +7,7 @@
 from gooddata_sdk._version import __version__
 from gooddata_sdk.catalog.data_source.action_requests.ldm_request import CatalogGenerateLdmRequest
 from gooddata_sdk.catalog.data_source.action_requests.scan_model_request import CatalogScanModelRequest
+from gooddata_sdk.catalog.data_source.declarative_model.data_source import CatalogDeclarativeDataSources
 from gooddata_sdk.catalog.data_source.entity_model.content_objects.table import CatalogDataSourceTable
 from gooddata_sdk.catalog.data_source.entity_model.data_source import (
     BigQueryAttributes,
@@ -24,13 +25,27 @@
 from gooddata_sdk.catalog.data_source.service import CatalogDataSourceService
 from gooddata_sdk.catalog.data_source.validation.data_source import DataSourceValidator
 from gooddata_sdk.catalog.entity import BasicCredentials, TokenCredentialsFromFile
+from gooddata_sdk.catalog.organization.entity_model.organization import CatalogOrganization
 from gooddata_sdk.catalog.organization.service import CatalogOrganizationService
-from gooddata_sdk.catalog.permission.declarative_model.permission import CatalogDeclarativeWorkspacePermissions
-from gooddata_sdk.catalog.user.declarative_model.user import CatalogDeclarativeUsers
+from gooddata_sdk.catalog.permission.declarative_model.permission import (
+    CatalogAssigneeIdentifier,
+    CatalogDeclarativeDataSourcePermission,
+    CatalogDeclarativeSingleWorkspacePermission,
+    CatalogDeclarativeWorkspaceHierarchyPermission,
+    CatalogDeclarativeWorkspacePermissions,
+)
+from gooddata_sdk.catalog.user.declarative_model.user import CatalogDeclarativeUser, CatalogDeclarativeUsers
 from gooddata_sdk.catalog.user.declarative_model.user_and_user_groups import CatalogDeclarativeUsersUserGroups
-from gooddata_sdk.catalog.user.declarative_model.user_group import CatalogDeclarativeUserGroups
+from gooddata_sdk.catalog.user.declarative_model.user_group import (
+    CatalogDeclarativeUserGroup,
+    CatalogDeclarativeUserGroups,
+)
 from gooddata_sdk.catalog.user.entity_model.user import CatalogUser
 from gooddata_sdk.catalog.user.entity_model.user_group import CatalogUserGroup
+from gooddata_sdk.catalog.workspace.declarative_model.workspace.analytics_model.analytics_model import (
+    CatalogDeclarativeAnalytics,
+)
+from gooddata_sdk.catalog.workspace.declarative_model.workspace.logical_model.ldm import CatalogDeclarativeModel
 from gooddata_sdk.catalog.workspace.declarative_model.workspace.workspace import (
     CatalogDeclarativeWorkspaceDataFilters,
     CatalogDeclarativeWorkspaceModel,

diff --git a/gooddata-sdk/tests/catalog/test_catalog_data_source.py b/gooddata-sdk/tests/catalog/test_catalog_data_source.py
@@ -12,24 +12,25 @@
 
 import gooddata_metadata_client.apis as metadata_apis
 from gooddata_sdk import (
+    BasicCredentials,
     BigQueryAttributes,
     CatalogDataSource,
     CatalogDataSourceBigQuery,
     CatalogDataSourcePostgres,
     CatalogDataSourceRedshift,
     CatalogDataSourceSnowflake,
     CatalogDataSourceVertica,
+    CatalogDeclarativeDataSources,
     CatalogScanModelRequest,
     ExecutionDefinition,
     GoodDataApiClient,
     GoodDataSdk,
     PostgresAttributes,
     RedshiftAttributes,
     SnowflakeAttributes,
+    TokenCredentialsFromFile,
     VerticaAttributes,
 )
-from gooddata_sdk.catalog.data_source.declarative_model.data_source import CatalogDeclarativeDataSources
-from gooddata_sdk.catalog.entity import BasicCredentials, TokenCredentialsFromFile
 from tests import VCR_MATCH_ON
 
 _current_dir = Path(__file__).parent.absolute()

diff --git a/gooddata-sdk/tests/catalog/test_catalog_organization.py b/gooddata-sdk/tests/catalog/test_catalog_organization.py
@@ -5,8 +5,7 @@
 
 import vcr
 
-from gooddata_sdk import GoodDataSdk
-from gooddata_sdk.catalog.organization.entity_model.organization import CatalogOrganization
+from gooddata_sdk import CatalogOrganization, GoodDataSdk
 from tests import VCR_MATCH_ON
 
 _current_dir = Path(__file__).parent.absolute()

diff --git a/gooddata-sdk/tests/catalog/test_catalog_permission.py b/gooddata-sdk/tests/catalog/test_catalog_permission.py
@@ -8,13 +8,14 @@
 import vcr
 
 import gooddata_metadata_client.apis as metadata_apis
-from gooddata_sdk import GoodDataApiClient, GoodDataSdk
-from gooddata_sdk.catalog.identifier import CatalogAssigneeIdentifier
-from gooddata_sdk.catalog.permission.declarative_model.permission import (
+from gooddata_sdk import (
+    CatalogAssigneeIdentifier,
     CatalogDeclarativeDataSourcePermission,
     CatalogDeclarativeSingleWorkspacePermission,
     CatalogDeclarativeWorkspaceHierarchyPermission,
     CatalogDeclarativeWorkspacePermissions,
+    GoodDataApiClient,
+    GoodDataSdk,
 )
 from tests import VCR_MATCH_ON
 

diff --git a/gooddata-sdk/tests/catalog/test_catalog_user_service.py b/gooddata-sdk/tests/catalog/test_catalog_user_service.py
@@ -8,14 +8,16 @@
 import vcr
 
 import gooddata_metadata_client.apis as metadata_apis
-from gooddata_sdk import CatalogDeclarativeUsersUserGroups, GoodDataApiClient, GoodDataSdk
-from gooddata_sdk.catalog.user.declarative_model.user import CatalogDeclarativeUser
-from gooddata_sdk.catalog.user.declarative_model.user_group import (
+from gooddata_sdk import (
+    CatalogDeclarativeUser,
     CatalogDeclarativeUserGroup,
     CatalogDeclarativeUserGroups,
+    CatalogDeclarativeUsersUserGroups,
+    CatalogUser,
+    CatalogUserGroup,
+    GoodDataApiClient,
+    GoodDataSdk,
 )
-from gooddata_sdk.catalog.user.entity_model.user import CatalogUser
-from gooddata_sdk.catalog.user.entity_model.user_group import CatalogUserGroup
 from gooddata_sdk.utils import create_directory
 from tests import VCR_MATCH_ON
 

diff --git a/gooddata-sdk/tests/catalog/test_catalog_workspace.py b/gooddata-sdk/tests/catalog/test_catalog_workspace.py
@@ -7,12 +7,13 @@
 import vcr
 
 import gooddata_metadata_client.apis as metadata_apis
-from gooddata_sdk import GoodDataApiClient, GoodDataSdk
-from gooddata_sdk.catalog.workspace.declarative_model.workspace.workspace import (
+from gooddata_sdk import (
     CatalogDeclarativeWorkspaceDataFilters,
     CatalogDeclarativeWorkspaces,
+    CatalogWorkspace,
+    GoodDataApiClient,
+    GoodDataSdk,
 )
-from gooddata_sdk.catalog.workspace.entity_model.workspace import CatalogWorkspace
 from gooddata_sdk.utils import create_directory
 from tests import VCR_MATCH_ON
 

diff --git a/gooddata-sdk/tests/catalog/test_catalog_workspace_content.py b/gooddata-sdk/tests/catalog/test_catalog_workspace_content.py
@@ -7,11 +7,13 @@
 
 import vcr
 
-from gooddata_sdk import CatalogWorkspace, DataSourceValidator, GoodDataSdk
-from gooddata_sdk.catalog.workspace.declarative_model.workspace.analytics_model.analytics_model import (
+from gooddata_sdk import (
     CatalogDeclarativeAnalytics,
+    CatalogDeclarativeModel,
+    CatalogWorkspace,
+    DataSourceValidator,
+    GoodDataSdk,
 )
-from gooddata_sdk.catalog.workspace.declarative_model.workspace.logical_model.ldm import CatalogDeclarativeModel
 from gooddata_sdk.utils import create_directory
 from tests import VCR_MATCH_ON