feat: Extension plguin type and fix sync ext plugs

quarkusio · Sep 11, 2024 · 0ae451c · 0ae451c
1 parent 9f917a7
commit 0ae451c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/plugin/PluginCommandFactory.java b/devtools/cli/src/main/java/io/quarkus/cli/plugin/PluginCommandFactory.java
@@ -40,6 +40,12 @@ private Optional<PluginCommand> createPluginCommand(Plugin plugin) {
                 return plugin.getLocation().map(l -> new JBangCommand(l, output));
             case executable:
                 return plugin.getLocation().map(l -> new ShellCommand(plugin.getName(), Paths.get(l), output));
+            case extension:
+                if (PluginUtil.checkGACTV(plugin.getLocation()).isPresent()) {
+                    return plugin.getLocation().flatMap(PluginUtil::checkGACTV).map(g -> new JBangCommand(toGAVC(g), output));
+                } else if (plugin.getLocation().filter(l -> l.endsWith(".jar")).isPresent()) {
+                    return plugin.getLocation().map(l -> new JBangCommand(l, output));
+                }
             default:
                 throw new IllegalStateException("Unknown plugin type!");
         }

diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/Plugin.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/Plugin.java
@@ -92,6 +92,10 @@ public Plugin withCatalogLocation(Optional<Path> catalogLocation) {
         return new Plugin(name, type, location, description, catalogLocation, inUserCatalog);
     }
 
+    public Plugin withType(PluginType type) {
+        return new Plugin(name, type, location, description, catalogLocation, inUserCatalog);
+    }
+
     public Plugin inUserCatalog() {
         return new Plugin(name, type, location, description, catalogLocation, true);
     }

diff --git a/...ent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginManager.java b/...ent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginManager.java
@@ -236,7 +236,7 @@ public boolean reconcile() {
      */
     private boolean reconcile(PluginCatalog catalog) {
         Path location = catalog.getCatalogLocation()
-                .orElseThrow(() -> new IllegalArgumentException("Unknwon plugin catalog location."));
+                .orElseThrow(() -> new IllegalArgumentException("Unknown plugin catalog location."));
         List<PluginType> installedTypes = catalog.getPlugins().entrySet().stream().map(Map.Entry::getValue).map(Plugin::getType)
                 .collect(Collectors.toList());
         //Let's only fetch installable plugins of the corresponding types.

diff --git a/...projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginMangerState.java b/...projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginMangerState.java
@@ -121,6 +121,9 @@ public Map<String, Plugin> installablePlugins(List<PluginType> types) {
                 case executable:
                     installablePlugins.putAll(executablePlugins());
                     break;
+                case extension:
+                    installablePlugins.putAll(extensionPlugins());
+                    break;
             }
         }
         installablePlugins.putAll(executablePlugins().entrySet().stream().filter(e -> types.contains(e.getValue().getType()))
@@ -188,8 +191,8 @@ public Map<String, Plugin> extensionPlugins() {
                     for (ArtifactKey key : allKeys) {
                         Extension extension = allExtensions.get(key);
                         for (String cliPlugin : ExtensionProcessor.getCliPlugins(extension)) {
-                            Plugin plugin = cliPlugin.contains(ALIAS_SEPARATOR) ? util.fromAlias(cliPlugin)
-                                    : util.fromLocation(cliPlugin);
+                            Plugin plugin = (cliPlugin.contains(ALIAS_SEPARATOR) ? util.fromAlias(cliPlugin)
+                                    : util.fromLocation(cliPlugin)).withType(PluginType.extension);
                             extensionPlugins.put(plugin.getName(), plugin);
                         }
                     }

diff --git a/...endent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginType.java b/...endent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginType.java
@@ -5,5 +5,6 @@ public enum PluginType {
     java,
     maven,
     executable,
-    jbang;
+    jbang,
+    extension
 }
diff --git a/...endent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginUtil.java b/...endent-projects/tools/devtools-common/src/main/java/io/quarkus/cli/plugin/PluginUtil.java
@@ -84,7 +84,7 @@ public static boolean shouldRemove(Plugin p) {
         if (checkUrl(p.getLocation()).isPresent()) { //We don't want to remove remotely located plugins
             return false;
         }
-        if (checkGACTV(p.getLocation()).isPresent()) { //We don't want to remove remotely located plugins
+        if (checkGACTV(p.getLocation()).isPresent() && p.getType() != PluginType.extension) { //We don't want to remove remotely located plugins
             return false;
         }
         if (p.getLocation().map(PluginUtil::isLocalFile).orElse(false)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,5 +5,6 @@ public enum PluginType { @@
         java,
         maven,
         executable,
-        jbang;
+        jbang,
+        extension
     }