Skip to content

Commit 37d9df2

Browse files
esc1144esc1144
authored
Merge pull request #413 from aws-solutions-library-samples/release/3.14.2
release 3.14.2
2 parents 59e3ee5 + f8cb019 commit 37d9df2

File tree

7 files changed

+51
-43
lines changed

7 files changed

+51
-43
lines changed

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

Lines changed: 29 additions & 29 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.14.1 - AWS Solution SO9011
3+
Description: CID Data Collection Stack v3.14.2 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -135,10 +135,10 @@ Mappings:
135135
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
136136
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
137137
StepFunctionCode:
138-
main-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/main-state-machine.json}
139-
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/crawler-state-machine.json}
140-
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/standalone-state-machine.json}
141-
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/health-detail-state-machine.json}
138+
main-state-machine: {TemplatePath: cfn/data-collection/v3.14.2/source/step-functions/main-state-machine.json}
139+
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.14.2/source/step-functions/crawler-state-machine.json}
140+
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.14.2/source/step-functions/standalone-state-machine.json}
141+
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.14.2/source/step-functions/health-detail-state-machine.json}
142142

143143
Parameters:
144144
DestinationBucket:
@@ -1046,7 +1046,7 @@ Resources:
10461046
Type: AWS::CloudFormation::Stack
10471047
Condition: DeployTAModule
10481048
Properties:
1049-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-trusted-advisor.yaml"
1049+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-trusted-advisor.yaml"
10501050
Parameters:
10511051
DatabaseName: !Ref DatabaseName
10521052
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1068,7 +1068,7 @@ Resources:
10681068
Type: AWS::CloudFormation::Stack
10691069
Condition: DeployRightsizingModule
10701070
Properties:
1071-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-cost-explorer-rightsizing.yaml"
1071+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-cost-explorer-rightsizing.yaml"
10721072
Parameters:
10731073
DatabaseName: !Ref DatabaseName
10741074
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1089,7 +1089,7 @@ Resources:
10891089
Type: AWS::CloudFormation::Stack
10901090
Condition: DeployCostAnomalyModule
10911091
Properties:
1092-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-cost-anomaly.yaml"
1092+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-cost-anomaly.yaml"
10931093
Parameters:
10941094
DatabaseName: !Ref DatabaseName
10951095
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1111,7 +1111,7 @@ Resources:
11111111
Type: AWS::CloudFormation::Stack
11121112
Condition: DeploySupportCasesModule
11131113
Properties:
1114-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-support-cases.yaml"
1114+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-support-cases.yaml"
11151115
Parameters:
11161116
DatabaseName: !Ref DatabaseName
11171117
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1132,7 +1132,7 @@ Resources:
11321132
Type: AWS::CloudFormation::Stack
11331133
Condition: DeployBackupModule
11341134
Properties:
1135-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-backup.yaml"
1135+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-backup.yaml"
11361136
Parameters:
11371137
DatabaseName: !Ref DatabaseName
11381138
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1153,7 +1153,7 @@ Resources:
11531153
Type: AWS::CloudFormation::Stack
11541154
Condition: DeployInventoryCollectorModule
11551155
Properties:
1156-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-inventory.yaml"
1156+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-inventory.yaml"
11571157
Parameters:
11581158
DatabaseName: !Ref DatabaseName
11591159
DestinationBucket: !Ref S3Bucket
@@ -1180,7 +1180,7 @@ Resources:
11801180
Type: AWS::CloudFormation::Stack
11811181
Condition: DeployPricingModule
11821182
Properties:
1183-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-pricing.yaml"
1183+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-pricing.yaml"
11841184
Parameters:
11851185
DatabaseName: !Ref DatabaseName
11861186
DestinationBucket: !Ref S3Bucket
@@ -1203,7 +1203,7 @@ Resources:
12031203
Type: AWS::CloudFormation::Stack
12041204
Condition: DeployComputeOptimizerModule
12051205
Properties:
1206-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-compute-optimizer.yaml"
1206+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-compute-optimizer.yaml"
12071207
Parameters:
12081208
DestinationBucket: !Ref S3Bucket
12091209
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
@@ -1228,7 +1228,7 @@ Resources:
12281228
Type: AWS::CloudFormation::Stack
12291229
Condition: DeployEcsChargebackModule
12301230
Properties:
1231-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-ecs-chargeback.yaml"
1231+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-ecs-chargeback.yaml"
12321232
Parameters:
12331233
DatabaseName: !Ref DatabaseName
12341234
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1254,7 +1254,7 @@ Resources:
12541254
Type: AWS::CloudFormation::Stack
12551255
Condition: DeployRDSUtilizationModule
12561256
Properties:
1257-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-rds-usage.yaml"
1257+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-rds-usage.yaml"
12581258
Parameters:
12591259
DatabaseName: !Ref DatabaseName
12601260
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1280,7 +1280,7 @@ Resources:
12801280
Type: AWS::CloudFormation::Stack
12811281
Condition: DeployEUCUtilizationModule
12821282
Properties:
1283-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-workspaces-metrics.yaml"
1283+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-workspaces-metrics.yaml"
12841284
Parameters:
12851285
DatabaseName: !Ref DatabaseName
12861286
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1306,7 +1306,7 @@ Resources:
13061306
Type: AWS::CloudFormation::Stack
13071307
Condition: DeployOrgDataModule
13081308
Properties:
1309-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-organization.yaml"
1309+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-organization.yaml"
13101310
Parameters:
13111311
DatabaseName: !Ref DatabaseName
13121312
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1327,7 +1327,7 @@ Resources:
13271327
Type: AWS::CloudFormation::Stack
13281328
Condition: DeployBudgetsModule
13291329
Properties:
1330-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-budgets.yaml"
1330+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-budgets.yaml"
13311331
Parameters:
13321332
DatabaseName: !Ref DatabaseName
13331333
DestinationBucket: !Ref S3Bucket
@@ -1348,7 +1348,7 @@ Resources:
13481348
Type: AWS::CloudFormation::Stack
13491349
Condition: DeployTransitGatewayModule
13501350
Properties:
1351-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-transit-gateway.yaml"
1351+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-transit-gateway.yaml"
13521352
Parameters:
13531353
DatabaseName: !Ref DatabaseName
13541354
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1374,7 +1374,7 @@ Resources:
13741374
Type: AWS::CloudFormation::Stack
13751375
Condition: DeployAWSFeedsModule
13761376
Properties:
1377-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-aws-feeds.yaml"
1377+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-aws-feeds.yaml"
13781378
Parameters:
13791379
DatabaseName: !Ref DatabaseName
13801380
DestinationBucket: !Ref S3Bucket
@@ -1393,7 +1393,7 @@ Resources:
13931393
Type: AWS::CloudFormation::Stack
13941394
Condition: DeployISVFeedsModule
13951395
Properties:
1396-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-isv-feeds.yaml"
1396+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-isv-feeds.yaml"
13971397
Parameters:
13981398
DatabaseName: !Ref DatabaseName
13991399
DestinationBucket: !Ref S3Bucket
@@ -1411,7 +1411,7 @@ Resources:
14111411
Type: AWS::CloudFormation::Stack
14121412
Condition: DeployHealthEventsModule
14131413
Properties:
1414-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-health-events.yaml"
1414+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-health-events.yaml"
14151415
Parameters:
14161416
DatabaseName: !Ref DatabaseName
14171417
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1433,7 +1433,7 @@ Resources:
14331433
Type: AWS::CloudFormation::Stack
14341434
Condition: DeployLicenseManagerModule
14351435
Properties:
1436-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-license-manager.yaml"
1436+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-license-manager.yaml"
14371437
Parameters:
14381438
DatabaseName: !Ref DatabaseName
14391439
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1454,7 +1454,7 @@ Resources:
14541454
Type: AWS::CloudFormation::Stack
14551455
Condition: DeployServiceQuotasModule
14561456
Properties:
1457-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-service-quotas.yaml"
1457+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-service-quotas.yaml"
14581458
Parameters:
14591459
DatabaseName: !Ref DatabaseName
14601460
DestinationBucket: !Ref S3Bucket
@@ -1480,7 +1480,7 @@ Resources:
14801480
Type: AWS::CloudFormation::Stack
14811481
Condition: DeployQuickSightModule
14821482
Properties:
1483-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-quicksight.yaml"
1483+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-quicksight.yaml"
14841484
Parameters:
14851485
DatabaseName: !Ref DatabaseName
14861486
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1499,7 +1499,7 @@ Resources:
14991499
Type: AWS::CloudFormation::Stack
15001500
Condition: DeployResilienceHubModule
15011501
Properties:
1502-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-resilience-hub.yaml"
1502+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-resilience-hub.yaml"
15031503
Parameters:
15041504
DatabaseName: !Ref DatabaseName
15051505
DestinationBucket: !Ref S3Bucket
@@ -1524,7 +1524,7 @@ Resources:
15241524
Type: AWS::CloudFormation::Stack
15251525
Condition: DeployMarketplaceModule
15261526
Properties:
1527-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-marketplace.yaml"
1527+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-marketplace.yaml"
15281528
Parameters:
15291529
DatabaseName: !Ref DatabaseName
15301530
DestinationBucket: !Ref S3Bucket
@@ -1550,7 +1550,7 @@ Resources:
15501550
Type: AWS::CloudFormation::Stack
15511551
Condition: DeployIncludeReferenceModule
15521552
Properties:
1553-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-reference.yaml"
1553+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/module-reference.yaml"
15541554
Parameters:
15551555
DatabaseName: !Ref DatabaseName
15561556
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1574,7 +1574,7 @@ Resources:
15741574
Type: AWS::CloudFormation::Stack
15751575
Condition: DeployAccountCollector
15761576
Properties:
1577-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/account-collector.yaml"
1577+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/account-collector.yaml"
15781578
Parameters:
15791579
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
15801580
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.14.1/deploy/deploy-data-read-permissions.yaml
1+
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.14.2/deploy/deploy-data-read-permissions.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection - All-in-One for Management Account v3.14.1 - AWS Solution SO9011
3+
Description: CID Data Collection - All-in-One for Management Account v3.14.2 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -206,7 +206,7 @@ Resources:
206206
DataCollectorMgmtAccountReadStack:
207207
Type: AWS::CloudFormation::Stack
208208
Properties:
209-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/deploy-in-management-account.yaml"
209+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/deploy-in-management-account.yaml"
210210
Parameters:
211211
DataCollectionAccountID: !Ref DataCollectionAccountID
212212
ManagementAccountRole: !Ref ManagementAccountRole
@@ -223,7 +223,7 @@ Resources:
223223
Type: AWS::CloudFormation::Stack
224224
Condition: DeployModuleReadInMgmt
225225
Properties:
226-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/deploy-in-linked-account.yaml"
226+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/deploy-in-linked-account.yaml"
227227
Parameters:
228228
DataCollectionAccountID: !Ref DataCollectionAccountID
229229
MultiAccountRoleName: !Ref MultiAccountRoleName
@@ -243,7 +243,7 @@ Resources:
243243
DataCollectorOrgAccountModulesReadStackSet:
244244
Type: AWS::CloudFormation::StackSet
245245
Properties:
246-
Description: "StackSet in charge of deploying read roles across organization accounts v3.14.1"
246+
Description: "StackSet in charge of deploying read roles across organization accounts v3.14.2"
247247
PermissionModel: SERVICE_MANAGED
248248
AutoDeployment:
249249
Enabled: true
@@ -292,4 +292,4 @@ Resources:
292292
- CAPABILITY_IAM
293293
- CAPABILITY_NAMED_IAM
294294
StackSetName: !Sub "StackSet-${AWS::AccountId}-OptimizationDataRole"
295-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/deploy-in-linked-account.yaml"
295+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.2/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.14.1
2+
Description: CID Data Collection - Role for Linked Account v3.14.2
33
Metadata:
44
AWS::CloudFormation::Interface:
55
ParameterGroups:

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

