From 807ec13cfb2d7a390dc4be8594c8a59c69b47de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kr=C3=A1l?= <53821852+im-konge@users.noreply.github.com> Date: Tue, 7 May 2024 19:39:46 +0200 Subject: [PATCH] Style changes + namespace related methods renaming and changes (#55) * style changes + namespace related methods renaming Signed-off-by: Lukas Kral * change the position of the namespace command Signed-off-by: Lukas Kral --------- Signed-off-by: Lukas Kral --- .../io/skodjob/testframe/LoggerUtils.java | 2 +- .../clients/cmdClient/BaseCmdKubeClient.java | 26 ++++++++++--------- .../clients/cmdClient/KubeCmdClient.java | 4 +-- .../testframe/clients/cmdClient/Kubectl.java | 4 +-- .../testframe/clients/cmdClient/Oc.java | 4 +-- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/LoggerUtils.java b/test-frame-common/src/main/java/io/skodjob/testframe/LoggerUtils.java index e02196b..a1c56f7 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/LoggerUtils.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/LoggerUtils.java @@ -56,7 +56,7 @@ public static void logSeparator(String delimiterChar, int length) { * @param resource resource * @param The type of the resources. */ - public static void logResource(String operation, T resource) { + public static void logResource(String operation, T resource) { if (resource.getMetadata().getNamespace() == null) { LOGGER.info(LoggerUtils.RESOURCE_LOGGER_PATTERN, operation, resource.getKind(), diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/BaseCmdKubeClient.java b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/BaseCmdKubeClient.java index e93daa3..a21b9f2 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/BaseCmdKubeClient.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/BaseCmdKubeClient.java @@ -95,7 +95,10 @@ protected Context adminContext() { } protected List namespacedCommand(String... rest) { - return command(asList(rest), true); + List cmd = new ArrayList<>(List.of("--namespace", namespace)); + cmd.addAll(asList(rest)); + + return command(cmd); } /** @@ -268,7 +271,7 @@ public K deleteContentInNamespace(String yamlContent) { @SuppressWarnings("unchecked") public K applyContent(String yamlContent) { try (Context context = defaultContext()) { - Exec.exec(yamlContent, command(Arrays.asList(APPLY, "-f", "-"), false), 0, + Exec.exec(yamlContent, command(Arrays.asList(APPLY, "-f", "-")), 0, true, true); return (K) this; } @@ -284,7 +287,7 @@ public K applyContent(String yamlContent) { @SuppressWarnings("unchecked") public K deleteContent(String yamlContent) { try (Context context = defaultContext()) { - Exec.exec(yamlContent, command(Arrays.asList(DELETE, "-f", "-"), false), 0, + Exec.exec(yamlContent, command(Arrays.asList(DELETE, "-f", "-")), 0, true, false); return (K) this; } @@ -413,7 +416,7 @@ public ExecResult exec(boolean throwError, String... command) { */ @Override public ExecResult exec(boolean throwError, boolean logToOutput, String... command) { - List cmd = command(asList(command), false); + List cmd = command(asList(command)); return Exec.exec(null, cmd, 0, logToOutput, throwError); } @@ -428,7 +431,7 @@ public ExecResult exec(boolean throwError, boolean logToOutput, String... comman */ @Override public ExecResult exec(boolean throwError, boolean logToOutput, int timeout, String... command) { - List cmd = command(asList(command), false); + List cmd = command(asList(command)); return Exec.exec(null, cmd, timeout, logToOutput, throwError); } @@ -630,17 +633,15 @@ public List listResourcesByLabel(String resourceType, String label) { .out().split("\\s+")); } - private List command(List rest, boolean namespaced) { + private List command(List rest) { List result = new ArrayList<>(); result.add(cmd()); + if (config != null) { result.add("--kubeconfig"); result.add(config); } - if (namespaced) { - result.add("--namespace"); - result.add(namespace); - } + result.addAll(rest); return result; } @@ -656,10 +657,11 @@ private List command(List rest, boolean namespaced) { @Override @SuppressWarnings("unchecked") public K process(Map parameters, String file, Consumer c) { - List command = command(asList(PROCESS, "-f", file), false); + List command = command(asList(PROCESS, "-f", file)); command.addAll(parameters.entrySet().stream() .map(e -> "-p " + e.getKey() + "=" + e.getValue()) - .collect(Collectors.toList())); + .toList()); + c.accept(Exec.exec(null, command, 0, false).out()); return (K) this; } diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/KubeCmdClient.java b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/KubeCmdClient.java index 254eb5b..c2b3a14 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/KubeCmdClient.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/KubeCmdClient.java @@ -48,14 +48,14 @@ public interface KubeCmdClient> { * @param namespace The namespace to set. * @return This kube client. */ - KubeCmdClient namespace(String namespace); + KubeCmdClient inNamespace(String namespace); /** * Retrieves the currently set namespace for the Kubernetes client. * * @return The currently set namespace. */ - String namespace(); + String getCurrentNamespace(); /** * Creates resources from the provided files. diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Kubectl.java b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Kubectl.java index 518a46c..60643ca 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Kubectl.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Kubectl.java @@ -42,7 +42,7 @@ private Kubectl(String futureNamespace, String config) { * @return A new Kubectl instance with the specified namespace. */ @Override - public Kubectl namespace(String namespace) { + public Kubectl inNamespace(String namespace) { return new Kubectl(namespace, config); } @@ -52,7 +52,7 @@ public Kubectl namespace(String namespace) { * @return The current namespace. */ @Override - public String namespace() { + public String getCurrentNamespace() { return namespace; } diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Oc.java b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Oc.java index 6ceae93..5382160 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Oc.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/Oc.java @@ -67,7 +67,7 @@ public String defaultOlmNamespace() { * @return A new Oc instance with the specified namespace. */ @Override - public Oc namespace(String namespace) { + public Oc inNamespace(String namespace) { return new Oc(namespace, config); } @@ -77,7 +77,7 @@ public Oc namespace(String namespace) { * @return The current namespace. */ @Override - public String namespace() { + public String getCurrentNamespace() { return namespace; }