lono 7.5.1 → 8.0.0.pre.rc2

data/lib/lono/builder/dsl/helpers/partials.rb

@@ -0,0 +1,145 @@
+require "aws-sdk-core"
+
+module Lono::Builder::Dsl::Helpers
+  module Partials
+    def template_s3_path(template_name)
+      # hi-jacking Uploader for https_url
+      template_path = "output/#{@blueprint.name}/templates/#{template_name}.yml"
+      Lono::S3::Uploader.new(template_path).s3_https_url
+    end
+
+    def template_params(param_name)
+      o = {
+        allow_not_exists: true
+      }.merge(@options)
+      o["param"] = param_name
+      generator = Lono::CLI::Param::Generator.new(o)
+      # do not generate because lono cfn calling logic already generated it we only need the values
+      parameters = generator.parameters    # Returns Array in underscore keys format
+      # convert Array to simplified hash structure
+      parameters.inject({}) do |h, param|
+        h.merge(param[:parameter_key] => param[:parameter_value])
+      end
+    end
+
+    # Adjust the partial path so that it will use app/user_data
+    def user_data(path,vars={}, options={})
+      options.merge!(user_data: true)
+      partial(path,vars, options)
+    end
+
+    def current_region
+      region = Aws.config[:region]
+      region ||= ENV['AWS_REGION']
+      return region if region
+
+      default_region = 'us-east-1' # fallback if default not found in ~/.aws/config
+      if ENV['AWS_PROFILE']
+        path = "#{ENV['HOME']}/.aws/config"
+        if File.exist?(path)
+          lines = IO.readlines(path)
+          capture_default, capture_current = false, false
+          lines.each do | line|
+            if line.include?('[default]')
+              capture_default = true # next line
+              next
+            end
+            if capture_default && line.match(/region = /)
+              # over default from above
+              default_region = line.split(' = ').last.strip
+              capture_default = false
+            end
+
+            md = line.match(/\[profile (.*)\]/)
+            if md && md[1] == ENV['AWS_PROFILE']
+              capture_current = true
+              next
+            end
+            if capture_current && line.match(/region = /)
+              region = line.split(' = ').last.strip
+              capture_current = false
+            end
+          end
+        end
+
+        region ||= default_region
+        return region if region
+      end
+
+      'us-east-1' # default
+    end
+
+  private
+    def render_path(path)
+      RenderMePretty.result(path, context: self)
+    end
+
+    def user_data_path_for(path)
+      "#{Lono.config.paths.user_data}/#{path}"
+    end
+
+    def auto_add_format(path)
+      # Return immediately if user provided explicit extension
+      extension = File.extname(path) # current extension
+      return path if !extension.empty?
+
+      # Else let's auto detect
+      paths = Dir.glob("#{path}.*")
+
+      if paths.size == 1 # non-ambiguous match
+        return paths.first
+      end
+
+      if paths.size > 1 # ambiguous match
+        logger.info "ERROR: Multiple possible partials found:".color(:red)
+        paths.each do |path|
+          logger.info "  #{path}"
+        end
+        logger.info "Please specify an extension in the name to remove the ambiguity.".color(:green)
+        exit 1
+      end
+
+      # Account for case when user wants to include a file with no extension at all
+      return path if File.exist?(path) && !File.directory?(path)
+
+      path # original path if this point is reached
+    end
+
+    # Bash code that is meant to included in user-data
+    def extract_scripts(options={})
+      settings = Lono.config.extract_scripts
+      options = settings.merge(options)
+      # defaults also here in case they are removed from settings
+      to = options[:to] || "/opt"
+      user = options[:as] || "ec2-user"
+
+      if Dir.glob("#{Lono.config.paths.scripts}/*").empty?
+        logger.info "WARN: you are using the extract_scripts helper method but you do not have any scripts.".color(:yellow)
+        calling_line = caller[0].split(':')[0..1].join(':')
+        logger.info "Called from: #{calling_line}"
+        return ""
+      end
+
+      <<~BASH_CODE
+        # Generated from the lono extract_scripts helper.
+        # Downloads scripts from s3, extract them, and setup.
+        mkdir -p #{to}
+        aws s3 cp #{scripts_s3_path} #{to}/
+        (
+          cd #{to}
+          tar zxf #{to}/#{scripts_name}
+          chown -R #{user}:#{user} #{to}/scripts
+        )
+      BASH_CODE
+    end
+
+    def scripts_name
+      File.basename(scripts_s3_path)
+    end
+
+    def scripts_s3_path
+      upload = Lono::Script::Upload.new(@options)
+      upload.s3_dest
+    end
+  end
+end

