fix: fix wrong type in runnables written by runtimes

scc-digitalhub · Jul 19, 2024 · 0d3d950 · 0d3d950
1 parent 8929233
commit 0d3d950
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 33 deletions.
diff --git a/...ons/src/main/java/it/smartcommunitylabdhub/commons/runtimes/base/AbstractBaseRuntime.java b/...ons/src/main/java/it/smartcommunitylabdhub/commons/runtimes/base/AbstractBaseRuntime.java
@@ -155,7 +155,7 @@ public R delete(@NotNull Run run) {
         }
 
         log.warn("Error deleting run {}", run.getId());
-        throw new NoSuchEntityException("Error deleting run");
+        throw new NoSuchEntityException("run");
     }
 
     @Override

diff --git a/...rc/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerBuildRunner.java b/...rc/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerBuildRunner.java
@@ -19,6 +19,7 @@
 import it.smartcommunitylabdhub.framework.kaniko.runnables.K8sKanikoRunnable;
 import it.smartcommunitylabdhub.runtime.container.ContainerRuntime;
 import it.smartcommunitylabdhub.runtime.container.specs.ContainerBuildTaskSpec;
+import it.smartcommunitylabdhub.runtime.container.specs.ContainerDeployTaskSpec;
 import it.smartcommunitylabdhub.runtime.container.specs.ContainerFunctionSpec;
 import it.smartcommunitylabdhub.runtime.container.specs.ContainerFunctionSpec.SourceCodeLanguages;
 import it.smartcommunitylabdhub.runtime.container.specs.ContainerRunSpec;
