[sdlf-pipeline] remove pStageName parameter

pPipelineName and pStageName, and pDeploymentInstance have a similar purpose

Author: cnfait

sdlf-pipeline/src/pipeline.yaml

@@ -10,6 +10,7 @@ Parameters:
     Type: String
     Description: A string uniquely identifying this deployment in this AWS account
     Default: pipeline
+    AllowedPattern: "[a-zA-Z0-9\\-]{1,20}"
   pDatasetDeploymentInstance:
     Type: String
     Description: The string uniquely identifying a sdlf-dataset deployment in this AWS account
@@ -30,10 +31,6 @@ Parameters:
     Description: The name of the dataset (all lowercase, no symbols or spaces)
     Type: String
     AllowedPattern: "[a-z0-9]{2,14}"
-  pStageName:
-    Description: Name of the stage (all lowercase, hyphen allowed, no other symbols or spaces)
-    Type: String
-    AllowedPattern: "[a-zA-Z0-9\\-]{1,12}"
   pStageEnabled:
     Description: Whether the stage is enabled or not
     Type: String
@@ -72,7 +69,7 @@ Resources:
     DeletionPolicy: Delete
     UpdateReplacePolicy: Delete
     Properties:
-      QueueName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-dlq-${pStageName}.fifo
+      QueueName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-dlq.fifo
       FifoQueue: True
       MessageRetentionPeriod: 1209600
       VisibilityTimeout: 60
@@ -85,15 +82,15 @@ Resources:
       Name: !Sub /sdlf/pipeline/rDeadLetterQueueRoutingStep/${pDeploymentInstance}
       Type: String
       Value: !GetAtt rDeadLetterQueueRoutingStep.QueueName
-      Description: !Sub "Name of the ${pStageName} ${pDataset} ${pDeploymentInstance} DLQ"
+      Description: !Sub "Name of the ${pDataset} ${pDeploymentInstance} DLQ"
 
   rQueueRoutingStep:
     Type: AWS::SQS::Queue
     Condition: HasSourceEvents
     DeletionPolicy: Delete
     UpdateReplacePolicy: Delete
     Properties:
-      QueueName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-queue-${pStageName}.fifo
+      QueueName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-queue.fifo
       FifoQueue: True
       ContentBasedDeduplication: True
       RedrivePolicy:
@@ -110,22 +107,22 @@ Resources:
       Name: !Sub /sdlf/pipeline/rQueueRoutingStep/${pDeploymentInstance}
       Type: String
       Value: !GetAtt rQueueRoutingStep.QueueName
-      Description: !Sub "Name of the ${pStageName} ${pDataset} ${pDeploymentInstance} Queue"
+      Description: !Sub "Name of the ${pDataset} ${pDeploymentInstance} Queue"
 
   rStageRule:
     Type: AWS::Events::Rule
     Condition: HasSourceEvents
     Properties:
-      Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-rule-${pStageName}
-      Description: !Sub Send events to ${pStageName} queue
+      Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-rule
+      Description: !Sub Send events to ${pDeploymentInstance} queue
       EventPattern: !Ref pEventPattern
       EventBusName: !If [FetchFromDatasetSsm, !Sub "{{resolve:ssm:/sdlf/dataset/rEventBus/${pDatasetDeploymentInstance}}}", !Ref pEventBus]
       State: !If
         - StageEnabled
         - ENABLED
         - DISABLED
       Targets:
-        - Id: !Sub sdlf-${pDataset}-${pDeploymentInstance}-rule-${pStageName}
+        - Id: !Sub sdlf-${pDataset}-${pDeploymentInstance}-rule
           Arn: !GetAtt rQueueRoutingStep.Arn
           SqsParameters:
             MessageGroupId: !Sub ${pDataset}-${pDeploymentInstance}
@@ -195,10 +192,10 @@ Resources:
     Type: AWS::Scheduler::Schedule
     Condition: ScheduleBased
     Properties:
-      Description: !Sub Trigger ${pStageName} Routing Lambda on a specified schedule
+      Description: !Sub Trigger ${pDeploymentInstance} Routing Lambda on a specified schedule
       GroupName: !If [FetchFromDatasetSsm, !Sub "{{resolve:ssm:/sdlf/dataset/rScheduleGroup/${pDatasetDeploymentInstance}}}", !Ref pScheduleGroup]
       KmsKeyArn: !If [FetchFromDatasetSsm, !Sub "{{resolve:ssm:/sdlf/dataset/rKMSInfraKey/${pDatasetDeploymentInstance}}}", !Ref pInfraKmsKey]
-      Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-schedule-rule-${pStageName}
+      Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-schedule-rule
       ScheduleExpression: !Ref pSchedule
       FlexibleTimeWindow:
         Mode: "OFF"
@@ -215,13 +212,13 @@ Resources:
             {
               "FunctionName": "${pLambdaRoutingStep}",
               "InvocationType": "Event",
-              "Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline_stage\": \"${pStageName}\",\n \"trigger_type\": \"${pTriggerType}\",\n \"event_pattern\": \"true\"\n }"
+              "Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline_stage\": \"${pDeploymentInstance}\",\n \"trigger_type\": \"${pTriggerType}\",\n \"event_pattern\": \"true\"\n }"
             }
           - !Sub >-
             {
               "FunctionName": "${pLambdaRoutingStep}",
               "InvocationType": "Event",
-              "Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline_stage\": \"${pStageName}\",\n \"trigger_type\": \"${pTriggerType}\"\n }"
+              "Payload": "{\n \"dataset\": \"${pDataset}\",\n \"pipeline_stage\": \"${pDeploymentInstance}\",\n \"trigger_type\": \"${pTriggerType}\"\n }"
             }
 
 Outputs: