Skip to content

Commit 16e324c

Browse files
davidecocciadavidecoccia
committed
fix: Restore version to v3.12.1 in all deployment templates
1 parent 4e4b8b3 commit 16e324c

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/deploy/deploy-data-collection.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection Stack v3.12.0 - AWS Solution SO9011
3+
Description: CID Data Collection Stack v3.12.1 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -133,10 +133,10 @@ Mappings:
133133
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
134134
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
135135
StepFunctionCode:
136-
main-state-machine: {TemplatePath: cfn/data-collection/v3.12.0/source/step-functions/main-state-machine.json}
137-
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.12.0/source/step-functions/crawler-state-machine.json}
138-
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.12.0/source/step-functions/standalone-state-machine.json}
139-
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.12.0/source/step-functions/health-detail-state-machine.json}
136+
main-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/main-state-machine.json}
137+
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/crawler-state-machine.json}
138+
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/standalone-state-machine.json}
139+
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/health-detail-state-machine.json}
140140

141141
Parameters:
142142
DestinationBucket:
@@ -1040,7 +1040,7 @@ Resources:
10401040
Type: AWS::CloudFormation::Stack
10411041
Condition: DeployTAModule
10421042
Properties:
1043-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-trusted-advisor.yaml"
1043+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-trusted-advisor.yaml"
10441044
Parameters:
10451045
DatabaseName: !Ref DatabaseName
10461046
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1061,7 +1061,7 @@ Resources:
10611061
Type: AWS::CloudFormation::Stack
10621062
Condition: DeployRightsizingModule
10631063
Properties:
1064-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-cost-explorer-rightsizing.yaml"
1064+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-cost-explorer-rightsizing.yaml"
10651065
Parameters:
10661066
DatabaseName: !Ref DatabaseName
10671067
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1082,7 +1082,7 @@ Resources:
10821082
Type: AWS::CloudFormation::Stack
10831083
Condition: DeployCostAnomalyModule
10841084
Properties:
1085-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-cost-anomaly.yaml"
1085+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-cost-anomaly.yaml"
10861086
Parameters:
10871087
DatabaseName: !Ref DatabaseName
10881088
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1104,7 +1104,7 @@ Resources:
11041104
Type: AWS::CloudFormation::Stack
11051105
Condition: DeploySupportCasesModule
11061106
Properties:
1107-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-support-cases.yaml"
1107+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-support-cases.yaml"
11081108
Parameters:
11091109
DatabaseName: !Ref DatabaseName
11101110
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1125,7 +1125,7 @@ Resources:
11251125
Type: AWS::CloudFormation::Stack
11261126
Condition: DeployBackupModule
11271127
Properties:
1128-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-backup.yaml"
1128+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-backup.yaml"
11291129
Parameters:
11301130
DatabaseName: !Ref DatabaseName
11311131
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1146,7 +1146,7 @@ Resources:
11461146
Type: AWS::CloudFormation::Stack
11471147
Condition: DeployInventoryCollectorModule
11481148
Properties:
1149-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-inventory.yaml"
1149+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-inventory.yaml"
11501150
Parameters:
11511151
DatabaseName: !Ref DatabaseName
11521152
DestinationBucket: !Ref S3Bucket
@@ -1173,7 +1173,7 @@ Resources:
11731173
Type: AWS::CloudFormation::Stack
11741174
Condition: DeployPricingModule
11751175
Properties:
1176-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-pricing.yaml"
1176+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-pricing.yaml"
11771177
Parameters:
11781178
DatabaseName: !Ref DatabaseName
11791179
DestinationBucket: !Ref S3Bucket
@@ -1196,7 +1196,7 @@ Resources:
11961196
Type: AWS::CloudFormation::Stack
11971197
Condition: DeployComputeOptimizerModule
11981198
Properties:
1199-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-compute-optimizer.yaml"
1199+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-compute-optimizer.yaml"
12001200
Parameters:
12011201
DestinationBucket: !Ref S3Bucket
12021202
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
@@ -1221,7 +1221,7 @@ Resources:
12211221
Type: AWS::CloudFormation::Stack
12221222
Condition: DeployEcsChargebackModule
12231223
Properties:
1224-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-ecs-chargeback.yaml"
1224+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-ecs-chargeback.yaml"
12251225
Parameters:
12261226
DatabaseName: !Ref DatabaseName
12271227
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1247,7 +1247,7 @@ Resources:
12471247
Type: AWS::CloudFormation::Stack
12481248
Condition: DeployRDSUtilizationModule
12491249
Properties:
1250-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-rds-usage.yaml"
1250+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-rds-usage.yaml"
12511251
Parameters:
12521252
DatabaseName: !Ref DatabaseName
12531253
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1273,7 +1273,7 @@ Resources:
12731273
Type: AWS::CloudFormation::Stack
12741274
Condition: DeployEUCUtilizationModule
12751275
Properties:
1276-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-workspaces-metrics.yaml"
1276+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-workspaces-metrics.yaml"
12771277
Parameters:
12781278
DatabaseName: !Ref DatabaseName
12791279
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1299,7 +1299,7 @@ Resources:
12991299
Type: AWS::CloudFormation::Stack
13001300
Condition: DeployOrgDataModule
13011301
Properties:
1302-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-organization.yaml"
1302+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-organization.yaml"
13031303
Parameters:
13041304
DatabaseName: !Ref DatabaseName
13051305
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1320,7 +1320,7 @@ Resources:
13201320
Type: AWS::CloudFormation::Stack
13211321
Condition: DeployBudgetsModule
13221322
Properties:
1323-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-budgets.yaml"
1323+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-budgets.yaml"
13241324
Parameters:
13251325
DatabaseName: !Ref DatabaseName
13261326
DestinationBucket: !Ref S3Bucket
@@ -1341,7 +1341,7 @@ Resources:
13411341
Type: AWS::CloudFormation::Stack
13421342
Condition: DeployTransitGatewayModule
13431343
Properties:
1344-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-transit-gateway.yaml"
1344+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-transit-gateway.yaml"
13451345
Parameters:
13461346
DatabaseName: !Ref DatabaseName
13471347
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1367,7 +1367,7 @@ Resources:
13671367
Type: AWS::CloudFormation::Stack
13681368
Condition: DeployAWSFeedsModule
13691369
Properties:
1370-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-aws-feeds.yaml"
1370+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-aws-feeds.yaml"
13711371
Parameters:
13721372
DatabaseName: !Ref DatabaseName
13731373
DestinationBucket: !Ref S3Bucket
@@ -1386,7 +1386,7 @@ Resources:
13861386
Type: AWS::CloudFormation::Stack
13871387
Condition: DeployISVFeedsModule
13881388
Properties:
1389-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-isv-feeds.yaml"
1389+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-isv-feeds.yaml"
13901390
Parameters:
13911391
DatabaseName: !Ref DatabaseName
13921392
DestinationBucket: !Ref S3Bucket
@@ -1404,7 +1404,7 @@ Resources:
14041404
Type: AWS::CloudFormation::Stack
14051405
Condition: DeployHealthEventsModule
14061406
Properties:
1407-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-health-events.yaml"
1407+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-health-events.yaml"
14081408
Parameters:
14091409
DatabaseName: !Ref DatabaseName
14101410
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1426,7 +1426,7 @@ Resources:
14261426
Type: AWS::CloudFormation::Stack
14271427
Condition: DeployLicenseManagerModule
14281428
Properties:
1429-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-license-manager.yaml"
1429+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-license-manager.yaml"
14301430
Parameters:
14311431
DatabaseName: !Ref DatabaseName
14321432
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1447,7 +1447,7 @@ Resources:
14471447
Type: AWS::CloudFormation::Stack
14481448
Condition: DeployServiceQuotasModule
14491449
Properties:
1450-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-service-quotas.yaml"
1450+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-service-quotas.yaml"
14511451
Parameters:
14521452
DatabaseName: !Ref DatabaseName
14531453
DestinationBucket: !Ref S3Bucket
@@ -1473,7 +1473,7 @@ Resources:
14731473
Type: AWS::CloudFormation::Stack
14741474
Condition: DeployQuickSightModule
14751475
Properties:
1476-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-quicksight.yaml"
1476+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-quicksight.yaml"
14771477
Parameters:
14781478
DatabaseName: !Ref DatabaseName
14791479
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1492,7 +1492,7 @@ Resources:
14921492
Type: AWS::CloudFormation::Stack
14931493
Condition: DeployResilienceHubModule
14941494
Properties:
1495-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-resilience-hub.yaml"
1495+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-resilience-hub.yaml"
14961496
Parameters:
14971497
DatabaseName: !Ref DatabaseName
14981498
DestinationBucket: !Ref S3Bucket
@@ -1517,7 +1517,7 @@ Resources:
15171517
Type: AWS::CloudFormation::Stack
15181518
Condition: DeployIncludeReferenceModule
15191519
Properties:
1520-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-reference.yaml"
1520+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-reference.yaml"
15211521
Parameters:
15221522
DatabaseName: !Ref DatabaseName
15231523
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1567,7 +1567,7 @@ Resources:
15671567
Type: AWS::CloudFormation::Stack
15681568
Condition: DeployAccountCollector
15691569
Properties:
1570-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/account-collector.yaml"
1570+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/account-collector.yaml"
15711571
Parameters:
15721572
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
15731573
ManagementAccountID: !Ref ManagementAccountID

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.12.0/deploy/deploy-data-read-permissions.yaml
1+
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.12.1/deploy/deploy-data-read-permissions.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection - All-in-One for Management Account v3.12.0 - AWS Solution SO9011
3+
Description: CID Data Collection - All-in-One for Management Account v3.12.1 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -204,7 +204,7 @@ Resources:
204204
DataCollectorMgmtAccountReadStack:
205205
Type: AWS::CloudFormation::Stack
206206
Properties:
207-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/deploy-in-management-account.yaml"
207+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/deploy-in-management-account.yaml"
208208
Parameters:
209209
DataCollectionAccountID: !Ref DataCollectionAccountID
210210
ManagementAccountRole: !Ref ManagementAccountRole
@@ -221,7 +221,7 @@ Resources:
221221
Type: AWS::CloudFormation::Stack
222222
Condition: DeployModuleReadInMgmt
223223
Properties:
224-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/deploy-in-linked-account.yaml"
224+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/deploy-in-linked-account.yaml"
225225
Parameters:
226226
DataCollectionAccountID: !Ref DataCollectionAccountID
227227
MultiAccountRoleName: !Ref MultiAccountRoleName
@@ -241,7 +241,7 @@ Resources:
241241
DataCollectorOrgAccountModulesReadStackSet:
242242
Type: AWS::CloudFormation::StackSet
243243
Properties:
244-
Description: "StackSet in charge of deploying read roles across organization accounts v3.12.0"
244+
Description: "StackSet in charge of deploying read roles across organization accounts v3.12.1"
245245
PermissionModel: SERVICE_MANAGED
246246
AutoDeployment:
247247
Enabled: true
@@ -290,4 +290,4 @@ Resources:
290290
- CAPABILITY_IAM
291291
- CAPABILITY_NAMED_IAM
292292
StackSetName: !Sub "StackSet-${AWS::AccountId}-OptimizationDataRole"
293-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/deploy-in-linked-account.yaml"
293+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/deploy-in-linked-account.yaml"

