Rewrite if-clause existing infra and resource for imported dataset

data-dot-all · Sep 12, 2024 · 0eb4f73 · 0eb4f73
1 parent 5358677
commit 0eb4f73
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/tests_new/integration_tests/modules/s3_datasets/aws_clients.py b/tests_new/integration_tests/modules/s3_datasets/aws_clients.py
@@ -216,10 +216,9 @@ def get_database(self, database_name):
         try:
             database = self._client.get_database(Name=database_name)
             return database
-        except self._client.exceptions.EntityNotFoundException:
-            return False
         except ClientError as e:
-            raise Exception(f'Error checking if database {database_name} exists: {e}')
+            log.exception(f'Database not found, exception: {e}')
+            return False
 
     def create_database(self, database_name, bucket):
         try:

diff --git a/tests_new/integration_tests/modules/s3_datasets/global_conftest.py b/tests_new/integration_tests/modules/s3_datasets/global_conftest.py
@@ -441,14 +441,14 @@ def persistent_imported_kms_s3_dataset1(
         aws_client=persistent_env1_aws_client,
         integration_role_arn=persistent_env1_integration_role_arn,
         env=persistent_env1,
-        bucket_name=resource_name if existing_bucket is None else None,
-        kms_alias_name=resource_name if existing_kms_alias is None else None,
-        glue_database_name=resource_name if existing_database is None else None,
+        bucket_name=resource_name if not existing_bucket else None,
+        kms_alias_name=resource_name if not existing_kms_alias else None,
+        glue_database_name=resource_name if not existing_database else None,
     )
     if (
-        all(None in item for item in [bucket, existing_bucket])
-        or all(None in item for item in [kms_alias, existing_kms_alias])
-        or all(None in item for item in [database, existing_database])
+        (not bucket and not existing_bucket)
+        or (not kms_alias and not existing_kms_alias)
+        or (not database and not existing_database)
     ):
         delete_aws_imported_resources(
             aws_client=persistent_env1_aws_client,
@@ -465,7 +465,7 @@ def persistent_imported_kms_s3_dataset1(
         client1,
         group1,
         persistent_env1,
-        bucket,
-        kms_alias,
-        database,
+        resource_name,
+        resource_name,
+        resource_name,
     )