Merge pull request #1 from lambda-my-aws/release/pipeline

Repushed from latest of source ozone
Automation working

Author: JohnPreston

.gitignore

@@ -12,3 +12,4 @@ build/*
 *venv*
 !buildspec*.yml
 !ozone_pipeline.yml
+!release/*.yml

buildspec.yml

@@ -8,9 +8,8 @@ phases:
       python: 3.7
     commands:
       - pip --version && pip install pip --upgrade || curl https://bootstrap.pypa.io/get-pip.py | python
-      - pip install troposphere
-      - pip install awscli --upgrade
-      - pip install boto3 --upgrade
+      - python -m venv venv
+      - pip install ozone --upgrade
   pre_build:
     commands:
       - export PY_VERSION=`python3 -c 'import sys; print("python%s.%s" % (sys.version_info[:2]))'`
@@ -21,11 +20,11 @@ phases:
   build:
     commands:
       - mkdir -p $PY_BUILD
-      - cp -r $PWD/$LAYER_NAME $PY_BUILD/
+      - pip install $LAYER_NAME -t $PY_BUILD
   post_build:
     commands:
       - mkdir -p $CFN_BUILD
-      - python3 $PWD/codebuild/layer.py --path $CFN_BUILD
+      - python3 $PWD/layer_build.py --path $CFN_BUILD
 artifacts:
   base-directory: build
   files:

buildspec_pypi.yml

@@ -1,20 +1,16 @@
 version: 0.2
 env:
-  variables:
-    PYPI_USERNAME: 'JohnPreston'
   parameter-store:
-    PYPI_PASSWORD: /CodeBuild/pypipassword
+    PYPI_USERNAME: /codebuild/pypi/username
+    PYPI_PASSWORD: /codebuild/pypi/password
 phases:
   install:
     runtime-versions:
       python: 3.7
     commands:
       - pip --version && pip install pip --upgrade || curl https://bootstrap.pypa.io/get-pip.py | python
       - pip install twine
-      - export BUILD_DIR=$PWD/builddir
   build:
     commands:
-      - mkdir -p $BUILD_DIR
-      - cd $BUILD_DIR
-      - python3 setup.py sdist bdist_wheel
+      - python3 setup.py sdist
       - twine upload dist/* -u $PYPI_USERNAME -p $PYPI_PASSWORD

layer_build.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+"""
+Script to generate the CFN template for the library into a Lambda Layer from within the CodeBuild of the Layer Build.
+"""
+from datetime import datetime as dt
+from os import environ
+from json import dumps
+from argparse import ArgumentParser
+from ozone.templates.awslambdalayer import template
+import boto3
+
+def get_artifact_location():
+    """
+    Retrieves the Destination bucket and path of the Layer from CodeBuild within the job
+    """
+    job_id = environ['CODEBUILD_BUILD_ID']
+    client = boto3.client('codebuild')
+    build_info = client.batch_get_builds(
+        ids=[job_id]
+    )['builds'][0]
+    location = build_info['artifacts']['location'].strip('aws:arn:s3:::')
+    bucket = location.split('/')[0]
+    key = location.split('/', 1)[-1]
+    return (bucket, key)
+
+
+if __name__ == '__main__':
+    PARSER = ArgumentParser('Codebuild CFN template and params build')
+    PARSER.add_argument(
+        '--path', help='Path where CFN files are created', required=True
+    )
+    ARGS = PARSER.parse_args()
+    BUILD_DEST = get_artifact_location()
+    LAYER_NAME = environ['LAYER_NAME']
+    PY_VERSION = environ['PY_VERSION']
+    DATE = dt.utcnow().isoformat()
+    TPL = template(make_public=True, Runtimes=[PY_VERSION], Bucket=BUILD_DEST[0], Key=BUILD_DEST[1])
+    TPL.set_metadata({
+        'Author': 'John Mille john@lambda-my-aws.io',
+        'Version': DATE,
+        'BuildBy': 'CodePipeline/CodeBuild',
+        'LayerName': LAYER_NAME
+    })
+    TPL.set_description(f'Template for {LAYER_NAME} - {DATE}')
+    with open(f'{ARGS.path}/layer_template.yml', 'w') as fd:
+        fd.write(TPL.to_yaml())
+    template_config = {
+        'Parameters':
+        {
+            'LayerName': LAYER_NAME
+        },
+        'Tags': {
+            'Name': LAYER_NAME
+        }
+    }
+    with open(f'{ARGS.path}/layer_config.json', 'w') as fd:
+        fd.write(dumps(template_config))

ozone/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """John Mille"""
 __email__ = 'john@lambda-my-aws.io'
-__version__ = '0.0.13'
+__version__ = '0.0.20'