‎data-collection/deploy/deploy-in-linked-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AWSTemplateFormatVersion: '2010-09-09'
2-
Description: CID Data Collection - Role for Linked Account v3.12.0
2+
Description: CID Data Collection - Role for Linked Account v3.12.1
33
Metadata:
44
AWS::CloudFormation::Interface:
55
ParameterGroups:

‎data-collection/deploy/deploy-in-management-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AWSTemplateFormatVersion: '2010-09-09'
2-
Description: CID Data Collection - Role for Management Account v3.12.0
2+
Description: CID Data Collection - Role for Management Account v3.12.1
33
Metadata:
44
AWS::CloudFormation::Interface:
55
ParameterGroups:

‎data-collection/deploy/source/step-functions/main-state-machine.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"EXE_UUID": "{% $split($states.context.Execution.Id, ':')[7] %}",
1818
"EXE_START_TIME_SPLIT": "{% $split($states.context.Execution.StartTime, /[-:T.]/) %}",
1919
"EXE_START_TIME": "{% $replace($states.context.Execution.StartTime,'Z','') %}",
20-
"STACK_VERSION": "v3.12.0"
20+
"STACK_VERSION": "v3.12.1"
2121
},
2222
"Next": "SetGlobalVariables2"
2323
},

0 commit comments

Comments
 (0)