mux_tf 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1742588983c720769618427118003ad76ab69f8be2035b19f8c779ab1876669
-  data.tar.gz: 12563430cfe99792a995675611a0dbd8aad9582d6ed063c0a38335dec1bac6b0
+  metadata.gz: 86f905c9dcd8264222677f830925cff18e3258d10319be26c339705866ef8118
+  data.tar.gz: e61638e5a1d0a104debdd034cd7aecb9da34bcdd64fee57444967ba516d21f1b
 SHA512:
-  metadata.gz: 302ebae8183b41dfb4c7218d95dcdf9d0117df023caf80c6a38ec9969071b6af55d538e73eb08e6ef275816e6dc29220277c4b731202df9f5f30b9f4e3013c5c
-  data.tar.gz: 3af421ee73ec82cb62d0b9e8ae41c9a220b5feae31dda1328b14c71aa8d6e02b5acd858da13fe606ecfcfeaf290f99a9d7b0806b0b2f9ea40e752d5f8d544bc6
+  metadata.gz: 120652ac965f70a186dd189a0cd0fd6fba14c2dc2c9421fe654d209e98432a70298079e86ea33107e61d0b163078db72a9d963971af43d4cddb3df499d2a76b9
+  data.tar.gz: dd063677d9d1f65b8c7e3a4a4d48c7c4bbefec455eda0ce021ddf020c17cb4d4230e0eae17914edec02d3c27a014a97456f4612a46bc11dbbff56fe023d100d5

data/lib/mux_tf/cli/current.rb

@@ -313,6 +313,9 @@ module MuxTf
           plan.flat_summary.each do |line|
             log line, depth: 2
           end
+          plan.output_summary.each do |line|
+            log line, depth: 2
+          end
           log "", depth: 2
           log plan.summary, depth: 2
         end

data/lib/mux_tf/cli/plan_summary.rb

@@ -49,6 +49,9 @@ module MuxTf
               plan.flat_summary.each do |line|
                 puts line
               end
+              plan.output_summary.each do |line|
+                puts line
+              end
             end
             puts
             puts plan.summary

data/lib/mux_tf/plan_formatter.rb

@@ -20,13 +20,13 @@ module MuxTf
         parser.state(:refreshing, /Refreshing Terraform state in-memory prior to plan.../, %i[none blank info])
         parser.state(:refresh_done, /^----------+$/, [:refreshing])
         parser.state(:refresh_done, /^$/, [:refreshing])
-        parser.state(:plan_info, /Terraform will perform the following actions:/, [:refresh_done])
+        parser.state(:plan_info, /Terraform will perform the following actions:/, [:refresh_done, :none])
         parser.state(:plan_summary, /^Plan:/, [:plan_info])
 
         parser.state(:error_lock_info, /Lock Info/, [:error])
         parser.state(:error, /^$/, [:error_lock_info])
 