@@ -47,8 +48,6 @@ public class ContainerBuildRunner implements Runner<K8sKanikoRunnable> {
     private static final String RUN_DEBUG =
         "PWD=`pwd`;echo \"DEBUG: dir ${PWD}\";LS=`ls -R`;echo \"DEBUG: dir content:\" && echo \"${LS}\";";
 
-    private static final String TASK = "job";
-
     private final ContainerFunctionSpec functionSpec;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -143,7 +142,7 @@ public K8sKanikoRunnable produce(Run run) {
             .id(run.getId())
             .project(run.getProject())
             .runtime(ContainerRuntime.RUNTIME)
-            .task(TASK)
+            .task(ContainerDeployTaskSpec.KIND)
             .state(State.READY.name())
             .labels(
                 k8sBuilderHelper != null

diff --git a/...c/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerDeployRunner.java b/...c/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerDeployRunner.java
@@ -30,8 +30,6 @@
  */
 public class ContainerDeployRunner implements Runner<K8sDeploymentRunnable> {
 
-    private static final String TASK = "deploy";
-
     private final ContainerFunctionSpec functionSpec;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -63,7 +61,7 @@ public K8sDeploymentRunnable produce(Run run) {
         K8sDeploymentRunnable k8sDeploymentRunnable = K8sDeploymentRunnable
             .builder()
             .runtime(ContainerRuntime.RUNTIME)
-            .task(TASK)
+            .task(ContainerDeployTaskSpec.KIND)
             .state(State.READY.name())
             .labels(
                 k8sBuilderHelper != null

diff --git a/.../src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerJobRunner.java b/.../src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerJobRunner.java
@@ -33,8 +33,6 @@
  */
 public class ContainerJobRunner implements Runner<K8sRunnable> {
 
-    private static final String TASK = "job";
-
     private final ContainerFunctionSpec functionSpec;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -66,7 +64,7 @@ public K8sRunnable produce(Run run) {
         K8sRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(ContainerRuntime.RUNTIME)
-            .task(TASK)
+            .task(ContainerJobTaskSpec.KIND)
             .state(State.READY.name())
             .labels(
                 k8sBuilderHelper != null
@@ -96,7 +94,7 @@ public K8sRunnable produce(Run run) {
                 K8sCronJobRunnable
                     .builder()
                     .runtime(ContainerRuntime.RUNTIME)
-                    .task(TASK)
+                    .task(ContainerJobTaskSpec.KIND)
                     .state(State.READY.name())
                     //base
                     .image(functionSpec.getImage())

diff --git a/...rc/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerServeRunner.java b/...rc/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerServeRunner.java
@@ -30,8 +30,6 @@
  */
 public class ContainerServeRunner implements Runner<K8sServeRunnable> {
 
-    private static final String TASK = "serve";
-
     private final ContainerFunctionSpec functionSpec;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -63,7 +61,7 @@ public K8sServeRunnable produce(Run run) {
         K8sServeRunnable k8sServeRunnable = K8sServeRunnable
             .builder()
             .runtime(ContainerRuntime.RUNTIME)
-            .task(TASK)
+            .task(ContainerServeTaskSpec.KIND)
             .state(State.READY.name())
             .labels(
                 k8sBuilderHelper != null

diff --git a/...me-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/runners/DbtTransformRunner.java b/...me-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/runners/DbtTransformRunner.java
@@ -25,8 +25,6 @@
  */
 public class DbtTransformRunner implements Runner<K8sJobRunnable> {
 
-    private static final String TASK = "transform";
-
     private final String image;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -54,7 +52,7 @@ public K8sJobRunnable produce(Run run) {
         K8sJobRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(DbtRuntime.RUNTIME)
-            .task(TASK)
+            .task(DbtTransformSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))

diff --git a/...ime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPPipelineRunner.java b/...ime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPPipelineRunner.java
@@ -27,8 +27,6 @@
  */
 public class KFPPipelineRunner implements Runner<K8sRunnable> {
 
-    private static final String TASK = "pipeline";
-
     private final String image;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -55,7 +53,7 @@ public K8sRunnable produce(Run run) {
         K8sRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(KFPRuntime.RUNTIME)
-            .task(TASK)
+            .task(KFPPipelineTaskSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))
@@ -75,7 +73,7 @@ public K8sRunnable produce(Run run) {
                 K8sCronJobRunnable
                     .builder()
                     .runtime(KFPRuntime.RUNTIME)
-                    .task(TASK)
+                    .task(KFPPipelineTaskSpec.KIND)
                     //base
                     .image(image)
                     .command("python")

diff --git a/...-mlrun/src/main/java/it/smartcommunitylabdhub/runtime/mlrun/runners/MlrunBuildRunner.java b/...-mlrun/src/main/java/it/smartcommunitylabdhub/runtime/mlrun/runners/MlrunBuildRunner.java
@@ -25,7 +25,6 @@
  */
 public class MlrunBuildRunner implements Runner<K8sJobRunnable> {
 
-    private static final String TASK = "build";
     private final String image;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -53,7 +52,7 @@ public K8sJobRunnable produce(Run run) {
         K8sJobRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(MlrunRuntime.RUNTIME)
-            .task(TASK)
+            .task(MlrunBuildTaskSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))

diff --git a/...me-mlrun/src/main/java/it/smartcommunitylabdhub/runtime/mlrun/runners/MlrunJobRunner.java b/...me-mlrun/src/main/java/it/smartcommunitylabdhub/runtime/mlrun/runners/MlrunJobRunner.java
@@ -25,7 +25,6 @@
  */
 public class MlrunJobRunner implements Runner<K8sJobRunnable> {
 
-    private static final String TASK = "job";
     private final String image;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -53,7 +52,7 @@ public K8sJobRunnable produce(Run run) {
         K8sJobRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(MlrunRuntime.RUNTIME)
-            .task(TASK)
+            .task(MlrunJobTaskSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))

diff --git a/.../src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemInferRunner.java b/.../src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemInferRunner.java
@@ -25,7 +25,6 @@
  */
 public class NefertemInferRunner implements Runner<K8sJobRunnable> {
 
-    private static final String TASK = "infer";
     private final String image;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -53,7 +52,7 @@ public K8sJobRunnable produce(Run run) {
         K8sJobRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(NefertemRuntime.RUNTIME)
-            .task(TASK)
+            .task(NefertemInferTaskSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))

diff --git a/...src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemMetricRunner.java b/...src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemMetricRunner.java
@@ -25,7 +25,6 @@
  */
 public class NefertemMetricRunner implements Runner<K8sJobRunnable> {
 
-    private static final String TASK = "metric";
     private final String image;
 
     private final Map<String, Set<String>> groupedSecrets;
@@ -54,7 +53,7 @@ public K8sJobRunnable produce(Run run) {
         K8sJobRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(NefertemRuntime.RUNTIME)
-            .task(TASK)
+            .task(NefertemMetricTaskSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))

diff --git a/...rc/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemProfileRunner.java b/...rc/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemProfileRunner.java
@@ -25,7 +25,6 @@
  */
 public class NefertemProfileRunner implements Runner<K8sJobRunnable> {
 
-    private static final String TASK = "profile";
     private final String image;
 
     private final Map<String, Set<String>> groupedSecrets;
@@ -54,7 +53,7 @@ public K8sJobRunnable produce(Run run) {
         K8sJobRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(NefertemRuntime.RUNTIME)
-            .task(TASK)
+            .task(NefertemProfileTaskSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))

diff --git a/...c/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemValidateRunner.java b/...c/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemValidateRunner.java
@@ -25,7 +25,6 @@
  */
 public class NefertemValidateRunner implements Runner<K8sJobRunnable> {
 
-    private static final String TASK = "validate";
     private final String image;
     private final Map<String, Set<String>> groupedSecrets;
 
@@ -53,7 +52,7 @@ public K8sJobRunnable produce(Run run) {
         K8sJobRunnable k8sJobRunnable = K8sJobRunnable
             .builder()
             .runtime(NefertemRuntime.RUNTIME)
-            .task(TASK)
+            .task(NefertemValidateTaskSpec.KIND)
             .image(image)
             .command("python")
             .args(List.of("wrapper.py").toArray(String[]::new))