Merge pull request #2008 from DependencyTrack/plugin-engine-module

Extract plugin infrastructure from apiserver module

Author: nscuro

apiserver/pom.xml

@@ -110,6 +110,11 @@
             <artifactId>plugin-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.dependencytrack</groupId>
+            <artifactId>plugin-config</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.dependencytrack</groupId>
             <artifactId>plugin-runtime</artifactId>

apiserver/src/main/java/org/dependencytrack/common/MdcKeys.java

@@ -30,9 +30,7 @@ public final class MdcKeys {
     public static final String MDC_BOM_VERSION = "bomVersion";
     public static final String MDC_COMPONENT_UUID = "componentUuid";
     public static final String MDC_EVENT_TOKEN = "eventToken";
-    public static final String MDC_EXTENSION = "extension";
     public static final String MDC_EXTENSION_NAME = "extensionName";
-    public static final String MDC_EXTENSION_POINT = "extensionPoint";
     public static final String MDC_EXTENSION_POINT_NAME = "extensionPointName";
     public static final String MDC_NOTIFICATION_GROUP = "notificationGroup";
     public static final String MDC_NOTIFICATION_ID = "notificationId";
@@ -41,7 +39,6 @@ public final class MdcKeys {
     public static final String MDC_NOTIFICATION_SCOPE = "notificationScope";
     public static final String MDC_PKG_METADATA_RESOLVER_NAME = "pkgMetadataResolverName";
     public static final String MDC_PKG_REPOSITORY_IDENTIFIER = "pkgRepositoryIdentifier";
-    public static final String MDC_PLUGIN = "plugin";
     public static final String MDC_PURL = "purl";
     public static final String MDC_PROJECT_NAME = "projectName";
     public static final String MDC_PROJECT_UUID = "projectUuid";

apiserver/src/main/java/org/dependencytrack/dex/DexEngineInitializer.java

@@ -56,7 +56,7 @@
 import org.dependencytrack.pkgmetadata.FetchPackageMetadataResolutionCandidatesActivity;
 import org.dependencytrack.pkgmetadata.ResolvePackageMetadataActivity;
 import org.dependencytrack.pkgmetadata.ResolvePackageMetadataWorkflow;
-import org.dependencytrack.plugin.PluginManager;
+import org.dependencytrack.plugin.runtime.PluginManager;
 import org.dependencytrack.policy.EvalProjectPoliciesActivity;
 import org.dependencytrack.policy.cel.CelPolicyEngine;
 import org.dependencytrack.policy.cel.CelVulnerabilityPolicyEvaluator;

apiserver/src/main/java/org/dependencytrack/notification/DefaultNotificationPublisherInitializer.java

@@ -24,7 +24,7 @@
 import org.dependencytrack.notification.api.publishing.NotificationPublisher;
 import org.dependencytrack.notification.api.publishing.NotificationPublisherFactory;
 import org.dependencytrack.notification.api.templating.NotificationTemplate;
-import org.dependencytrack.plugin.PluginManager;
+import org.dependencytrack.plugin.runtime.PluginManager;
 import org.jdbi.v3.core.statement.PreparedBatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apiserver/src/main/java/org/dependencytrack/notification/PublishNotificationActivity.java

@@ -34,13 +34,13 @@
 import org.dependencytrack.notification.api.templating.NotificationTemplate;
 import org.dependencytrack.notification.proto.v1.Notification;
 import org.dependencytrack.notification.templating.pebble.PebbleNotificationTemplateRendererFactory;
-import org.dependencytrack.plugin.NoSuchExtensionException;
-import org.dependencytrack.plugin.PluginManager;
 import org.dependencytrack.plugin.api.config.InvalidRuntimeConfigException;
 import org.dependencytrack.plugin.api.config.RuntimeConfig;
 import org.dependencytrack.plugin.api.config.RuntimeConfigSpec;
-import org.dependencytrack.plugin.runtime.config.RuntimeConfigMapper;
-import org.dependencytrack.plugin.runtime.config.UnresolvableSecretException;
+import org.dependencytrack.plugin.config.RuntimeConfigMapper;
+import org.dependencytrack.plugin.config.UnresolvableSecretException;
+import org.dependencytrack.plugin.runtime.NoSuchExtensionException;
+import org.dependencytrack.plugin.runtime.PluginManager;
 import org.dependencytrack.proto.internal.workflow.v1.PublishNotificationActivityArg;
 import org.jdbi.v3.core.statement.Query;
 import org.jspecify.annotations.Nullable;

apiserver/src/main/java/org/dependencytrack/persistence/jdbi/ExtensionConfigDao.java

@@ -111,7 +111,7 @@ private static Handle forApiRequest(final Handle handle, final AlpineRequest api
      *
      * @return The global {@link Jdbi} instance
      */
-    static Jdbi createJdbi() {
+    public static Jdbi createJdbi() {
         return GLOBAL_INSTANCE_HOLDER
                 .updateAndGet(previous -> {
                     final DataSource dataSource = DataSourceRegistry.getInstance().getDefault();

apiserver/src/main/java/org/dependencytrack/persistence/jdbi/JdbiFactory.java

@@ -25,7 +25,7 @@
 import org.dependencytrack.dex.api.ActivitySpec;
 import org.dependencytrack.pkgmetadata.resolution.api.PackageMetadataResolver;
 import org.dependencytrack.pkgmetadata.resolution.api.PackageMetadataResolverFactory;
-import org.dependencytrack.plugin.PluginManager;
+import org.dependencytrack.plugin.runtime.PluginManager;
 import org.dependencytrack.proto.internal.workflow.v1.FetchPackageMetadataResolutionCandidatesRes;
 import org.dependencytrack.proto.internal.workflow.v1.PackageMetadataResolutionCandidateGroup;
 import org.jspecify.annotations.Nullable;

apiserver/src/main/java/org/dependencytrack/pkgmetadata/FetchPackageMetadataResolutionCandidatesActivity.java

@@ -37,9 +37,9 @@
 import org.dependencytrack.pkgmetadata.resolution.api.PackageMetadataResolverFactory;
 import org.dependencytrack.pkgmetadata.resolution.api.PackageRepository;
 import org.dependencytrack.pkgmetadata.resolution.api.RetryableResolutionException;
-import org.dependencytrack.plugin.NoSuchExtensionException;
-import org.dependencytrack.plugin.NoSuchExtensionPointException;
-import org.dependencytrack.plugin.PluginManager;
+import org.dependencytrack.plugin.runtime.NoSuchExtensionException;
+import org.dependencytrack.plugin.runtime.NoSuchExtensionPointException;
+import org.dependencytrack.plugin.runtime.PluginManager;
 import org.dependencytrack.proto.internal.workflow.v1.ResolvePackageMetadataActivityArg;
 import org.dependencytrack.secret.management.SecretManager;
 import org.dependencytrack.util.InternalComponentIdentifier;

apiserver/src/main/java/org/dependencytrack/pkgmetadata/ResolvePackageMetadataActivity.java

@@ -21,9 +21,12 @@
 import jakarta.servlet.ServletContextEvent;
 import jakarta.servlet.ServletContextListener;
 import org.dependencytrack.cache.api.CacheManager;
-import org.dependencytrack.pkgmetadata.resolution.api.PackageMetadataResolver;
+import org.dependencytrack.common.HttpClient;
 import org.dependencytrack.notification.api.publishing.NotificationPublisher;
+import org.dependencytrack.persistence.jdbi.JdbiFactory;
+import org.dependencytrack.pkgmetadata.resolution.api.PackageMetadataResolver;
 import org.dependencytrack.plugin.api.Plugin;
+import org.dependencytrack.plugin.runtime.PluginManager;
 import org.dependencytrack.secret.management.SecretManager;
 import org.dependencytrack.vulnanalysis.api.VulnAnalyzer;
 import org.dependencytrack.vulndatasource.api.VulnDataSource;
@@ -78,6 +81,9 @@ public void contextInitialized(ServletContextEvent event) {
                 config,
                 cacheManager,
                 secretManager::getSecretValue,
+                JdbiFactory.createJdbi(),
+                HttpClient.INSTANCE,
+                HttpClient.INSTANCE.userAgent(),
                 extensionPoints);
 
         LOGGER.info("Discovering plugins");