simplify a bit

joan38 · Nov 16, 2023 · abc0cbe · abc0cbe
1 parent 5d00d22
commit abc0cbe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/kubernetes-client/test/src/com/goyeau/kubernetes/client/TestPodSpec.scala b/kubernetes-client/test/src/com/goyeau/kubernetes/client/TestPodSpec.scala
@@ -6,11 +6,16 @@ import io.k8s.apimachinery.pkg.api.resource.Quantity
 
 object TestPodSpec {
 
-  val alpine: PodSpec = PodSpec(
+  val alpine: PodSpec = alpine(None)
+
+  def alpine(command: Seq[String]): PodSpec = alpine(command.some)
+
+  private def alpine(command: Option[Seq[String]]): PodSpec = PodSpec(
     containers = Seq(
       Container(
         name = "test",
         image = "alpine".some,
+        command = command,
         imagePullPolicy = "IfNotPresent".some,
         resources = ResourceRequirements(
           requests = Map(

diff --git a/kubernetes-client/test/src/com/goyeau/kubernetes/client/api/JobsApiTest.scala b/kubernetes-client/test/src/com/goyeau/kubernetes/client/api/JobsApiTest.scala
@@ -38,9 +38,7 @@ class JobsApiTest
           template = PodTemplateSpec(
             metadata = Option(ObjectMeta(name = Option(resourceName))),
             spec = Option(
-              TestPodSpec.alpine.copy(
-                restartPolicy = "Never".some
-              )
+              TestPodSpec.alpine.copy(restartPolicy = "Never".some)
             )
           )
         )

diff --git a/kubernetes-client/test/src/com/goyeau/kubernetes/client/api/PodsApiTest.scala b/kubernetes-client/test/src/com/goyeau/kubernetes/client/api/PodsApiTest.scala
@@ -63,32 +63,18 @@ class PodsApiTest
 
   def testPod(podName: String, labels: Map[String, String] = Map.empty): Pod = Pod(
     metadata = Option(ObjectMeta(name = Option(podName), labels = Option(labels))),
-    spec = TestPodSpec.alpine
-      .copy(
-        containers = TestPodSpec.alpine.containers.map { container =>
-          container.copy(
-            command = Option(Seq("sh", "-c", "sleep 120"))
-          )
-        }
-      )
-      .some
+    spec = TestPodSpec.alpine(command = Seq("sh", "-c", "sleep 120")).some
   )
 
   def testPodWithLogs(podName: String, labels: Map[String, String] = Map.empty): Pod = Pod(
     metadata = Option(ObjectMeta(name = Option(podName), labels = Option(labels))),
-    spec = TestPodSpec.alpine
-      .copy(
-        containers = TestPodSpec.alpine.containers.map { container =>
-          container.copy(
-            command = Option(
-              Seq(
-                "sh",
-                "-c",
-                "echo line 1; sleep 1; echo line 2; sleep 2; echo line 3; echo line 4; echo line 5; echo line 6"
-              )
-            )
-          )
-        }
+    spec = TestPodSpec
+      .alpine(command =
+        Seq(
+          "sh",
+          "-c",
+          "echo line 1; sleep 1; echo line 2; sleep 2; echo line 3; echo line 4; echo line 5; echo line 6"
+        )
       )
       .some
   )