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

Commit 2a054c9

Browse files
committed
Update to version v2.0.2
1 parent 976b4ca commit 2a054c9

File tree

7 files changed

+51
-47
lines changed

7 files changed

+51
-47
lines changed

CHANGELOG.md

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

7-
## [tbd] - tbd
87

9-
- New feature: Mitigate the risk of reverse tabnabbing in href links (#43)
10-
- Bug fix: Confidence value has no impact on search queries (#54)
8+
## [2.0.2] - 2023-01-11
119

12-
## [2.0.1] - 08/18/2022
10+
### Fixed:
11+
12+
* Updated python packages
13+
* Replaced deprecated python command with python3
14+
15+
## [2.0.1] - 2022-08-18
1316

1417
### Fixed:
1518

deployment/build-s3-dist.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
###############################################################################
3-
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
# SPDX-License-Identifier: Apache-2.0
55
#
66
# PURPOSE:
@@ -15,7 +15,7 @@
1515
# VERSION can be anything but should be in a format like v1.0.0 just to be consistent
1616
# with the official solution release labels.
1717
# REGION needs to be in a format like us-east-1
18-
# PROFILE is optional. It's the profile that you have setup in ~/.aws/credentials
18+
# PROFILE is optional. It's the profile that you have setup in ~/.aws/config
1919
# that you want to use for AWS CLI commands.
2020
#
2121
# The following options are available:
@@ -78,6 +78,7 @@ parse_params() {
7878
# default values of variables set from params
7979
flag=0
8080
param=''
81+
profile=default
8182

8283
while :; do
8384
case "${1-}" in
@@ -167,7 +168,7 @@ regional_dist_dir="$build_dir/regional-s3-assets"
167168
echo "------------------------------------------------------------------------------"
168169
echo "Creating a temporary Python virtualenv for this script"
169170
echo "------------------------------------------------------------------------------"
170-
python -c "import os; print (os.getenv('VIRTUAL_ENV'))" | grep -q None
171+
python3 -c "import os; print (os.getenv('VIRTUAL_ENV'))" | grep -q None
171172
if [ $? -ne 0 ]; then
172173
echo "ERROR: Do not run this script inside Virtualenv. Type \`deactivate\` and run again.";
173174
exit 1;
@@ -348,20 +349,20 @@ if [ "$global_bucket" != "solutions-reference" ] && [ "$global_bucket" != "solut
348349
echo "------------------------------------------------------------------------------"
349350
echo "Validating ownership of s3://$global_bucket"
350351
# Get account id
351-
account_id=$(aws sts get-caller-identity --query Account --output text $(if [ ! -z $profile ]; then echo "--profile $profile"; fi))
352+
account_id=$(aws sts get-caller-identity --query Account --output text --profile $profile)
352353
if [ $? -ne 0 ]; then
353354
msg "ERROR: Failed to get AWS account ID"
354355
die 1
355356
fi
356357
# Validate ownership of $global_bucket
357-
aws s3api head-bucket --bucket $global_bucket --expected-bucket-owner $account_id $(if [ ! -z $profile ]; then echo "--profile $profile"; fi)
358+
aws s3api head-bucket --bucket $global_bucket --expected-bucket-owner $account_id --profile $profile
358359
if [ $? -ne 0 ]; then
359360
msg "ERROR: Your AWS account does not own s3://$global_bucket/"
360361
die 1
361362
fi
362363
echo "Validating ownership of s3://${regional_bucket}-${region}"
363364
# Validate ownership of ${regional_bucket}-${region}
364-
aws s3api head-bucket --bucket ${regional_bucket}-${region} --expected-bucket-owner $account_id $(if [ ! -z $profile ]; then echo "--profile $profile"; fi)
365+
aws s3api head-bucket --bucket ${regional_bucket}-${region} --expected-bucket-owner $account_id --profile $profile
365366
if [ $? -ne 0 ]; then
366367
msg "ERROR: Your AWS account does not own s3://${regional_bucket}-${region} "
367368
die 1

source/anonymous-data-logger/lib/metrics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/python
22
# -*- coding: utf-8 -*-
33
##############################################################################
4-
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #
4+
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. #
55
# #
66
# Licensed under the Apache License Version 2.0 (the "License"). #
77
# You may not use this file except in compliance with the License. #
@@ -30,7 +30,7 @@ def send_metrics(config):
3030
data = json.dumps(metrics).encode('utf8')
3131
headers = {'content-type': 'application/json'}
3232
req = urllib.request.Request(url, data,headers)
33-
response = urllib.request.urlopen(req)
33+
response = urllib.request.urlopen(req) #nosec
3434
print('RESPONSE CODE:: {}'.format(response.getcode()))
3535
print('METRICS SENT:: {}'.format(data))
3636
return
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
requests==2.26.0
1+
requests==2.28.1

source/consumer/lambda_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

44
from elasticsearch import Elasticsearch, RequestsHttpConnection
@@ -773,7 +773,7 @@ def delete_asset_all_indices(es_object, asset_id):
773773
body=delete_query
774774
)
775775
except Exception as e:
776-
print("Unable to delete from elasticsearch: {es}:".format(es=e))
776+
print("Unable to delete from elasticsearch: {es}:".format(es=e)) #nosec
777777
else:
778778
print(delete_request)
779779
print("Deleted asset: {asset} from elasticsearch".format(asset=asset_id))

source/consumer/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
elasticsearch==7.13.4
1+
elasticsearch==8.6.0
22
requests-aws4auth==1.1.1

source/website/package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@
99
"deploy": "aws s3 sync --acl public-read --profile mie --delete dist/ s3://[your_website_bucket]"
1010
},
1111
"dependencies": {
12-
"aws-amplify": "^3.3.27",
13-
"aws-amplify-vue": "^2.1.5",
12+
"aws-amplify": "3.3.27",
13+
"aws-amplify-vue": "2.1.5",
1414
"axios": ">=0.21.4",
15-
"bad-words": "^3.0.4",
16-
"chart.js": "^2.9.4",
17-
"core-js": "^3.14.0",
18-
"dropzone": "^5.7.0",
19-
"jquery": "^3.4.1",
20-
"jwt-decode": "^3.1.2",
21-
"lodash": "^4.17.21",
22-
"register-service-worker": "^1.7.2",
23-
"video.js": "^7.10.2",
24-
"videojs-flash": "^2.2.1",
25-
"videojs-hotkeys": "^0.2.25",
26-
"videojs-markers": "^1.0.1",
27-
"vue": "^2.6.12",
28-
"vue-highlightjs": "^1.3.3",
29-
"vue-router": "^3.5.1",
30-
"vue-video-player": "^5.0.2",
31-
"vuex": "^3.6.2",
32-
"vuex-persistedstate": "^v4.0.0-beta.3"
15+
"bad-words": "3.0.4",
16+
"chart.js": "2.9.4",
17+
"core-js": "3.14.0",
18+
"dropzone": "5.7.0",
19+
"jquery": "3.4.1",
20+
"jwt-decode": "3.1.2",
21+
"lodash": "4.17.21",
22+
"register-service-worker": "1.7.2",
23+
"video.js": "7.10.2",
24+
"videojs-flash": "2.2.1",
25+
"videojs-hotkeys": "0.2.25",
26+
"videojs-markers": "1.0.1",
27+
"vue": "2.6.12",
28+
"vue-highlightjs": "1.3.3",
29+
"vue-router": "3.5.1",
30+
"vue-video-player": "5.0.2",
31+
"vuex": "3.6.2",
32+
"vuex-persistedstate": "v4.0.0-beta.3"
3333
},
3434
"devDependencies": {
35-
"@vue/cli-plugin-babel": "^4.5.11",
36-
"@vue/cli-plugin-eslint": "^4.5.11",
37-
"@vue/cli-plugin-pwa": "^4.5.11",
38-
"@vue/cli-service": "^3.12.1",
39-
"babel-eslint": "^10.0.3",
40-
"bootstrap": "^4.6.0",
41-
"bootstrap-vue": "^2.21.2",
42-
"eslint": "^6.8.0",
43-
"eslint-plugin-vue": "^7.5.0",
44-
"vue-template-compiler": "^2.6.12",
45-
"webpack-subresource-integrity": "^1.5.2"
35+
"@vue/cli-plugin-babel": "4.5.11",
36+
"@vue/cli-plugin-eslint": "4.5.11",
37+
"@vue/cli-plugin-pwa": "4.5.11",
38+
"@vue/cli-service": "3.12.1",
39+
"babel-eslint": "10.0.3",
40+
"bootstrap": "4.6.0",
41+
"bootstrap-vue": "2.21.2",
42+
"eslint": "6.8.0",
43+
"eslint-plugin-vue": "7.5.0",
44+
"vue-template-compiler": "2.6.12",
45+
"webpack-subresource-integrity": "1.5.2"
4646
},
4747
"eslintConfig": {
4848
"root": false,

0 commit comments

Comments
 (0)