lono 8.0.0.pre.rc4 → 8.0.0.pre.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963246c282376afe61a61f60ad1ec0ccb17ee194420d972802868f8574fbc97a
-  data.tar.gz: 3e8b4c478d5ee57744ff05ad45023592dffab08825a5af2e044a8656680b0512
+  metadata.gz: 060b7af587a3c5cf93ccbd9c5f7431d987b3198c4fdd1477978f196107d80bce
+  data.tar.gz: 67007f1e5c107869e8a40a125d25a578153ade317c93a8cec52b340ad7a1821b
 SHA512:
-  metadata.gz: f8ea0aa2e31ea1dad60b69d7993ef1b6eb9781c1ee0d04770ed2a1eb0fec9387703e79b95faf1a04918685d147ff884a7f712420891dbb50f9091bdf3439fa9b
-  data.tar.gz: f73dd80095b287c9be478a68c4de4181fdd0657153d69dc0c72145497555a7c542096e8bd0fb5b85877589251d878cd2dee7cace277614917dcab383991de30f
+  metadata.gz: '075091a4124f123f1d1fa7d98558c3b55c2fc83c0bbfe5c60b417d4f2d09f9334d2999ff4c3a2915f80f221edd17161fdc387a9b84b65eae9e0d84de35fd95c8'
+  data.tar.gz: 11d2770339bcd8723984d837413b663016c04350dcca587479a616e1cb44a6c7f2df3868f44e713141fd8c032ba384f61b65749df3a17a6d9a7b52fe393856a3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [8.0.0.rc5] - 2022-04-29
+
+* #76 fix plan: upload template to s3
+* #75 user_data helper improvements
+* Improve lono error reported to use with better call line backtrace
+* load helpers before variables so they're available in vars files
+* vpc helper returns object
+
 ## [8.0.0.rc4] - 2022-03-19
 
 Notable:

data/lib/lono/builder/context.rb

@@ -3,8 +3,8 @@ class Lono::Builder
     include DslEvaluator
 
     def load_context
+      load_helpers # load helpers before variable so user custom helpers are available in vars files
       load_variables
-      load_helpers
     end
 
     # Variables in base.rb are overridden by their environment specific variables

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

@@ -2,12 +2,25 @@ module Lono::Builder::Dsl::Helpers
   module Ec2
     extend Memoist
 
+    # Returns vpc object
+    def vpc(name)
+      filters = name == "default" ?
+                [name: "isDefault", values: ["true"]] :
+                [name: "tag:Name", values: [name]]
+      resp = ec2.describe_vpcs(filters: filters)
+      resp.vpcs.first
+    end
+    memoize :vpc
+
     def default_vpc
-      resp = ec2.describe_vpcs(filters: [name: "isDefault", values: ["true"]])
-      vpc = resp.vpcs.first
+      vpc = vpc("default")
       vpc ? vpc.vpc_id : "no default vpc found"
     end
-    memoize :default_vpc
+
+    def default_vpc_cidr
+      vpc = vpc("default")
+      vpc.cidr_block
+    end
 
     def default_subnets
       return "no default subnets because no default vpc found" if default_vpc == "no default vpc found"

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

@@ -1,66 +1,48 @@
 module Lono::Builder::Dsl::Helpers
   module TemplateFile
     extend Memoist
+    include Lono::Utils::CallLine
     include Lono::Utils::Pretty
 
+    # Do not memoize :template_file - it'll hide the template_file_missing error
     def template_file(path)
-      path = "#{@blueprint.root}/#{path}"
+      path = "#{@blueprint.root}/#{path}" unless path.starts_with?('/')
       if File.exist?(path)
-        render_file(path)
+        RenderMePretty.result(path, context: self)
       else
         template_file_missing(path)
       end
     end
-    # do not memoize :template_file - it'll hide the template_file_missing error
+    alias_method :render_file, :template_file
+    alias_method :render_path, :template_file
+    alias_method :user_data, :template_file
+    alias_method :content, :template_file
+
 
     # Caller lines are different for OSes:
     #
     #   windows: "C:/Ruby31-x64/lib/ruby/gems/3.1.0/gems/lono-1.1.1/lib/lono/builder.rb:34:in `build'"
     #   linux: "/home/ec2-user/.rvm/gems/ruby-3.0.3/gems/lono-1.1.1/lib/lono/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/} }
-      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)
-      if File.exist?(path)
-        RenderMePretty.result(path, context: self)
-      else
-        lines = caller.select { |l| l.include?(Lono.root.to_s) }
-        caller_line = pretty_path(lines.first)
-        message =<<~EOL
-          WARN: #{pretty_path(path)} does not exist
-          Called from: #{caller_line}
-        EOL
-        logger.info message.color(:yellow)
-        message
-      end
+      logger.warn "WARN: File path not found: #{pretty_path(path)}".color(:yellow)
+      call_line = lono_call_line
+      DslEvaluator.print_code(call_line) # returns true right now
+      ""
     end
-    alias_method :render_path, :render_file
 
     def user_data_script
-      unless @user_data_script
-        script_example = pretty_path("#{@blueprint.root}/template/user_data.sh")
+      path = @user_data_script || @user_data_script_path
+      unless path
+        # script_example = pretty_path("#{@blueprint.root}/template/bootstrap.sh")
+        script_example = "bootstrap.sh"
         return <<~EOL
