lono 6.1.11 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b8aac5691cff8ed8b88b54966069a649acebb0a9560c1ca0dff78319c2ab50
-  data.tar.gz: fb47bc4be6366f4f88edeb21ede8cfdf58de7f88795cb46b3246e6a6935caf08
+  metadata.gz: 385523caa0cc8ae16b14546c6a46f4b8210ea43c21d83807754a75357f92cef2
+  data.tar.gz: 9db612e67d8d23db5be53394f71ea2edc03b7e526e72951dfe9c7821d731d00f
 SHA512:
-  metadata.gz: f9144be84cdd745dbbcb5dff0882d2ac6e13edb8f979c91264406f1c47c2d3267481f448a0c2c4f508503e04bddd97072dbd9b06fa119d7f8e77cf8ed2ea3f74
-  data.tar.gz: 355428a2feabeefab9af469bf52e589a3870e2d08bcf1b6d4ae418e8fef8970deff523d6ba2636bf34ddef1b3df843d4782cb8cecc640c8d880411da4fc11f78
+  metadata.gz: caece4d3ea56da6d7159ba95cceacfb205f9af85827a20eb2f555db385703a344c81dc32eb390cc65870b34c0bb04a85791c7dc918e18b9ca2bed316f2b826d0
+  data.tar.gz: 44e8056a90c0f6346d31a55deeb80e0f80d7aa0f063b55ecf09b312cea9a240f0ec908f5b227731c67b706163c38771f43b8cfd9ee80f0ac0d0c0850e1bd255c

data/.cody/acceptance.sh

@@ -2,6 +2,9 @@
 
 set -exu
 
+git config --global user.email "tonguerooo@gmail.com"
+git config --global user.name "tung"
+
 # https://unix.stackexchange.com/questions/1496/why-doesnt-my-bash-script-recognize-aliases
 shopt -s expand_aliases
 alias lono="$(pwd)/exe/lono"
@@ -12,20 +15,33 @@ rm -rf infra
 
 lono new infra
 cd infra
-lono blueprint new demo
-# Very simply template with just a security group
-cp ../.cody/demo.rb blueprints/demo/app/templates/demo.rb
 
 # Rewrite the Gemfile to use the local lono gem for testing
 cat << EOF > Gemfile
 source "https://rubygems.org"
 gem "lono", path: "$CODEBUILD_SRC_DIR", submodules: true
 EOF
+cat Gemfile
 
 bundle # install lono gem in the infra project
 
+# Create a demo blueprint
+lono blueprint new demo
+# Very simply template with just a security group
+cp ../.cody/demo.rb app/blueprints/demo/app/templates/demo.rb
+
 STACK_NAME="demo-$(date +%Y%m%d%H%M%S)"
 
+# Configure lono registration
+mkdir -p .lono
+cat << EOF > .lono/registration.yml
+---
+name: <%= ssm("/lono/registration/name") %>
+company: <%= ssm("/lono/registration/company") %>
+email: <%= ssm("/lono/registration/email") %>
+registration_key: <%= ssm("/lono/registration/registration_key") %>
+EOF
+
 lono cfn deploy $STACK_NAME --blueprint demo
 lono cfn status $STACK_NAME
 lono cfn delete $STACK_NAME --sure

data/.gitignore

@@ -10,7 +10,6 @@ doc/
 Gemfile.lock
 InstalledFiles
 lib/bundler/man
-output
 pkg
 rdoc
 spec/fixtures/my_project/templates/aws-waf-security-automations.yml
@@ -18,6 +17,7 @@ spec/project
 spec/reports
 test/tmp
 test/version_tmp
-tmp
 
 /infra
+/output
+/tmp

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 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.
 
+## [7.0.0]
+* Breaking: project `blueprints` moved to `app/blueprints`. Use `lono upgrade` to update.
+* Introduce configsets concept.
+* Introduce lono sets concept: `lono sets`, `lono sets deploy`, `lono sets instances sync`
+* Merge lono-pro into lono. Deprecate lono-pro gem.
+* Add lono registration.
+* Major refactoring:
+* Remove stack name suffix option
+* Remove current concept
+* Introduce Lono::AbstractBase class
+* Pass CLI options consistently straight through.
+* Use Lono::Conventions.
+* Introduce Lono::Cfn::Opts to remove duplication
+* Internally use `@stack` instead of `@stack_name`. `@stack` can be either a stack or stack_set
+
 ## [6.1.11]
 - #35 fix app files variables erb lookup scope
 
