Merge branch 'master' into crioux-stripe/add-rebatch-remote-observable

.github/CODEOWNERS

@@ -1 +1 @@
-* @calvin681 @sundargates @Andyz26 @hmitnflx @fdc-ntflx @dtrager02
+* @calvin681 @Andyz26 @hmitnflx @fdc-ntflx @dtrager02

mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/proto/JobClusterManagerProto.java

@@ -553,7 +553,11 @@ public UpdateJobClusterArtifactRequest(
 
             this.clusterName = clusterName;
             this.artifactName = artifact;
-            this.jobJarUrl = jobJarUrl != null ? jobJarUrl : "http://" + artifact;
+            // [Note] in the legacy setup this artifact field is used to host the job jar url field (it maps to the
+            // json property "url".
+            this.jobJarUrl = jobJarUrl != null ?
+                jobJarUrl :
+                (artifact.startsWith("http://") || artifact.startsWith("https://") ? artifact : "http://" + artifact);
             this.version = version;
             this.skipSubmit = skipSubmit;
             this.user = user;

mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/JobClusterAkkaTest.java

@@ -789,6 +789,40 @@ public void testJobClusterMigrationConfigUpdate() throws Exception  {
         verify(jobStoreMock, times(1)).createJobCluster(any());
     }
 
+    @Test
+    public void testJobClusterArtifactUpdateBackCompat() throws Exception {
+        String clusterName = "testJobClusterArtifactUpdateBackCompat";
+        UpdateJobClusterArtifactRequest req = new UpdateJobClusterArtifactRequest(
+            clusterName,
+            "http://path1/artifact1-1.zip",
+            null,
+            "1",
+            true,
+            "user");
+        assertEquals("http://path1/artifact1-1.zip", req.getArtifactName());
+        assertEquals("http://path1/artifact1-1.zip", req.getjobJarUrl());
+
+        UpdateJobClusterArtifactRequest req2 = new UpdateJobClusterArtifactRequest(
+            clusterName,
+            "artifact1-1.zip",
+            null,
+            "1",
+            true,
+            "user");
+        assertEquals("artifact1-1.zip", req2.getArtifactName());
+        assertEquals("http://artifact1-1.zip", req2.getjobJarUrl());
+
+        UpdateJobClusterArtifactRequest req3 = new UpdateJobClusterArtifactRequest(
+            clusterName,
+            "https://path1/artifact1-1.zip",
+            null,
+            "1",
+            true,
+            "user");
+        assertEquals("https://path1/artifact1-1.zip", req3.getArtifactName());
+        assertEquals("https://path1/artifact1-1.zip", req3.getjobJarUrl());
+    }
+
     @Test
     public void testJobClusterArtifactUpdate() throws Exception  {
         TestKit probe = new TestKit(system);