-          # @user_data_script variable not set. IE: @user_data_script = "#{script_example}"
+          # @user_data_script_path variable not set. IE: @user_data_script_path = "#{script_example}"
           # Also, make sure that "#{script_example}" 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
+      user_data(path)
     end
+    alias_method :user_data_script_path, :user_data_script
   end
 end

data/lib/lono/builder/param.rb

@@ -2,10 +2,12 @@ class Lono::Builder
   class Param < Lono::CLI::Base
     attr_reader :env_path, :base_path # set when build is called
     include Lono::Builder::Dsl::Syntax
+    include Lono::Builder::Context
     # Overriding output resource DSL method
     alias_method :output, :stack_output
 
     def build
+      load_context
       logger.info "Building parameters"
 
       contents = []

data/lib/lono/cfn/deploy/operable.rb

@@ -3,7 +3,7 @@ class Lono::Cfn::Deploy
     def check!
       status = stack_status
       unless status =~ /_COMPLETE$/ || status == "UPDATE_ROLLBACK_FAILED"
-        logger.info "Cannot create run operation on stack #{@stack} is not in an updatable state.  Stack status: #{status}".color(:red)
+        logger.info "Cannot run operation on stack #{@stack} is not in an updatable state.  Stack status: #{status}".color(:red)
         quit 1
       end
     end

data/lib/lono/cfn/deploy.rb

@@ -59,7 +59,6 @@ module Lono::Cfn
       opts = Opts.new(@blueprint, "create_stack", iam, options)
       opts.show
       options = opts.values
-      upload_all
       cfn.create_stack(options)
     end
 
@@ -70,33 +69,11 @@ module Lono::Cfn
       end
 
       operable.check!
-      upload_all # important to call before plan.for_update.
-      # plan.for_update creates the changeset and requires the template to already be uploaded to s3
       changeset = plan.for_update
       !changeset.changed? || @sure || sure?("Are you sure you want to update the #{@stack} stack?")
       changeset.execute_change_set
     end
 
-    def upload_all
-      upload_templates
-      upload_files
-    end
-
-    def upload_templates
-      Lono::Builder::Template::Upload.new(@options).run
-    end
-
-    # Upload files right before create_stack or execute_change_set
-    # Its better to upload here as part of a deploy vs a build
-    # IE: lono build should try not to do a remote write to s3 if possible
-    def upload_files
-      # Files built and compressed in
-      #     Lono::Builder::Dsl::Finalizer::Files::Build#build_files
-      Lono::Files.files.each do |file| # using singular file, but is like a "file_list"
-        file.upload
-      end
-    end
-
     def create?
       !stack_exists?(@stack)
     end

data/lib/lono/cfn/plan.rb

@@ -10,6 +10,7 @@ module Lono::Cfn
     end
 
     def for_update
+      upload_all
       # Allow passing down of the build object from Cfn::Deploy so build.all only runs once.
       # Fallback to creating new build object but still pass one build object instance down.
       @options[:build] ||= build
@@ -24,11 +25,35 @@ module Lono::Cfn
     end
 
     def for_create
+      upload_all
       New.new(@options).run
     end
 
     def for_delete
       Delete.new(@options).run
     end
+
+    # important to call before for_update and for_create
+    # since changeset requires the template to already be uploaded to s3
+    def upload_all
+      upload_templates
+      upload_files
+    end
+
+    def upload_templates
+      Lono::Builder::Template::Upload.new(@options).run
+    end
+
+    # Upload files right before create_stack or execute_change_set
+    # Its better to upload here as part of a deploy vs a build
+    # IE: lono build should try not to do a remote write to s3 if possible
+    def upload_files
+      # Files built and compressed in
+      #     Lono::Builder::Dsl::Finalizer::Files::Build#build_files
+      Lono::Files.files.each do |file| # using singular file, but is like a "file_list"
+        file.upload
+      end
+    end
+
   end
 end

data/lib/lono/utils/call_line.rb

@@ -0,0 +1,9 @@
+module Lono::Utils
+  module CallLine
+    include Pretty
+
+    def lono_call_line
+      caller.find { |l| l.include?(Lono.root.to_s) }
+    end
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "8.0.0-rc4"
+  VERSION = "8.0.0-rc5"
 end

data/lib/templates/project/Gemfile.tt

@@ -2,10 +2,5 @@ source "https://rubygems.org"
 
 # gem "lono", "~> <%= Lono::VERSION %>"
 
-if ENV['C9_USER']
-  gem "lono", path: "~/boltops-tools/lono"
-  gem "rspec-lono", path: "~/boltops-tools/rspec-lono"
-else
-  gem "lono", git: "https://github.com/boltops-tools/lono", branch: "v8"
-  gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"
-end
+gem "lono", git: "https://github.com/boltops-tools/lono", branch: "master"
+gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre.rc4
+  version: 8.0.0.pre.rc5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-20 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -765,6 +765,7 @@ files:
 - lib/lono/seeder.rb
 - lib/lono/user_data.rb
 - lib/lono/utils.rb
+- lib/lono/utils/call_line.rb
 - lib/lono/utils/logging.rb
 - lib/lono/utils/pretty.rb
 - lib/lono/utils/quit.rb
@@ -807,7 +808,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.12
 signing_key: 
 specification_version: 4
 summary: 'Lono: The CloudFormation Framework'