kurgan 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3fe34e72bd7fc90667d4fbcc0c1981f284a1a7670c6735ccf276cf5f6b7a79d
-  data.tar.gz: 8b6cfeb1b0cce8e69e0f387c6ebc346f4ba2c5ec36fef0a4ac4ab651280a49dd
+  metadata.gz: 13e0829241c7cb5e338bf5bcd9f0e2dda93c762f3892866cc6af12663fb50a28
+  data.tar.gz: 227a2567eae45d9385aa385b634cb0089f04d47b7962150ec8bffa342209674b
 SHA512:
-  metadata.gz: 6a3efca63e094ee686b5d9a65489eaf7b700ac4e0191b863ff7e9f070111d8906a0f9e6b2f7fd03be55c6b429e7bed254da0b110d654115e4a53a02a2e9e1957
-  data.tar.gz: e6dc44b198c12ba1cdd4012f8cde7c1d6c0395e81de561ff63ab418e96e99541dcbcad94c3c0813f084e157fbff211eda690f15eabb699508ff95e0f673b248f
+  metadata.gz: d1db730b78f85a5b800f9d6b493a80c6bff0c85dc691f7a15775896570b3304ef01083771b28995a66aa455d57759d2afcc23b6e661e7dcf7b5e4068237097df
+  data.tar.gz: eafc409b22f9b9397181ca69f0181c4d6bdac21923ea1dd7ae9da1c64c806e66f7b7e1fc1c42d577e87a798ea3a91f2286735e1deab8e373620d996cdacf6c45

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kurgan (0.1.3)
+    kurgan (0.1.4)
       thor (~> 0.19)
 
 GEM

data/lib/kurgan/component.rb

@@ -3,6 +3,10 @@ require 'kurgan/init'
 module Kurgan
   class Component < Kurgan::Init
 
+    def set_type
+      @type = 'component'
+    end
+
     def set_directory
       @dir = ask "directory name ", default: "hl-component-#{name}"
       empty_directory @dir
@@ -23,19 +27,20 @@ module Kurgan
       template('templates/cfndsl.rb.tt', "#{@dir}/#{name}.cfndsl.rb")
     end
 
-    def copy_licence
-      if yes?("Use MIT license?")
-        copy_file "templates/MITLICENSE", "#{@dir}/LICENSE"
+    def create_empty_test
+      if yes?("Setup sample test?")
+        empty_directory "#{@dir}/tests"
+        template('templates/sns_topic.test.yaml.tt', "#{@dir}/tests/sns_topic.test.yaml")
       else
-        say "Skipping license", :yellow
+        say "Skipping tests", :yellow
       end
     end
 
-    def create_travis_config
-      if yes?("Use Travis-ci?")
-        copy_file "templates/travis.yml.tt", "#{@dir}/travis-ci.yml"
+    def copy_licence
+      if yes?("Use MIT license?")
+        copy_file "templates/MITLICENSE", "#{@dir}/LICENSE"
       else
-        say "skipping travis", :yellow
+        say "Skipping license", :yellow
       end
     end
 

data/lib/kurgan/init.rb

@@ -7,12 +7,16 @@ module Kurgan
 
     argument :name
 
-    class_option :type, aliases: :t, default: 'empty', enum: ['empty','vpc','ecs'], desc: "Create a pre-canned project"
+    class_option :project, aliases: '-p', default: 'empty', enum: ['empty','vpc','ecs'], desc: "Create a pre-canned project"
 
     def self.source_root
       File.dirname(__FILE__)
     end
 
+    def set_type
+      @type = 'project'
+    end
+
     def set_directory
       @dir = ask "directory name ", default: name
       empty_directory @dir
@@ -23,11 +27,11 @@ module Kurgan
     end
 
     def set_template_parameters
-      @parameters = Kurgan::Projects.properties[options['type'].to_sym][:parameters]
+      @parameters = Kurgan::Projects.properties[options['project'].to_sym][:parameters]
     end
 
     def set_template_components
-      @components = Kurgan::Projects.properties[options['type'].to_sym][:components]
+      @components = Kurgan::Projects.properties[options['project'].to_sym][:components]
     end
 
     def create_cfhighlander_template
@@ -43,7 +47,7 @@ module Kurgan
       if yes?("git init project?")
         run "git init #{@dir}"
         template 'templates/gitignore.tt', "#{@dir}/.gitignore"
-        template 'templates/README.md.tt', "#{@dir}/README.md"
+        template "templates/README.md.tt", "#{@dir}/README.md"
       else
         say "Skipping git init", :yellow
       end
@@ -51,11 +55,11 @@ module Kurgan
 
     def ci_init
       if yes?("Setup a CI pipeline?")
-        type = ask "CI flavour", limited_to: ['jenkins', 'travis', 'codebuild']
-        case type
+        ci = ask "CI flavour", limited_to: ['jenkins', 'travis', 'codebuild']
+        case ci
         when 'jenkins'
           template('templates/Jenkinsfile.tt', "#{@dir}/Jenkinsfile")
-        when 'travis-ci'
+        when 'travis'
           template('templates/travis.yml.tt', "#{@dir}/.travis.yml")
         when 'codebuild'
           template('templates/codebuild.yaml.tt', "#{@dir}/.codebuild.yaml")

