Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Commit ffdf6b5

Browse files
eggoyneseggoynes
authored
Merge pull request #762 from aws-solutions/release/v5.1.6
Update to v5.1.6
2 parents ee6d069 + dd1050d commit ffdf6b5

File tree

11 files changed

+37
-80
lines changed

11 files changed

+37
-80
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [5.1.6] - 2024-03-20
9+
10+
### Changed
11+
12+
- Removed duplicate SQS Queue Policy
13+
- Specify chalice version in build script
14+
815
## [5.1.5] - 2023-11-02
916

1017
### Security

‎NOTICE.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,41 @@ THIRD PARTY COMPONENTS
99
**********************
1010
This software includes third party software subject to the following copyrights:
1111

12+
attrs under the Massachusetts Institute of Technology license
1213
aws-amplify under the Apache License Version 2.0
1314
aws-amplify-vue under the Apache License Version 2.0
15+
awscli under the Apache License Version 2.0
1416
aws-xray-sdk under the Apache License Version 2.0
1517
boto3 under the Apache License Version 2.0
1618
botocore under the Apache License Version 2.0
1719
cdk-nag under the Apache License Version 2.0
1820
chalice under the Apache License Version 2.0
21+
click under the BSD 3-Clause License
22+
colorama under the BSD License
1923
docker under the Apache License Version 2.0
2024
docopt under the Massachusetts Institute of Technology license
25+
docutils under the BSD License
26+
iniconfig under the Massachusetts Institute of Technology license
2127
jest-cdk-snapshot under the Massachusetts Institute of Technology license
28+
jmespath under the Massachusetts Institute of Technology license
29+
joblib under the BSD 3-Clause License
2230
jsonpickle under the BSD 3-Clause "New" or "Revised" License
2331
jsonschema under the Massachusetts Institute of Technology license
2432
nltk under the Apache License Version 2.0
33+
pluggy under the Massachusetts Institute of Technology license
34+
pyasn1 under the Massachusetts Institute of Technology license
2535
pymediainfo under the Massachusetts Institute of Technology license
36+
pyrsistent under the Massachusetts Institute of Technology license
2637
pytest under the Massachusetts Institute of Technology license
2738
pytest-cov under the Massachusetts Institute of Technology license
39+
python-dateutil under the Apache License Version 2.0
40+
regex under the Apache License Version 2.0
2841
requests under the Apache License Version 2.0
2942
requests_aws4auth under the Massachusetts Institute of Technology license
43+
rsa under the Apache License Version 2.0
44+
s3transfer under the Apache License Version 2.0
3045
source-map-support under the Massachusetts Institute of Technology license
46+
tqdm under the Massachusetts Institute of Technology license
3147
urllib3 under the Massachusetts Institute of Technology license
3248
webvtt-py under the Massachusetts Institute of Technology license
49+
wrapt under the BSD License

‎deployment/build-s3-dist.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ pip3 install wheel
228228
# See the following issues for more details:
229229
# - https://github.com/aws/aws-cdk/issues/26300
230230
# - https://github.com/python-jsonschema/jsonschema/issues/1117
231-
pip3 install --quiet boto3 chalice docopt pyyaml jsonschema==4.17.3 aws_xray_sdk
231+
pip3 install --quiet boto3 chalice==1.31.0 docopt pyyaml jsonschema==4.17.3 aws_xray_sdk
232232
export PYTHONPATH="$PYTHONPATH:$source_dir/lib/MediaInsightsEngineLambdaHelper/"
233233
if [ $? -ne 0 ]; then
234234
echo "ERROR: Failed to install required Python libraries."

‎solution-manifest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: SO0163
22
name: media-insights-on-aws
3-
version: 5.1.5
3+
version: 5.1.6
44
cloudformation_templates:
55
- template: media-insights-on-aws-stack.template
66
main_template: true

‎source/cdk/lib/media-insights-stack.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -487,28 +487,6 @@ export class MediaInsightsStack extends Stack {
487487
enforceSSL: true,
488488
});
489489

490-
const sqsQueuePolicy = new sqs.QueuePolicy(this, 'SqsQueuePolicy', {
491-
queues: [workflowExecutionEventQueue],
492-
});
493-
sqsQueuePolicy.document.addStatements(
494-
new iam.PolicyStatement({
495-
principals: [new iam.ServicePrincipal('sns.amazonaws.com')],
496-
resources: [workflowExecutionEventQueue.queueArn],
497-
actions: ["sqs:SendMessage"],
498-
conditions: {
499-
ArnEquals: {
500-
['aws:SourceArn']: workflowExecutionEventTopic.topicArn,
501-
}
502-
},
503-
}),
504-
);
505-
506-
// cfn_nag
507-
util.setNagSuppressRules(sqsQueuePolicy, {
508-
id: 'W11',
509-
reason: "The queue permissions are scoped to the SNS topic using the condition",
510-
});
511-
512490
workflowExecutionEventTopic.addSubscription(new subscriptions.SqsSubscription(workflowExecutionEventQueue));
513491

