Implement app logic and unit tests (#6)

* Implement app logic and unit tests

* Address comments

* Update CodeBuild image to 3.7.1 to match Lambda python version

* Move s3/codepipeline helper functions into separate files

* Add flake8 settings

* Add a codepipeline test event template for re-using between test files

* Minor fix

* Change default input artifact name to BuildArtifact

Author: Simon2228

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 120
+ignore = E126

.gitignore

@@ -25,6 +25,7 @@ wheels/
 *.egg
 MANIFEST
 .idea*
+.vscode/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -102,4 +103,4 @@ venv.bak/
 /site
 
 # mypy
-.mypy_cache/
+.mypy_cache/

Makefile

@@ -1,18 +1,25 @@
 SHELL := /bin/sh
-PY_VERSION := 3.6
+PY_VERSION := 3.7
 
 export PYTHONUNBUFFERED := 1
 
-BUILD_DIR := dist
+SRC_DIR := src
+TEST_DIR := test
+SAM_DIR := .aws-sam
 TEMPLATE_DIR := sam
 
 # Required environment variables (user must override)
 
 # S3 bucket used for packaging SAM templates
-PACKAGE_BUCKET ?= <bucket>
+PACKAGE_BUCKET ?= aws-sar-publishing
 
 # user can optionally override the following by setting environment variables with the same names before running make
 
+# Path to system pip
+PIP ?= pip
+# Default AWS CLI region
+AWS_DEFAULT_REGION ?= us-east-1
+
 # Stack name used when deploying the app for manual testing
 APP_STACK_NAME ?= aws-serverless-codepipeline-serverlessrepo-publish
 # GitHub owner.
@@ -28,32 +35,36 @@ PYTHON := $(shell /usr/bin/which python$(PY_VERSION))
 .DEFAULT_GOAL := build
 
 clean:
-	rm -rf $(BUILD_DIR)
+	rm -f $(SRC_DIR)/requirements.txt
+	rm -rf $(SAM_DIR)
 
+# used by CI build to install dependencies
 init:
 	$(PYTHON) -m pip install pipenv --user
 	pipenv sync --dev
 
 init-cicd:
 	pipenv run sam deploy --template-file $(TEMPLATE_DIR)/cicd.yml --stack-name $(CICD_STACK_NAME) --parameter-overrides GitHubOwner="$(GITHUB_OWNER)" GitHubRepo="$(GITHUB_REPO)" --capabilities CAPABILITY_IAM
 
-compile-app:
-	mkdir -p $(BUILD_DIR)
-	pipenv run flake8 app
-	pipenv run pydocstyle app
+compile:
+	pipenv run flake8 $(SRC_DIR) $(TEST_DIR)
+	pipenv run pydocstyle $(SRC_DIR)
+	pipenv run cfn-lint $(TEMPLATE_DIR)/app.yml
+	pipenv run py.test --cov=$(SRC_DIR) --cov-fail-under=85 -vv test/unit
+	pipenv lock --requirements > $(SRC_DIR)/requirements.txt
+	pipenv run sam build -t $(TEMPLATE_DIR)/app.yml -m $(SRC_DIR)/requirements.txt --debug
 
-test: compile-app
-	pipenv run py.test --cov=app -vv test/unit
+integ-test:
+	pipenv run py.test --cov=$(SRC_DIR) --cov-fail-under=85 -vv test/integration
 
-build: package test
+build: compile
 
-package: compile-app
-	cp -r $(TEMPLATE_DIR)/app.yml app $(BUILD_DIR)
+package: compile
+	pipenv run sam package --template-file $(SAM_DIR)/build/template.yaml --s3-bucket $(PACKAGE_BUCKET) --output-template-file $(SAM_DIR)/packaged-app.yml
 
-	# package dependencies in lib dir
-	pipenv lock --requirements > $(BUILD_DIR)/requirements.txt
-	pipenv run pip install -t $(BUILD_DIR)/app/lib -r $(BUILD_DIR)/requirements.txt
+publish: package
+	pipenv run sam publish --template $(SAM_DIR)/packaged-app.yml
 
 deploy: package
-	pipenv run sam package --template-file $(BUILD_DIR)/app.yml --s3-bucket $(PACKAGE_BUCKET) --output-template-file $(BUILD_DIR)/packaged-app.yml
-	pipenv run sam deploy --template-file $(BUILD_DIR)/packaged-app.yml --stack-name $(APP_STACK_NAME) --capabilities CAPABILITY_IAM
+	pipenv run sam package --template-file $(SAM_DIR)/app.yml --s3-bucket $(PACKAGE_BUCKET) --output-template-file $(SAM_DIR)/packaged-app.yml
+	pipenv run sam deploy --template-file $(SAM_DIR)/packaged-app.yml --stack-name $(APP_STACK_NAME) --capabilities CAPABILITY_IAM

Pipfile

@@ -4,14 +4,21 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-"boto3" = "*"
+boto3 = "*"
+aws-xray-sdk = "*"
+serverlessrepo = "*"
 
 [dev-packages]
-pytest = "*"
-"flake8" = "*"
+flake8 = "*"
+autopep8 = "*"
 pydocstyle = "*"
-pytest-cov = "*"
+cfn-lint = "*"
 aws-sam-cli = "*"
+awscli = "*"
+pytest = "*"
+pytest-mock = "*"
+pytest-cov = "*"
+mock = "*"
 
 [requires]
-python_version = "3.6"
+python_version = "3.7"