[DOP-17107] bugfix

MobileTeleSystems · Jun 20, 2024 · 84d2ace · 84d2ace
1 parent dac209f
commit 84d2ace
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 48 deletions.
diff --git a/tests/test_integration/test_run_transfer/test_hdfs.py b/tests/test_integration/test_run_transfer/test_hdfs.py
@@ -150,11 +150,14 @@ async def test_run_transfer_hdfs_to_postgres(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = DBReader(
         connection=postgres,
@@ -214,11 +217,14 @@ async def test_run_transfer_postgres_to_hdfs(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = FileDFReader(
         connection=hdfs_file_df_connection,

diff --git a/tests/test_integration/test_run_transfer/test_hve.py b/tests/test_integration/test_run_transfer/test_hve.py
@@ -100,11 +100,14 @@ async def test_run_transfer_postgres_to_hive(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = DBReader(
         connection=hive,
@@ -144,11 +147,14 @@ async def test_run_transfer_postgres_to_hive_mixed_naming(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
     reader = DBReader(
         connection=hive,
         table="default.target_table",
@@ -191,11 +197,14 @@ async def test_run_transfer_hive_to_postgres(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
     reader = DBReader(
         connection=postgres,
         table="public.target_table",
@@ -234,11 +243,14 @@ async def test_run_transfer_hive_to_postgres_mixes_naming(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = DBReader(
         connection=postgres,

diff --git a/tests/test_integration/test_run_transfer/test_oracle.py b/tests/test_integration/test_run_transfer/test_oracle.py
@@ -103,11 +103,14 @@ async def test_run_transfer_postgres_to_oracle(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
     reader = DBReader(
         connection=oracle,
         table=f"{oracle.user}.target_table",
@@ -146,11 +149,14 @@ async def test_run_transfer_postgres_to_oracle_mixed_naming(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = DBReader(
         connection=oracle,
@@ -193,11 +199,14 @@ async def test_run_transfer_oracle_to_postgres(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = DBReader(
         connection=postgres,
@@ -238,11 +247,14 @@ async def test_run_transfer_oracle_to_postgres_mixed_naming(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password", None)
+    assert source_auth_data["user"]
+    assert "password" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = DBReader(
         connection=postgres,

diff --git a/tests/test_integration/test_run_transfer/test_s3.py b/tests/test_integration/test_run_transfer/test_s3.py
@@ -150,11 +150,15 @@ async def test_run_transfer_s3_to_postgres(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["access_key"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("secret_key", None)
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("password")
+    assert source_auth_data["access_key"]
+    assert "secret_key" not in source_auth_data
+    assert target_auth_data["user"]
+    assert "password" not in target_auth_data
 
     reader = DBReader(
         connection=postgres,
@@ -213,11 +217,14 @@ async def test_run_transfer_postgres_to_s3(
         run_id=result.json()["id"],
         token=group_owner.token,
     )
+    source_auth_data = run_data["transfer_dump"]["source_connection"]["auth_data"]
+    target_auth_data = run_data["transfer_dump"]["target_connection"]["auth_data"]
+
     assert run_data["status"] == Status.FINISHED.value
-    assert run_data["transfer_dump"]["source_connection"]["auth_data"]["user"]
-    assert not run_data["transfer_dump"]["source_connection"]["auth_data"].get("password")
-    assert run_data["transfer_dump"]["target_connection"]["auth_data"]["access_key"]
-    assert not run_data["transfer_dump"]["target_connection"]["auth_data"].get("secret_key")
+    assert source_auth_data["access_key"]
+    assert "secret_key" not in source_auth_data
+    assert target_auth_data["access_key"]
+    assert "secret_key" not in target_auth_data
 
     reader = FileDFReader(
         connection=s3_file_df_connection,