514492
//

‎source/cdk/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎source/cdk/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "media-insights-on-aws",
3-
"version": "5.1.5",
3+
"version": "5.1.6",
44
"description": "Synthesize templates for Media Insights on AWS using AWS Cloud Development Kit (CDK).",
55
"license": "Apache-2.0",
66
"private": true,

‎source/cdk/test/__snapshots__/media-insights-dataplane-api-stack.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ exports[`Snapshot media-insights-dataplane-api stack test 1`] = `
150150
},
151151
"Runtime": "python3.11",
152152
"Tags": {
153-
"aws-chalice": "version=1.29.0:stage=dev:app=dataplaneapi",
153+
"aws-chalice": "version=1.31.0:stage=dev:app=dataplaneapi",
154154
},
155155
"Timeout": 120,
156156
"Tracing": {

‎source/cdk/test/__snapshots__/media-insights-stack.test.ts.snap‎

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,7 @@ exports[`Snapshot media-insights root stack test 1`] = `
20772077
"CodeKeyPrefix",
20782078
],
20792079
},
2080-
"media_insights_on_aws_lambda_layer_python3.10-v5.1.5.zip",
2080+
"media_insights_on_aws_lambda_layer_python3.10-v5.1.6.zip",
20812081
],
20822082
],
20832083
},
@@ -2124,7 +2124,7 @@ exports[`Snapshot media-insights root stack test 1`] = `
21242124
"CodeKeyPrefix",
21252125
],
21262126
},
2127-
"media_insights_on_aws_lambda_layer_python3.11-v5.1.5.zip",
2127+
"media_insights_on_aws_lambda_layer_python3.11-v5.1.6.zip",
21282128
],
21292129
],
21302130
},
@@ -2171,7 +2171,7 @@ exports[`Snapshot media-insights root stack test 1`] = `
21712171
"CodeKeyPrefix",
21722172
],
21732173
},
2174-
"media_insights_on_aws_lambda_layer_python3.9-v5.1.5.zip",
2174+
"media_insights_on_aws_lambda_layer_python3.9-v5.1.6.zip",
21752175
],
21762176
],
21772177
},
@@ -3291,51 +3291,6 @@ def handler(event, context):
32913291
"Type": "AWS::CloudFormation::Stack",
32923292
"UpdateReplacePolicy": "Delete",
32933293
},
3294-
"SqsQueuePolicy": {
3295-
"Metadata": {
3296-
"cfn_nag": {
3297-
"rules_to_suppress": [
3298-
{
3299-
"id": "W11",
3300-
"reason": "The queue permissions are scoped to the SNS topic using the condition",
3301-
},
3302-
],
3303-
},
3304-
},
3305-
"Properties": {
3306-
"PolicyDocument": {
3307-
"Statement": [
3308-
{
3309-
"Action": "sqs:SendMessage",
3310-
"Condition": {
3311-
"ArnEquals": {
3312-
"aws:SourceArn": {
3313-
"Ref": "WorkflowExecutionEventTopic",
3314-
},
3315-
},
3316-
},
3317-
"Effect": "Allow",
3318-
"Principal": {
3319-
"Service": "sns.amazonaws.com",
3320-
},
3321-
"Resource": {
3322-
"Fn::GetAtt": [
3323-
"WorkflowExecutionEventQueue",
3324-
"Arn",
3325-
],
3326-
},
3327-
},
3328-
],
3329-
"Version": "2012-10-17",
3330-
},
3331-
"Queues": [
3332-
{
3333-
"Ref": "WorkflowExecutionEventQueue",
3334-
},
3335-
],
3336-
},
3337-
"Type": "AWS::SQS::QueuePolicy",
3338-
},
33393294
"StageExecutionDeadLetterQueue": {
33403295
"DeletionPolicy": "Delete",
33413296
"Metadata": {

‎source/cdk/test/__snapshots__/media-insights-workflow-api-stack.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ exports[`Snapshot media-insights-workflow-api stack test 1`] = `
246246
},
247247
"Runtime": "python3.11",
248248
"Tags": {
249-
"aws-chalice": "version=1.29.0:stage=dev:app=workflowapi",
249+
"aws-chalice": "version=1.31.0:stage=dev:app=workflowapi",
250250
},
251251
"Timeout": 60,
252252
"Tracing": {
@@ -4877,7 +4877,7 @@ Raises:
48774877
},
48784878
"Runtime": "python3.11",
48794879
"Tags": {
4880-
"aws-chalice": "version=1.29.0:stage=dev:app=workflowapi",
4880+
"aws-chalice": "version=1.31.0:stage=dev:app=workflowapi",
48814881
},
48824882
"Timeout": 180,
48834883
"Tracing": {

0 commit comments

Comments
 (0)