Skip to content

Commit fde1dcb

Browse files
committed
[sdlf-stage-lambda] remove pStageName parameter
pPipeline and pStageName, and pDeploymentInstance have a similar purpose
1 parent b26dd3a commit fde1dcb

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

sdlf-stage-lambda/src/awslambda.yaml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Parameters:
1111
Type: String
1212
Description: A string uniquely identifying this deployment in this AWS account
1313
Default: lambda
14+
AllowedPattern: "[a-zA-Z0-9\\-]{1,20}"
1415
pDatasetDeploymentInstance:
1516
Type: String
1617
Description: The string uniquely identifying a sdlf-dataset deployment in this AWS account
@@ -67,10 +68,6 @@ Parameters:
6768
Description: The name of the dataset (all lowercase, no symbols or spaces)
6869
Type: String
6970
AllowedPattern: "[a-z0-9]{2,14}"
70-
pStageName:
71-
Description: Name of the stage (all lowercase, hyphen allowed, no other symbols or spaces)
72-
Type: String
73-
AllowedPattern: "[a-zA-Z0-9\\-]{1,12}"
7471
pStageEnabled:
7572
Description: Whether the stage is enabled or not
7673
Type: String
@@ -150,7 +147,6 @@ Globals:
150147
Environment:
151148
Variables:
152149
DATASET: !Ref pDataset
153-
PIPELINE_STAGE: !Ref pStageName
154150
DEPLOYMENT_INSTANCE: !Ref pDeploymentInstance
155151
STORAGE_DEPLOYMENT_INSTANCE: !Ref pStorageDeploymentInstance
156152
DATASET_DEPLOYMENT_INSTANCE: !Ref pDatasetDeploymentInstance
@@ -175,7 +171,6 @@ Resources:
175171
pEventBus: !Ref pEventBus
176172
pScheduleGroup: !Ref pScheduleGroup
177173
pDataset: !Ref pDataset
178-
pStageName: !Ref pStageName
179174
pStageEnabled: !Ref pStageEnabled
180175
pTriggerType: !Ref pTriggerType
181176
pSchedule: !Ref pSchedule
@@ -248,7 +243,7 @@ Resources:
248243
Service: lambda.amazonaws.com
249244
Action: sts:AssumeRole
250245
Policies:
251-
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-process
246+
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-process
252247
PolicyDocument:
253248
Version: "2012-10-17"
254249
Statement:
@@ -306,7 +301,7 @@ Resources:
306301
Service: lambda.amazonaws.com
307302
Action: sts:AssumeRole
308303
Policies:
309-
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-routing
304+
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-routing
310305
PolicyDocument:
311306
Version: "2012-10-17"
312307
Statement:
@@ -338,7 +333,7 @@ Resources:
338333
reason: Permissions to write CloudWatch Logs are granted by rLambdaCommonPolicy
339334
Properties:
340335
CodeUri: ./lambda/routing/src
341-
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-routing
336+
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-routing
342337
Description: Checks if items are to be processed and route them to state machine
343338
Environment:
344339
Variables:
@@ -362,7 +357,7 @@ Resources:
362357
Name: !Sub /sdlf/pipeline/rLambdaRoutingStep/${pDeploymentInstance}
363358
Type: String
364359
Value: !GetAtt rLambdaRoutingStep.Arn
365-
Description: !Sub "ARN of the ${pStageName} ${pDataset} ${pDeploymentInstance} Routing Lambda" # TODO
360+
Description: !Sub "ARN of the ${pDataset} ${pDeploymentInstance} Routing Lambda" # TODO
366361

367362
rLambdaRedriveStep:
368363
Type: AWS::Serverless::Function
@@ -373,7 +368,7 @@ Resources:
373368
reason: Permissions to write CloudWatch Logs are granted by rLambdaCommonPolicy
374369
Properties:
375370
CodeUri: ./lambda/redrive/src
376-
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-redrive
371+
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-redrive
377372
Description: Redrives Failed messages to the routing queue
378373
MemorySize: 192
379374
Timeout: 300
@@ -397,7 +392,7 @@ Resources:
397392
reason: Permissions to write CloudWatch Logs are granted by rLambdaCommonPolicy
398393
Properties:
399394
CodeUri: ./lambda/process-object/src
400-
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-process
395+
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-process
401396
Description: Processing pipeline
402397
MemorySize: 1536
403398
Timeout: 600
@@ -441,7 +436,7 @@ Resources:
441436
reason: Permissions to write CloudWatch Logs are granted by rLambdaCommonPolicy
442437
Properties:
443438
CodeUri: ./lambda/postupdate-metadata/src
444-
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-postupdate
439+
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-postupdate
445440
Description: Post-Update the metadata in the DynamoDB Catalog table
446441
MemorySize: 192
447442
Timeout: 300
@@ -476,7 +471,7 @@ Resources:
476471
Service: lambda.amazonaws.com
477472
Action: sts:AssumeRole
478473
Policies:
479-
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-error
474+
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-error
480475
PolicyDocument:
481476
Version: "2012-10-17"
482477
Statement:
@@ -502,7 +497,7 @@ Resources:
502497
reason: Permissions to write CloudWatch Logs are granted by rLambdaCommonPolicy
503498
Properties:
504499
CodeUri: ./lambda/error/src
505-
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-error
500+
FunctionName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-error
506501
Description: Fallback lambda to handle messages which failed processing
507502
MemorySize: 192
508503
Timeout: 300
@@ -540,7 +535,7 @@ Resources:
540535
StringEquals:
541536
"aws:SourceAccount": !Sub ${AWS::AccountId}
542537
Policies:
543-
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-sm
538+
- PolicyName: !Sub sdlf-${pDataset}-${pDeploymentInstance}-sm
544539
PolicyDocument:
545540
Version: "2012-10-17"
546541
Statement:
@@ -576,7 +571,7 @@ Resources:
576571
rStateMachine:
577572
Type: AWS::Serverless::StateMachine
578573
Properties:
579-
Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-${pStageName}-sm
574+
Name: !Sub sdlf-${pDataset}-${pDeploymentInstance}-sm
580575
DefinitionUri: ./state-machine/stage-lambda.asl.json
581576
DefinitionSubstitutions:
582577
lPostMetadata: !GetAtt rLambdaPostMetadataStep.Arn
@@ -592,7 +587,7 @@ Resources:
592587
Name: !Sub /sdlf/pipeline/rStateMachine/${pDeploymentInstance}
593588
Type: String
594589
Value: !Ref rStateMachine
595-
Description: !Sub "ARN of the ${pStageName} ${pDataset} ${pDeploymentInstance} State Machine" # TODO
590+
Description: !Sub "ARN of the ${pDataset} ${pDeploymentInstance} State Machine" # TODO
596591

597592
Outputs:
598593
oPipelineReference:

0 commit comments

Comments
 (0)