data/lib/lono/{template/strategy/dsl/builder/helpers/s3_helper.rb → builder/dsl/helpers/s3.rb}

@@ -1,5 +1,5 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
-  module S3Helper
+module Lono::Builder::Dsl::Helpers
+  module S3
     def s3_bucket
       Lono::S3::Bucket.name
     end
@@ -8,7 +8,7 @@ module Lono::Template::Strategy::Dsl::Builder::Helpers
     def s3_key(name, options={})
       default = {type: "file"}
       options.reverse_merge!(default)
-      Lono::AppFile::Registry.register(name, @blueprint, options)
+      Lono::AppFile::Registry.register(name, @blueprint.name, options)
       "file://app/files/#{options[:type]}/#{name}" # placeholder for post processing
     end
     alias_method :file_s3_key, :s3_key

data/lib/lono/{template/context/ssm_fetcher.rb → builder/dsl/helpers/ssm/fetcher.rb}

@@ -1,7 +1,7 @@
 require 'aws-sdk-ssm'
 
-class Lono::Template::Context
-  class SsmFetcher
+module Lono::Builder::Dsl::Helpers::Ssm
+  class Fetcher
     extend Memoist
 
     def get(name)

data/lib/lono/{template/context/helpers.rb → builder/dsl/helpers/ssm.rb}

@@ -1,5 +1,5 @@
-class Lono::Template::Context
-  module Helpers
+module Lono::Builder::Dsl::Helpers
+  module Ssm
     extend Memoist
 
     def ssm(name)
@@ -7,7 +7,7 @@ class Lono::Template::Context
     end
 
     def ssm_fetcher
-      SsmFetcher.new
+      Fetcher.new
     end
     memoize :ssm_fetcher
   end

data/lib/lono/{template/strategy/dsl/builder/helpers/stack_helper.rb → builder/dsl/helpers/stack.rb}

@@ -1,10 +1,11 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
-  module StackHelper
+module Lono::Builder::Dsl::Helpers
+  module Stack
     extend Memoist
     include Lono::AwsServices
 
     def stack_output(name)
       stack_name, key = name.split(".")
+      stack_name = stack_name(stack_name)
       resp = describe_stacks(stack_name: stack_name)
       stack = resp.stacks.first
       if stack
@@ -14,27 +15,31 @@ module Lono::Template::Strategy::Dsl::Builder::Helpers
       if o
         o.output_value
       else
-        "NOT FOUND: output #{key} for stack #{stack_name}"
+        logger.info "WARN2: NOT FOUND: output #{key} for stack #{stack_name}"
+        nil
       end
     end
 
     def stack_resource(name)
       stack_name, logical_id = name.split(".")
+      stack_name = stack_name(stack_name)
       resp = describe_stack_resources(stack_name: stack_name)
       resources = resp.stack_resources
       resource = resources.find { |r| r.logical_resource_id == logical_id }
       if resource
         resource.physical_resource_id
       else
-        "NOT FOUND: logical_id #{logical_id} for stack #{stack_name}"
+        logger.info "WARN: NOT FOUND: logical_id #{logical_id} for stack #{stack_name}"
+        nil
       end
     end
 
-    def lookup_output(name)
-      result = stack_output(name)
-      return unless ENV['LONO_DEPRECATION_SOFT']
-      puts "DEPRECATION WARNING: lookup_output is deprecated. Please use stack_output instead".color(:yellow)
-      result
+    def stack_name(blueprint)
+      return blueprint unless Lono.config.names.output.expand
+      names = Lono::Names.new(blueprint: blueprint)
+      # explicit expansion pattern provided by user
+      pattern = blueprint.include?(':') ? blueprint : Lono.config.names.output.stack
+      names.expansion(pattern)
     end
 
   private

data/lib/lono/{template/strategy/dsl/builder/helpers/tags_helper.rb → builder/dsl/helpers/tags.rb}

