WIP. Refactor the code to support to generate a resource of type: Pip…

…eline(Run), Task(Run)

Signed-off-by: cmoulliard <[email protected]>

src/main/java/dev/snowdrop/factory/ActionProvider.java

@@ -0,0 +1,8 @@
+package dev.snowdrop.factory;
+
+import dev.snowdrop.model.Configurator;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+public interface ActionProvider {
+    HasMetadata buildResource(Configurator cfg);
+}

src/main/java/dev/snowdrop/factory/JobBuilder.java

@@ -0,0 +1,22 @@
+package dev.snowdrop.factory;
+
+import dev.snowdrop.model.Configurator;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+public class JobBuilder {
+    private final JobProvider jobProvider;
+    private String resourceType;
+
+    public JobBuilder(JobProvider jobProvider) {
+        this.jobProvider = jobProvider;
+    }
+
+    public JobBuilder withResourceType(String resourceType) {
+        this.resourceType = resourceType;
+        return this;
+    }
+
+    public HasMetadata buildResource(Configurator cfg) {
+        return jobProvider.buildResource(cfg, resourceType);
+    }
+}

src/main/java/dev/snowdrop/factory/JobFactory.java

@@ -1,14 +1,19 @@
 package dev.snowdrop.factory;
 
 public class JobFactory {
-    public static JobProvider withType(Type type) {
-        switch (type) {
-            case KONFLUX:
+    public static JobBuilder withProvider(Type providerType) {
+        JobProvider provider = createProvider(providerType.toString()); // convert string to enum if needed
+        return new JobBuilder(provider);
+    }
+
+    private static JobProvider createProvider(String provider) {
+        switch (provider.toUpperCase()) {
+            case "KONFLUX":
                 return new dev.snowdrop.factory.konflux.pipeline.Pipelines();
-            case TEKTON:
+            case "TEKTON":
                 return new dev.snowdrop.factory.tekton.pipeline.Pipelines();
             default:
-                throw new IllegalArgumentException("Unknown type: " + type);
+                throw new IllegalArgumentException("Unknown provider type: " + provider);
         }
     }
 }

src/main/java/dev/snowdrop/factory/JobProvider.java

@@ -4,5 +4,5 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
 public interface JobProvider {
-    HasMetadata generatePipeline(Configurator cfg);
+    HasMetadata buildResource(Configurator cfg, String resourceType);
 }

src/main/java/dev/snowdrop/factory/TektonResource.java

@@ -1,6 +1,6 @@
 package dev.snowdrop.factory;
 
-import dev.snowdrop.factory.tekton.pipeline.TaskRefResolver;
+import dev.snowdrop.factory.tekton.TaskRefResolver;
 import dev.snowdrop.model.*;
 import dev.snowdrop.model.ConfigMap;
 import dev.snowdrop.model.Secret;
@@ -24,20 +24,21 @@ public class TektonResource {
     private static final Logger logger = LoggerFactory.getLogger(TektonResource.class);
 
     public static HasMetadata create(Configurator cfg) {
-        String domain = cfg.getDomain().toUpperCase();
-        Type TYPE = Type.valueOf(cfg.getType().toUpperCase());
+        String DOMAIN = cfg.getDomain().toUpperCase();
+        Type PROVIDER = Type.valueOf(cfg.getType().toUpperCase());
 
-        if (TYPE == null) {
+        if (PROVIDER == null) {
             throw new RuntimeException("Missing type/provider");
         }
 
-        if (domain == null) {
+        if (DOMAIN == null) {
             throw new RuntimeException("Missing domain");
         }
 
         return JobFactory
-            .withType(TYPE)
-            .generatePipeline(cfg);
+            .withProvider(PROVIDER)
+            .withResourceType(cfg.getJob().getResourceType())
+            .buildResource(cfg);
     }
 
     public static PipelineTask createTaskWithEmbeddedScript(Action action, String runAfter, List<String> args, List<When> when, Map<String, Workspace> jobWorkspacesMap, List<TaskResult> results) {

src/main/java/dev/snowdrop/factory/konflux/pipeline/Pipelines.java

@@ -2,9 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import dev.snowdrop.factory.AnnotationsProviderFactory;
 import dev.snowdrop.factory.JobProvider;
-import dev.snowdrop.factory.LabelsProviderFactory;
 import dev.snowdrop.factory.Type;
 import dev.snowdrop.model.*;
 import dev.snowdrop.service.ConfiguratorSvc;
@@ -42,7 +40,7 @@ public class Pipelines implements JobProvider {
     List<PipelineTask> tasks = new ArrayList<>();
 
     @Override
-    public HasMetadata generatePipeline(Configurator cfg) {
+    public HasMetadata buildResource(Configurator cfg, String resourceType) {
         TYPE = Type.valueOf(cfg.getType().toUpperCase());
 
         PipelineTask aTask;

src/main/java/dev/snowdrop/factory/tekton/pipeline/TaskRefResolver.java → src/main/java/dev/snowdrop/factory/tekton/TaskRefResolver.java

@@ -1,4 +1,4 @@
-package dev.snowdrop.factory.tekton.pipeline;
+package dev.snowdrop.factory.tekton;
 
 import dev.snowdrop.model.Bundle;
 import io.fabric8.tekton.pipeline.v1.ParamValue;

src/main/java/dev/snowdrop/factory/tekton/pipeline/Pipelines.java

@@ -31,7 +31,7 @@ public class Pipelines implements JobProvider {
     private static Type TYPE;
 
     @Override
-    public HasMetadata generatePipeline(Configurator cfg) {
+    public HasMetadata buildResource(Configurator cfg, String resourceType) {
         TYPE = Type.valueOf(cfg.getType().toUpperCase());
         @SuppressWarnings("unchecked")
         PipelineTask aTask;

src/main/java/dev/snowdrop/factory/tekton/task/Tasks.java

@@ -0,0 +1,12 @@
+package dev.snowdrop.factory.tekton.task;
+
+import dev.snowdrop.factory.ActionProvider;
+import dev.snowdrop.model.Configurator;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+public class Tasks implements ActionProvider {
+    @Override
+    public HasMetadata buildResource(Configurator cfg) {
+        return null;
+    }
+}