Change test-files structure and rename default cluster context (#354)

## Description

1. Change test-files folder structure
2. Rename default cluster context from "default" to "primary" (to avoid
confuses with default kubernetes namespace)

## Type of Change

Please delete options that are not relevant.

* Bug fix (non-breaking change which fixes an issue)

---------

Signed-off-by: David Kornel <[email protected]>

Author: kornys

test-frame-common/src/main/java/io/skodjob/testframe/TestFrameConstants.java

@@ -79,5 +79,5 @@ private TestFrameConstants() {
     /**
      * Default cluster context name
      */
-    public static final String DEFAULT_CONTEXT_NAME = "default";
+    public static final String DEFAULT_CONTEXT_NAME = "primary";
 }

test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java

@@ -71,7 +71,7 @@
  *   KUBECONFIG   = /path/to/default.kubeconfig   # overrides URL/TOKEN
  *
  *   # extra contexts
- *   KUBECONFIG_PROD = /path/to/prod.kubeconfig  # highest precedence per context
+ *   KUBECONFIG_PROD = /path/to/prod.kubeconfig  # the highest precedence per context
  *   KUBE_URL_STAGE  = https://api.stage:6443
  *   KUBE_TOKEN_STAGE= token
  *   KUBE_URL_QA     = https://api.qa:6443
@@ -776,7 +776,7 @@ public <T extends HasMetadata> boolean waitResourceCondition(
         Wait.until(String.format("Resource condition: %s to be fulfilled for resource %s/%s",
                 condition.conditionName(), resource.getKind(), resource.getMetadata().getName()),
             TestFrameConstants.GLOBAL_POLL_INTERVAL_MEDIUM, resourceTimeout, () -> {
-                LOGGER.trace("Obtainining current state of resource: {}/{}",
+                LOGGER.trace("Obtaining current state of resource: {}/{}",
                     resource.getKind(), resource.getMetadata().getName());
                 T r = resourceSupplier.get();
                 LOGGER.trace("Finished obtaining resource: {}/{}",
@@ -898,11 +898,13 @@ private <T extends HasMetadata> boolean isResourceWithReadiness(T resource) {
 
     private void writeResourceAsYaml(HasMetadata res) {
         synchronized (CREATION_LOCK) {
-            File dir = Paths.get(storeYamlPath).resolve(CURRENT_CLUSTER_CONTEXT.get()).resolve("test-files")
+            File dir = Paths.get(storeYamlPath).resolve("test-files").resolve(CURRENT_CLUSTER_CONTEXT.get())
                 .resolve(getTestContext().getRequiredTestClass().getName())
                 .toFile();
             if (getTestContext().getTestMethod().isPresent()) {
                 dir = dir.toPath().resolve(getTestContext().getRequiredTestMethod().getName()).toFile();
+            } else {
+                dir = dir.toPath().resolve("before-all").toFile();
             }
             if (!dir.exists() && !dir.mkdirs()) {
                 throw new RuntimeException("Cannot create dir " + dir);

test-frame-common/src/test/java/io/skodjob/testframe/clients/KubeResourceManagerTest.java

@@ -393,8 +393,8 @@ void testWriteResourceAsYaml() throws Exception {
 
         // Verify the YAML file was created  
         Path expectedFile = Paths.get(testPath)
-            .resolve(currentContext)
             .resolve("test-files")
+            .resolve(currentContext)
             .resolve(getClass().getName())
             .resolve("testWriteResourceAsYaml")
             .resolve("ConfigMap-test-namespace-test-configmap.yaml");

test-frame-common/src/test/java/io/skodjob/testframe/environment/TestEnvironmentVariablesTest.java

@@ -31,7 +31,7 @@ void testGetEnvVariablesCorrectly() {
     @Test
     void testKubernetesContextLoad() {
         assertEquals(3, MyEnvs.CLUSTER_CONFIGS.size());
-        assertNotNull(MyEnvs.CLUSTER_CONFIGS.get("default"));
+        assertNotNull(MyEnvs.CLUSTER_CONFIGS.get("primary"));
         assertNotNull(MyEnvs.CLUSTER_CONFIGS.get("prod"));
         assertNotNull(MyEnvs.CLUSTER_CONFIGS.get("stage"));
     }