runtime-v2: fix manual trigger exclusive schema (#993)

Author: benbroadaway

runtime/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/parser/TriggersGrammar.java

@@ -170,7 +170,8 @@ private static GithubTriggerExclusiveMode validateGithubExclusiveMode(GithubTrig
                                     optional("name", stringVal.map(v -> o.putConfiguration("name", v))),
                                     mandatory("entryPoint", stringVal.map(v -> o.putConfiguration("entryPoint", v))),
                                     optional("activeProfiles", stringArrayVal.map(o::activeProfiles)),
-                                    optional("arguments", mapVal.map(o::arguments)))))
+                                    optional("arguments", mapVal.map(o::arguments)),
+                                    optional("exclusive", exclusiveVal.map(v -> o.putConfiguration("exclusive", v))))))
                     .map(t -> t.name("manual"))
                     .map(ImmutableTrigger.Builder::build);
 

runtime/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/schema/TriggerMixIn.java

@@ -45,16 +45,16 @@ public interface TriggerMixIn extends Trigger {
     @JsonTypeName("ManualTrigger")
     interface ManualTriggerMixIn extends TriggerMixIn {
 
-        @JsonProperty("exclusive")
-        ExclusiveMode exclusive();
-
         @JsonProperty("manual")
         ManualTriggerParams params();
 
         interface ManualTriggerParams extends DefaultTriggerParams {
 
             @JsonProperty("name")
             String name();
+
+            @JsonProperty("exclusive")
+            ExclusiveMode exclusive();
         }
     }
 

runtime/v2/model/src/test/java/com/walmartlabs/concord/project/runtime/v2/parser/YamlOkParserTest.java

@@ -570,6 +570,22 @@ public void test019() throws Exception {
         assertTrue(p1.configuration().debug());
     }
 
+    @Test
+    void test021() throws Exception {
+        ProcessDefinition pd = load("021.yml");
+
+        List<Trigger> triggers = pd.triggers();
+        assertNotNull(triggers);
+
+        assertEquals(1, triggers.size());
+
+        Trigger t = triggers.get(0);
+        assertEquals("manual", t.name());
+        var exclusive = assertInstanceOf(ExclusiveMode.class, t.configuration().get("exclusive"));
+        assertEquals("manual-group", exclusive.group());
+        assertEquals(ExclusiveMode.Mode.cancel, exclusive.mode());
+    }
+
     @Test
     public void testArgsOrder() throws Exception {
         ProcessDefinition pd = load("args-order.concord.yml");

runtime/v2/model/src/test/resources/021.yml

@@ -0,0 +1,15 @@
+flows:
+  main:
+    - log: "hello: ${v}"
+
+triggers:
+  - manual:
+      name: "test"
+      entryPoint: "main"
+      arguments:
+        k: "v"
+      activeProfiles:
+        - "profile-1"
+      exclusive:
+        mode: "cancel"
+        group: "manual-group"

runtime/v2/model/src/test/resources/schema/concord.yml

@@ -130,6 +130,9 @@ triggers:
         k: "v"
       activeProfiles:
         - "profile-1"
+      exclusive:
+        mode: "cancel"
+        group: "manual-group"
   - cron:
       spec: "* 12 * * *"
       entryPoint: eventOutput