Skip to content

Commit 8863761

Browse files
iakov-awsiakov-aws
authored
Switching to 3 hours timeout for step functions to support customers with > 3k accounts (#214)
1 parent 3c79117 commit 8863761

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎data-collection/deploy/deploy-data-collection.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Mappings:
109109
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
110110
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
111111
StepFunctionCode:
112-
main-v2: {TemplatePath: cfn/data-collection/source/step-functions/main-state-machine-v2.json}
112+
main-v3: {TemplatePath: cfn/data-collection/source/step-functions/main-state-machine-v3.json}
113113
crawler-v1: {TemplatePath: cfn/data-collection/source/step-functions/crawler-state-machine-v1.json}
114114
standalone-v1: {TemplatePath: cfn/data-collection/source/step-functions/awsfeeds-state-machine-v1.json}
115115

@@ -893,7 +893,7 @@ Resources:
893893
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
894894
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
895895
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
896-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
896+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
897897
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
898898
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
899899

@@ -913,7 +913,7 @@ Resources:
913913
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
914914
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
915915
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
916-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
916+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
917917
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
918918
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
919919

@@ -933,7 +933,7 @@ Resources:
933933
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
934934
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
935935
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
936-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
936+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
937937
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
938938
LambdaManageGlueTableARN: !GetAtt LambdaManageGlueTable.Arn
939939
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
@@ -954,7 +954,7 @@ Resources:
954954
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
955955
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
956956
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
957-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
957+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
958958
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
959959
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
960960

@@ -974,7 +974,7 @@ Resources:
974974
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
975975
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
976976
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
977-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
977+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
978978
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
979979
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
980980

@@ -994,7 +994,7 @@ Resources:
994994
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
995995
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
996996
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
997-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
997+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
998998
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
999999
LambdaManageGlueTableARN: !GetAtt LambdaManageGlueTable.Arn
10001000
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
@@ -1046,7 +1046,7 @@ Resources:
10461046
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10471047
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10481048
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1049-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1049+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
10501050
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
10511051
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
10521052

@@ -1066,7 +1066,7 @@ Resources:
10661066
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10671067
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10681068
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1069-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1069+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
10701070
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
10711071
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
10721072
RegionsInScope:
@@ -1091,7 +1091,7 @@ Resources:
10911091
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10921092
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10931093
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1094-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1094+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
10951095
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
10961096
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
10971097
RegionsInScope:
@@ -1116,7 +1116,7 @@ Resources:
11161116
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
11171117
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
11181118
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1119-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1119+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
11201120
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
11211121
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
11221122

@@ -1136,7 +1136,7 @@ Resources:
11361136
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
11371137
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
11381138
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1139-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1139+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
11401140
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
11411141
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
11421142

@@ -1156,7 +1156,7 @@ Resources:
11561156
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
11571157
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
11581158
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1159-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1159+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
11601160
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
11611161
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
11621162
RegionsInScope:
@@ -1199,7 +1199,7 @@ Resources:
11991199
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
12001200
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
12011201
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1202-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1202+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
12031203
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
12041204
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
12051205

@@ -1219,7 +1219,7 @@ Resources:
12191219
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
12201220
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
12211221
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1222-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v2, TemplatePath]
1222+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v3, TemplatePath]
12231223
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
12241224
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
12251225

‎data-collection/deploy/source/step-functions/main-state-machine-v2.json‎ renamed to ‎data-collection/deploy/source/step-functions/main-state-machine-v3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@
8989
"End": true
9090
}
9191
},
92-
"TimeoutSeconds": 1200
93-
}
92+
"TimeoutSeconds": 10800
93+
}

0 commit comments

Comments
 (0)