lono 8.0.0.pre.rc1 → 8.0.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93888f3a1dc76f9c5e21f98c0edf5d03ee7ba4cdcf9e5a4115b0ee1ce0f3b518
-  data.tar.gz: 22b18e2ccc2e98a41c57903aef1e67677f40dd48a953359447ef5546942f7ccb
+  metadata.gz: 963246c282376afe61a61f60ad1ec0ccb17ee194420d972802868f8574fbc97a
+  data.tar.gz: 3e8b4c478d5ee57744ff05ad45023592dffab08825a5af2e044a8656680b0512
 SHA512:
-  metadata.gz: 67562f7b0059f63f0cd33c93157f4bc0d7182125305b9602f67cb6d3a13094c1d6c1f84f0fe493800ba917cb2404b0f31c789744ff6ef2232b1629b7b51ef34f
-  data.tar.gz: 7f9c0b5998e36e2acf9cef7dacdfd115ce8bcb49fde35c6664008fe31820e0ed4ce14c36897fc733c93ac93a5033770d1cdf4bf29d170420cc8335b0432cb35d
+  metadata.gz: f8ea0aa2e31ea1dad60b69d7993ef1b6eb9781c1ee0d04770ed2a1eb0fec9387703e79b95faf1a04918685d147ff884a7f712420891dbb50f9091bdf3439fa9b
+  data.tar.gz: f73dd80095b287c9be478a68c4de4181fdd0657153d69dc0c72145497555a7c542096e8bd0fb5b85877589251d878cd2dee7cace277614917dcab383991de30f

