Skip to content

Commit 46444f8

Browse files
esc1144esc1144
committed
Merge main, normalize linked sf code file names
1 parent a542da1 commit 46444f8

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ Mappings:
115115
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
116116
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
117117
StepFunctionCode:
118-
main-v4-1: {TemplatePath: cfn/data-collection/source/step-functions/main-state-machine-v4-1.json}
118+
main-v4: {TemplatePath: cfn/data-collection/source/step-functions/main-state-machine-v4.json}
119119
crawler-v2: {TemplatePath: cfn/data-collection/source/step-functions/crawler-state-machine-v2.json}
120120
standalone-v2: {TemplatePath: cfn/data-collection/source/step-functions/standalone-state-machine-v2.json}
121-
he-detail-v1-1: {TemplatePath: cfn/data-collection/source/step-functions/health-detail-state-machine-v1-1.json}
121+
he-detail-v1: {TemplatePath: cfn/data-collection/source/step-functions/health-detail-state-machine-v1.json}
122122

123123
Parameters:
124124
DestinationBucket:
@@ -990,7 +990,7 @@ Resources:
990990
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
991991
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
992992
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
993-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
993+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
994994
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
995995
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
996996

@@ -1011,7 +1011,7 @@ Resources:
10111011
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10121012
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10131013
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1014-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1014+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
10151015
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
10161016
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
10171017

@@ -1032,7 +1032,7 @@ Resources:
10321032
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10331033
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10341034
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1035-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1035+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
10361036
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
10371037
LambdaManageGlueTableARN: !GetAtt LambdaManageGlueTable.Arn
10381038
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
@@ -1054,7 +1054,7 @@ Resources:
10541054
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10551055
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10561056
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1057-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1057+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
10581058
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
10591059
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
10601060

@@ -1075,7 +1075,7 @@ Resources:
10751075
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10761076
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10771077
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1078-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1078+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
10791079
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
10801080
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
10811081

@@ -1096,7 +1096,7 @@ Resources:
10961096
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
10971097
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
10981098
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1099-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1099+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
11001100
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
11011101
LambdaManageGlueTableARN: !GetAtt LambdaManageGlueTable.Arn
11021102
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
@@ -1150,7 +1150,7 @@ Resources:
11501150
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
11511151
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
11521152
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1153-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1153+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
11541154
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
11551155
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
11561156

@@ -1171,7 +1171,7 @@ Resources:
11711171
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
11721172
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
11731173
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1174-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1174+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
11751175
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
11761176
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
11771177
RegionsInScope:
@@ -1197,7 +1197,7 @@ Resources:
11971197
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
11981198
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
11991199
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1200-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1200+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
12011201
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
12021202
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
12031203
RegionsInScope:
@@ -1223,7 +1223,7 @@ Resources:
12231223
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
12241224
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
12251225
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1226-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1226+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
12271227
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
12281228
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
12291229

@@ -1244,7 +1244,7 @@ Resources:
12441244
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
12451245
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
12461246
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1247-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1247+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
12481248
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
12491249
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
12501250

@@ -1265,7 +1265,7 @@ Resources:
12651265
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
12661266
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
12671267
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1268-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1268+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
12691269
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
12701270
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
12711271
RegionsInScope:
@@ -1310,10 +1310,10 @@ Resources:
13101310
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
13111311
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
13121312
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1313-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1313+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
13141314
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
13151315
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
1316-
DetailStepFunctionTemplate: !FindInMap [StepFunctionCode, he-detail-v1-1, TemplatePath]
1316+
DetailStepFunctionTemplate: !FindInMap [StepFunctionCode, he-detail-v1, TemplatePath]
13171317

13181318
LicenseManagerModule:
13191319
Type: AWS::CloudFormation::Stack
@@ -1332,7 +1332,7 @@ Resources:
13321332
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
13331333
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
13341334
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1335-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1335+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
13361336
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
13371337
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
13381338

@@ -1353,7 +1353,7 @@ Resources:
13531353
LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
13541354
AccountCollectorLambdaARN: !Sub "${AccountCollector.Outputs.LambdaFunctionARN}"
13551355
CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNSourceBucket ]
1356-
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4-1, TemplatePath]
1356+
StepFunctionTemplate: !FindInMap [StepFunctionCode, main-v4, TemplatePath]
13571357
StepFunctionExecutionRoleARN: !GetAtt StepFunctionExecutionRole.Arn
13581358
SchedulerExecutionRoleARN: !GetAtt SchedulerExecutionRole.Arn
13591359
RegionsInScope:

data-collection/deploy/source/step-functions/health-detail-state-machine-v1-1.json renamed to data-collection/deploy/source/step-functions/health-detail-state-machine-v1.json

File renamed without changes.

data-collection/deploy/source/step-functions/main-state-machine-v4-1.json renamed to data-collection/deploy/source/step-functions/main-state-machine-v4.json

File renamed without changes.

0 commit comments

Comments
 (0)