Add manual trigger mode for bundle refresh

opa-services/src/main/java/io/github/open_policy_agent/opa/config/Config.java

@@ -325,34 +325,26 @@ public String toString() {
           + '}';
     }
   }
-
+    public enum Trigger {
+        PERIODIC,
+        MANUAL
+    }
   public static class BundleConfig {
-    /** Default maximum bundle size (compressed download and decompressed contents): 512 MB. */
-    public static final long DEFAULT_MAX_SIZE_BYTES = 512L * 1024 * 1024;
-
     private PollingConfig polling;
     private String service;
     private String resource;
+<<<<<<< HEAD
+
+    @JsonProperty("trigger")
+    private Trigger trigger = Trigger.PERIODIC;
+
+    public static final long DEFAULT_MAX_SIZE_BYTES = 1024L * 1024L * 1024L;
 
-    /**
-     * Maximum bundle size in bytes, applied both to the compressed HTTP download and to the
-     * decompressed tarball contents. Defaults to {@link #DEFAULT_MAX_SIZE_BYTES} (512 MB).
-     *
-     * <p><strong>Effective ceiling differs by path</strong>, because both paths buffer payloads
-     * into a Java {@code byte[]}, whose maximum length is {@link Integer#MAX_VALUE} (~2 GB):
-     *
-     * <ul>
-     *   <li><strong>HTTP download:</strong> The entire response is buffered in a single {@code
-     *       byte[]}, so the effective limit is capped at {@code Integer.MAX_VALUE} (~2 GB).
-     *       Configured values above that are silently clamped to {@code Integer.MAX_VALUE} on the
-     *       download path.
-     *   <li><strong>Decompressed tarball contents:</strong> The cumulative budget is tracked as a
-     *       {@code long} and may exceed 2 GB. Only each individual entry is bounded by the {@code
-     *       byte[]} ceiling (~2 GB per entry); the sum across all entries can be larger.
-     * </ul>
-     */
     @JsonProperty("max_size_bytes")
     private long maxSizeBytes = DEFAULT_MAX_SIZE_BYTES;
+=======
+    public static final long DEFAULT_MAX_SIZE_BYTES = 1024L * 1024L * 1024L;
+>>>>>>> 1a6e0d2e887f7d8247cae25ae6cadbdb4c2b718a
 
     public PollingConfig getPolling() {
       return polling;
@@ -381,20 +373,42 @@ public BundleConfig setResource(String resource) {
       return this;
     }
 
+<<<<<<< HEAD
+    public Trigger getTrigger() {
+      return trigger;
+    }
+
+    public BundleConfig setTrigger(Trigger trigger) {
+      this.trigger = trigger;
+      return this;
+    }
+
     public long getMaxSizeBytes() {
       return maxSizeBytes;
     }
 
-    /**
-     * Set the maximum bundle size in bytes. Note that the HTTP download enforcement is capped at
-     * {@link Integer#MAX_VALUE} (~2 GB); values above that are clamped on the download path. See
-     * {@link #maxSizeBytes} for details.
-     */
     public BundleConfig setMaxSizeBytes(long maxSizeBytes) {
       this.maxSizeBytes = maxSizeBytes;
       return this;
     }
 
+    @Override
+    public String toString() {
+      return "BundleConfig{"
+              + "polling="
+              + polling
+              + ", service='"
+              + service
+              + '\''
+              + ", resource='"
+              + resource
+              + '\''
+              + ", trigger="
+              + trigger
+              + ", maxSizeBytes="
+              + maxSizeBytes
+              + '}';
+=======
     @Override
     public String toString() {
       return "BundleConfig{"
@@ -406,9 +420,8 @@ public String toString() {
           + ", resource='"
           + resource
           + '\''
-          + ", maxSizeBytes="
-          + maxSizeBytes
           + '}';
+>>>>>>> 1a6e0d2e887f7d8247cae25ae6cadbdb4c2b718a
     }
   }
 

opa-services/src/main/java/io/github/open_policy_agent/opa/plugins/BundleDownloader.java

@@ -53,6 +53,11 @@
   protected String service;
   protected String resource;
   protected Config.PollingConfig polling;
+  protected Config.Trigger trigger = Config.Trigger.PERIODIC;
+<<<<<<< HEAD
+  private ScheduledExecutorService scheduler;
+=======
+>>>>>>> 1a6e0d2e887f7d8247cae25ae6cadbdb4c2b718a
   protected String etag;
   protected long lastModifiedTime = 0;
   protected long maxSizeBytes = Config.BundleConfig.DEFAULT_MAX_SIZE_BYTES;
@@ -66,6 +71,18 @@
           "binary/octet-stream",
           "application/x-tar");
 
+  public BundleDownloader setTrigger(Config.Trigger trigger) {
+    this.trigger = trigger;
+    return this;
+  }
+
+<<<<<<< HEAD
+  public Config.Trigger getTrigger() {
+    return trigger;
+  }
+
+=======
+>>>>>>> 1a6e0d2e887f7d8247cae25ae6cadbdb4c2b718a
   /**
    * Construct a BundleDownloader.
    *
@@ -165,6 +182,10 @@
     return this;
   }
 
+  public long getMaxSizeBytes() {
+    return maxSizeBytes;
+  }
+
   /**
    * @return a future that completes when the first bundle download succeeds, or completes
    *     exceptionally with the underlying download/activation error
@@ -179,7 +200,20 @@
    * @param scheduler the scheduler to use for periodic downloads
    * @return a future that completes when the initial bundle is downloaded and activated
    */
+
+
   public CompletableFuture<Void> startPolling(ScheduledExecutorService scheduler) {
+<<<<<<< HEAD
+    this.scheduler = scheduler;
+=======
+
+>>>>>>> 1a6e0d2e887f7d8247cae25ae6cadbdb4c2b718a
+    if (trigger == Config.Trigger.MANUAL) {
+      manager.getLogger().info(
+              "Bundle '%s': Manual trigger mode enabled; waiting for refresh()", name);
+      return initialActivation;
+    }
+
     int minDelay =
         (polling != null && polling.getMinDelaySeconds() != null)
             ? polling.getMinDelaySeconds()
@@ -189,12 +223,31 @@
             ? polling.getMaxDelaySeconds()
             : 120;
 
+
+
+<<<<<<< HEAD
+    scheduler.schedule(() -> downloadBundle(initialActivation), 0, TimeUnit.SECONDS);
+=======
     scheduler.schedule(this::downloadBundle, 0, TimeUnit.SECONDS);
+>>>>>>> 1a6e0d2e887f7d8247cae25ae6cadbdb4c2b718a
     scheduleNextPoll(scheduler, minDelay, maxDelay);
 
     return initialActivation;
   }
 
+  public CompletableFuture<Void> refresh() {
+<<<<<<< HEAD
+    CompletableFuture<Void> refreshFuture = new CompletableFuture<>();
+
+    scheduler.execute(() -> downloadBundle(refreshFuture));
+
+    return refreshFuture;
+=======
+    downloadBundle();
+    return initialActivation;
+>>>>>>> 1a6e0d2e887f7d8247cae25ae6cadbdb4c2b718a
+  }
+
   // Re-schedules the next download with a uniformly random delay in [minDelay, maxDelay],
   // matching Go-OPA's jittered polling. ScheduledExecutorService has no built-in jitter, so the
   // task chains itself. RejectedExecutionException after a shutdown breaks the chain cleanly.
@@ -207,7 +260,7 @@
       scheduler.schedule(
           () -> {
             try {
-              downloadBundle();
+              downloadBundle(initialActivation);
             } catch (Exception e) {
               // downloadBundle() handles its own logging; swallow so the chain keeps polling.
               // Only Exception is caught here — Errors (OOM, etc.) propagate and let the
@@ -230,7 +283,7 @@
    * <p>Handles HTTP/HTTPS downloads with ETag caching, file:// URIs, and filesystem paths. Calls
    * {@link #activateBundle(byte[])} when new bundle data is available.
    */
-  protected void downloadBundle() {
+  protected void downloadBundle(CompletableFuture<Void> future) {
     try {
       Config.ServiceConfig serviceConfig = manager.getConfig().getService(service);
       if (serviceConfig == null) {
@@ -256,17 +309,17 @@
 
         // Handle file:// URIs
         if ("file".equalsIgnoreCase(uri.getScheme())) {
-          handleFileDownload(Paths.get(uri));
+          handleFileDownload(Paths.get(uri), future);
           return;
         }
 
         // Handle HTTP/HTTPS URIs
-        handleHttpDownload(uri);
+        handleHttpDownload(uri, future);
       } else {
         // It's a file path (relative or absolute)
         Path basePath = Paths.get(baseUrl);
         Path filePath = basePath.resolve(resource);
-        handleFileDownload(filePath);
+        handleFileDownload(filePath, future);
       }
 
     } catch (Exception e) {
@@ -282,12 +335,13 @@
    *
    * @param filePath the path to the file
    */
-  private void handleFileDownload(Path filePath) throws IOException {
+  private void handleFileDownload(Path filePath, CompletableFuture<Void> future) throws IOException{
     FileTime currentModTime = Files.getLastModifiedTime(filePath);
     long currentModTimeMillis = currentModTime.toMillis();
 
     if (lastModifiedTime != 0 && lastModifiedTime == currentModTimeMillis) {
       manager.getLogger().debug("Bundle '%s': File not modified, skipping activation", name);
+      future.complete(null);
       if (!initialActivation.isDone()) {
         initialActivation.complete(null);
       }
@@ -298,6 +352,8 @@
     activateBundle(bundleData);
     lastModifiedTime = currentModTimeMillis;
 
+    future.complete(null);
+
     if (!initialActivation.isDone()) {
       initialActivation.complete(null);
     }
@@ -308,7 +364,7 @@
    *
    * @param uri the URI to download from
    */
-  private void handleHttpDownload(URI uri) {
+  private void handleHttpDownload(URI uri, CompletableFuture<Void> future) {
     HttpRequest.Builder requestBuilder =
         HttpRequest.newBuilder()
             .uri(uri)
@@ -335,6 +391,8 @@
                         ? throwable.getCause()
                         : throwable;
                 manager.getLogger().error("Bundle '%s': Download error: %s", name, cause.getMessage());
+                future.completeExceptionally(cause);
+
                 if (!initialActivation.isDone()) {
                   initialActivation.completeExceptionally(cause);
                 }
@@ -343,6 +401,8 @@
 
               if (response.statusCode() == 304) {
                 manager.getLogger().debug("Bundle '%s': Not modified (ETag match)", name);
+                future.complete(null);
+
                 if (!initialActivation.isDone()) {
                   initialActivation.complete(null);
                 }
@@ -354,8 +414,12 @@
                 if (!isAcceptableContentType(contentType)) {
                   String errorMsg = "Unexpected Content-Type: '" + contentType + "'";
                   manager.getLogger().error("Bundle '%s': %s", name, errorMsg);
+                  RuntimeException ex = new RuntimeException(errorMsg);
+
+                  future.completeExceptionally(ex);
+
                   if (!initialActivation.isDone()) {
-                    initialActivation.completeExceptionally(new RuntimeException(errorMsg));
+                    initialActivation.completeExceptionally(ex);
                   }
                   return;
                 }
@@ -364,19 +428,27 @@
                   activateBundle(response.body());
                 } catch (Exception e) {
                   manager.getLogger().error("Bundle '%s': Activation failed: %s", name, e.getMessage());
+                  future.completeExceptionally(e);
+
                   if (!initialActivation.isDone()) {
                     initialActivation.completeExceptionally(e);
                   }
                   return;
                 }
+                future.complete(null);
+
                 if (!initialActivation.isDone()) {
                   initialActivation.complete(null);
                 }
               } else {
                 String errorMsg = "Download failed with status " + response.statusCode();
                 manager.getLogger().error("Bundle '%s': %s", name, errorMsg);
+                RuntimeException ex = new RuntimeException(errorMsg);
+
+                future.completeExceptionally(ex);
+
                 if (!initialActivation.isDone()) {
-                  initialActivation.completeExceptionally(new RuntimeException(errorMsg));
+                  initialActivation.completeExceptionally(ex);
                 }
               }
             });