@@ -1,5 +1,5 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
-  module TagsHelper
+module Lono::Builder::Dsl::Helpers
+  module Tags
     def tags(hash={})
       if hash.empty?
         tag_list(@tags) if @tags # when hash is empty, use @tags variable. If not set then return nil

data/lib/lono/builder/dsl/helpers/template_file.rb

@@ -0,0 +1,54 @@
+module Lono::Builder::Dsl::Helpers
+  module TemplateFile
+    extend Memoist
+    include Lono::Utils::Pretty
+
+    def template_file(path)
+      path = "#{@blueprint.root}/#{path}"
+      if File.exist?(path)
+        render_file(path)
+      else
+        template_file_missing(path)
+      end
+    end
+    # do not memoize :template_file - it'll hide the template_file_missing error
+
+    # Caller lines are different for OSes:
+    #
+    #   windows: "C:/Ruby31-x64/lib/ruby/gems/3.1.0/gems/terraspace-1.1.1/lib/terraspace/builder.rb:34:in `build'"
+    #   linux: "/home/ec2-user/.rvm/gems/ruby-3.0.3/gems/terraspace-1.1.1/lib/terraspace/compiler/dsl/syntax/mod.rb:4:in `<module:Mod>'"
+    #
+    class TempleFileNotFoundError < StandardError; end
+    def template_file_missing(path)
+      message = "ERROR: path #{pretty_path(path)} not found"
+      caller_line = caller.find { |l| l =~ %r{/blueprints/} } # TODO: show code itself
+      logger.error message.color(:red)
+      logger.error "Called from:"
+      logger.error "    #{pretty_path(caller_line)}"
+      # Raise an error so Dsl::Evaluator#template_evaluation_error provides user friendly info
+      raise TempleFileNotFoundError.new
+    end
+
+    def render_file(path)
+      RenderMePretty.result(path, context: template_context)
+    end
+    memoize :render_file
+
+    def user_data_script
+      unless @user_data_script
+        return <<~EOL
+          # @user_data_script variable not set. IE: @user_data_script = "#{pretty_path(@blueprint.root)}/template/user_data.sh"
+          # Also, make sure that "config/#{@blueprint.name}/user_data/boostrap.sh" path you're using exists.
+        EOL
+      end
+
+      if File.exist?(@user_data_script)
+        render_file(@user_data_script)
+      else
+        message = "WARN: #{@user_data_script} not found"
+        logger.info message.color(:yellow)
+        "# #{message}"
+      end
+    end
+  end
+end

data/lib/lono/{template/strategy/dsl/builder → builder/dsl}/helpers.rb

@@ -1,16 +1,15 @@
 # Built-in helpers for the DSL form
-class Lono::Template::Strategy::Dsl::Builder
+class Lono::Builder::Dsl
   module Helpers
     extend Memoist
 
     # Auto include all modules in helpers folder
+    # only load one level deep. IE: ssm/fetcher is a class
     helpers_dir = File.expand_path("helpers", __dir__)
-    Dir.glob("#{helpers_dir}/**/*").each do |path|
+    Dir.glob("#{helpers_dir}/*.rb").each do |path|
       next unless File.file?(path)
       klass = path.gsub(%r{.*/lib/},'').sub(".rb",'').camelize
       include klass.constantize
     end
-
-    include Lono::Template::Strategy::Common::Helpers
   end
 end

data/lib/lono/builder/dsl/syntax/core/base.rb

@@ -0,0 +1,22 @@
+module Lono::Builder::Dsl::Syntax::Core
+  class Base
+    include Lono::Builder::Util::Stringify
+    include Lono::Builder::Dsl::Syntax::Fn
+
+    def initialize(blueprint, *definition)
+      @blueprint = blueprint
+      @definition = definition.flatten
+    end
+
+  private
+    def camelize(attributes)
+      data = stringify!(attributes)
+      clean(data)
+    end
+
+    # Remove items with nil value automatically
+    def clean(data)
+      Squeezer.new(data).squeeze
+    end
+  end
+end

