added triggeringWorkflowId

v1r3n · Oct 13, 2022 · c3d3eb1 · c3d3eb1
1 parent f172d9d
commit c3d3eb1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/BaseDef.java b/common/src/main/java/com/netflix/conductor/common/metadata/BaseDef.java
@@ -30,6 +30,10 @@ public void addPermission(Permission permission, String allowedAuthority) {
         this.accessPolicy.put(permission, allowedAuthority);
     }
 
+    public void addPermissionIfAbsent(Permission permission, String allowedAuthority) {
+        this.accessPolicy.putIfAbsent(permission, allowedAuthority);
+    }
+
     public void removePermission(Permission permission) {
         this.accessPolicy.remove(permission);
     }

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/StartWorkflowInput.java b/core/src/main/java/com/netflix/conductor/core/execution/StartWorkflowInput.java
@@ -32,6 +32,7 @@ public class StartWorkflowInput {
     private String event;
     private Map<String, String> taskToDomain;
     private String workflowId;
+    private String triggeringWorkflowId;
 
     public StartWorkflowInput() {}
 
@@ -143,6 +144,14 @@ public void setWorkflowId(String workflowId) {
         this.workflowId = workflowId;
     }
 
+    public String getTriggeringWorkflowId() {
+        return triggeringWorkflowId;
+    }
+
+    public void setTriggeringWorkflowId(String triggeringWorkflowId) {
+        this.triggeringWorkflowId = triggeringWorkflowId;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -160,6 +169,7 @@ public boolean equals(Object o) {
                 && Objects.equals(parentWorkflowTaskId, that.parentWorkflowTaskId)
                 && Objects.equals(event, that.event)
                 && Objects.equals(taskToDomain, that.taskToDomain)
+                && Objects.equals(triggeringWorkflowId, that.triggeringWorkflowId)
                 && Objects.equals(workflowId, that.workflowId);
     }
 
@@ -177,6 +187,7 @@ public int hashCode() {
                 parentWorkflowTaskId,
                 event,
                 taskToDomain,
+                triggeringWorkflowId,
                 workflowId);
     }
 }
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
@@ -664,6 +664,7 @@ public WorkflowModel terminateWorkflow(
                     startWorkflowInput.setCorrelationId(workflow.getCorrelationId());
                     startWorkflowInput.setTaskToDomain(workflow.getTaskToDomain());
                     startWorkflowInput.setWorkflowId(failureWFId);
+                    startWorkflowInput.setTriggeringWorkflowId(workflowId);
 
                     eventPublisher.publishEvent(new WorkflowCreationEvent(startWorkflowInput));
 

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java
@@ -71,7 +71,7 @@ public void start(
                         request.getCorrelationId(), workflow.getCorrelationId()));
 
         try {
-            String workflowId = startWorkflow(request);
+            String workflowId = startWorkflow(request, workflow.getWorkflowId());
             taskModel.addOutput(WORKFLOW_ID, workflowId);
             taskModel.setStatus(COMPLETED);
         } catch (TransientException te) {
@@ -136,8 +136,10 @@ private StartWorkflowRequest getRequest(TaskModel taskModel) {
         return startWorkflowRequest;
     }
 
-    private String startWorkflow(StartWorkflowRequest request) {
-        return startWorkflowOperation.execute(new StartWorkflowInput(request));
+    private String startWorkflow(StartWorkflowRequest request, String workflowId) {
+        StartWorkflowInput input = new StartWorkflowInput(request);
+        input.setTriggeringWorkflowId(workflowId);
+        return startWorkflowOperation.execute(input);
     }
 
     @Override