-        parser.state(:plan_error, /^Error: /, %i[refreshing refresh_done])
+        parser.state(:plan_error, /^╷|Error: /, %i[refreshing refresh_done])
 
         status = tf_plan(out: filename, detailed_exitcode: true, compact_warnings: true, targets: targets) { |raw_line|
           parser.parse(raw_line.rstrip) do |state, line|

data/lib/mux_tf/plan_summary_handler.rb

@@ -32,77 +32,174 @@ module MuxTf
     def initialize(data)
       @parts = []
 
-      data["resource_changes"].each do |v|
-        next unless v["change"]
-
-        case v["change"]["actions"]
-        when ["no-op"]
-          # do nothing
-        when ["create"]
-          parts << {
-            action: "create",
-            address: v["address"],
-            deps: find_deps(data, v["address"])
-          }
-        when ["update"]
-          parts << {
-            action: "update",
-            address: v["address"],
-            deps: find_deps(data, v["address"])
-          }
-        when ["delete"]
-          parts << {
-            action: "delete",
-            address: v["address"],
-            deps: find_deps(data, v["address"])
-          }
-        when %w[delete create]
-          parts << {
-            action: "replace",
-            address: v["address"],
-            deps: find_deps(data, v["address"])
-          }
-        when ["read"]
-          parts << {
-            action: "read",
-            address: v["address"],
-            deps: find_deps(data, v["address"])
-          }
-        else
-          puts "[??] #{v["address"]}"
-          puts "UNKNOWN ACTIONS: #{v["change"]["actions"].inspect}"
-          puts "TODO: update plan_summary to support this!"
+      if data["output_changes"]
+        data["output_changes"].each do |output_name, v|
+          case v["actions"]
+          when ["no-op"]
+            # do nothing
+          when ["create"]
+            parts << {
+              type: "output",
+              action: "create",
+              after_unknown: v["after_unknown"],
+              sensitive: [v["before_sensitive"], v["after_sensitive"]],
+              address: output_name
+            }
+          when ["update"]
+            parts << {
+              type: "output",
+              action: "update",
+              after_unknown: v["after_unknown"],
+              sensitive: [v["before_sensitive"], v["after_sensitive"]],
+              address: output_name
+            }
+          when ["delete"]
+            parts << {
+              type: "output",
+              action: "delete",
+              after_unknown: v["after_unknown"],
+              sensitive: [v["before_sensitive"], v["after_sensitive"]],
+              address: output_name
+            }
+          else
+            puts "[??] #{output_name}"
+            puts "UNKNOWN ACTIONS: #{v["actions"].inspect}"
+            puts "TODO: update plan_summary to support this!"
+          end
+        end
+      end
+
+      if data["resource_changes"]
+        data["resource_changes"].each do |v|
+          next unless v["change"]
+
+          case v["change"]["actions"]
+          when ["no-op"]
+            # do nothing
+          when ["create"]
+            parts << {
+              type: "resource",
+              action: "create",
+              address: v["address"],
+              deps: find_deps(data, v["address"])
+            }
+          when ["update"]
+            parts << {
+              type: "resource",
+              action: "update",
+              address: v["address"],
+              deps: find_deps(data, v["address"])
+            }
+          when ["delete"]
+            parts << {
+              type: "resource",
+              action: "delete",
+              address: v["address"],
+              deps: find_deps(data, v["address"])
+            }
+          when %w[delete create]
+            parts << {
+              type: "resource",
+              action: "replace",
+              address: v["address"],
+              deps: find_deps(data, v["address"])
+            }
+          when ["read"]
+            parts << {
+              type: "resource",
+              action: "read",
+              address: v["address"],
+              deps: find_deps(data, v["address"])
+            }
+          else
+            puts "[??] #{v["address"]}"
+            puts "UNKNOWN ACTIONS: #{v["change"]["actions"].inspect}"
+            puts "TODO: update plan_summary to support this!"
+          end
         end
       end
 
       prune_unchanged_deps(parts)
     end
 
+    def resource_parts
+      parts.select { |part| part[:type] == "resource" }
+    end
+
+    def output_parts
+      parts.select { |part| part[:type] == "output" }
+    end
+
     def summary
-      summary = {}
-      parts.each do |part|
-        summary[part[:action]] ||= 0
-        summary[part[:action]] += 1
+      # resources
+      resource_summary = {}
+      resource_parts.each do |part|
+        resource_summary[part[:action]] ||= 0
+        resource_summary[part[:action]] += 1
       end
-      pieces = summary.map { |k, v|
+      resource_pieces = resource_summary.map { |k, v|
         color = color_for_action(k)
         "#{Paint[v, :yellow]} to #{Paint[k, color]}"
       }
 
-      "Plan Summary: #{pieces.join(Paint[", ", :gray])}"
+      # outputs
+      output_summary = {}
+      output_parts.each do |part|
+        output_summary[part[:action]] ||= 0
+        output_summary[part[:action]] += 1
+      end
+      output_pieces = output_summary.map { |k, v|
+        color = color_for_action(k)
+        "#{Paint[v, :yellow]} to #{Paint[k, color]}"
+      }
+
+      if resource_pieces.any? || output_pieces.any?
+        [
+          "Plan Summary:",
+          resource_pieces.any? ? resource_pieces.join(Paint[", ", :gray]) : nil,
+          output_pieces.any? ? "Outputs: #{output_pieces.join(Paint[", ", :gray])}" : nil
+        ].compact.join(" ")
+      else
+        "Plan Summary: no changes"
+      end
     end
 
     def flat_summary
       result = []
-      parts.each do |part|
+      resource_parts.each do |part|
         result << "[#{format_action(part[:action])}] #{format_address(part[:address])}"
       end
       result
     end
 
+    def sensitive_summary(bv, av)
+      # before vs after
+      if bv && av
+        "(#{Paint["sensitive", :yellow]})"
+      elsif bv
+        "(#{Paint["-sensitive", :red]})"
+      elsif av
+        "(#{Paint["+sensitive", :cyan]})"
+      end
+    end
+
+    def output_summary
+      result = []
+      output_parts.each do |part|
+        pieces = [
+          "[#{format_action(part[:action])}]",
+          format_address("output.#{part[:address]}"),
+          part[:after_unknown] ? "(unknown)" : nil,
+          sensitive_summary(*part[:sensitive])
+        ].compact
+        result << pieces.join(" ")
+      end
+      result
+    end
+
     def nested_summary
       result = []
-      parts = parts.deep_dup
+      parts = resource_parts.deep_dup
       until parts.empty?
         part = parts.shift
         if part[:deps] == []
@@ -131,7 +228,7 @@ module MuxTf
     def run_interactive
       prompt = TTY::Prompt.new
       result = prompt.multi_select("Update resources:", per_page: 99, echo: false) { |menu|
-        parts.each do |part|
+        resource_parts.each do |part|
           label = "[#{format_action(part[:action])}] #{format_address(part[:address])}"
           menu.choice label, part[:address]
         end
@@ -187,14 +284,17 @@ module MuxTf
       plan.flat_summary.each do |line|
         log line, depth: 2
       end
+      plan.output_summary.each do |line|
+        log line, depth: 2
+      end
       log "", depth: 2
       log plan.summary, depth: 2
     end
 
     def prune_unchanged_deps(parts)
-      valid_addresses = parts.map { |part| part[:address] }
+      valid_addresses = resource_parts.map { |part| part[:address] }
 
-      parts.each do |part|
+      resource_parts.each do |part|
         part[:deps].select! { |dep| valid_addresses.include?(dep) }
       end
     end

data/lib/mux_tf/resource_tokenizer.rb

@@ -32,6 +32,13 @@ class ResourceTokenizer
           pn = n
           state = :ri
         end
+        if n == resource.length - 1
+          # last character .. close the current group
+          # the last thing should only ever be an index or a name
+          result << [:rn, resource[pn..n]]
+          pn = n
+          state = :done
+        end
       when :ri
         # looking for ]
         if resource[n] == "]"

data/lib/mux_tf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MuxTf
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport