refactor: Remove unneeded temp file usage in tests

Author: Batalex

tests/integration/test_cli_service_accounts.py

@@ -1,13 +1,12 @@
 import json
-import os
 import subprocess
 import uuid
 from collections import defaultdict
 from typing import Generator, MutableMapping
 
 import pytest
 
-from spark8t.domain import KubernetesResourceType, PropertyFile
+from spark8t.domain import KubernetesResourceType
 from spark8t.kube_interface.lightkube import LightKubeInterface
 from spark8t.literals import (
     HUB_LABEL,
@@ -607,25 +606,13 @@ def test_service_account_add_config(
     # add integration hub secret for the test service account
     secret_name = f"{HUB_LABEL}-{username}"
 
-    property_file = PropertyFile({"key": "value"})
-
-    with umask_named_temporary_file(
-        mode="w",
-        prefix="spark-dynamic-conf-k8s-",
-        suffix=".conf",
-        dir=os.path.expanduser("~"),
-    ) as t:
-        property_file.write(t.file)
-
-        t.flush()
-
-        kubeinterface.create(
-            KubernetesResourceType.SECRET_GENERIC,
-            secret_name,
-            namespace=namespace,
-            dry_run=False,
-            **{"from-env-file": str(t.name)},
-        )
+    kubeinterface.create(
+        KubernetesResourceType.SECRET_GENERIC,
+        secret_name,
+        namespace=namespace,
+        dry_run=False,
+        extra_args={"key": "value"},
+    )
 
     assert kubeinterface.exists(
         KubernetesResourceType.SECRET_GENERIC, secret_name, namespace
@@ -676,25 +663,13 @@ def test_service_account_remove_config(
     # add integration hub secret for the test service account
     secret_name = f"{HUB_LABEL}-{username}"
 
-    property_file = PropertyFile({"key": "value"})
-
-    with umask_named_temporary_file(
-        mode="w",
-        prefix="spark-dynamic-conf-k8s-",
-        suffix=".conf",
-        dir=os.path.expanduser("~"),
-    ) as t:
-        property_file.write(t.file)
-
-        t.flush()
-
-        kubeinterface.create(
-            KubernetesResourceType.SECRET_GENERIC,
-            secret_name,
-            namespace=namespace,
-            dry_run=False,
-            **{"from-env-file": str(t.name)},
-        )
+    kubeinterface.create(
+        KubernetesResourceType.SECRET_GENERIC,
+        secret_name,
+        namespace=namespace,
+        dry_run=False,
+        extra_args={"key": "value"},
+    )
 
     assert kubeinterface.exists(
         KubernetesResourceType.SECRET_GENERIC, secret_name, namespace

tests/integration/test_kube_interface.py

@@ -1,11 +1,9 @@
-import os
 from time import sleep
 
 import pytest
 
 from spark8t.domain import KubernetesResourceType, PropertyFile
 from spark8t.kube_interface.lightkube import LightKubeInterface
-from spark8t.utils import umask_named_temporary_file
 
 
 @pytest.mark.parametrize(
@@ -38,25 +36,13 @@ def test_create_exists_delete_secret(
 ) -> None:
     secret_name = "my-secret"
 
-    property_file = PropertyFile({"key": "value"})
-
-    with umask_named_temporary_file(
-        mode="w",
-        prefix="spark-dynamic-conf-k8s-",
-        suffix=".conf",
-        dir=os.path.expanduser("~"),
-    ) as t:
-        property_file.write(t.file)
-
-        t.flush()
-
-        kubeinterface.create(
-            KubernetesResourceType.SECRET_GENERIC,
-            secret_name,
-            namespace=namespace,
-            dry_run=False,
-            **{"from-env-file": str(t.name)},
-        )
+    kubeinterface.create(
+        KubernetesResourceType.SECRET_GENERIC,
+        secret_name,
+        namespace=namespace,
+        dry_run=False,
+        extra_args={"key": "value"},
+    )
 
     assert kubeinterface.exists(
         KubernetesResourceType.SECRET_GENERIC, secret_name, namespace
@@ -74,25 +60,16 @@ def test_delete_secret_content(
 ) -> None:
     secret_name = "my-secret"
 
-    property_file = PropertyFile({"key": "value"})
-
-    with umask_named_temporary_file(
-        mode="w",
-        prefix="spark-dynamic-conf-k8s-",
-        suffix=".conf",
-        dir=os.path.expanduser("~"),
-    ) as t:
-        property_file.write(t.file)
-
-        t.flush()
-
-        kubeinterface.create(
-            KubernetesResourceType.SECRET_GENERIC,
-            secret_name,
-            namespace=namespace,
-            dry_run=False,
-            **{"from-env-file": str(t.name)},
-        )
+    secret_content = {"key": "value"}
+    property_file = PropertyFile(secret_content)
+
+    kubeinterface.create(
+        KubernetesResourceType.SECRET_GENERIC,
+        secret_name,
+        namespace=namespace,
+        dry_run=False,
+        extra_args=secret_content,
+    )
 
     assert kubeinterface.exists(
         KubernetesResourceType.SECRET_GENERIC, secret_name, namespace