lono 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0639e6b23ecef2ac642cafdf9f9c9eaeb3dbfdc5cec7d4f7bcfc35068060fe
-  data.tar.gz: b22af994e3793c5548b14e1203120c46534c84e10d96df56d8e642773ddbbe30
+  metadata.gz: e7dbb4bce7dacd00dd7ee37ce9335cb0b8b351bb9bba768f01a7663c09dc4ce0
+  data.tar.gz: e41da1e4fca3c854c6b0c8debe9374ca0d3a2e592234cdc24b2306df6e6ae84b
 SHA512:
-  metadata.gz: 2b60894c2b295b58cfc80e0f293ad7925a8152dbe2bb5e794481d97a658c270c2c1f7160601e2a274fcab5109cd9bbbcf72a4d90c088fd85197a82da17cd3fd6
-  data.tar.gz: 49badaca98ef867ae2e9503057f9f7d14c3d1ae72ae6750665a13bfc061d833c6b3195c41c3c3d7a2f798a00f72c389d55d71515995087a1872f424b3acf496d
+  metadata.gz: a51d6207cd16a08628750e1f4169e04964d09cc9d3dbd6e3bf4b8ea8d6404863c840f61b6658b2ceedafaadb0c447a7ad1d78e6c6a896afe533747e662db1df6
+  data.tar.gz: bcdd52effdeec486e452db25c91108cfaa2aa24fc7bb9042e2f82af2aae6a77d4f3d58b50c52a80c7693083c047055bf3445b54b17ef06d077ce158c49e2e51a

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.
 
+## [5.3.3]
+- #12 fix param preview
+
 ## [5.3.2]
 - #11 enable sse-s3 encryption for lono managed s3 bucket
 

data/lib/lono/cfn/preview/param.rb

@@ -9,37 +9,56 @@ module Lono::Cfn::Preview
     def run
       return unless stack_exists?(@stack_name)
 
+      generated_params # eager call generated_params so its output is above Parameter Diff Preview
       puts "Parameter Diff Preview:".color(:green)
       if @options[:noop]
         puts "NOOP CloudFormation parameters preview for #{@stack_name} update"
         return
       end
 
-      write_to_tmp(existing_path, existing_parameters)
-      write_to_tmp(new_path, new_parameters)
+      write_to_tmp(existing_path, existing_params)
+      write_to_tmp(new_path, new_params)
 
       show_diff(existing_path, new_path)
     end
 
-    def new_parameters
+    def existing_params
+      existing = stack_parameters
+      params = normalize(existing)
+      subtract(params, noecho_params)
+    end
+    memoize :existing_params
+
+    def new_params
+      params = optional_params.merge(generated_params)
+      subtract(params, noecho_params)
+    end
+
+    def subtract(h1,h2)
+      hash = h1.reject do |k,v|
+        h2[k] == v
+      end
+      Hash[hash.sort_by {|k,v| k}]
+    end
+
+    def generated_params
       params = generate_all
-      params.reject { |p| ignore_parameters.include?(p[:parameter_key]) }
+      normalize(params)
     end
+    memoize :generated_params
 
-    def existing_parameters
-      existing = stack_parameters
-      existing = existing.reject { |p| ignore_parameters.include?(p.parameter_key) }
-      convert_to_cfn_format(existing)
+    def optional_params
+      # normalizing to simple Hash
+      optional_parameters.inject({}) do |result,(k,v)|
+        result.merge(k => v["Default"].to_s)
+      end
     end
 
-    def ignore_parameters
-      # Remove optional parameters if they match already. Produces better diff.
-      optional = optional_parameters.map { |logical_id, attributes| logical_id }
+    def noecho_params
       noecho = stack_parameters.select { |p| p.parameter_value == '****' }
-      noecho = noecho.map { |p| p.parameter_key }
-      optional + noecho
+      normalize(noecho)
     end
-    memoize :ignore_parameters
+    memoize :noecho_params
 
     def stack_parameters
       resp = cfn.describe_stacks(stack_name: @stack_name)
@@ -54,18 +73,25 @@ module Lono::Cfn::Preview
     end
     memoize :output_template
 
-    def write_to_tmp(path, list)
-      converted = convert_to_cfn_format(list)
-      text = JSON.pretty_generate(converted)
+    def write_to_tmp(path, hash)
+      text = JSON.pretty_generate(hash)
       FileUtils.mkdir_p(File.dirname(path))
       IO.write(path, text)
     end
 
-    def convert_to_cfn_format(list)
+
+    # Returns simple Hash. Example:
+    #
+    #     {"foo"=>"1", "bar"=>"2"},
+    #
+    def normalize(list)
       camelized = list.map(&:to_h).map do |h|
         h.transform_keys {|k| k.to_s.camelize}
       end
-      camelized.sort_by { |h| h["ParameterKey"] }
+      camelized.sort_by! { |h| h["ParameterKey"] }
+      camelized.inject({}) do |result,h|
+        result.merge(h["ParameterKey"] => h["ParameterValue"])
+      end
     end
 
     def existing_path

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "5.3.2"
+  VERSION = "5.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport