data-dot-all · dlpzx · Jun 11, 2024 · Jun 10, 2024 · Jun 10, 2024 · Jun 10, 2024
diff --git a/...taall/modules/s3_datasets_shares/services/share_managers/s3_access_point_share_manager.py b/...taall/modules/s3_datasets_shares/services/share_managers/s3_access_point_share_manager.py
@@ -192,6 +192,7 @@ def check_target_role_access_policy(self) -> None:
         version_id, policy_document = IAM.get_managed_policy_default_version(
             self.target_environment.AwsAccountId, self.target_environment.region, share_resource_policy_name
         )
+        logger.info(f'Policy... {policy_document}')
 
         s3_statement_index = SharePolicyService._get_statement_by_sid(
             policy_document, f'{IAM_S3_ACCESS_POINTS_STATEMENT_SID}S3'

diff --git a/tests/modules/datasets/__init__.py → tests/modules/s3_datasets/__init__.py b/tests/modules/datasets/__init__.py → tests/modules/s3_datasets/__init__.py
diff --git a/tests/modules/datasets/conftest.py → tests/modules/s3_datasets/conftest.py b/tests/modules/datasets/conftest.py → tests/modules/s3_datasets/conftest.py
diff --git a/tests/modules/datasets/tasks/__init__.py → tests/modules/s3_datasets/tasks/__init__.py b/tests/modules/datasets/tasks/__init__.py → tests/modules/s3_datasets/tasks/__init__.py
diff --git a/tests/modules/datasets/tasks/conftest.py → tests/modules/s3_datasets/tasks/conftest.py b/tests/modules/datasets/tasks/conftest.py → tests/modules/s3_datasets/tasks/conftest.py
diff --git a/...ets/tasks/test_dataset_catalog_indexer.py → ...ets/tasks/test_dataset_catalog_indexer.py b/...ets/tasks/test_dataset_catalog_indexer.py → ...ets/tasks/test_dataset_catalog_indexer.py
diff --git a/...asets/tasks/test_dataset_subscriptions.py → ...asets/tasks/test_dataset_subscriptions.py b/...asets/tasks/test_dataset_subscriptions.py → ...asets/tasks/test_dataset_subscriptions.py
@@ -81,8 +81,6 @@ def share(
             itemUri=table.tableUri,
             itemType=ShareableType.Table.value,
             itemName=table.GlueTableName,
-            GlueDatabaseName=table.GlueDatabaseName,
-            GlueTableName=table.GlueTableName,
             status=ShareItemStatus.Share_Approved.value,
         )
         session.add(share_item)

diff --git a/...atasets/tasks/test_dataset_tables_sync.py → ...atasets/tasks/test_dataset_tables_sync.py b/...atasets/tasks/test_dataset_tables_sync.py → ...atasets/tasks/test_dataset_tables_sync.py
diff --git a/...asks/test_stacks_updater_with_datasets.py → ...asks/test_stacks_updater_with_datasets.py b/...asks/test_stacks_updater_with_datasets.py → ...asks/test_stacks_updater_with_datasets.py
diff --git a/tests/modules/datasets/test_dataset.py → tests/modules/s3_datasets/test_dataset.py b/tests/modules/datasets/test_dataset.py → tests/modules/s3_datasets/test_dataset.py
@@ -8,7 +8,7 @@
 from dataall.core.organizations.db.organization_models import Organization
 from dataall.modules.s3_datasets.db.dataset_repositories import DatasetRepository
 from dataall.modules.s3_datasets.db.dataset_models import DatasetStorageLocation, DatasetTable, S3Dataset
-from dataall.modules.datasets_base.db.dataset_models import DatasetLock
+from dataall.modules.datasets_base.db.dataset_models import DatasetLock, DatasetBase
 from tests.core.stacks.test_stack import update_stack_query
 
 from dataall.modules.datasets_base.services.datasets_enums import ConfidentialityClassification
@@ -352,6 +352,7 @@ def test_delete_dataset(client, dataset, env_fixture, org_fixture, db, module_mo
     with db.scoped_session() as session:
         session.query(DatasetLock).delete()
         session.query(S3Dataset).delete()
+        session.query(DatasetBase).delete()
         session.commit()
     deleted_dataset = dataset(org=org_fixture, env=env_fixture, name='dataset1', owner=user.username, group=group.name)
     response = client.query(
@@ -381,7 +382,7 @@ def test_delete_dataset(client, dataset, env_fixture, org_fixture, db, module_mo
         username=user.username,
         groups=[group.name],
     )
-    assert response.data.getDataset is None
+    assert response.data.getDataset == None
 
     response = client.query(
         """

diff --git a/...ules/datasets/test_dataset_count_votes.py → ...s/s3_datasets/test_dataset_count_votes.py b/...ules/datasets/test_dataset_count_votes.py → ...s/s3_datasets/test_dataset_count_votes.py
diff --git a/tests/modules/datasets/test_dataset_feed.py → .../modules/s3_datasets/test_dataset_feed.py b/tests/modules/datasets/test_dataset_feed.py → .../modules/s3_datasets/test_dataset_feed.py
diff --git a/...modules/datasets/test_dataset_glossary.py → ...ules/s3_datasets/test_dataset_glossary.py b/...modules/datasets/test_dataset_glossary.py → ...ules/s3_datasets/test_dataset_glossary.py
diff --git a/...modules/datasets/test_dataset_indexers.py → ...ules/s3_datasets/test_dataset_indexers.py b/...modules/datasets/test_dataset_indexers.py → ...ules/s3_datasets/test_dataset_indexers.py
diff --git a/...es/datasets/test_dataset_key_value_tag.py → ...s3_datasets/test_dataset_key_value_tag.py b/...es/datasets/test_dataset_key_value_tag.py → ...s3_datasets/test_dataset_key_value_tag.py
diff --git a/...modules/datasets/test_dataset_location.py → ...ules/s3_datasets/test_dataset_location.py b/...modules/datasets/test_dataset_location.py → ...ules/s3_datasets/test_dataset_location.py
diff --git a/...ules/datasets/test_dataset_permissions.py → ...s/s3_datasets/test_dataset_permissions.py b/...ules/datasets/test_dataset_permissions.py → ...s/s3_datasets/test_dataset_permissions.py
diff --git a/...odules/datasets/test_dataset_profiling.py → ...les/s3_datasets/test_dataset_profiling.py b/...odules/datasets/test_dataset_profiling.py → ...les/s3_datasets/test_dataset_profiling.py
diff --git a/...s/datasets/test_dataset_resource_found.py → ...3_datasets/test_dataset_resource_found.py b/...s/datasets/test_dataset_resource_found.py → ...3_datasets/test_dataset_resource_found.py
diff --git a/tests/modules/datasets/test_dataset_stack.py → ...modules/s3_datasets/test_dataset_stack.py b/tests/modules/datasets/test_dataset_stack.py → ...modules/s3_datasets/test_dataset_stack.py
diff --git a/tests/modules/datasets/test_dataset_table.py → ...modules/s3_datasets/test_dataset_table.py b/tests/modules/datasets/test_dataset_table.py → ...modules/s3_datasets/test_dataset_table.py
diff --git a/...ts/test_environment_stack_with_dataset.py → ...ts/test_environment_stack_with_dataset.py b/...ts/test_environment_stack_with_dataset.py → ...ts/test_environment_stack_with_dataset.py
diff --git a/tests/modules/datasets/test_glue_profiler.py → ...modules/s3_datasets/test_glue_profiler.py b/tests/modules/datasets/test_glue_profiler.py → ...modules/s3_datasets/test_glue_profiler.py
diff --git a/...atasets/test_import_dataset_check_unit.py → ...atasets/test_import_dataset_check_unit.py b/...atasets/test_import_dataset_check_unit.py → ...atasets/test_import_dataset_check_unit.py
diff --git a/tests/modules/s3_datasets_shares/__init__.py b/tests/modules/s3_datasets_shares/__init__.py