Version 3.0.0

Version 3.0.0 updates

Author: shsenior

CONTRIBUTING.md

@@ -1,17 +1,17 @@
 # Contributing Guidelines
 
-Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional 
+Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
 documentation, we greatly value feedback and contributions from our community.
 
-Please read through this document before submitting any issues or pull requests to ensure we have all the necessary 
+Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
 information to effectively respond to your bug report or contribution.
 
 
 ## Reporting Bugs/Feature Requests
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/awslabs/serverless-image-handler/issues), or [recently closed](https://github.com/awslabs/serverless-image-handler/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+When filing an issue, please check [existing open](https://github.com/awslabs/serverless-image-handler/issues), or [recently closed](https://github.com/awslabs/serverless-image-handler/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -36,17 +36,17 @@ To send us a pull request, please:
 5. Send us a pull request, answering any default questions in the pull request interface.
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and 
+GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/serverless-image-handler/labels/help%20wanted) issues is a great place to start. 
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/serverless-image-handler/labels/help%20wanted) issues is a great place to start.
 
 
 ## Code of Conduct
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
 [email protected] with any additional questions or comments.
 
 

LICENSE.txt

@@ -4,11 +4,10 @@
 #sudo yum-config-manager --enable epel
 #sudo yum update -y
 #sudo yum install git libpng-devel libcurl-devel gcc python-devel libjpeg-devel -y
-#sudo pip install --upgrade pip
-#alias sudo='sudo env PATH=$PATH'
-#sudo  pip install --upgrade setuptools
-#sudo pip install --upgrade virtualenv
-
+# pip install --upgrade pip==9.0.3
+# alias sudo='sudo env PATH=$PATH'
+# pip install --upgrade setuptools==39.0.1
+# pip install --upgrade virtualenv==15.2.0
 # This script should be run from the repo's deployment directory
 # cd deployment
 # ./build-s3-dist.sh source-bucket-base-name
@@ -24,7 +23,7 @@ if [ -z "$1" ]; then
 fi
 
 # Build source
-echo "Staring to build distribution"
+echo "Starting to build distribution"
 echo "export deployment_dir=`pwd`"
 export deployment_dir=`pwd`
 echo "mkdir -p dist"
@@ -35,43 +34,96 @@ echo "Updating code source bucket in template with $1"
 replace="s/%%BUCKET_NAME%%/$1/g"
 echo "sed -i '' -e $replace dist/serverless-image-handler.template"
 sed -i '' -e $replace dist/serverless-image-handler.template
+
+# SO-SIH-154 - 07/16/2018 - Build fixes
+# Adding variable for artifact version
+replace="s/%%VERSION%%/$2/g"
+echo "sed -i '' -e $replace dist/serverless-image-handler.template"
+sed -i '' -e $replace dist/serverless-image-handler.template
+
 echo "Creating UI ZIP file"
 cd $deployment_dir/../source/ui
 zip -q -r9 $deployment_dir/dist/serverless-image-handler-ui.zip *
 echo "Building custom resource package ZIP file"
 cd $deployment_dir/dist
 pwd
-echo "virtualenv env"
-virtualenv env
+echo "virtualenv --no-site-packages env"
+virtualenv --no-site-packages env
 echo "source env/bin/activate"
 source env/bin/activate
-echo "pip install $deployment_dir/../source/image-handler-custom-resource/. --target=$deployment_dir/dist/env/lib/python2.7/site-packages/"
-pip install $deployment_dir/../source/image-handler-custom-resource/. --target=$deployment_dir/dist/env/lib/python2.7/site-packages/
+echo "python -m pip install pip==9.0.3"
+python -m pip install pip==9.0.3
+# SO-SIH-157 - 07/17/2018 - Pip version
+# Checking pip version inside virtualenv for debugging
+echo "which python pip virtualenv, version"
+which python && python --version
+which pip && pip --version
+which virtualenv && virtualenv --version
+
+# Building custom resource zip
+echo "pip install -q $deployment_dir/../source/image-handler-custom-resource/. --target=$deployment_dir/dist/env/lib/python2.7/site-packages/"
+pip install -q $deployment_dir/../source/image-handler-custom-resource/. --target=$deployment_dir/dist/env/lib/python2.7/site-packages/
 cd $deployment_dir/dist/env/lib/python2.7/site-packages/
 zip -r9 $deployment_dir/dist/serverless-image-handler-custom-resource.zip *
 cd $deployment_dir/dist
 zip -q -d serverless-image-handler-custom-resource.zip pip*
 zip -q -d serverless-image-handler-custom-resource.zip easy*
 rm -rf env
