sfn 2.1.8 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 610903a7a6be9347a5c0d51bff46e3eba9239e28
-  data.tar.gz: 0aacd95b68b649c70416a02c77c8bf06d60072cf
+  metadata.gz: be1b4ec736e954ea46336a4a6e3a957c8331a450
+  data.tar.gz: a62b4144c909edaeaa66e0c871ed6fe23e66934b
 SHA512:
-  metadata.gz: 3cce4831036082b7f85c80e7d29b9d71aff2ae54b645830030126732642edfac1c10fd3e3a9e36f8bc889666cfd3bdc98f1c1113f948f3d6bc61310834cea2b9
-  data.tar.gz: bb744d8e3639da9440321c325f1f70ce593fa0e748795e0f4184e7dd9ec492345b85956755c83fcafac2227bfdb54b7a45e399715e767b521ca58d7533fb5185
+  metadata.gz: a8a4930dc3f88d29f9c277cd40037fbb8e7b8fae0f21efe709271bde0ec9afec7a968cf50aed21dd708488ba3a3a3883e6d2b66a048479ef90dce3100095ba59
+  data.tar.gz: 6ad2aba6a8d844eb5984e5c147a0ec0bc11bcd4f29838d72df2ea4dc96ad61d47a2acf594b9194953f68e2f18beeb0ed19e765ad45e65462bf9327e2fdafb454

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v2.1.10
+* [fix] Prevent direct output key modification on graph mapping
+* [enhancement] Restrict graph colors to readable values
+
 # v2.1.8
 * [fix] Fix some planner errors caused by unexpected types (#146)
 * [fix] Use common stack scrubbing implementation for create and update (#148)

data/lib/sfn/command/graph.rb

@@ -25,6 +25,10 @@ module Sfn
         end
         run_action 'Pre-processing template for graphing' do
           output_discovery(file, @outputs, nil, nil)
+          ui.debug 'Output remapping results from pre-processing:'
+          @outputs.each_pair do |o_key, o_value|
+            ui.debug "#{o_key} -> #{o_value}"
+          end
           nil
         end
         graph = nil
@@ -73,6 +77,7 @@ module Sfn
           end
         end
         if(parent_template)
+          ui.debug "Pre-processing stack resource `#{resource_name}`"
           substack_parameters = Smash[
             parent_template.fetch('Resources', resource_name, 'Properties', 'Parameters', {}).map do |key, value|
               result = [key, value]
@@ -80,16 +85,21 @@ module Sfn
                 v_key = value.keys.first
                 v_value = value.values.first
                 if(v_key == 'Fn::GetAtt' && parent_template.fetch('Resources', {}).keys.include?(v_value.first) && v_value.last.start_with?('Outputs.'))
-                  output_key = v_value.first << '__' << v_value.last.split('.', 2).last
+                  output_key = v_value.first + '__' + v_value.last.split('.', 2).last
+                  ui.debug "Output key for check: #{output_key}"
                   if(outputs.key?(output_key))
                     new_value = outputs[output_key]
                     result = [key, new_value]
+                    ui.debug "Parameter for output swap `#{key}`: #{value} -> #{new_value}"
                   end
                 end
               end
               result
             end
           ]
+
+          ui.debug "Generated internal parameters for `#{resource_name}`: #{substack_parameters}"
+
           processor = GraphProcessor.new({},
             :parameters => substack_parameters
           )
@@ -143,7 +153,7 @@ module Sfn
             )
             next
           else
-            graph.node(node_name).attributes << graph.fillcolor(colorize(node_prefix).inspect)
+            graph.node(node_name).attributes << graph.fillcolor(colorize(node_prefix.empty? ? config[:file] : node_prefix).inspect)
             graph.box3d << graph.node(node_name)
           end
           graph.filled << graph.node(node_name)
@@ -182,11 +192,21 @@ module Sfn
 
       def colorize(string)
         hash = string.chars.inject(0) do |memo, chr|
-          chr.ord + ((memo << 5) - memo)
+          if(memo + chr.ord > 127)
+            (memo - chr.ord).abs
+          else
+            memo + chr.ord
+          end
         end
         color = '#'
-        6.times do |count|
-          color << ('00' + ((hash >> count * 8) & 0xFF).to_s(16)).slice(-2)
+        3.times do |i|
+          color << (255 ^ hash).to_s(16)
+          new_val = hash + (hash * (1 / (i + 1.to_f))).to_i
+          if(hash * (i + 1) < 127)
+            hash = new_val
+          else
+            hash = hash / (i + 1)
+          end
         end
         color
       end

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('2.1.8')
+  VERSION = Gem::Version.new('2.1.10')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.10
 platform: ruby
 authors:
 - Chris Roberts