Skip to content

Allow stacky event rules to listen to new events while providing SFNs targets with the legacy objects #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2025
Merged

Allow stacky event rules to listen to new events while providing SFNs targets with the legacy objects #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
146fb8b
Add in event translations
alexiswl Oct 9, 2025
16bc294
Listen to workflow version as well
alexiswl Oct 9, 2025
e3adfb1
Add in event translation to handle new workflow manager
alexiswl Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...functions_templates/workflowrunstatechange_generate_ready_step_function_template.asl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,12 @@
"portalRunId.$": "$.input_event_detail_draft.portal_run_id",
"timestamp.$": "$$.State.EnteredTime",
"status": "${__ready_status__}",
"workflowName": "${__workflow_name__}",
"workflowVersion": "${__workflow_version__}",
"workflow": {
"name": "${__workflow_name__}",
"version": "${__workflow_version__}"
},
"workflowRunName.$": "$.input_event_detail_draft.workflow_run_name",
"linkedLibraries.$": "$.input_event_detail_draft.linked_libraries",
"libraries.$": "$.input_event_detail_draft.linked_libraries",
"payload": {
"version": "${__payload_version__}",
"data": {
Expand Down
20 changes: 17 additions & 3 deletions lib/workload/components/sfn-icav2-ready-event-handler/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import * as lambda from 'aws-cdk-lib/aws-lambda';
import { Duration } from 'aws-cdk-lib';
import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
import { NagSuppressions } from 'cdk-nag';
import { EventField } from 'aws-cdk-lib/aws-events';

export interface WfmWorkflowStateChangeIcav2ReadyEventHandlerConstructProps {
/* Names of table to write to */
Expand Down Expand Up @@ -177,15 +178,28 @@ export class WfmWorkflowStateChangeIcav2ReadyEventHandlerConstruct extends Const
detailType: [props.detailType],
detail: {
status: ['READY'],
workflowName: [{ 'equals-ignore-case': props.workflowName }],
workflow: {
name: [{ 'equals-ignore-case': props.workflowName }],
version: [{ 'equals-ignore-case': props.workflowVersion }],
},
},
},
});

/* Add rule as a target to the state machine */
// Add target of event to be the state machine
// But revert to a legacy event type for the target
rule.addTarget(
new events_targets.SfnStateMachine(this.stateMachineObj, {
input: events.RuleTargetInput.fromEventPath('$.detail'),
input: events.RuleTargetInput.fromObject({
status: EventField.fromPath('$.detail.status'),
timestamp: EventField.fromPath('$.detail.timestamp'),
workflowName: EventField.fromPath('$.detail.workflow.name'),
workflowVersion: EventField.fromPath('$.detail.workflow.version'),
workflowRunName: EventField.fromPath('$.detail.workflowRunName'),
portalRunId: EventField.fromPath('$.detail.portalRunId'),
linkedLibraries: EventField.fromPath('$.detail.libraries'),
payload: EventField.fromPath('$.detail.payload'),
}),
})
);

