Merge pull request #2 from aws-samples/ci

Add travis, lint some cfn, integrate cfn-publish

Author: matteofigus

.travis.yml

@@ -0,0 +1,40 @@
+language: python
+
+python:
+  - "3.7"
+
+before_script:
+  - python --version
+  - pip install -r requirements.txt
+
+script:
+  - |
+    if [ $TRAVIS_PULL_REQUEST == true ] && [ $TRAVIS_BRANCH != "master" ]; then
+      VERSION="v$(cat main/main.template | shyaml get-value Metadata.Version)"
+      git tag $VERSION
+    fi
+
+before_deploy:
+  - VERSION="v$(cat main/main.template | shyaml get-value Metadata.Version)"
+  - if [ -z "$TRAVIS_TAG" ]; then git tag $VERSION; fi
+  - zip -r "$VERSION.zip" -@ < ci/include.lst
+
+deploy:
+  - provider: releases
+    api_key:
+      secure: Yf9p3yVj85V3Ur9rt7SrNPkYTN1bfPaW1nWMtIjfEYdeKAHDOJGasJ/6flPj2WXkAyho7tPrp3QupV+c37hZkdJK0ZxhQYvIzrE19BBTo1BuXF6z10lOInC1oF+tKuFHNKmmtYa/0wJK4gyF251xKqS+Q3HaBM86aLS3ZNHJVlVQM4rVh/O139y7Ar+cXxfpAugpSKljWKmPC7tKV9nZvQvUrpyXZ/HbHDdNNSwhxcb38OcRUtbP6klSMzBRa4Es2l9uFgepyJytsFeRx3w4DUUXFDhkk8rXeOMnkatKnpzyuS9yrChLL/h95TE2jlB4vPe+yB4JLbqyNd1dq5KrHpG8XDVtm3d7lqLQ3/IAc+VgrMVG/3TAJjSjY+pKZIBv0B0LGqlbYLORCUB8x/ip+DfeM222y8d/BDeHUhw2jFRAaRt5WBAoFJ2S+Bw0sjjWO2SElxBcAAPBYSc9h16AQhkgZj9cMfwcZniwu6BbAppKFUM9C1pLT6DN8McYg77eHY3zmTCYzgIkQ/b7fnmf8zCXNqUkRe2wW3poqTspEGeoJiqp7cUGGC4qBnvNWXvVxAGn1ZNahVOrhVJI8OzPxc1jlnEheQFNidW522SNDJX+9od7RuI32MO9U0uwgzJNGQuANRddCWA8Y+T2frbnC46hVWi9jsOvSyoZiV0XAxs=
+    file: $VERSION.zip
+    skip_cleanup: true
+    on:
+      branch: master
+      condition: type != pull_request
+  - provider: script
+    script: aws s3 cp ./$VERSION.zip s3://$CFN_BUCKET/aws-waf-workshop/$VERSION/aws-waf-workshop.zip
+    skip_cleanup: true
+    on:
+      tags: true
+
+notifications:
+  email: false
+
+cache: pip

cfn-publish.config

@@ -0,0 +1,4 @@
+template=templates/main.template
+acl="public-read"
+bucket_name_prefix="solution-builders"
+regions="eu-west-1 eu-west-2 us-east-1 us-east-2 us-west-2"

ci/include.lst

@@ -0,0 +1,2 @@
+cfn-publish.config
+templates

requirements.txt

@@ -0,0 +1,2 @@
+awscli>=1.16.244
+shyaml==0.6.1

templates/instance.template

@@ -55,8 +55,6 @@ Resources:
       ManagedPolicyArns:
         - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM
   TheInstanceProfile:
-    DependsOn:
-      - TheRole
     Type: AWS::IAM::InstanceProfile
     Properties:
       Path: /
@@ -77,9 +75,6 @@ Resources:
           Value: !Sub '${AWS::StackName}-ALB'
       Type: application
   TheListener:
-    DependsOn:
-      - TheTargetGroup
-      - TheLoadBalancer
     Type: AWS::ElasticLoadBalancingV2::Listener
     Properties:
       DefaultActions:
@@ -89,8 +84,6 @@ Resources:
       Port: !Ref 'TheWebPort'
       Protocol: HTTP
   TheRule:
-    DependsOn:
-      - TheListener
     Type: AWS::ElasticLoadBalancingV2::ListenerRule
     Properties:
       Actions:
@@ -101,7 +94,7 @@ Resources:
           Values:
             - /
       ListenerArn: !Ref 'TheListener'
-      Priority: '1'
+      Priority: 1
   TheTargetGroup:
     Type: AWS::ElasticLoadBalancingV2::TargetGroup
     Properties:
@@ -146,8 +139,6 @@ Resources:
       MinSize: '1'
       MaxSize: '3'
   TheLaunchConfig:
-    DependsOn:
-      - TheInstanceProfile
     Type: AWS::AutoScaling::LaunchConfiguration
     Properties:
       IamInstanceProfile: !Ref 'TheInstanceProfile'

templates/main.template

@@ -1,6 +1,7 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Description: create all non-WAF resources for the Summit WAF session
 Metadata:
+  Version: '0.1'
   AWS::CloudFormation::Interface:
     ParameterGroups:
       - Label:
@@ -45,26 +46,6 @@ Parameters:
     Description: subnet CIDR
     Default: 10.0.3.32/28
     Type: String
-  TheSubnetId:
-    Description: for load balancer
-    Type: String
-    Default: ''
-  TheVpcId:
-    Description: for load balancer
-    Type: String
-    Default: ''
-  TheOtherSubnetId:
-    Description: for load balancer
-    Default: ''
-    Type: String
-  WebSecurityGroup:
-    Description: output from security template
-    Type: String
-    Default: ''
-  ALBSecurityGroup:
-    Description: output from security template
-    Type: String
-    Default: ''
   TheWebPort:
     Description: port application is listening at
     Default: 80
@@ -86,8 +67,6 @@ Resources:
       TemplateURL: ./network.template
       TimeoutInMinutes: 20
   TheSecurityStack:
-    DependsOn:
-      - TheNeworkStack
     Type: AWS::CloudFormation::Stack
     Properties:
       Parameters:
@@ -100,9 +79,6 @@ Resources:
       TemplateURL: ./security.template
       TimeoutInMinutes: 20
   TheInstanceStack:
-    DependsOn:
-      - TheSecurityStack
-      - TheNeworkStack
     Type: AWS::CloudFormation::Stack
     Properties:
       Parameters: