Skip to content

Commit 66fb0f3

Browse files
committed
[sdlf-pipeline] remove pPipelineName parameter
pPipelineName and pStageName, and pDeploymentInstance have a similar purpose
1 parent 5ef1783 commit 66fb0f3

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

sdlf-pipeline/src/pipeline.yaml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ Parameters:
3030
Description: The name of the dataset (all lowercase, no symbols or spaces)
3131
Type: String
3232
AllowedPattern: "[a-z0-9]{2,14}"
33-
pPipelineName:
34-
Description: The name of the pipeline (all lowercase, no symbols or spaces)
35-
Type: String
36-
AllowedPattern: "[a-z0-9]*"
3733
pStageName:
3834
Description: Name of the stage (all lowercase, hyphen allowed, no other symbols or spaces)
3935
Type: String
@@ -76,7 +72,7 @@ Resources:
7672
DeletionPolicy: Delete
7773
UpdateReplacePolicy: Delete
7874
Properties:
79-
QueueName: !Sub sdlf-${pDataset}-${pPipelineName}-dlq-${pStageName}.fifo
75+
QueueName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-dlq-${pStageName}.fifo
8076
FifoQueue: True
8177
MessageRetentionPeriod: 1209600
8278
VisibilityTimeout: 60
@@ -89,15 +85,15 @@ Resources:
8985
Name: !Sub /sdlf/pipeline/rDeadLetterQueueRoutingStep/${pDeploymentInstance}
9086
Type: String
9187
Value: !GetAtt rDeadLetterQueueRoutingStep.QueueName
92-
Description: !Sub "Name of the ${pStageName} ${pDataset} ${pPipelineName} DLQ"
88+
Description: !Sub "Name of the ${pStageName} ${pDataset} ${pDeploymentInstance} DLQ"
9389

9490
rQueueRoutingStep:
9591
Type: AWS::SQS::Queue
9692
Condition: HasSourceEvents
9793
DeletionPolicy: Delete
9894
UpdateReplacePolicy: Delete
9995
Properties:
100-
QueueName: !Sub sdlf-${pDataset}-${pPipelineName}-queue-${pStageName}.fifo
96+
QueueName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-queue-${pStageName}.fifo
10197
FifoQueue: True
10298
ContentBasedDeduplication: True
10399
RedrivePolicy:
@@ -114,13 +110,13 @@ Resources:
114110
Name: !Sub /sdlf/pipeline/rQueueRoutingStep/${pDeploymentInstance}
115111
Type: String
116112
Value: !GetAtt rQueueRoutingStep.QueueName
117-
Description: !Sub "Name of the ${pStageName} ${pDataset} ${pPipelineName} Queue"
113+
Description: !Sub "Name of the ${pStageName} ${pDataset} ${pDeploymentInstance} Queue"
118114

119115
rStageRule:
120116
Type: AWS::Events::Rule
121117
Condition: HasSourceEvents
122118
Properties:
123-
Name: !Sub sdlf-${pDataset}-${pPipelineName}-rule-${pStageName}
119+
Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-rule-${pStageName}
124120
Description: !Sub Send events to ${pStageName} queue
125121
EventPattern: !Ref pEventPattern
126122
EventBusName: !If [FetchFromDatasetSsm, !Sub "{{resolve:ssm:/sdlf/dataset/rEventBus/${pDatasetDeploymentInstance}}}", !Ref pEventBus]
@@ -129,10 +125,10 @@ Resources:
129125
- ENABLED
130126
- DISABLED
131127
Targets:
132-
- Id: !Sub sdlf-${pDataset}-${pPipelineName}-rule-${pStageName}
128+
- Id: !Sub sdlf-${pDataset}-${pDeploymentInstance}-rule-${pStageName}
133129
Arn: !GetAtt rQueueRoutingStep.Arn
134130
SqsParameters:
135-
MessageGroupId: !Sub ${pDataset}-${pPipelineName}
131+
MessageGroupId: !Sub ${pDataset}-${pDeploymentInstance}
136132
InputPath: "$.detail"
137133

138134
rQueuePolicyEventsStageRule:
@@ -202,7 +198,7 @@ Resources:
202198
Description: !Sub Trigger ${pStageName} Routing Lambda on a specified schedule
203199
GroupName: !If [FetchFromDatasetSsm, !Sub "{{resolve:ssm:/sdlf/dataset/rScheduleGroup/${pDatasetDeploymentInstance}}}", !Ref pScheduleGroup]
204200
KmsKeyArn: !If [FetchFromDatasetSsm, !Sub "{{resolve:ssm:/sdlf/dataset/rKMSInfraKey/${pDatasetDeploymentInstance}}}", !Ref pInfraKmsKey]
205-
Name: !Sub sdlf-${pDataset}-${pPipelineName}-schedule-rule-${pStageName}
201+
Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-schedule-rule-${pStageName}
206202
ScheduleExpression: !Ref pSchedule
207203
FlexibleTimeWindow:
208204
Mode: "OFF"
@@ -219,13 +215,13 @@ Resources:
219215
{
220216
"FunctionName": "${pLambdaRoutingStep}",
221217
"InvocationType": "Event",
222-
"Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline\": \"${pPipelineName}\",\n \"pipeline_stage\": \"${pStageName}\",\n \"trigger_type\": \"${pTriggerType}\",\n \"event_pattern\": \"true\"\n }"
218+
"Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline_stage\": \"${pStageName}\",\n \"trigger_type\": \"${pTriggerType}\",\n \"event_pattern\": \"true\"\n }"
223219
}
224220
- !Sub >-
225221
{
226222
"FunctionName": "${pLambdaRoutingStep}",
227223
"InvocationType": "Event",
228-
"Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline\": \"${pPipelineName}\",\n \"pipeline_stage\": \"${pStageName}\",\n \"trigger_type\": \"${pTriggerType}\"\n }"
224+
"Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline_stage\": \"${pStageName}\",\n \"trigger_type\": \"${pTriggerType}\"\n }"
229225
}
230226
231227
Outputs:

0 commit comments

Comments
 (0)