Expand Down
8 changes: 5 additions & 3 deletions ...dler/step_functions_templates/icav2_get_workflow_status_and_raise_internal_event.asl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,12 @@
"portalRunId.$": "$.get_event_data_step.portal_run_id",
"timestamp.$": "$.get_event_data_step.timestamp",
"status.$": "$.get_event_data_step.status",
"workflowName.$": "$.get_event_data_step.workflow_name",
"workflowVersion.$": "$.get_event_data_step.workflow_version",
"workflow": {
"name.$": "$.get_event_data_step.workflow_name",
"version.$": "$.get_event_data_step.workflow_version"
},
"workflowRunName.$": "$.get_event_data_step.workflow_run_name",
"linkedLibraries.$": "$.get_event_data_step.linked_libraries",
"libraries.$": "$.get_event_data_step.linked_libraries",
"payload": {
"version": "${__service_version__}",
"data.$": "$.set_data_event_outputs"
Expand Down
19 changes: 15 additions & 4 deletions ...ky-mcstackface/glue-constructs/kwik/part_4/push-fastq-list-row-qc-complete-event/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { PythonFunction } from '@aws-cdk/aws-lambda-python-alpha';
import * as lambda from 'aws-cdk-lib/aws-lambda';
import * as iam from 'aws-cdk-lib/aws-iam';
import { Duration } from 'aws-cdk-lib';
import { EventField } from 'aws-cdk-lib/aws-events';

/*
Part 6
Expand Down Expand Up @@ -138,19 +139,29 @@ export class FastqListRowQcCompleteConstruct extends Construct {
detailType: [this.WgtsQcCompleteMap.triggerDetailType],
detail: {
status: [{ 'equals-ignore-case': this.WgtsQcCompleteMap.triggerStatus }],
workflowName: [
{
workflow: {
name: {
'equals-ignore-case': this.WgtsQcCompleteMap.triggerWorkflowName,
},
],
},
},
},
});

// Add target of event to be the state machine
// But revert to a legacy event type for the target
rule.addTarget(
new eventsTargets.SfnStateMachine(qcCompleteSfn, {
input: events.RuleTargetInput.fromEventPath('$.detail'),
input: events.RuleTargetInput.fromObject({
status: EventField.fromPath('$.detail.status'),
timestamp: EventField.fromPath('$.detail.timestamp'),
workflowName: EventField.fromPath('$.detail.workflow.name'),
workflowVersion: EventField.fromPath('$.detail.workflow.version'),
workflowRunName: EventField.fromPath('$.detail.workflowRunName'),
portalRunId: EventField.fromPath('$.detail.portalRunId'),
linkedLibraries: EventField.fromPath('$.detail.libraries'),
payload: EventField.fromPath('$.detail.payload'),
}),
})
);
}
Expand Down
18 changes: 14 additions & 4 deletions ...acks/stacky-mcstackface/glue-constructs/pva/part_2/tn-complete-to-umccrise-draft/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import * as secretsManager from 'aws-cdk-lib/aws-secretsmanager';
import { WorkflowDraftRunStateChangeCommonPreambleConstruct } from '../../../../../../../components/sfn-workflowdraftrunstatechange-common-preamble';
import { GenerateWorkflowRunStateChangeReadyConstruct } from '../../../../../../../components/sfn-generate-workflowrunstatechange-ready-event';
import { NagSuppressions } from 'cdk-nag';
import { EventField } from 'aws-cdk-lib/aws-events';

/*
Part 2
Expand Down Expand Up @@ -197,19 +198,28 @@ export class TnCompleteToUmccriseReadyConstruct extends Construct {
detailType: [this.UmccriseReadyMap.triggerDetailType],
detail: {
status: [{ 'equals-ignore-case': this.UmccriseReadyMap.triggerStatus }],
workflowName: [
{
workflow: {
name: {
'equals-ignore-case': this.UmccriseReadyMap.triggerWorkflowName,
},
],
},
},
},
});

// Add target of event to be the state machine
rule.addTarget(
new eventsTargets.SfnStateMachine(qcCompleteToDraftSfn, {
input: events.RuleTargetInput.fromEventPath('$.detail'),
input: events.RuleTargetInput.fromObject({
status: EventField.fromPath('$.detail.status'),
timestamp: EventField.fromPath('$.detail.timestamp'),
workflowName: EventField.fromPath('$.detail.workflow.name'),
workflowVersion: EventField.fromPath('$.detail.workflow.version'),
workflowRunName: EventField.fromPath('$.detail.workflowRunName'),
portalRunId: EventField.fromPath('$.detail.portalRunId'),
linkedLibraries: EventField.fromPath('$.detail.libraries'),
payload: EventField.fromPath('$.detail.payload'),
}),
})
);
}
Expand Down
31 changes: 22 additions & 9 deletions ...stackface/glue-constructs/roket/part_2/umccrise-and-wts-complete-to-rnasum-draft/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { GetMetadataLambdaConstruct } from '../../../../../../../components/pyth
import { GenerateWorkflowRunStateChangeReadyConstruct } from '../../../../../../../components/sfn-generate-workflowrunstatechange-ready-event';
import { rnasumIcav2PipelineVersion } from '../../../../../../../../../config/constants';
import { NagSuppressions } from 'cdk-nag';
import { EventField } from 'aws-cdk-lib/aws-events';

/*
Part 4
Expand Down Expand Up @@ -241,22 +242,34 @@ export class UmccriseAndWtsCompleteToRnasumReadyConstruct extends Construct {
detailType: [this.RnasumDraftMap.triggerDetailType],
detail: {
status: [{ 'equals-ignore-case': this.RnasumDraftMap.triggerStatus }],
workflowName: [
{
'equals-ignore-case': this.RnasumDraftMap.triggerWorkflowName.umccrise,
},
{
'equals-ignore-case': this.RnasumDraftMap.triggerWorkflowName.wts,
},
],
workflow: {
name: [
{
'equals-ignore-case': this.RnasumDraftMap.triggerWorkflowName.umccrise,
},
{
'equals-ignore-case': this.RnasumDraftMap.triggerWorkflowName.wts,
},
],
},
},
},
});

// Add target of event to be the state machine
// But revert to a legacy event type for the target
rule.addTarget(
new eventsTargets.SfnStateMachine(umccriseAndWtsCompleteToDraftSfn, {
input: events.RuleTargetInput.fromEventPath('$.detail'),
input: events.RuleTargetInput.fromObject({
status: EventField.fromPath('$.detail.status'),
timestamp: EventField.fromPath('$.detail.timestamp'),
workflowName: EventField.fromPath('$.detail.workflow.name'),
workflowVersion: EventField.fromPath('$.detail.workflow.version'),
workflowRunName: EventField.fromPath('$.detail.workflowRunName'),
portalRunId: EventField.fromPath('$.detail.portalRunId'),
linkedLibraries: EventField.fromPath('$.detail.libraries'),
payload: EventField.fromPath('$.detail.payload'),
}),
})
);
}
Expand Down