data/lib/lono/{template/strategy/dsl/builder/section → builder/dsl/syntax/core}/condition.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Dsl::Syntax::Core
   class Condition < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder/section → builder/dsl/syntax/core}/mapping.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Dsl::Syntax::Core
   class Mapping < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder/section → builder/dsl/syntax/core}/output.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Dsl::Syntax::Core
   class Output < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder/section → builder/dsl/syntax/core}/parameter.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Dsl::Syntax::Core
   class Parameter < Base
     attr_accessor :group_label
     attr_reader :conditional, :label

data/lib/lono/{template/strategy/dsl/builder/section → builder/dsl/syntax/core}/resource/property_mover.rb

@@ -1,4 +1,4 @@
-class Lono::Template::Strategy::Dsl::Builder::Section::Resource
+class Lono::Builder::Dsl::Syntax::Core::Resource
   # Moves the property to the top-level attributes *destructively*
   class PropertyMover
     def initialize(resource, logical_id, properties)

data/lib/lono/{template/strategy/dsl/builder/section → builder/dsl/syntax/core}/resource.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Dsl::Syntax::Core
   class Resource < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder/section → builder/dsl/syntax/core}/section.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Dsl::Syntax::Core
   class Section < Base
     def template
       hash, _ = @definition

data/lib/lono/{template/strategy/dsl/builder → builder/dsl/syntax/core}/squeezer.rb

@@ -1,4 +1,4 @@
-class Lono::Template::Strategy::Dsl::Builder
+module Lono::Builder::Dsl::Syntax::Core
   class Squeezer
     def initialize(data)
       @data = data

data/lib/lono/{template/strategy/dsl/builder/section/methods.rb → builder/dsl/syntax/core.rb}

@@ -1,6 +1,6 @@
 # Organize core section method syntax here
-module Lono::Template::Strategy::Dsl::Builder::Section
-  module Methods
+module Lono::Builder::Dsl::Syntax
+  module Core
     def aws_template_format_version(version_date)
       @cfn["AWSTemplateFormatVersion"] = version_date
     end
@@ -20,7 +20,7 @@ module Lono::Template::Strategy::Dsl::Builder::Section
 
     def parameter(*definition)
       @cfn["Parameters"] ||= {}
-      param = Parameter.new(@blueprint, definition)
+      param = Parameter.new(@blueprint.name, definition)
       @cfn["Parameters"].merge!(param.template)
 
       # Additional decorations
@@ -33,32 +33,32 @@ module Lono::Template::Strategy::Dsl::Builder::Section
 
     def mapping(*definition)
       @cfn["Mappings"] ||= {}
-      mapping = Mapping.new(@blueprint, definition)
+      mapping = Mapping.new(@blueprint.name, definition)
       @cfn["Mappings"].merge!(mapping.template)
     end
 
     def resource(*definition)
       @cfn["Resources"] ||= {}
-      resource = Resource.new(@blueprint, definition)
+      resource = Resource.new(@blueprint.name, definition)
       @cfn["Resources"].merge!(resource.template)
     end
 
     def condition(*definition)
       @cfn["Conditions"] ||= {}
-      condition = Condition.new(@blueprint, definition)
+      condition = Condition.new(@blueprint.name, definition)
       @cfn["Conditions"].merge!(condition.template)
     end
 
     def output(*definition)
       @cfn["Outputs"] ||= {}
-      output = Output.new(@blueprint, definition)
+      output = Output.new(@blueprint.name, definition)
       @cfn["Outputs"].merge!(output.template)
     end
 
     # Generic section method in case CloudFormation adds a new future section.
     # The generic section method adds a new top-level key
     def section(key, definition)
-      @cfn[key] = Section.new(@blueprint, definition).template
+      @cfn[key] = Section.new(@blueprint.name, definition).template
     end
   end
 end

data/lib/lono/{template/strategy/dsl/builder → builder/dsl/syntax}/fn.rb

@@ -1,4 +1,4 @@
-class Lono::Template::Strategy::Dsl::Builder
+module Lono::Builder::Dsl::Syntax
   module Fn
     # Also act as documentation on the method signatures
     # Also used in Coder crafting so should always list all the functions here
@@ -83,7 +83,7 @@ class Lono::Template::Strategy::Dsl::Builder
       end
     end
 