data/.cody/acceptance/bin/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 final_status=0
-function final_status {
+function capture_status {
   if [ "$?" -ne "0" ] && [ $final_status -ne 1 ] ; then
     final_status=1
   fi
@@ -32,21 +32,21 @@ lono new blueprint demo --examples
 set +e
 # Test new stack creation
 lono up demo -y
-final_status
+capture_status
 
 lono seed demo # just to test it. will overwrite file
-final_status
+capture_status
 
 # Test stack update
 cat << EOF > config/blueprints/demo/params/$LONO_ENV.txt
 AccessControl=PublicRead
 EOF
 lono up demo -y
-final_status
+capture_status
 
 # Clean up resources
 lono down demo -y
-final_status
+capture_status
 set -e
 
 exit $final_status

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,84 @@
+---
+name: Reproducible Bug Report
+about: Is something not working as expected?
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--
+Hi! Thanks for considering to file a bug with Lono. Please take the time to
+answer the basic questions. Please try to be as detailed as possible.
+To be sensitive to everyone's time, if not enough details are provided, the
+issue may be closed without comment. If you repeatedly fail to provide enough
+details, you may be blocked from ever submitting issues to Lono again.
+Please use your best judgment. 👍
+
+If you are unsure this is a bug in Lono, please consider asking your question at:
+https://community.boltops.com
+
+Thanks!
+-->
+
+## Checklist
+
+<!--
+Make sure that you've done all of these.  To mark a checkbox done, replace [ ] with [x]. Or after you create the issue you can click the checkbox.
+-->
+
+- [ ] Upgrade Lono: Are you using the latest version of Lono? This allows Lono to fix issues fast. There's an Upgrading Guide: https://lono.cloud/docs/upgrading/
+- [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on https://community.boltops.com
+- [ ] Code sample: Have you put together a code sample to reproduce the issue and make it available?  Code samples help speed up fixes dramatically. If it's an easily reproducible issue, then code samples are not needed. If you're unsure, please include a code sample.
+
+## My Environment
+
+<!-- Please fill out the table below with debugging info to help: -->
+
+| Software         | Version |
+| ---------------- | ------- |
+| Operating System |         |
+| Lono             |         |
+| Ruby             |         |
+
+---
+
+## Expected Behaviour
+
+<!--
+What is it you expected to happen? This should be a description of how the functionality you tried to use is supposed to work. Try to keep this to one-paragraph.
+-->
+
+## Current Behavior
+
+<!--
+Describe the details of the bug.  Try to keep this to one-paragraph.
+-->
+
+## Step-by-step reproduction instructions
+
+<!--
+Be sure to include any steps you took for the problem to exist. This is likely the longest part of the report.
+
+Please include any logs you think relevant here. If the logs are long (more than 50 lines) please make a gist of the logs and link to it. https://gist.github.com
+
+With long logs, you can also use the <details> tag to keep the report readable. Example:
+
+<details>
+ <summary>Summary Goes Here</summary>
+
+ ...this is hidden, collapsable content. start with a blank line to get terminal output to format right...
+</details>
+-->
+
+## Code Sample
+
+<!--
+Please provide a code repository, gist, code snippet or sample files to reproduce the issue.
+-->
+
+## Solution Suggestion
+
+<!--
+Please provide possible solutions. If you can't think of anything, feel free to omit. Please be kind and add helpful possible solutions.  For example, "Fix it!" is not a helpful solution suggestion. We are mere mortals. Please be constructive.
+-->

data/.github/ISSUE_TEMPLATE/documentation.md

@@ -0,0 +1,12 @@
+---
+name: Documentation
+about: Found a typo or something that isn't crystal clear in the docs?
+title: ''
+labels: docs
+assignees: ''
+
+---
+
+The Lono Docs are in the [lono-docs repo](https://github.com/boltops-tools/lono-docs). Please submit a PR there. Thanks!
+
+For documentation changes to the lono code base itself, like code comments. Please submit a PR here. Thanks!

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,64 @@
+---
+name: New Feature Suggestion
+about: Want to add a feature to Lono?
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+<!--
+Hi! Thanks for considering to file a feature request with Lono. Please take the time to answer the basic questions. Please try to be as detailed as possible.
+
+Thanks!
+-->
+
+## Summary
+
+<!--
+A one-paragraph explanation of the feature.
+-->
+
+## Motivation
+
+<!--
+Why do you want to see this feature in Lono? What use cases does it support?
+
+How the feature would be relevant to 80% or more of Lono users.
+-->
+
+## Guide-level explanation
+
+<!--
+Explain the proposal as if it was already included in the project and you were teaching it to another programmer. That generally means:
+
+- Introducing new named concepts.
+- Explaining the feature largely in terms of examples.
+- If applicable, provide sample error messages, deprecation warnings, or upgrade guidance.
+
+If this is a small feature, you may omit this section.
+-->
+
+## Reference-level explanation
+
+<!--
+This is the technical portion of the feature request. Explain the design in sufficient detail that:
+
+- Its interaction with other features is clear.
+- It is reasonably clear how the feature would be implemented.
+- Corner cases are dissected by example.
+
+If you do not know how to answer this, you can omit it. No worries!
+-->
+
+## Drawbacks
+
+<!--
+Why should we *not* do this?
+-->
+
+## Unresolved Questions
+
+<!--
+What related issues do you consider out of scope for this feature that could be addressed in the future independently of the solution that comes out of this feature?
+-->

data/.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,14 @@
+---
+name: Question
+about: Have any questions about how Lono works?
+title: ''
+labels: 'question'
+assignees: ''
+
+---
+
+The Lono issue tracker IS NOT for usage questions! Please post your question on our dedicated forum at https://community.boltops.com
+
+To be sensitive to everyone's time, we may close issues asking questions without comment. If you repeatedly post questions in the issues tracker, you may be blocked from ever submitting issues to Lono again. Please use your best judgment. 👍
+
+Posting your questions in the Lono community forum benefits others by grouping questions in a dedicated place. Here are some additional options also https://lono.cloud/support/ 😁

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+Please fill out one of the templates on https://github.com/boltops-tools/lono/issues/new/choose
+
+If you want to ask a question please do so in the Lono category in the BoltOps Community forum: https://community.boltops.com
+
+To be sensitive to everyone's time, we may close issues asking questions without comment. Posting your questions in the Lono community forum is the best place. It also benefits others by making the questions easier to find. Here are some additional options also https://lono.cloud/support/ 👌
+
+Thank you!

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,50 @@
+<!--
+Thanks for creating a Pull Request! Before you submit, please make sure you've done the following:
+
+- I read the contributing document at https://lono.cloud/docs/contributing/
+-->
+
+<!--
+Make our lives easier! Choose one of the following by uncommenting it:
+-->
+
+<!-- This is a 🐞 bug fix. -->
+<!-- This is a 🙋‍♂️ feature or enhancement. -->
+<!-- This is a 🧐 documentation change. -->
+
+<!--
+Before you submit this pull request, make sure to have a look at the following checklist. To mark a checkbox done, replace [ ] with [x]. Or after you create the issue you can click the checkbox.
+
+If you don't know how to do some of these, that's fine!  Submit your pull request and we will help you out on the way.
+-->
+
+- [ ] I've added tests (if it's a bug, feature or enhancement)
+- [ ] I've adjusted the documentation (if it's a feature or enhancement)
+- [ ] The test suite passes (run `bundle exec rspec` to verify this)
+
+## Summary
+
+<!--
+Provide a description of what your pull request changes.
+-->
+
+## Context
+
+<!--
+Is this related to any GitHub issue(s) or another relevant link?
+-->
+
+## How to Test
+
+<!--
+Please provide instructions on how to test the fix. This speeds up reviewing the PR. If testing requires a demo Lono project, please provide an example repo.
+-->
+
+
+## Version Changes
+
+<!--
+Which semantic version change would you recommend?
+If you don't know, feel free to omit it.
+-->
+

data/CHANGELOG.md

@@ -1,7 +1,64 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-This project *tries* to adhere to [Semantic Versioning](http://semver.org/).
+## [8.0.0.rc4] - 2022-03-19
+
+Notable:
+
+* lono app and role concept
+* extra layering support
+* hooks support: project and blueprint level
+
+Misc:
+
+* add lono bucket output
+* alias blueprint with -b
+* change params extension to .env
+* config.hooks.show = true default
+* config.layering.show = true option
+* extra layering support
+* github templates
+* improve simplier new helper cli interface
+* improve squeezer: edge case Array with nil elements
+* hooks generator
+* lambda layer
+* layering full mode default
+* lazy create lono stack and lono bucket
+* lono extra support
+* lono iam
+* lono summary
+* lono up: edge case fix continue after rollback
+* parse_for_layering_show
+* remove extensions and add new hook generator
+* show configset layering
+* update dsl_evaluator dependency to at least 0.3.0
+* version structure check
+
+## [8.0.0.rc3] - 2022-03-06
+
+* lono files support for lambda functions
+  * new structure: remove Appfile
+  * allow regions and envs support
+  * print friend message with exact line of yaml code in case of aws
+  * cloudformation yaml validation error
+  * improve cli help
+* configsets new structure
+  * lono new helper blueprint and project commands
+  * project helpers support
+  * include_modules improvements
+  * support vendor level helpers
+  * improve plan params diff
+* lono plan build all first
+
+## [8.0.0.rc2] - 2022-02-23
+
+* restructure builder and helpers
+* improve template_evaluation_error
+* lono seed --where option and config.seed.where
+* return nil when output not found
+* setup configsets finalizer
+* template_file helper
+* fix coder
+* lono s3 bucket auto-creation
 
 ## [8.0.0.rc1] - 2022-02-21
 

data/Gemfile

@@ -3,8 +3,6 @@ source "https://rubygems.org"
 # Specify your gem dependencies in lono.gemspec
 gemspec
 
-if ENV['C9_USER']
-  gem "rspec-lono", path: "~/boltops-tools/rspec-lono"
-else
+group :test do
   gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"
 end

data/README.md

@@ -27,18 +27,13 @@ Lono is a CloudFormation framework. It builds, manages, and deploys CloudFormati
 
 See [lono.cloud](http://lono.cloud) for full lono documentation.
 
-## 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
 
 It only takes a couple of commands to start using lono.
 
-    gem install lono
-    lono new infra
+    gem install lono --prerelease
+    lono new project infra --examples
     cd infra
-    lono blueprint new demo
     lono up demo
 
 ![Lono flowchart](https://lono.cloud/img/tutorial/lono-flowchart.png "Lono flowchart")

data/lib/lono/app/callable_option/concern.rb

@@ -0,0 +1,12 @@
+class Lono::App::CallableOption
+  module Concern
+    def callable_option(options={})
+      callable_option = Lono::App::CallableOption.new(
+        config_name: options[:config_name],
+        config_value: options[:config_value],
+        passed_args: options[:passed_args],
+      )
+      callable_option.object
+    end
+  end
+end

data/lib/lono/app/callable_option.rb

@@ -0,0 +1,56 @@
+# Class represents a lono option that is possibly callable. Examples:
+#
+#    config.allow.envs
+#    config.allow.regions
+#    config.deny.envs
+#    config.deny.regions
+#
+# Abstraction is definitely obtuse. Using it to get rid of duplication.
+#
+class Lono::App
+  class CallableOption
+    include Lono::Utils::Logging
+
+    def initialize(options={})
+      @options = options
+      # Example:
+      # config_name:  config.allow.envs
+      # config_value: ["dev"]
+      # args:         [@stack_name] # passed to object.call
+      @config_name = options[:config_name]
+      @config_value = options[:config_value]
+      @passed_args = options[:passed_args]
+    end
+
+    # Returns either an Array or nil
+    def object
+      case @config_value
+      when nil
+        return nil
+      when Array
+        return @config_value
+      when -> (c) { c.respond_to?(:public_instance_methods) && c.public_instance_methods.include?(:call) }
+        object= @config_value.new
+      when -> (c) { c.respond_to?(:call) }
+        object = @config_value
+      else
+        raise "Invalid option for #{@config_name}"
+      end
+
+      if object
+        result = @passed_args.empty? ? object.call : object.call(*@passed_args)
+        unless result.is_a?(Array) || result.is_a?(NilClass)
+          message = "ERROR: The #{@config_name} needs to return an Array or nil"
+          logger.info message.color(:yellow)
+          logger.info <<~EOL
+            The #{@config_name} when assigned a class, object, or proc must implement
+            the call method and return an Array or nil.
+            The current return value is a #{result.class}
+          EOL
+          raise message
+        end
+      end
+      result
+    end
+  end
+end

data/lib/lono/app.rb

@@ -13,6 +13,21 @@ module Lono
     def defaults
       config = ActiveSupport::OrderedOptions.new
 
+      config.allow = ActiveSupport::OrderedOptions.new
+      config.allow.envs = nil
+      config.allow.regions = nil
+      config.deny = ActiveSupport::OrderedOptions.new
+      config.deny.envs = nil
+      config.deny.regions = nil
+
+      config.hooks = ActiveSupport::OrderedOptions.new
+      config.hooks.show = true
+
+      config.layering = ActiveSupport::OrderedOptions.new
+      config.layering.names = {}
+      config.layering.mode = "full" # simple or fulll. simple does not include region, account, and region/account layers
+      config.layering.show = show_layers?
+
       config.log = ActiveSupport::OrderedOptions.new
       config.log.root = Lono.log_root
       config.logger = lono_logger
@@ -20,16 +35,19 @@ module Lono
       config.logger.level = ENV['LONO_LOG_LEVEL'] || :info
 
       config.names = ActiveSupport::OrderedOptions.new
-      config.names.stack = ":APP-:BLUEPRINT-:ENV"
       config.names.output = ActiveSupport::OrderedOptions.new
-      config.names.output.stack = ":BLUEPRINT-:ENV" # does not include APP by default. Think this is more common
-      config.names.output.expand = true
+      config.names.stack = ":APP-:ROLE-:BLUEPRINT-:ENV-:EXTRA"
 
-      config.paths = ActiveSupport::OrderedOptions.new
-      config.paths.scripts = "scripts"
-      config.paths.content = "content"
-      config.paths.helpers = "helpers"
-      config.paths.user_data = "user_data"
+      config.plan = ActiveSupport::OrderedOptions.new
+      config.plan.changeset = true
+      config.plan.params = "full"
+      config.plan.template = "summary" # summary is same as true
+
+      config.seed = ActiveSupport::OrderedOptions.new
+      config.seed.where = "config"
+
+      config.test = ActiveSupport::OrderedOptions.new
+      config.test.framework = "rspec"
 
       config.up = ActiveSupport::OrderedOptions.new
       config.up.capabilities = nil
@@ -37,21 +55,39 @@ module Lono
       config.up.rollback = true
       config.up.tags = nil
 
-      config.diff = ActiveSupport::OrderedOptions.new
-      config.diff.changeset = true
-      config.diff.params = "full"
-      config.diff.template = "summary" # summary is same as true
-
-      config.extract_scripts = {}
-
-      config.test = ActiveSupport::OrderedOptions.new
-      config.test.framework = "rspec"
+      config
+    end
 
-      config.layering = ActiveSupport::OrderedOptions.new
-      config.layering.names = {}
+    def show_layers?
+      ENV['LONO_SHOW_LAYERS'] || parse_for_layering_show
+    end
+    private :show_layers?
 
-      config
+    # Some limitations:
+    #
+    # * Only parsing one file: .ufo/config.rb
+    # * If user is using Ruby code that cannot be parse will fallback to default
+    #
+    # Think it's worth it so user only has to configure
+    #
+    #     config.layering.show = true
+    #
+    def parse_for_layering_show
+      return false if Lono::Command.non_project_command?
+      lines = IO.readlines("#{Lono.root}/config/app.rb")
+      config_line = lines.find { |l| l =~ /config\.layering.show.*=/ && l !~ /^\s+#/ }
+      return false unless config_line # default is false
+      config_value = config_line.gsub(/.*=/,'').strip.gsub(/["']/,'')
+      config_value != "false" && config_value != "nil"
+    rescue Exception => e
+      if ENV['LONO_DEBUG']
+        puts "#{e.class} #{e.message}".color(:yellow)
+        puts "WARN: Unable to parse for config.layering.show".color(:yellow)
+        puts "Using default: config.layering.show = false"
+      end
+      false
     end
+    memoize :parse_for_layering_show
 
     def lono_logger
       Logger.new(ENV['LONO_LOG_PATH'] || $stderr)

data/lib/lono/autoloader.rb

@@ -17,6 +17,7 @@ module Lono
         loader.inflector = Inflector.new
         loader.push_dir(File.dirname(__dir__)) # lib
         loader.log! if ENV["LONO_AUTOLOAD_LOG"]
+        loader.ignore("#{__dir__}/ext.rb")
         loader.setup
       end
     end

data/lib/lono/aws_services/helper.rb

@@ -1,8 +1,6 @@
 module Lono::AwsServices
   module Helper
     def stack_exists?(stack_name)
-      return false if ENV['LONO_NOOP']
-
       exist = nil
       begin
         # When the stack does not exist an exception is raised. Example:

data/lib/lono/blueprint.rb

@@ -1,22 +1,5 @@
 module Lono
-  class Blueprint
-    attr_reader :name
-    def initialize(options={})
-      @options = options
-      @name = options[:blueprint]
-    end
-
-    def exist?
-      !root.nil?
-    end
-
-    def root
-      paths = Dir.glob("#{Lono.root}/{app,vendor}/blueprints/*")
-      paths.find do |path|
-        path.include?("blueprints/#{@name}")
-      end
-    end
-
+  class Blueprint < Component
     def output_path
       "#{Lono.root}/output/#{@name}/template.yml"
     end

data/lib/lono/builder/allow/base.rb

@@ -0,0 +1,54 @@
+class Lono::Builder::Allow
+  class Base < Lono::CLI::Base
+    include Lono::App::CallableOption::Concern
+
+    def check!
+      messages = []
+      unless allowed?
+        messages << message # message is interface method
+      end
+      unless messages.empty?
+        puts "ERROR: The configs do not allow this.".color(:red)
+        puts messages
+        exit 1
+      end
+    end
+
+    def allowed?
+      if allows.nil? && denys.nil?
+        true
+      elsif denys.nil?
+        allows.include?(check_value)
+      elsif allows.nil?
+        !denys.include?(check_value)
+      else
+        allows.include?(check_value) && !denys.include?(check_value)
+      end
+    end
+
+    def allows
+      callable_option(
+        config_name: "config.allow.#{config_name}",
+        config_value: config.dig(:allow, config_name),
+        passed_args: [@blueprint],
+      )
+    end
+
+    def denys
+      callable_option(
+        config_name: "config.deny.#{config_name}",
+        config_value: config.dig(:deny, config_name),
+        passed_args: [@blueprint],
+      )
+    end
+
+  private
+    def config
+      Lono.config
+    end
+
+    def config_name
+      self.class.to_s.split('::').last.underscore.pluralize.to_sym # ActiveSuport::HashWithIndifferentAccess#dig requires symbol
+    end
+  end
+end

data/lib/lono/builder/allow/env.rb

@@ -0,0 +1,17 @@
+class Lono::Builder::Allow
+  class Env < Base
+    # interface method
+    def message
+      messages = []
+      messages << "This env is not allowed to be used: LONO_ENV=#{Lono.env}"
+      messages << "Allow envs: #{allows.join(', ')}" if allows
+      messages << "Deny envs: #{denys.join(', ')}" if denys
+      messages.join("\n")
+    end
+
+    # interface method
+    def check_value
+      Lono.env
+    end
+  end
+end