lono 4.2.7 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0cbcfa87ee5f1282166f6d878e37bf3f69b8f2facbad9774ed254d72d90f75e
-  data.tar.gz: f63bfd75b1892b6a7eacade99308cbf164afc026795d636daab59974ea0fe416
+  metadata.gz: eab7933de970a48215d89f351912ab01931bc0fd08083d273cb3dc660795d4f3
+  data.tar.gz: 99dd7038597bece84bc118ab0dd7272a59ab5ecc6735024e3b9393dd8e453072
 SHA512:
-  metadata.gz: ba2ad72fb843067693c95df59783e06a6e5943777fac3ed65ea96ca5d04a3f4ccb76e834cc5490e5edb7f2d967a3d0f7dbd9ae278d55f33f7b9678909e5487e3
-  data.tar.gz: 00b0fbeb10085941bdd18ad53f5c46f0e5f45c9f1d946bc3f1bd1822d30824e86b269ce4c92e8e8114384a2cbd13cd9e177740000f971d48c0ef40f17257f460
+  metadata.gz: 6845fbe057aa1e6b2ba479b38e8be9121a8588b11ae24e64e06c07334a62881aa5763158f6453e051e81f3402a31763abecf2f3caf7f77aacb2aa95f69e4fc13
+  data.tar.gz: 29bfb1dff44778cd35a78b91a0b705e9a57ec5c6f8f587fcc2022a2732379d32e24aa2f8f03e13256171d649f92928d7dbac30f1db118ebfe53528ca784bf43d

data/.cody/README.md

@@ -0,0 +1,6 @@
+# CodeBuild Cheatsheet
+
+Command to kick off build:
+
+    aws codebuild start-build --project-name lono-acceptance # master branch
+    aws codebuild start-build --project-name lono-acceptance --source-version another-branch

data/.cody/acceptance.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -exu
+
+# https://unix.stackexchange.com/questions/1496/why-doesnt-my-bash-script-recognize-aliases
+shopt -s expand_aliases
+alias bolt="$(pwd)/exe/bolt"
+
+bundle install --without development test
+
+rm -rf infra
+
+bolt new infra
+# Very simply template with just a security group
+cp .codebuild/demo.rb infra/blueprints/demo/app/templates/demo.rb
+cd infra
+
+# Rewrite the Gemfile to use the local bolt gem for testing
+cat << EOF > Gemfile
+source "https://rubygems.org"
+gem "bolt", path: "$CODEBUILD_SRC_DIR", submodules: true
+EOF
+
+bundle # install bolt gem in the infra project
+
+STACK_NAME="demo-$(date +%Y%m%d%H%M%S)"
+
+bolt cfn deploy $STACK_NAME --blueprint demo
+bolt cfn status $STACK_NAME
+bolt cfn delete $STACK_NAME --sure

data/.cody/buildspec.yml

