Skip to content

Fix ADF State Machines #514

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
sbkok merged 2 commits into from
Sep 1, 2022
Merged

Fix ADF State Machines #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc0c087
Fix ADF State Machines
sbkok Aug 31, 2022
c2afa08
Include tenacity in pipeline management lambda reqs
sbkok Aug 31, 2022
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 src/lambda_codebase/initial_commit/bootstrap_repository/adf-bootstrap/deployment/global.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,9 @@ Resources:
Type: "AWS::StepFunctions::StateMachine"
Properties:
StateMachineName: "EnableCrossAccountAccess"
RoleArn: !GetAtt StatesExecutionRole.Arn
TracingConfiguration:
Enabled: true
DefinitionString: !Sub |-
{
"Comment": "Enable Cross Account Access from Deployment Account",
Expand Down Expand Up @@ -1277,7 +1280,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand Down Expand Up @@ -1314,7 +1317,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand Down Expand Up @@ -1363,7 +1366,6 @@ Resources:
}
}
}
RoleArn: !GetAtt StatesExecutionRole.Arn

DetermineDefaultBranchName:
Type: Custom::DetermineDefaultBranchName
Expand Down
1 change: 1 addition & 0 deletions ..._repository/adf-bootstrap/deployment/lambda_codebase/pipeline_management/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pyyaml==5.4.1
wrapt==1.14.1 # https://github.com/aws/aws-lambda-builders/issues/302
schema==0.7.5
tenacity=8.0.1
16 changes: 8 additions & 8 deletions ...base/initial_commit/bootstrap_repository/adf-bootstrap/deployment/pipeline_management.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand All @@ -414,7 +414,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand All @@ -440,7 +440,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand All @@ -466,7 +466,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand Down Expand Up @@ -502,7 +502,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand Down Expand Up @@ -554,6 +554,9 @@ Resources:
PipelineDeletionStateMachine:
Type: "AWS::StepFunctions::StateMachine"
Properties:
RoleArn: !GetAtt DeletionStateMachineExecutionRole.Arn
TracingConfiguration:
Enabled: true
DefinitionString: !Sub |-
{
"Comment": "Delete Stacks",
Expand Down Expand Up @@ -583,9 +586,6 @@ Resources:
}
}
}
RoleArn: !GetAtt DeletionStateMachineExecutionRole.Arn
TracingConfiguration:
Enabled: true

PipelineManagementCodeBuildProject:
Type: AWS::CodeBuild::Project
Expand Down
22 changes: 12 additions & 10 deletions src/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ Resources:
"IntervalSeconds": 2,
"BackoffRate": 2,
"MaxAttempts": 6
},
}
],
"Next": "ConfigureAccountTags"
},
Expand All @@ -697,7 +697,7 @@ Resources:
"IntervalSeconds": 2,
"BackoffRate": 2,
"MaxAttempts": 6
},
}
],
"Next": "WaitFor10Seconds"
},
Expand Down Expand Up @@ -726,7 +726,7 @@ Resources:
"IntervalSeconds": 2,
"BackoffRate": 2,
"MaxAttempts": 6
},
}
],
"Next": "ConfigureAccountAlias"
},
Expand All @@ -750,7 +750,7 @@ Resources:
"IntervalSeconds": 2,
"BackoffRate": 2,
"MaxAttempts": 6
},
}
],
"Next": "ConfigureAccountOU"
},
Expand All @@ -774,7 +774,7 @@ Resources:
"IntervalSeconds": 2,
"BackoffRate": 2,
"MaxAttempts": 6
},
}
],
"Next": "DeleteDefaultVPCChoice"
},
Expand Down Expand Up @@ -809,7 +809,7 @@ Resources:
"IntervalSeconds": 2,
"BackoffRate": 2,
"MaxAttempts": 6
},
}
],
"Next": "DeleteDefaultVPCMap"
},
Expand All @@ -832,7 +832,7 @@ Resources:
"Lambda.Unknown",
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException"
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"IntervalSeconds": 2,
Expand Down Expand Up @@ -1048,7 +1048,7 @@ Resources:
eventName:
- MoveAccount
Targets:
- Arn: !Ref StateMachine
- Arn: !Ref AccountBootstrappingStateMachine
RoleArn: !GetAtt StatesExecutionRole.Arn
Id: CreateStackLinkedAccountV1

Expand Down Expand Up @@ -1422,9 +1422,12 @@ Resources:
- "states:StartExecution"
Resource: "*"

StateMachine:
AccountBootstrappingStateMachine:
Type: "AWS::StepFunctions::StateMachine"
Properties:
RoleArn: !GetAtt StatesExecutionRole.Arn
TracingConfiguration:
Enabled: true
DefinitionString: !Sub |-
{
"Comment": "ADF Account Bootstrapping Process",
Expand Down Expand Up @@ -1620,7 +1623,6 @@ Resources:
}
}
}
RoleArn: !GetAtt StatesExecutionRole.Arn

DetermineDefaultBranchName:
Type: Custom::DetermineDefaultBranchName
Expand Down