Merge pull request #234 from awslabs/dev-v1.10.0

Dev v1.10.0
aws-solutions · May 12, 2021 · 9f07103 · 9f07103
2 parents f204a99 + 1aea4ef
commit 9f07103
Show file tree

Hide file tree

Showing 10 changed files with 187 additions and 182 deletions.
diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh
@@ -127,12 +127,13 @@ EVENTS_ZIP="events.zip"
 cd $source_dir/events
 
 # install all the requirements into package dir
+rm -f error.txt
 pip install --upgrade --force-reinstall --target ./package -r requirements.txt 2> error.txt
-if [ -s error.txt ]; then
+RETVAL=$?
+if [ "$RETVAL" -ne "0" ]; then
   echo "ERROR: Event collector package installation failed."
   cat error.txt
-  rm error.txt
-  exit 1
+  exit $RETVAL
 fi
 
 cd package

diff --git a/source/html/external/ajax/libs/handlebars.js/4.0.12/handlebars.min.js b/source/html/external/ajax/libs/handlebars.js/4.0.12/handlebars.min.js
diff --git a/source/html/external/ajax/libs/handlebars.js/4.7.7/handlebars.min.js b/source/html/external/ajax/libs/handlebars.js/4.7.7/handlebars.min.js
diff --git a/source/html/external/ajax/libs/lodash.js/4.17.15/lodash.min.js b/source/html/external/ajax/libs/lodash.js/4.17.15/lodash.min.js
diff --git a/source/html/external/ajax/libs/lodash.js/4.17.21/lodash.min.js b/source/html/external/ajax/libs/lodash.js/4.17.21/lodash.min.js
diff --git a/source/html/index.html b/source/html/index.html
@@ -24,7 +24,7 @@
     <script src="/external/ajax/libs/popper.js/1.14.4/umd/popper.min.js" integrity="sha256-EGs9T1xMHdvM1geM8jPpoo8EZ1V1VRsmcJz8OByENLA=" crossorigin="anonymous"></script>
     <script src="/external/ajax/libs/tabulator/4.1.2/js/tabulator.min.js" integrity="sha256-C2vQLVoRZEK5WCH+4cp6B5CdxeAXev735CdK+2aPs7o=" crossorigin="anonymous"></script>
     <script src="/external/ajax/libs/tabulator/4.1.2/js/jquery_wrapper.min.js" integrity="sha256-3hV8hYuqj/Es6MGB4/mfB+VXmhJvohcbdxvVhXtl1B4=" crossorigin="anonymous"></script>
-    <script src="/external/ajax/libs/handlebars.js/4.0.12/handlebars.min.js" integrity="sha256-qlku5J3WO/ehJpgXYoJWC2px3+bZquKChi4oIWrAKoI=" crossorigin="anonymous"></script>
+    <script src="/external/ajax/libs/handlebars.js/4.7.7/handlebars.min.js" crossorigin="anonymous"></script>
     <script src="/external/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
     <script src="/external/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js" integrity="sha256-bqVeqGdJ7h/lYPq6xrPv/YGzMEb6dNxlfiTUHSgRCp8=" crossorigin="anonymous"></script>
     <script src="/external/ajax/libs/fuse.js/3.4.5/fuse.min.js"></script>

diff --git a/source/html/js/app.js b/source/html/js/app.js
@@ -11,7 +11,7 @@ requirejs.config({
         "fuse": "/external/ajax/libs/fuse.js/3.4.5/fuse.min",
         "object_hash": "/external/gh/puleos/object-hash/dist/object_hash",
         "levenshtein": "/external/npm/fast-levenshtein@2.0.6/levenshtein.min",
-        "lodash": "/external/ajax/libs/lodash.js/4.17.15/lodash.min",
+        "lodash": "/external/ajax/libs/lodash.js/4.17.21/lodash.min",
         "machina": "/external/npm/machina@2.0.2/lib/machina.min",
         "vis": "/external/ajax/libs/vis/4.21.0/vis.min"
     },

diff --git a/source/html/js/app/build.js b/source/html/js/app/build.js
@@ -3,7 +3,7 @@
 
 define(["app/server"], function(server) {
 
-    var stamp = "1613427093";
+    var stamp = "1620858083";
 
     return {
         "get_timestamp": function() {

diff --git a/source/msam/db/makezip.sh b/source/msam/db/makezip.sh
@@ -6,13 +6,13 @@
 ORIGIN=`pwd`
 ZIP="$ORIGIN/dynamodb_resource.zip"
 
-rm -f $ZIP
+rm -f $ZIP error.txt
 pip install --upgrade --force-reinstall --target ./package requests 2> error.txt
-if [ -s error.txt ]; then
+RETVAL=$?
+if [ "$RETVAL" -ne "0" ]; then
     echo "ERROR: Database package installation failed."
     cat error.txt
-    rm error.txt
-    exit 1
+    exit $RETVAL
 fi
 cd package
 zip -r9 $ZIP .

diff --git a/source/web-cloudformation/makezip.sh b/source/web-cloudformation/makezip.sh
@@ -7,20 +7,21 @@ ORIGIN=`pwd`
 ZIP="$ORIGIN/webcontent_resource.zip"
 HTML_ZIP=$1
 
-if [ -f "$ZIP" ]; then
-    rm -f $ZIP
-fi
+
 
 if [ -d "package" ]; then
   rm -rf package
 fi
 
+rm -f $ZIP
+rm -f error.txt
+
 pip install --force-reinstall --target ./package requests crhelper 2> error.txt
-if [ -s error.txt ]; then
+RETVAL=$?
+if [ "$RETVAL" -ne "0" ]; then
     echo "ERROR: System package installation failed."
     cat error.txt
-    rm error.txt
-    exit 1
+    exit $RETVAL
 fi
 cd package
 zip -r9 $ZIP .