feat(core): load properly secret plugins

kestra-io · Sep 7, 2023 · 92b1c21 · 92b1c21
1 parent 74b83d8
commit 92b1c21
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/core/src/main/java/io/kestra/core/docs/Plugin.java b/core/src/main/java/io/kestra/core/docs/Plugin.java
@@ -26,6 +26,7 @@ public class Plugin {
     private List<String> conditions;
     private List<String> controllers;
     private List<String> storages;
+    private List<String> secrets;
     private List<String> guides;
 
     public static Plugin of(RegisteredPlugin registeredPlugin) {
@@ -54,6 +55,7 @@ public static Plugin of(RegisteredPlugin registeredPlugin) {
         plugin.conditions = className(filter(registeredPlugin.getConditions()).toArray(Class[]::new));
         plugin.controllers = className(filter(registeredPlugin.getControllers()).toArray(Class[]::new));
         plugin.storages = className(filter(registeredPlugin.getStorages()).toArray(Class[]::new));
+        plugin.secrets = className(filter(registeredPlugin.getSecrets()).toArray(Class[]::new));
 
         return plugin;
     }

diff --git a/core/src/main/java/io/kestra/core/plugins/PluginScanner.java b/core/src/main/java/io/kestra/core/plugins/PluginScanner.java
@@ -3,6 +3,7 @@
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.triggers.AbstractTrigger;
+import io.kestra.core.secret.SecretPluginInterface;
 import io.kestra.core.storages.StorageInterface;
 import io.micronaut.core.beans.BeanIntrospectionReference;
 import io.micronaut.core.io.service.SoftServiceLoader;
@@ -86,6 +87,7 @@ private RegisteredPlugin scanClassLoader(final ClassLoader classLoader, External
         List<Class<? extends AbstractTrigger>> triggers = new ArrayList<>();
         List<Class<? extends Condition>> conditions = new ArrayList<>();
         List<Class<? extends StorageInterface>> storages = new ArrayList<>();
+        List<Class<? extends SecretPluginInterface>> secrets = new ArrayList<>();
         List<Class<?>> controllers = new ArrayList<>();
         List<String> guides = new ArrayList<>();
 
@@ -128,6 +130,10 @@ private RegisteredPlugin scanClassLoader(final ClassLoader classLoader, External
                 storages.add(beanType);
             }
 
+            if (SecretPluginInterface.class.isAssignableFrom(beanType)) {
+                secrets.add(beanType);
+            }
+
             if (beanType.isAnnotationPresent(Controller.class)) {
                 controllers.add(beanType);
             }
@@ -160,6 +166,7 @@ private RegisteredPlugin scanClassLoader(final ClassLoader classLoader, External
             .conditions(conditions)
             .controllers(controllers)
             .storages(storages)
+            .secrets(secrets)
             .guides(guides)
             .build();
     }

diff --git a/core/src/main/java/io/kestra/core/plugins/RegisteredPlugin.java b/core/src/main/java/io/kestra/core/plugins/RegisteredPlugin.java
@@ -2,13 +2,11 @@
 
 import com.github.jknack.handlebars.internal.lang3.ObjectUtils;
 import com.google.common.base.Charsets;
-import com.google.common.collect.ImmutableMap;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.triggers.AbstractTrigger;
+import io.kestra.core.secret.SecretPluginInterface;
 import io.kestra.core.storages.StorageInterface;
-import io.micronaut.http.HttpStatus;
-import io.micronaut.http.exceptions.HttpStatusException;
 import lombok.*;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
@@ -36,10 +34,11 @@ public class RegisteredPlugin {
     private final List<Class<? extends Condition>> conditions;
     private final List<Class<?>> controllers;
     private final List<Class<? extends StorageInterface>> storages;
+    private final List<Class<? extends SecretPluginInterface>> secrets;
     private final List<String> guides;
 
     public boolean isValid() {
-        return tasks.size() > 0 || triggers.size() > 0 || conditions.size() > 0 || controllers.size() > 0 || storages.size() > 0;
+        return !tasks.isEmpty() || !triggers.isEmpty() || !conditions.isEmpty() || !controllers.isEmpty() || !storages.isEmpty() || !secrets.isEmpty();
     }
 
     public boolean hasClass(String cls) {
@@ -74,6 +73,10 @@ public Class baseClass(String cls) {
             return StorageInterface.class;
         }
 
+        if (this.getSecrets().stream().anyMatch(r -> r.getName().equals(cls))) {
+            return SecretPluginInterface.class;
+        }
+
         if (this.getTasks().stream().anyMatch(r -> r.getName().equals(cls))) {
             return Task.class;
         }
@@ -99,6 +102,7 @@ public Map<String, List<Class>> allClassGrouped() {
         result.put("conditions", Arrays.asList(this.getConditions().toArray(Class[]::new)));
         result.put("controllers", Arrays.asList(this.getControllers().toArray(Class[]::new)));
         result.put("storages", Arrays.asList(this.getStorages().toArray(Class[]::new)));
+        result.put("secrets", Arrays.asList(this.getSecrets().toArray(Class[]::new)));
 
         return result;
     }
@@ -234,6 +238,12 @@ public String toString() {
             b.append("] ");
         }
 
+        if (!this.getSecrets().isEmpty()) {
+            b.append("[Secrets: ");
+            b.append(this.getSecrets().stream().map(Class::getName).collect(Collectors.joining(", ")));
+            b.append("] ");
+        }
+
         return b.toString();
     }
 }
diff --git a/core/src/main/java/io/kestra/core/secret/SecretPluginInterface.java b/core/src/main/java/io/kestra/core/secret/SecretPluginInterface.java
@@ -0,0 +1,5 @@
+package io.kestra.core.secret;
+
+public interface SecretPluginInterface {
+
+}