+
+# Building image handler zip
 echo "Building Image Handler package ZIP file"
 cd $deployment_dir/dist
 pwd
-echo "virtualenv env"
-virtualenv env
+echo "virtualenv --no-site-packages env"
+virtualenv --no-site-packages env
 echo "source env/bin/activate"
 source env/bin/activate
+echo "python -m pip install pip==9.0.3"
+python -m pip install pip==9.0.3
+echo "which python pip virtualenv, version"
+which python && python --version
+which pip && pip --version
+which virtualenv && virtualenv --version
+
 cd ../..
 pwd
+
+# SO-SIH-159 - 07/25/2018 - Pycurl ssl backend
+# Configuring compile time ssl backend
+# https://stackoverflow.com/questions/21096436/ssl-backend-error-when-using-openssl
+export PYCURL_SSL_LIBRARY=nss
+
+# to help with debugging
+echo "which curl && curl --version"
+which curl && curl --version
+echo "which curl-config && curl-config --version"
+which curl-config && curl-config --version
+
+cd $VIRTUAL_ENV
+pwd
+
+# SO-SIH-159 - 07/25/2018 - Curl 7.51.0
+# Installing curl 7.51.0 to keep libcurl link-time and compile-time version same
+# Building pycurl against libcurl 7.51.0 resolves the issue
+echo "installing curl 7.51.0"
+wget https://curl.haxx.se/download/curl-7.51.0.tar.gz
+tar -zxvf curl-7.51.0.tar.gz
+cd curl-7.51.0
+./configure
+make
+make install
+which curl && curl --version
+which curl-config && curl-config --version
+
+cd $VIRTUAL_ENV
+cd ../../..
+pwd
 echo "pip install source/image-handler/. --target=$VIRTUAL_ENV/lib/python2.7/site-packages/"
 pip install source/image-handler/. --target=$VIRTUAL_ENV/lib/python2.7/site-packages/
-echo "pip install -r source/image-handler/requirements.txt --target=$VIRTUAL_ENV/lib/python2.7/site-packages/"
-pip install -r source/image-handler/requirements.txt --target=$VIRTUAL_ENV/lib/python2.7/site-packages/
+
 cd $VIRTUAL_ENV
-pwd
-#building pngquant
-echo "cp pngquant $VIRTUAL_ENV"
-cp -f pngquant $VIRTUAL_ENV
-#installing optipng pngcrush gifsicle jpegtran
+
+#installing optipng pngcrush gifsicle pngquant jpegtran
 echo "yum install optipng pngcrush gifsicle libjpeg* pngquant ImageMagick-devel -y"
 yum install optipng pngcrush gifsicle libjpeg* pngquant ImageMagick-devel -y
 mkdir $VIRTUAL_ENV/bin/lib
@@ -81,24 +133,28 @@ cp -f /usr/bin/pngcrush $VIRTUAL_ENV
 cp -f /usr/bin/gifsicle $VIRTUAL_ENV
 cp -f /usr/bin/pngquant $VIRTUAL_ENV
 cp -f /usr/lib64/libimagequant.so* $VIRTUAL_ENV/bin/lib
+
 #building mozjpeg
 cd $VIRTUAL_ENV
 pwd
 echo 'yum install nasm autoconf automake libtool -y'
 yum install nasm autoconf automake libtool -y
 echo 'wget https://github.com/mozilla/mozjpeg/releases/download/v3.2/mozjpeg-3.2-release-source.tar.gz'
 wget https://github.com/mozilla/mozjpeg/releases/download/v3.2/mozjpeg-3.2-release-source.tar.gz
-tar -zxvf mozjpeg-3.2-release-source.tar.gz 
-cd mozjpeg 
+tar -zxvf mozjpeg-3.2-release-source.tar.gz
+cd mozjpeg
 autoreconf -fiv
 mkdir build && cd build
