Skip to content

Commit 9e5ff48

Browse files
schniberschniber
authored
addition of the loop over languages to fetch cases in different languages (#353)
1 parent b3d611f commit 9e5ff48

File tree

6 files changed

+117
-115
lines changed

6 files changed

+117
-115
lines changed

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

Lines changed: 25 additions & 25 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.9.1 - AWS Solution SO9011
3+
Description: CID Data Collection Stack v3.10.0 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -128,9 +128,9 @@ Mappings:
128128
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
129129
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
130130
StepFunctionCode:
131-
main-v3: {TemplatePath: cfn/data-collection/v3.9.1/source/step-functions/main-state-machine-v3.json}
132-
crawler-v1: {TemplatePath: cfn/data-collection/v3.9.1/source/step-functions/crawler-state-machine-v1.json}
133-
standalone-v1: {TemplatePath: cfn/data-collection/v3.9.1/source/step-functions/awsfeeds-state-machine-v1.json}
131+
main-v3: {TemplatePath: cfn/data-collection/v3.10.0/source/step-functions/main-state-machine-v3.json}
132+
crawler-v1: {TemplatePath: cfn/data-collection/v3.10.0/source/step-functions/crawler-state-machine-v1.json}
133+
standalone-v1: {TemplatePath: cfn/data-collection/v3.10.0/source/step-functions/awsfeeds-state-machine-v1.json}
134134

135135
Parameters:
136136
DestinationBucket:
@@ -971,7 +971,7 @@ Resources:
971971
Type: AWS::CloudFormation::Stack
972972
Condition: DeployTAModule
973973
Properties:
974-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-trusted-advisor.yaml"
974+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-trusted-advisor.yaml"
975975
Parameters:
976976
DatabaseName: !Ref DatabaseName
977977
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -992,7 +992,7 @@ Resources:
992992
Type: AWS::CloudFormation::Stack
993993
Condition: DeployRightsizingModule
994994
Properties:
995-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-cost-explorer-rightsizing.yaml"
995+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-cost-explorer-rightsizing.yaml"
996996
Parameters:
997997
DatabaseName: !Ref DatabaseName
998998
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1013,7 +1013,7 @@ Resources:
10131013
Type: AWS::CloudFormation::Stack
10141014
Condition: DeployCostAnomalyModule
10151015
Properties:
1016-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-cost-anomaly.yaml"
1016+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-cost-anomaly.yaml"
10171017
Parameters:
10181018
DatabaseName: !Ref DatabaseName
10191019
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1035,7 +1035,7 @@ Resources:
10351035
Type: AWS::CloudFormation::Stack
10361036
Condition: DeploySupportCasesModule
10371037
Properties:
1038-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-support-cases.yaml"
1038+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-support-cases.yaml"
10391039
Parameters:
10401040
DatabaseName: !Ref DatabaseName
10411041
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1056,7 +1056,7 @@ Resources:
10561056
Type: AWS::CloudFormation::Stack
10571057
Condition: DeployBackupModule
10581058
Properties:
1059-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-backup.yaml"
1059+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-backup.yaml"
10601060
Parameters:
10611061
DatabaseName: !Ref DatabaseName
10621062
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1077,7 +1077,7 @@ Resources:
10771077
Type: AWS::CloudFormation::Stack
10781078
Condition: DeployInventoryCollectorModule
10791079
Properties:
1080-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-inventory.yaml"
1080+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-inventory.yaml"
10811081
Parameters:
10821082
DatabaseName: !Ref DatabaseName
10831083
DestinationBucket: !Ref S3Bucket
@@ -1104,7 +1104,7 @@ Resources:
11041104
Type: AWS::CloudFormation::Stack
11051105
Condition: DeployPricingModule
11061106
Properties:
1107-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-pricing.yaml"
1107+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-pricing.yaml"
11081108
Parameters:
11091109
DatabaseName: !Ref DatabaseName
11101110
DestinationBucket: !Ref S3Bucket
@@ -1127,7 +1127,7 @@ Resources:
11271127
Type: AWS::CloudFormation::Stack
11281128
Condition: DeployComputeOptimizerModule
11291129
Properties:
1130-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-compute-optimizer.yaml"
1130+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-compute-optimizer.yaml"
11311131
Parameters:
11321132
DestinationBucket: !Ref S3Bucket
11331133
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
@@ -1152,7 +1152,7 @@ Resources:
11521152
Type: AWS::CloudFormation::Stack
11531153
Condition: DeployEcsChargebackModule
11541154
Properties:
1155-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-ecs-chargeback.yaml"
1155+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-ecs-chargeback.yaml"
11561156
Parameters:
11571157
DatabaseName: !Ref DatabaseName
11581158
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1178,7 +1178,7 @@ Resources:
11781178
Type: AWS::CloudFormation::Stack
11791179
Condition: DeployRDSUtilizationModule
11801180
Properties:
1181-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-rds-usage.yaml"
1181+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-rds-usage.yaml"
11821182
Parameters:
11831183
DatabaseName: !Ref DatabaseName
11841184
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1204,7 +1204,7 @@ Resources:
12041204
Type: AWS::CloudFormation::Stack
12051205
Condition: DeployEUCUtilizationModule
12061206
Properties:
1207-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-workspaces-metrics.yaml"
1207+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-workspaces-metrics.yaml"
12081208
Parameters:
12091209
DatabaseName: !Ref DatabaseName
12101210
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1230,7 +1230,7 @@ Resources:
12301230
Type: AWS::CloudFormation::Stack
12311231
Condition: DeployOrgDataModule
12321232
Properties:
1233-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-organization.yaml"
1233+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-organization.yaml"
12341234
Parameters:
12351235
DatabaseName: !Ref DatabaseName
12361236
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1251,7 +1251,7 @@ Resources:
12511251
Type: AWS::CloudFormation::Stack
12521252
Condition: DeployBudgetsModule
12531253
Properties:
1254-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-budgets.yaml"
1254+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-budgets.yaml"
12551255
Parameters:
12561256
DatabaseName: !Ref DatabaseName
12571257
DestinationBucket: !Ref S3Bucket
@@ -1272,7 +1272,7 @@ Resources:
12721272
Type: AWS::CloudFormation::Stack
12731273
Condition: DeployTransitGatewayModule
12741274
Properties:
1275-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-transit-gateway.yaml"
1275+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-transit-gateway.yaml"
12761276
Parameters:
12771277
DatabaseName: !Ref DatabaseName
12781278
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1298,7 +1298,7 @@ Resources:
12981298
Type: AWS::CloudFormation::Stack
12991299
Condition: DeployAWSFeedsModule
13001300
Properties:
1301-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-aws-feeds.yaml"
1301+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-aws-feeds.yaml"
13021302
Parameters:
13031303
DatabaseName: !Ref DatabaseName
13041304
DestinationBucket: !Ref S3Bucket
@@ -1317,7 +1317,7 @@ Resources:
13171317
Type: AWS::CloudFormation::Stack
13181318
Condition: DeployISVFeedsModule
13191319
Properties:
1320-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-isv-feeds.yaml"
1320+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-isv-feeds.yaml"
13211321
Parameters:
13221322
DatabaseName: !Ref DatabaseName
13231323
DestinationBucket: !Ref S3Bucket
@@ -1335,7 +1335,7 @@ Resources:
13351335
Type: AWS::CloudFormation::Stack
13361336
Condition: DeployHealthEventsModule
13371337
Properties:
1338-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-health-events.yaml"
1338+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-health-events.yaml"
13391339
Parameters:
13401340
DatabaseName: !Ref DatabaseName
13411341
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1356,7 +1356,7 @@ Resources:
13561356
Type: AWS::CloudFormation::Stack
13571357
Condition: DeployLicenseManagerModule
13581358
Properties:
1359-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-license-manager.yaml"
1359+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-license-manager.yaml"
13601360
Parameters:
13611361
DatabaseName: !Ref DatabaseName
13621362
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1377,7 +1377,7 @@ Resources:
13771377
Type: AWS::CloudFormation::Stack
13781378
Condition: DeployServiceQuotasModule
13791379
Properties:
1380-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.amazonaws.com/cfn/data-collection/v3.9.1/module-service-quotas.yaml"
1380+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.amazonaws.com/cfn/data-collection/v3.10.0/module-service-quotas.yaml"
13811381
Parameters:
13821382
DatabaseName: !Ref DatabaseName
13831383
DestinationBucket: !Ref S3Bucket
@@ -1403,7 +1403,7 @@ Resources:
14031403
Type: AWS::CloudFormation::Stack
14041404
Condition: DeployQuickSightModule
14051405
Properties:
1406-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/module-quicksight.yaml"
1406+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-quicksight.yaml"
14071407
Parameters:
14081408
DatabaseName: !Ref DatabaseName
14091409
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1422,7 +1422,7 @@ Resources:
14221422
Type: AWS::CloudFormation::Stack
14231423
Condition: DeployAccountCollector
14241424
Properties:
1425-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/account-collector.yaml"
1425+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/account-collector.yaml"
14261426
Parameters:
14271427
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
14281428
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.9.1/deploy/deploy-data-read-permissions.yaml
1+
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.10.0/deploy/deploy-data-read-permissions.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection - All-in-One for Management Account v3.9.1 - AWS Solution SO9011
3+
Description: CID Data Collection - All-in-One for Management Account v3.10.0 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -190,7 +190,7 @@ Resources:
190190
DataCollectorMgmtAccountReadStack:
191191
Type: AWS::CloudFormation::Stack
192192
Properties:
193-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/deploy-in-management-account.yaml"
193+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/deploy-in-management-account.yaml"
194194
Parameters:
195195
DataCollectionAccountID: !Ref DataCollectionAccountID
196196
ManagementAccountRole: !Ref ManagementAccountRole
@@ -206,7 +206,7 @@ Resources:
206206
Type: AWS::CloudFormation::Stack
207207
Condition: DeployModuleReadInMgmt
208208
Properties:
209-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/deploy-in-linked-account.yaml"
209+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/deploy-in-linked-account.yaml"
210210
Parameters:
211211
DataCollectionAccountID: !Ref DataCollectionAccountID
212212
MultiAccountRoleName: !Ref MultiAccountRoleName
@@ -223,7 +223,7 @@ Resources:
223223
DataCollectorOrgAccountModulesReadStackSet:
224224
Type: AWS::CloudFormation::StackSet
225225
Properties:
226-
Description: "StackSet in charge of deploying read roles across organization accounts v3.9.1"
226+
Description: "StackSet in charge of deploying read roles across organization accounts v3.10.0"
227227
PermissionModel: SERVICE_MANAGED
228228
AutoDeployment:
229229
Enabled: true
@@ -268,4 +268,4 @@ Resources:
268268
- CAPABILITY_IAM
269269
- CAPABILITY_NAMED_IAM
270270
StackSetName: !Sub "StackSet-${AWS::AccountId}-OptimizationDataRole"
271-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.9.1/deploy-in-linked-account.yaml"
271+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/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.9.1
2+
Description: CID Data Collection - Role for Linked Account v3.10.0
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.9.1
2+
Description: CID Data Collection - Role for Management Account v3.10.0
33
Metadata:
44
AWS::CloudFormation::Interface:
55
ParameterGroups:

0 commit comments

Comments
 (0)