Lines changed: 2 additions & 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.14.1
2+
Description: CID Data Collection - Role for Management Account v3.14.2
33
Metadata:
44
cfn-lint:
55
config:
@@ -344,6 +344,7 @@ Resources:
344344
- "license-manager:ListReceivedGrants"
345345
- "license-manager:ListReceivedLicenses"
346346
- "license-manager:ListReceivedGrantsForOrganization"
347+
- "license-manager:ListReceivedLicensesForOrganization"
347348
Resource: "*"
348349
Roles:
349350
- Ref: LambdaRole

‎data-collection/deploy/module-license-manager.yaml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Resources:
149149
S3_GRANTS_PREFIX = os.environ['S3_GRANTS_PREFIX']
150150
S3_LICENSES_PREFIX = os.environ['S3_LICENSES_PREFIX']
151151
PREFIX = os.environ['PREFIX']
152+
USE_ORG = 'local' != os.environ.get('API', 'org')
152153
153154
def store_data_to_s3(data, prefix, payer_id):
154155
if not data:
@@ -168,10 +169,16 @@ Resources:
168169
licenses = []
169170
pagination_token = '' #nosec
170171
while True: #Operation list_received_licenses cannot be paginated
171-
response = license_manager.list_received_licenses(
172-
MaxResults=100,
173-
NextToken=pagination_token
174-
)
172+
if USE_ORG:
173+
response = license_manager.list_received_licenses_for_organization(
174+
MaxResults=100,
175+
NextToken=pagination_token
176+
)
177+
else:
178+
response = license_manager.list_received_licenses(
179+
MaxResults=100,
180+
NextToken=pagination_token
181+
)
175182
licenses.extend(response.get('Licenses', []))
176183
pagination_token = response.get('NextToken', '')
177184
if not pagination_token:

‎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.14.1"
20+
"STACK_VERSION": "v3.14.2"
2121
},
2222
"Next": "SetGlobalVariables2"
2323
},

‎data-collection/utils/version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "3.14.1"
2+
"version": "3.14.2"
33
}

0 commit comments

Comments
 (0)