-    def conditional_ref(name, options)
+    def conditional_ref(name, options={})
       fallback = options[:Fallback] || options[:fallback] || ref("AWS::NoValue")
       if!("Has#{name}", ref(name, options), fallback)
     end

data/lib/lono/{template/strategy/dsl/builder → builder/dsl}/syntax/parameter_group.rb

@@ -1,4 +1,4 @@
-module Lono::Template::Strategy::Dsl::Builder::Syntax
+module Lono::Builder::Dsl::Syntax
   module ParameterGroup
     def parameter_group(label)
       @group_label = label

data/lib/lono/builder/dsl/syntax.rb

@@ -0,0 +1,9 @@
+# Encapsulates syntax methods so they can be included in both the Evaluator and Context scope
+class Lono::Builder::Dsl
+  module Syntax
+    include Fn
+    include Core
+    include ParameterGroup
+    include Helpers
+  end
+end

data/lib/lono/builder/dsl.rb

@@ -0,0 +1,14 @@
+module Lono::Builder
+  class Dsl < Lono::CLI::Base
+    attr_reader :results
+    def run
+      logger.info "Building template" unless @options[:quiet]
+      build_template
+    end
+
+    def build_template
+      evaluator = Evaluator.new(@options)
+      evaluator.build
+    end
+  end
+end

data/lib/lono/{param/generator.rb → builder/param.rb}

@@ -1,15 +1,16 @@
-class Lono::Param
-  class Generator < Lono::AbstractBase
-    attr_reader :env_path, :base_path # set when generate is called
+module Lono::Builder
+  class Param < Lono::CLI::Base
+    attr_reader :env_path, :base_path # set when build is called
 
-    def generate
-      puts "Generating parameter files for blueprint #{@blueprint.color(:green)}:"
+    def build
+      logger.info "Building parameters"
 
       contents = []
-      layering = Lono::Layering.new("params", @options, Lono.env)
-      layering.locations.each do |path|
-        contents << render_erb(path)
+
+      layers.each do |layer|
+        contents << render_erb(layer)
       end
+
       contents = contents.compact.join("\n") # result
 
       data = convert_to_cfn_format(contents)
@@ -17,30 +18,28 @@ class Lono::Param
       json = JSON.pretty_generate(camel_data)
       write_output(json)
       unless @options[:mute]
-        short_output_path = output_path.sub("#{Lono.root}/","")
-        puts "  #{short_output_path}"
+        short_param_path = param_path.sub("#{Lono.root}/","")
+        logger.info "    #{short_param_path}"
       end
 
       data
     end
 
+    def layers
+      Lono::Layering::Layer.new(@blueprint, "params").paths
+    end
+
     def parameters
-      generate
+      build
     end
 
     def render_erb(path)
       return unless path
       if File.exist?(path)
-        RenderMePretty.result(path, context: context)
+        RenderMePretty.result(path, context: params_context)
       end
     end
 
-    # Context for ERB rendering.
-    # This is where we control what references get passed to the ERB rendering.
-    def context
-      @context ||= Lono::Template::Context.new(@options)
-    end
-
     def convert_to_cfn_format(contents, casing=:underscore)
       lines = parse_contents(contents)
 
@@ -96,14 +95,14 @@ class Lono::Param
       end
     end
 
-    def output_path
-      "#{Lono.root}/output/#{@blueprint}/params/#{@stack}.json"
+    def param_path
+      "#{Lono.root}/output/#{@blueprint.name}/params.json"
     end
 
     def write_output(json)
-      dir = File.dirname(output_path)
+      dir = File.dirname(param_path)
       FileUtils.mkdir_p(dir)
-      IO.write(output_path, json)
+      IO.write(param_path, json)
     end
   end
 end

data/lib/lono/builder/template/aws_service.rb

@@ -0,0 +1,15 @@
+require "aws-sdk-s3"
+
+class Lono::Builder::Template::AwsService
+  def s3
+    return @s3 if @s3
+
+    options = {}
+    endpoint = ENV['S3_ENDPOINT'] if ENV['S3_ENDPOINT']
+    options[:endpoint] = endpoint if endpoint
+    if options[:endpoint]
+      options[:region] = options[:endpoint].split('.')[1]
+    end
+    @s3 = Aws::S3::Client.new(options)
+  end
+end