@@ -0,0 +1,21 @@
+version: 0.2
+
+phases:
+  pre_build:
+    commands:
+      - uname -a
+      - pwd
+      - ls
+      - env
+      - ls /etc/*release*
+      - cat /etc/*release*
+      - whoami
+  build:
+    commands:
+      - echo Build started on `date`
+      - echo Building project...
+      - uptime
+      - .codebuild/acceptance.sh
+artifacts:
+  files:
+    - result.txt

data/.cody/demo.rb

@@ -0,0 +1,38 @@
+# Acceptance Level Stack
+aws_template_format_version "2010-09-09"
+description "Demo stack"
+
+parameter(:instance_type, "t3.micro")
+
+mapping(:ami_map,
+  "ap-northeast-1": { ami: "ami-0f9ae750e8274075b" },
+  "ap-northeast-2": { ami: "ami-047f7b46bd6dd5d84" },
+  "ap-south-1":     { ami: "ami-0889b8a448de4fc44" },
+  "ap-southeast-1": { ami: "ami-0b419c3a4b01d1859" },
+  "ap-southeast-2": { ami: "ami-04481c741a0311bbb" },
+  "ca-central-1":   { ami: "ami-03338e1f67dae0168" },
+  "eu-central-1":   { ami: "ami-09def150731bdbcc2" },
+  "eu-north-1":     { ami: "ami-d16fe6af" },
+  "eu-west-1":      { ami: "ami-07683a44e80cd32c5" },
+  "eu-west-2":      { ami: "ami-09ead922c1dad67e4" },
+  "eu-west-3":      { ami: "ami-0451ae4fd8dd178f7" },
+  "sa-east-1":      { ami: "ami-0669a96e355eac82f" },
+  "us-east-1":      { ami: "ami-0de53d8956e8dcf80" },
+  "us-east-2":      { ami: "ami-02bcbb802e03574ba" },
+  "us-west-1":      { ami: "ami-0019ef04ac50be30f" },
+  "us-west-2":      { ami: "ami-061392db613a6357b" }
+)
+
+# Comment out instance to save costs
+# resource(:instance, "AWS::EC2::Instance",
+#   instance_type: ref(:instance_type),
+#   image_id: find_in_map(:ami_map, ref("AWS::Region"), :ami),
+#   security_group_ids: [get_att("security_group.group_id")],
+#   user_data: base64(user_data("bootstrap.sh"))
+# )
+resource(:security_group, "AWS::EC2::SecurityGroup",
+  group_description: "demo security group",
+)
+
+# output(:instance)
+output(:security_group, get_att("security_group.group_id"))

data/.cody/project.rb

@@ -0,0 +1,12 @@
+# For methods, refer to the properties of the CloudFormation CodeBuild::Project https://amzn.to/2UTeNlr
+# For convenience methods, refer to the source https://github.com/tongueroo/codebuild/blob/master/lib/codebuild/dsl/project.rb
+
+github_url("https://github.com/boltopspro/bolt.git")
+linux_image("aws/codebuild/ruby:2.5.3-1.7.0")
+
+# Uncomment to enable github webhook, the GitHub oauth token needs admin:repo_hook permissions
+# Refer to https://github.com/tongueroo/codebuild/blob/master/readme/github_oauth.md
+triggers(webhook: true)
+
+# Shorthand to enable all local cache modes
+# local_cache(true)

data/.cody/role.rb

@@ -0,0 +1 @@
+iam_policy("logs", "ssm", "cloudformation", "ec2")

data/.gitignore

@@ -19,3 +19,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+/infra

data/.gitmodules

@@ -1,3 +1,6 @@
-[submodule "vendor/plissken"]
-	path = vendor/plissken
-	url = https://github.com/tongueroo/plissken.git
+[submodule "vendor/cfn-status"]
+	path = vendor/cfn-status
+	url = https://github.com/tongueroo/cfn-status
+[submodule "vendor/cfn_camelizer"]
+	path = vendor/cfn_camelizer
+	url = https://github.com/tongueroo/cfn_camelizer

data/.travis.yml

@@ -0,0 +1,7 @@
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.5.3
+before_install: gem install bundler -v 2.0.1

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [5.0.1]
+- Introduce lono DSL and set as default mode
+- Introduce blueprints concept
+- Introduce lono cfn deploy command
+- Auto-create lono managed s3 bucket
+- Zeitwerk autoloader
+- Restructure project structure
+- Remove aws\_profiles settings.yml in favor of aws_profile
+- lono upgrade v4to5 command
+
 ## [4.2.7]
 - retain tag values on cfn update operations
 

data/Gemfile

@@ -4,4 +4,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "codeclimate-test-reporter", group: :test, require: nil
-

data/LICENSE.txt

@@ -1,22 +1 @@
-Copyright (c) 2018 Tung Nguyen
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+https://www.boltops.com/boltops-community-license

data/README.md

@@ -4,74 +4,75 @@
 
 # Lono
 
-[![Gem Version](https://badge.fury.io/rb/lono.png)](http://badge.fury.io/rb/lono)
-[![CircleCI](https://circleci.com/gh/tongueroo/lono.svg?style=svg)](https://circleci.com/gh/tongueroo/lono)
-[![Code Climate][3]][4]
-[![Dependency Status](https://gemnasium.com/tongueroo/lono.png)](https://gemnasium.com/tongueroo/lono)
-[![Coverage Status](https://coveralls.io/repos/tongueroo/lono/badge.png)](https://coveralls.io/r/tongueroo/lono)
-[![Join the chat at https://gitter.im/tongueroo/lono](https://badges.gitter.im/tongueroo/lono.svg)](https://gitter.im/tongueroo/lono?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![CodeBuild](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiaHF3Y2pqSVBlZ0JMdXhPL010bTI2cVd6SkpHQWlLRkJ5SHlCcDFueUtHVFNCVFZyWEVZd01yWDZ1VjZCRjNVQ1F4d2JlTlJOWDRtU3R3NkJzVkJKSHJ3PSIsIml2UGFyYW1ldGVyU3BlYyI6IkZIRVZwM00rQzQxcDJWaVMiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
 [![Support](https://img.shields.io/badge/get-support-blue.svg)](https://boltops.com?utm_source=badge&utm_medium=badge&utm_campaign=lono)
 
-[3]: https://codeclimate.com/repos/51d7f1407e00a4042c010ab4/badges/5273fe6cdb5a13e58554/gpa.png
-[4]: https://codeclimate.com/repos/51d7f1407e00a4042c010ab4/feed
+Lono is a powerful CloudFormation framework. Lono handles the entire CloudFormation lifecycle. It builds, manages and deploys CloudFormation templates.
 
-Lono is a tool to help you manage your CloudFormation templates. Lono handles the entire CloudFormation lifecyle. It helps you craft the templates and then provision the infrastructure.
-
-* Lono generates CloudFormation templates based on ERB ruby templates in `yaml` format.
+* Lono generates CloudFormation templates based on a [DSL](http://lono.cloud/docs/dsl/).
 * Lono takes simple env-like files and generates the CloudFormation parameter files.
 * Lono provides a simple CLI interface to launch the CloudFormation stacks.
 
 See [lono.cloud](http://lono.cloud) for full lono documentation.
 
-## Important
+## Upgrading
 
-If you are on version 3, you can run `lono upgrade v3to4` within your project to upgrade it to version 4.  Refer to the [CHANGELOG](CHANGELOG.md).
+If you are on version 4.2 and upgrade to 5.0.  You can run `lono upgrade v4to5` within your project to upgrade it to version 5.0.  Refer to the [Upgrading Guide](http://lono.cloud/docs/extras/upgrading/).
 
-If you are on version 4.0 or 4.1 and need to uppgrade to 4.2.  You can run `lono upgrade v4to4_2` within your project to upgrade it to version 4.2.  Refer to the [CHANGELOG](CHANGELOG.md).
+## Quick Usage
 
-## Blog Posts
+It only takes a couple of commands to start using lono.
 
-These blog posts also cover lono:
+    gem install lono
+    lono new infra
+    cd infra
+    lono cfn deploy demo
 
-* [Why Generate CloudFormation Templates with Lono](https://medium.com/boltops/why-generate-cloudformation-templates-with-lono-65b8ea5eb87d)
-* [Generating CloudFormation Templates with Lono](https://medium.com/boltops/generating-cloudformation-templates-with-lono-4709afa1299b)
-* [AutoScaling CloudFormation Template with Lono](https://medium.com/boltops/autoscaling-cloudformation-template-with-lono-3dc520480c5f)
-* [CloudFormation Tools: lono, lono-params and lono cfn Together](https://medium.com/boltops/cloudformation-tools-lono-lono-params-and-lono-cfn-play-together-620af51e616)
-* [AWS CloudFormation dry-run with lono cfn preview](https://medium.com/boltops/aws-cloudformation-dry-run-with-lono-cfn-plan-2a1e0f80d13c)
+![Lono flowchart](http://lono.cloud/img/tutorial/lono-flowchart.png "Lono flowchart")
 
-## Quick Usage
+## DSL
 
-It only takes a couple of commands to start using lono.
+Here's an example of what the Lono CloudFormation DSL looks like:
+
+```ruby
+description "Demo stack"
+
+parameter(:instance_type, "t3.micro")
+
+mapping(:ami_map,
+  "us-east-1": { ami: "ami-0de53d8956e8dcf80" },
+  "us-west-2": { ami: "ami-061392db613a6357b" }
+)
+
+resource(:instance, "AWS::EC2::Instance",
+  instance_type: ref(:instance_type),
+  image_id: find_in_map(:ami_map, ref("AWS::Region"), :ami),
+  security_group_ids: [get_att("security_group.group_id")],
+  user_data: base64(user_data("bootstrap.sh"))
+)
+resource(:security_group, "AWS::EC2::SecurityGroup",
+  group_description: "demo security group",
+)
 
-```sh
-gem install lono
-lono new infra
-cd infra
-lono import https://s3-us-west-2.amazonaws.com/cloudformation-templates-us-west-2/EC2InstanceWithSecurityGroupSample.template --name ec2
-# update the generated params file
-lono cfn create ec2
+output(:instance)
+output(:security_group, get_att("security_group.group_id"))
 ```
-![Lono flowchart](http://tongueroo.com/images/github-readmes/lono-flowchart.png "Lono flowchart")
 
 ### Lono Cfn Lifecycle Commands
 
-Lono provides a `lono cfn` lifecycle command that allows you to launch stacks quickly.  The `lono cfn` tool automatically runs `lono generate` internally and then launches the CloudFormation stack all in one command.  If you are in a lono project and have a `my-stack` lono template definition.  To create a stack you can simply run:
+Lono provides a `lono cfn` lifecycle command that allows you to launch stacks quickly.  The `lono cfn` tool automatically runs `lono generate` internally and then launches the CloudFormation stack all in one command.  If you are in a lono project and have a `demo` lono blueprint.  To create a stack you can simply run:
 
-```
-$ lono cfn create my-stack
-```
+    $ lono cfn deploy demo
 
-The above command will generate files to `output/templates/my-stack.json` and `output/params/my-stack.txt` and use them to create a CloudFormation stack.  Here are some more examples of cfn commands:
+The above command will generate files to `output/infra/templates/demo.yml` and `output/infra/params/demo.txt` and use them to create a CloudFormation stack.  Here are some more examples of cfn commands:
 
-```
-$ lono cfn create mystack-$(date +%Y%m%d%H%M%S) --template mystack --params mystack
-$ lono cfn create mystack-$(date +%Y%m%d%H%M%S) # shorthand if template and params file matches.
-$ lono cfn diff mystack-1493859659
-$ lono cfn preview mystack-1493859659
-$ lono cfn update mystack-1493859659
-$ lono cfn delete mystack-1493859659
-$ lono cfn create -h # getting help
-```
+    lono cfn deploy demo # shorthand if blueprint, template and params file matches.
+    lono cfn deploy demo-$(date +%Y%m%d%H%M%S) --blueprint demo --template demo --param demo
+    lono cfn diff demo-1493859659
+    lono cfn preview demo-1493859659
+    lono cfn update demo-1493859659
+    lono cfn delete demo-1493859659
+    lono cfn deploy -h # getting help
 
 See [lono.cloud](http://lono.cloud) for full lono documentation.
 
@@ -82,13 +83,3 @@ See [lono.cloud](http://lono.cloud) for full lono documentation.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-## Developing
-
-There is a submodule in this project, so when you check out remember to sync the submodule.
-
-```bash
-$ git clone git@github.com:yourfork/lono.git
-$ git submodule sync
-$ git submodule update --init
-```

data/lib/lono.rb

@@ -1,39 +1,32 @@
+$stdout.sync = true unless ENV["LONO_STDOUT_SYNC"] == "0"
+
+require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
 require 'fileutils'
 require 'json'
 require 'memoist'
+require 'plissken'
 require 'rainbow/ext/string'
 require 'render_me_pretty'
 require 'yaml'
 
-# vendor because need https://github.com/futurechimp/plissken/pull/6 to be merged
-$:.unshift(File.expand_path("../../vendor/plissken/lib", __FILE__))
-require "plissken"
+gem_root = File.dirname(__dir__)
+$:.unshift("#{gem_root}/lib")
+$:.unshift("#{gem_root}/vendor/cfn-status/lib")
+require "cfn/status"
+$:.unshift("#{gem_root}/vendor/cfn_camelizer/lib")
+require "cfn_camelizer"
 
-$:.unshift(File.expand_path('../', __FILE__))
-module Lono
-  autoload :Cfn, 'lono/cfn'
-  autoload :Clean, 'lono/clean'
-  autoload :CLI, 'lono/cli'
-  autoload :Command, 'lono/command'
-  autoload :Completer, 'lono/completer'
-  autoload :Completion, 'lono/completion'
-  autoload :Core, 'lono/core'
-  autoload :Env, 'lono/env'
-  autoload :FileUploader, 'lono/file_uploader'
-  autoload :Help, 'lono/help'
-  autoload :Importer, 'lono/importer'
-  autoload :Inspector, 'lono/inspector'
-  autoload :New, 'lono/new'
-  autoload :Param, 'lono/param'
-  autoload :ProjectChecker, 'lono/project_checker'
-  autoload :Script, 'lono/script'
-  autoload :Sequence, 'lono/sequence'
-  autoload :Setting, 'lono/setting'
-  autoload :Template, 'lono/template'
-  autoload :Upgrade, 'lono/upgrade'
-  autoload :UserData, 'lono/user_data'
-  autoload :VERSION, 'lono/version'
+require "lono/autoloader"
+Lono::Autoloader.setup
 
+module Lono
   extend Core
 end
+
+Lono.set_aws_profile!
+
+begin
+  require "lono-pro" # optional
+rescue LoadError
+end

data/lib/lono/app_file.rb

@@ -0,0 +1,5 @@
+# Unsure why but zeitwerk is not autovifiying this as a module
+# Adding this fixes the issue.
+# Also using bundle exec in front works. Ran into this with jets also and Jets just bundle exec witihin the project.
+module Lono::AppFile
+end

data/lib/lono/app_file/base.rb

@@ -0,0 +1,19 @@
+# Naming AppFile instead of File so we dont to use ::File for normal regular File class
+module Lono::AppFile
+  class Base
+    include Lono::Blueprint::Root
+    extend Memoist
+
+    def initialize(blueprint, options = {})
+      @blueprint, @options = blueprint, options
+      @template = @options[:template] || @blueprint
+      Lono::ProjectChecker.check
+      set_blueprint_root(@blueprint)
+      Lono::ProjectChecker.empty_templates
+      initialize_variables
+    end
+
+    def initialize_variables
+    end
+  end
+end

data/lib/lono/app_file/build.rb

@@ -0,0 +1,78 @@
+module Lono::AppFile
+  class Build < Base
+    def initialize_variables
+      @output_files_path = "#{Lono.config.output_path}/#{@blueprint}/files"
+    end
+
+    def run
+      return unless detect_files?
+
+      puts "Building app/files for blueprint #{@blueprint}"
+      build_all
+    end
+
+    def build_all
+      clean_output
+      copy_to_output
+      Registry.items.each do |item|
+        if item.directory?
+          zip_directory(item)
+        elsif item.file?
+          zip_file(item)
+        else
+          puts "WARN: #{item.path} does not exist. Double check that the path is correct in the s3_key call.".color(:yellow)
+        end
+      end
+    end
+
+    def zip_file(item)
+      path = item.path
+      zip_file = item.zip_file_name
+
+      puts "Zipping file and generating md5 named file from: #{path}"
+      command = "cd #{File.dirname(path)} && zip -q #{zip_file} #{File.basename(path)}" # create zipfile at same level of file
+      zip(command)
+    end
+
+    def zip_directory(item)
+      path = item.path
+      zip_file = item.zip_file_name
+
+      puts "Zipping folder and generating md5 named file from: #{path}"
+      command = "cd #{path} && zip --symlinks -rq #{zip_file} ." # create zipfile witih directory
+      zip(command)
+      FileUtils.mv("#{path}/#{zip_file}", "#{File.dirname(path)}/#{zip_file}") # move zip back to the parent directory
+    end
+
+    def zip(command)
+      # puts "=> #{command}".color(:green) # uncomment to debug
+      `#{command}`
+      unless $?.success?
+        puts "ERROR: Fail to run #{command}".color(:red)
+        puts "Maybe zip is not installed or path is incorrect?"
+        exit 1
+      end
+    end
+
+    def clean_output
+      FileUtils.rm_rf(@output_files_path)
+    end
+
+    def copy_to_output
+      src = "#{Lono.blueprint_root}/app/files"
+      dest = @output_files_path
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp_r(src, dest)
+    end
+
+    def detect_files?
+      app_files = Dir["#{Lono.blueprint_root}/app/files/*"]
+      if app_files.empty?
+        false
+      else
+        puts "Detected app/files for blueprint #{@blueprint}"
+        true
+      end
+    end
+  end
+end