@@ -206,7 +221,7 @@ This project *tries* to adhere to [Semantic Versioning](http://semver.org/), eve
 - update cli docs
 
 ## [4.0.1]
-- add http://lono.cloud/reference/
+- add https://lono.cloud/reference/
 - improve cli docs
 
 ## [4.0.0]

data/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="http://lono.cloud/img/logos/lono-logo-small.png" />
+  <img src="https://lono.cloud/img/logos/lono-logo-small.png" />
 </div>
 
 # Lono
@@ -10,17 +10,25 @@
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 
-Lono is a powerful CloudFormation framework. Lono handles the entire CloudFormation lifecycle. It builds, manages and deploys CloudFormation templates.
+Lono is a CloudFormation framework. It builds, manages, and deploys CloudFormation templates.
 
-* 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.
+## Lono Features
+
+* Simple CLI interface to launch CloudFormation stacks.
+* Ability to use [Existing CloudFormation Templates](https://lono.cloud/docs/existing-templates/).
+* [The Lono DSL](https://lono.cloud/docs/dsl/) - Generate templates from beautiful code.
+* Write your CloudFormation parameters with [simple env-like values](https://lono.cloud/docs/configs/params/).
+* Preview CloudFormation changes before pressing the big red button.
+* [Layering](https://lono.cloud/docs/core/layering/) - Allows you to build multiple environments like development and production with the same template.
+* [Variables](https://lono.cloud/docs/layering/variables/) - Allows you to construct templates where runtime Parameters do not suffice.
+* [Helpers](https://lono.cloud/docs/core/helpers/) - Allows you to extend Lono and simplify code.
+* [Configsets](https://lono.cloud/docs/configsets/) - Configurement Management. Automatically configure EC2 instances with reuseable code.
 
 See [lono.cloud](http://lono.cloud) for full lono documentation.
 
 ## Upgrading
 
-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 6 and upgrading to 7.  You can run [lono upgrade](https://lono.cloud/reference/lono-upgrade/) within your project. Refer to the [Upgrading Guide](https://lono.cloud/docs/extras/upgrading/).
 
 ## Quick Usage
 
@@ -29,9 +37,10 @@ It only takes a couple of commands to start using lono.
     gem install lono
     lono new infra
     cd infra
+    lono blueprint new demo
     lono cfn deploy demo
 
-![Lono flowchart](http://lono.cloud/img/tutorial/lono-flowchart.png "Lono flowchart")
+![Lono flowchart](https://lono.cloud/img/tutorial/lono-flowchart.png "Lono flowchart")
 
 ## DSL
 
@@ -61,23 +70,12 @@ output("Instance")
 output("SecurityGroup", get_att("SecurityGroup.GroupId"))
 ```
 
-### Lono Cfn Lifecycle Commands
+### Lono Cfn Deploy
 
-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 provides a `lono cfn` lifecycle command that allows you to launch stacks quickly.  The `lono cfn deploy` generates and launches the CloudFormation stack.  If you are in a lono project and have a `demo` lono blueprint.  To create a stack run:
 
     $ lono cfn deploy demo
 
-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 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
-    lono cfn preview demo
-    lono cfn delete demo
-    lono cfn deploy -h # getting help
-
-See [lono.cloud](http://lono.cloud) for full lono documentation.
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,3 +1,4 @@
+require "./lib/lono"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/lib/lono.rb

@@ -1,5 +1,6 @@
 $stdout.sync = true unless ENV["LONO_STDOUT_SYNC"] == "0"
 
+require "active_support/core_ext/class"
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
 require 'fileutils'
@@ -16,16 +17,17 @@ $:.unshift("#{gem_root}/lib")
 $:.unshift("#{gem_root}/vendor/cfn-status/lib")
 require "cfn_status"
 
+require "lono/ext/bundler"
+
 require "lono/autoloader"
 Lono::Autoloader.setup
 
 module Lono
+  API_DEFAULT = 'https://api.lono.cloud/v1'
+  API = ENV['LONO_API'] || API_DEFAULT
+
   extend Core
 end
 
 Lono.set_aws_profile!
-
-begin
-  require "lono-pro" # optional
-rescue LoadError
-end
+Lono.lono_pro_removal_check!

data/lib/lono/abstract_base.rb

@@ -0,0 +1,25 @@
+module Lono
+  class AbstractBase
+    extend Memoist
+    include Lono::Blueprint::Root
+
+    def initialize(options={})
+      reinitialize(options)
+    end
+
+    # Hack so that we can use include Thor::Base
+    def reinitialize(options)
+      @options = options
+      Lono::ProjectChecker.check
+      @stack, @blueprint, @template, @param = Conventions.new(options).values
+
+      return if options[:source]
+      set_blueprint_root(@blueprint)
+      Lono::ProjectChecker.empty_templates
+    end
+
+    def template_path
+      "#{Lono.config.output_path}/#{@blueprint}/templates/#{@template}.yml"
+    end
+  end
+end

data/lib/lono/api/client.rb

@@ -0,0 +1,30 @@
+module Lono::Api
+  class Client
+    extend Memoist
+    include Verify
+    include Repos
+
+    def http
+      Proxy.new
+    end
+    memoize :http
+
+    def load_json(res)
+      if res.code == "200"
+        data = JSON.load(res.body)
+        case data
+        when Array
+          data.map(&:deep_symbolize_keys)
+        when Hash
+          data.deep_symbolize_keys
+        end
+      else
+        if ENV['LONO_DEBUG_API']
+          puts "Error: Non-successful http response status code: #{res.code}"
+          puts "headers: #{res.each_header.to_h.inspect}"
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/lono/api/proxy.rb

@@ -0,0 +1,58 @@
+# To allow a pretty interface:
+#
+#     res = http.get("blueprints")
+#
+module Lono::Api
+  class Proxy
+    extend Memoist
+
+    def get(path)
+      request(Net::HTTP::Get, path)
+    end
+
+    def post(path, data={})
+      request(Net::HTTP::Post, path, data)
+    end
+
+    def http(url)
+      uri = URI(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = http.read_timeout = 30
+      http.use_ssl = true if uri.scheme == 'https'
+      http
+    end
+    memoize :http
+
+    def request(klass, path, data={})
+      url = url(path)
+      http = http(url)
+      req = send_request(klass, url, data)
+      http.request(req) # send request
+    end
+
+    def send_request(klass, url, data={})
+      data.merge!(
+        lono_version: Lono::VERSION,
+        lono_command: lono_command,
+      )
+      req = klass.new(url) # url includes query string and uri.path does not, must used url
+      if [Net::HTTP::Post, Net::HTTP::Put].include?(klass)
+        text = JSON.dump(data)
+        req.body = text
+        req.content_length = text.bytesize
+      end
+      req
+    end
+
+    # Lono::API does not include the /. IE: localhost:8888
+    # path includes the /. IE: "/blueprints"
+    def url(path)
+      "#{Lono::API}/#{path}"
+    end
+
+  private
+    def lono_command
+      "#{$0} #{ARGV.join(' ')}"
+    end
+  end
+end

data/lib/lono/api/repos.rb

@@ -0,0 +1,8 @@
+module Lono::Api
+  module Repos
+    def repos(type)
+      res = http.get("repos?type=#{type}")
+      load_json(res)
+    end
+  end
+end

data/lib/lono/api/verify.rb

@@ -0,0 +1,13 @@
+module Lono::Api
+  module Verify
+    def verify(data)
+      res = http.post("verify", data)
+      load_json(res)
+    end
+
+    def temp_key
+      res = http.post("temp_keys")
+      load_json(res)
+    end
+  end
+end

data/lib/lono/app_file/base.rb

@@ -1,20 +1,13 @@
 # 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
-
+  class Base < Lono::AbstractBase
     # What's needed for a Thor::Group or "Sequence". Gives us Thor::Actions commands like create_file
     # Must be included before `def initialize` as we override the Thor initialize
     include Thor::Actions
     include Thor::Base
-
-    def initialize(blueprint, options={})
-      @blueprint, @options = blueprint, options
-      @template = @options[:template] || @blueprint
-      Lono::ProjectChecker.check
-      set_blueprint_root(@blueprint)
-      Lono::ProjectChecker.empty_templates
+    # Override Thor::Base initialize
+    def initialize(options={})
+      reinitialize(options)
       initialize_variables
     end
 

data/lib/lono/app_file/build.rb

@@ -33,7 +33,7 @@ module Lono::AppFile
     end
 
     def context
-      Lono::Template::Context.new(@blueprint, @options)
+      Lono::Template::Context.new(@options)
     end
     memoize :context
 

data/lib/lono/app_file/upload.rb

@@ -3,11 +3,8 @@ module Lono::AppFile
     include Lono::AwsServices
     extend Memoist
 
-    def initialize(blueprint, options={})
-      @blueprint, @options = blueprint, options
-    end
-
     def upload
+      return unless Registry.items.size > 0
       puts "Uploading app/files..."
 
       Registry.items.each do |item|

data/lib/lono/autoloader.rb

@@ -1,3 +1,5 @@
+require "lono/bundle"
+Lono::Bundle.setup
 require "zeitwerk"
 
 module Lono
@@ -14,7 +16,7 @@ module Lono
         loader = Zeitwerk::Loader.new
         loader.inflector = Inflector.new
         loader.push_dir(File.dirname(__dir__)) # lib
-        # loader.log! # uncomment to debug
+        loader.log! if ENV["LONO_AUTOLOAD_LOG"]
         loader.setup
       end
     end

data/lib/lono/aws_services.rb

@@ -8,7 +8,12 @@ require "aws_mfa_secure/ext/aws" # add MFA support
 module Lono
   module AwsServices
     extend Memoist
-    include Util
+    include Helper
+
+    def cfn
+      Aws::CloudFormation::Client.new
+    end
+    memoize :cfn
 
     def ec2
       Aws::EC2::Client.new
@@ -20,11 +25,6 @@ module Lono
     end
     memoize :iam
 
-    def sts
-      Aws::STS::Client.new # part of aws-sdk-core
-    end
-    memoize :sts
-
     def s3
       Aws::S3::Client.new
     end
@@ -40,9 +40,9 @@ module Lono
     end
     memoize :s3_presigner
 
-    def cfn
-      Aws::CloudFormation::Client.new
+    def sts
+      Aws::STS::Client.new # part of aws-sdk-core
     end
-    memoize :cfn
+    memoize :sts
   end
 end