data/lib/kurgan/templates/Jenkinsfile.tt

@@ -3,16 +3,42 @@ pipeline {
   environment {
     AWS_REGION = 'us-east-1'
     PROJECT_NAME = '<%= @name %>'
+    VERSION = '0.1.0'
   }
 
   agent {
     docker {
-        image 'theonestack/cfhighlander'
+      image 'theonestack/cfhighlander'
     }
   }
 
   stages {
 
+<%- if @type == 'component' -%>
+    stage('cftest') {
+      steps {
+        sh 'cfndsl -u'
+        sh "cfhighlander cftest -r xml"
+      }
+      post {
+        always {
+          junit 'reports/report.xml'
+        }
+      }
+    }
+
+    stage('cfn nag') {
+      agent {
+        docker {
+          image 'base2/cfn-nag'
+          reuseNode true
+        }
+      }
+      steps {
+        sh 'cfn_nag_scan -i out/tests'
+      }
+    }
+<%- elsif @type == 'project' -%>
     stage('Compile and validate templates') {
       steps {
         sh 'cfndsl -u'
@@ -20,20 +46,24 @@ pipeline {
       }
     }
 
-    stage('Publish templates to S3') {
-      steps {
-        script {
-          env['VERSION'] = ${env.BRANCH_NAME}-${env.SHORT_COMMIT}
+    stage('cfn nag') {
+      agent {
+        docker {
+          image 'base2/cfn-nag'
+          reuseNode true
         }
-        sh "cfpublish ${PROJECT_NAME} --version ${VERSION}"
+      }
+      steps {
+        sh 'cfn_nag_scan -i out/yaml'
       }
     }
 
-    stage('Deploy') {
+    stage('Publish templates') {
       steps {
-        println "Deploying ${env.PROJECT_NAME} version ${env.VERSION}"
+        sh "cfpublish ${env.PROJECT_NAME} --version ${env.VERSION}"
       }
     }
+<%- end -%>
 
   }
 }

data/lib/kurgan/templates/README.md.tt

@@ -1,5 +1,4 @@
-# <%= name %> CfHighlander project
----
+# <%= name %> CfHighlander <%= @type %>
 
 ## Cfhighlander Setup
 
@@ -14,12 +13,16 @@ or via docker
 ```bash
 docker pull theonestack/cfhighlander
 ```
+<%- if @type == 'component' -%>
+## Testing Components
 
-compiling the templates
+Running the tests
 
 ```bash
-cfcompile <%= name %>
+cfhighlander cftest <%= name %>
 ```
+<%- elsif @type == 'project' -%>
+## Compiling the project
 
 compiling with the vaildate fag to validate the templates
 
@@ -32,3 +35,4 @@ publish the templates to s3
 ```bash
 cfpublish <%= name %> --version latest
 ```
+<%- end -%>

data/lib/kurgan/templates/cfndsl.rb.tt

@@ -1,3 +1,6 @@
 CloudFormation do
   ## Add your cfndsl resources here
+  SNS_Topic(:Topic) {
+    TopicName topic_name if defined? topic_name
+  }
 end

data/lib/kurgan/templates/codebuild.yaml.tt

@@ -7,7 +7,13 @@ env:
 phases:
   install:
     commands:
-      - gem install cfhighlander
+      - gem install cfhighlander cfn-nag
   build:
     commands:
+<%- if @type == 'component' -%>
+      - cfhighlander cftest
+      - cfn_nag_scan -i out/tests
+<%- elsif @type == 'project' -%>
       - cfcompile --validate
+      - cfn_nag_scan -i out/yaml
+<%- end -%>

data/lib/kurgan/templates/gitignore.tt

@@ -1 +1,2 @@
 out/
+reports/

data/lib/kurgan/templates/sns_topic.test.yaml.tt

@@ -0,0 +1,6 @@
+test_metadata:
+  type: config
+  name: sns_topic
+  description: test for the default sns topic
+
+topic_name: sample-test

data/lib/kurgan/templates/travis.yml.tt

@@ -1,6 +1,15 @@
 language: ruby
 rvm:
   - 2.5
+install:
+  - gem install cfhighlander cfn-nag
+before_script:
+  - cfndsl -u
+<%- if @type == 'component' -%>
+script:
+  - cfhighlander cftest
+  - cfn_nag_scan -i out/tests
+<%- elsif @type == 'project' -%>
 script:
   - gem install cfhighlander
-  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then cfcompile ; else cfcompile --validate; fi%
+<%- end -%>

data/lib/kurgan/version.rb

@@ -1,3 +1,3 @@
 module Kurgan
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurgan
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Guslington
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,6 +84,7 @@ files:
 - lib/kurgan/templates/codebuild.yaml.tt
 - lib/kurgan/templates/config.yaml.tt
 - lib/kurgan/templates/gitignore.tt
+- lib/kurgan/templates/sns_topic.test.yaml.tt
 - lib/kurgan/templates/travis.yml.tt
 - lib/kurgan/version.rb
 homepage: http://iamkurgan.com