-sh ../configure
+sh ../configure --disable-shared --enable-static
 make install prefix=/var/task libdir=/var/task
 cp -f /var/task/libjpeg.so* $VIRTUAL_ENV/bin/lib
-cp -f /var/task/bin/jpegtran $VIRTUAL_ENV/mozjpeg
+# SO-SIH-170 - 08/15/2018 - mozjpeg path
+# mozjpeg executable becomes cjpeg, rectifying path
+echo "cp -f /var/task/bin/cjpeg $VIRTUAL_ENV"
+cp -f /var/task/bin/cjpeg $VIRTUAL_ENV
 #building imgmin
 cd $VIRTUAL_ENV
-pwd 
+pwd
 echo 'git clone https://github.com/rflynn/imgmin.git'
 git clone https://github.com/rflynn/imgmin.git
 cd imgmin
@@ -133,8 +189,8 @@ echo "zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip pngcrush"
 zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip pngcrush
 echo "zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip gifsicle"
 zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip gifsicle
-echo "zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip mozjpeg"
-zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip mozjpeg
+echo "zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip mozjpeg/cjpeg"
+zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip cjpeg
 echo "zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip imgmin"
 zip -q -g $VIRTUAL_ENV/../serverless-image-handler.zip imgmin
 cd $VIRTUAL_ENV/bin

NOTICE.txt

@@ -0,0 +1,76 @@
+#!/bin/bash
+# This assumes all of the OS-level configuration has been completed and git repo has already been cloned
+#sudo yum-config-manager --enable epel
+#sudo yum update -y
+#sudo yum install git libpng-devel libcurl-devel gcc python-devel libjpeg-devel -y
+# pip install --upgrade pip==9.0.3
+# alias sudo='sudo env PATH=$PATH'
+# pip install --upgrade setuptools==39.0.1
+# pip install --upgrade virtualenv==15.2.0
+
+# This script should be run from the repo's deployment directory
+# cd deployment
+# ./run-unit-tests.sh
+
+# Test source
+echo "Staring to test distribution"
+echo "export deployment_dir=`pwd`"
+export deployment_dir=`pwd`
+echo "mkdir -p test"
+mkdir -p test
+cd $deployment_dir/test
+pwd
+# SIM - 07/31/2018 - Fix in class import
+# The test.test_support module seems to be missing from 2.7.14.
+# Module is needed for unit tests, compiling 2.7.15
+# https://docs.python.org/2/library/test.html
+wget https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz
+tar xzf Python-2.7.15.tgz
+cd Python-2.7.15
+./configure --enable-optimizations
+make altinstall
+cd ..
+
+echo "virtualenv --python=/usr/local/bin/python2.7 --no-site-packages testenv"
+virtualenv --python=/usr/local/bin/python2.7 --no-site-packages testenv
+echo "source testenv/bin/activate"
+source testenv/bin/activate
+pip install pip==9.0.3
+cd ../..
+pwd
+
+# SO-SIH-157 - 07/17/2018 - Pip version
+# Checking python, pip version inside virtualenv
+echo "python --version"
+python --version
+echo "pip --version"
+pip --version
+echo "virtualenv --version"
+virtualenv --version
+
+echo "pip install source/image-handler/. --target=$VIRTUAL_ENV/lib/python2.7/site-packages/"
+pip install source/image-handler/. --target=$VIRTUAL_ENV/lib/python2.7/site-packages/
+echo "pip install mock pytest"
+# SIM - 07/31/2018 - Locking dependency version
+# Locking to mock==2.0.0 pytest==3.5.0
+pip install mock==2.0.0 pytest==3.5.0
+echo "pytest source/image-handler"
+pytest source/image-handler/
+retval=$?
+if [ $retval -eq 0 ] ; then
+	echo "All tests were successful"
+else
+	echo "Tests failed"
+	exit 1
+
+fi
+echo "Clean up test material"
+echo "remove virtualenv"
+deactivate
+rm -rf $VIRTUAL_ENV
+rm -rf $deployment_dir/test
+pwd
+rm -rf source/image-handler/tests/__pycache__
+rm -rf source/image-handler/.pytest_cache
+rm source/image-handler/tests/*.pyc
+echo "Completed testing distribution"