Adding force option to update to skip validations

vectorize-io · Apr 28, 2024 · 1b25c8f · 1b25c8f
1 parent fc24ae0
commit 1b25c8f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/...i/src/main/java/ai/langstream/cli/commands/applications/AbstractDeployApplicationCmd.java b/...i/src/main/java/ai/langstream/cli/commands/applications/AbstractDeployApplicationCmd.java
@@ -122,6 +122,11 @@ public static class UpdateApplicationCmd extends AbstractDeployApplicationCmd {
                 description = "Secrets file path")
         private String secretFilePath;
 
+        @CommandLine.Option(
+                names = {"--force"},
+                description = "Skip validation and force update. Use with caution.")
+        private boolean force;
+
         @Override
         String applicationId() {
             return name;

diff --git a/...ore/src/main/java/ai/langstream/runtime/impl/k8s/agents/PulsarDLQSourceAgentProvider.java b/...ore/src/main/java/ai/langstream/runtime/impl/k8s/agents/PulsarDLQSourceAgentProvider.java
@@ -59,7 +59,7 @@ public static class PulsarDLQSourceConfiguration {
                         The URL of the Pulsar cluster to connect to.
                         """,
                 defaultValue = "pulsar://localhost:6650",
-                required = true)
+                required = false)
         @JsonProperty("pulsar-url")
         private String pulsarUrl;
 
@@ -69,7 +69,7 @@ public static class PulsarDLQSourceConfiguration {
                         Namespace to listen for DLQ topics.
                         """,
                 defaultValue = "public/default",
-                required = true)
+                required = false)
         @JsonProperty("namespace")
         private String namespace;
 
@@ -79,7 +79,7 @@ public static class PulsarDLQSourceConfiguration {
                         Subscription name to use for the DLQ topics.
                         """,
                 defaultValue = "langstream-dlq-subscription",
-                required = true)
+                required = false)
         @JsonProperty("subscription")
         private String subscription;
 
@@ -89,7 +89,7 @@ public static class PulsarDLQSourceConfiguration {
                         Suffix to use for DLQ topics.
                         """,
                 defaultValue = "-DLQ",
-                required = true)
+                required = false)
         @JsonProperty("dlq-suffix")
         private String dlqSuffix;
 

diff --git a/...am-webservice/src/main/java/ai/langstream/webservice/application/ApplicationResource.java b/...am-webservice/src/main/java/ai/langstream/webservice/application/ApplicationResource.java
@@ -180,7 +180,8 @@ void updateApplication(
             @NotBlank @PathVariable("id") String applicationId,
             @NotNull @RequestParam("app") Optional<MultipartFile> appFile,
             @RequestParam Optional<String> instance,
-            @RequestParam Optional<String> secrets)
+            @RequestParam Optional<String> secrets,
+            @RequestParam(value = "force", required = false) Boolean force)
             throws Exception {
         performAuthorization(authentication, tenant);
         final ParsedApplication parsedApplication =
@@ -189,7 +190,8 @@ void updateApplication(
                 tenant,
                 applicationId,
                 parsedApplication.getApplication(),
-                parsedApplication.getCodeArchiveReference());
+                parsedApplication.getCodeArchiveReference(),
+                force);
     }
 
     @Data

diff --git a/...eam-webservice/src/main/java/ai/langstream/webservice/application/ApplicationService.java b/...eam-webservice/src/main/java/ai/langstream/webservice/application/ApplicationService.java
@@ -172,17 +172,19 @@ public void updateApplication(
             String tenant,
             String applicationId,
             ModelBuilder.ApplicationWithPackageInfo applicationInstance,
-            String codeArchiveReference) {
+            String codeArchiveReference,
+            Boolean force) {
         checkTenant(tenant);
         validateDeployMergeAndUpdate(
-                tenant, applicationId, applicationInstance, codeArchiveReference);
+                tenant, applicationId, applicationInstance, codeArchiveReference, force);
     }
 
     private void validateDeployMergeAndUpdate(
             String tenant,
             String applicationId,
             ModelBuilder.ApplicationWithPackageInfo applicationInstance,
-            String codeArchiveReference) {
+            String codeArchiveReference,
+            Boolean force) {
 
         final StoredApplication existing = applicationStore.get(tenant, applicationId, false);
         if (existing == null) {
@@ -191,7 +193,8 @@ private void validateDeployMergeAndUpdate(
         final Application newApplication = applicationInstance.getApplication();
         if (!applicationInstance.isHasInstanceDefinition()
                 && !applicationInstance.isHasSecretDefinition()
-                && !applicationInstance.isHasAppDefinition()) {
+                && !applicationInstance.isHasAppDefinition()
+                && !force) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "No changes detected");
         }
         if (!applicationInstance.isHasInstanceDefinition()) {
@@ -212,7 +215,9 @@ private void validateDeployMergeAndUpdate(
             newApplication.setResources(existing.getInstance().getResources());
         }
         final ExecutionPlan newPlan = validateExecutionPlan(applicationId, newApplication);
-        validateUpdate(tenant, existing, existingSecrets, newPlan);
+        if (!force) {
+            validateUpdate(tenant, existing, existingSecrets, newPlan);
+        }
         if (codeArchiveReference == null) {
             codeArchiveReference = existing.getCodeArchiveReference();
         }