lono 7.4.8 → 7.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d747ecd65bb8239ac79bebab231572190de2a39d46d4db692cb449e64abc6f77
-  data.tar.gz: 609e5aa49b41c5b981b5e62075d41195683a75976cf3db99df6f3e664d00e3d0
+  metadata.gz: 4e552e98666394b4573d02131de0e2e8e31707b9a2eab4f0d5abee72cc166bb4
+  data.tar.gz: d8471da49ad51dfe39698e551d20f43f627d98b8c7661bc41484adeb60f598ed
 SHA512:
-  metadata.gz: bb81fa313393a78647e218e5d61d53ea0b36c1c6aee29c39fed24036bdefeba2265f5449ca7d894fae173868437d1c64d24626fbe51282de69208cf57f427ba6
-  data.tar.gz: 29bf3543f1b61a416c2bbe148c5c60227a8cf5cea3e15455b30fcdc4fe8c2f18dc4b3b88a9ee9b0b4f929ee6b6e251518319470fa0af57ec92843c73cc6de728
+  metadata.gz: 383c2617d88b1ffb08dbe6f755616534ae872bf901b59a2a1412fc97161d955cd0ed3ce87679f5a8e4945d056c7b3aa5021684b6ef7dfcc366f67b569b8d2b7a
+  data.tar.gz: '09f12a84287cbdcb76ea14d4ed7151bb87947d8503b4ed1f2b1fd26954aa49fd539813ec297ad8dc41fc574b41788195f8cdcb7d648f788ac94b7f083c9b3d53'

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.4.9]
+- #69 `stack_output` and `stack_resource` helpers
+
 ## [7.4.8]
 - #68 squeezer: auto clean empty array values
 - add version numbers to extension gemspec template to remove deprecations

data/lib/lono/registration/temp.rb

@@ -21,13 +21,6 @@ class Lono::Registration
     def prompt
       return if ENV['LONO_TEST']
 
-      # We get the api first before the prompt to check if api is up
-      resp = get_temp_key
-      # resp nil means non-200 http response. Failsafe behavior is to continue.
-      if resp.nil?
-        return true
-      end
-
       puts <<~EOL
 
         Looks like lono is not registered. Lono registration is optional and free.
@@ -35,12 +28,17 @@ class Lono::Registration
 
             https://register.lono.cloud
 
-        Registration removes this message. Registered users can also optionally receive
-        updates and special offers, including discounts to BoltOps Pro:
+        This prompt appears every 24 hours when lono is not registered. Registration removes
+        this message. Registered users can also optionally receive updates and special offers,
+        including discounts to BoltOps Pro:
 
             https://lono.cloud/docs/boltops-pro/
 
       EOL
+
+      # resp nil means non-200 http response
+      resp = get_temp_key
+      save_temp_key(resp) unless resp.nil? # save temp key so prompt only happens periodically
     end
 
     def save_temp_key(info)

data/lib/lono/template/strategy/dsl/builder/helpers.rb

@@ -2,12 +2,14 @@
 class Lono::Template::Strategy::Dsl::Builder
   module Helpers
     extend Memoist
-    include CoreHelper
-    include Ec2Helper
-    include FileHelper
-    include LookupHelper
-    include S3Helper
-    include TagsHelper
+
+    # Auto include all modules in helpers folder
+    helpers_dir = File.expand_path("helpers", __dir__)
+    Dir.glob("#{helpers_dir}/**/*").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

data/lib/lono/template/strategy/dsl/builder/helpers/stack_helper.rb

@@ -0,0 +1,50 @@
+module Lono::Template::Strategy::Dsl::Builder::Helpers
+  module StackHelper
+    extend Memoist
+    include Lono::AwsServices
+
+    def stack_output(name)
+      stack_name, key = name.split(".")
+      resp = describe_stacks(stack_name: stack_name)
+      stack = resp.stacks.first
+      if stack
+        o = stack.outputs.detect { |h| h.output_key == key }
+      end
+
+      if o
+        o.output_value
+      else
+        "NOT FOUND: output #{key} for stack #{stack_name}"
+      end
+    end
+
+    def stack_resource(name)
+      stack_name, logical_id = name.split(".")
+      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}"
+      end
+    end
+
+    def lookup_output(name)
+      stack_output(name)
+      return unless ENV['LONO_DEPRECATION_SOFT']
+      puts "DEPRECATION WARNING: lookup_output is deprecated. Please use stack_output instead".color(:yellow)
+    end
+
+  private
+    def describe_stacks(options={})
+      cfn.describe_stacks(options)
+    end
+    memoize :describe_stacks
+
+    def describe_stack_resources(options={})
+      cfn.describe_stack_resources(options)
+    end
+    memoize :describe_stack_resources
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.4.8"
+  VERSION = "7.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.4.8
+  version: 7.4.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -688,8 +688,8 @@ files:
 - lib/lono/template/strategy/dsl/builder/helpers/core_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/ec2_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/file_helper.rb
-- lib/lono/template/strategy/dsl/builder/helpers/lookup_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/s3_helper.rb
+- lib/lono/template/strategy/dsl/builder/helpers/stack_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/tags_helper.rb
 - lib/lono/template/strategy/dsl/builder/section/base.rb
 - lib/lono/template/strategy/dsl/builder/section/condition.rb

data/lib/lono/template/strategy/dsl/builder/helpers/lookup_helper.rb

@@ -1,27 +0,0 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
-  module LookupHelper
-    extend Memoist
-    include Lono::AwsServices
-
-    def lookup_output(name)
-      stack_name, key = name.split(".")
-      resp = describe_stacks(stack_name: stack_name)
-      stack = resp.stacks.first
-      if stack
-        o = stack.outputs.detect { |h| h.output_key == key }
-      end
-
-      if o
-        o.output_value
-      else
-        "NOT FOUND: Did not lookup_output #{name} for stack #{stack}"
-      end
-    end
-
-  private
-    def describe_stacks(options={})
-      cfn.describe_stacks(options)
-    end
-    memoize :describe_stacks
-  end
-end