mux_tf 0.5.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e874484664c177ee479dab2a1807681c5a6bf5bb15bc0f9e573db85c3d2cf0db
-  data.tar.gz: 369461d8dbb4788a67cdff92c722f9ba550e9b4e5f40f2b7f2a5dfc0e0383f38
+  metadata.gz: 41f1a93a9cc1bb9b03075271173a8afe09681fb9526030ca51629157c7d55005
+  data.tar.gz: c352b093345f3f8abbf780a0ebcd996ca10c7a24c2d085ac3ed8e42067eb9755
 SHA512:
-  metadata.gz: ead76731cd675e2bbaf6a9f5c476a7b56ab65862e082ff12c398a25608dbc1de193550a50ac395e13e697ff4045d9d069ff1daf63d1a4c8b40a45e1f3e841f90
-  data.tar.gz: 8b81a3ec56ad271118bfd87860c9943a1b6c1dfbe9d36452f7884003a17e3bf921e8eacc9eb838e74b6f6876f2c65869543fbd3fa8eced9120bea6bc8d794578
+  metadata.gz: 7115744f5a2d49be3dd29309614e94e6efbe7e29ff010079275a7144a731f2f722f30dd8e919a6ac94a29fcc37aba84566de460408cf2bcde9094931c3a9c4b2
+  data.tar.gz: 936d1b885d4699599e022da3bdb7b7e69703f4247807835c80cd5524a54c0d371dcacdfe04fd89e53d702a53d89319a681b092574037966042b59a90e8db809c

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/mux.rb

@@ -103,7 +103,7 @@ module MuxTf
 
           ignored += ENV["MUX_IGNORE"].split(",") if ENV["MUX_IGNORE"]
 
-          dirs = Dir["**/*/.terraform"].map { |n| n.gsub(%r{/\.terraform}, "") }
+          dirs = Dir["**/.terraform.lock.hcl"].map { |f| File.dirname(f) }
           dirs.reject! { |d| d.in?(ignored) }
 
           dirs

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

@@ -108,7 +108,7 @@ module MuxTf
 
         parser.state(:modules_init, /^Initializing modules\.\.\./)
         parser.state(:modules_upgrade, /^Upgrading modules\.\.\./)
-        parser.state(:backend, /^Initializing the backend\.\.\./, [:modules_init, :modules_upgrade])
+        parser.state(:backend, /^Initializing the backend\.\.\./, [:none, :modules_init, :modules_upgrade])
         parser.state(:plugins, /^Initializing provider plugins\.\.\./, [:backend])
 
         parser.state(:plugin_warnings, /^$/, [:plugins])
@@ -128,6 +128,8 @@ module MuxTf
               case stripped_line
               when /^Downloading (?<repo>[^ ]+) (?<version>[^ ]+) for (?<module>[^ ]+)\.\.\./
                 print "D"
+              when /^Downloading (?<repo>[^ ]+) for (?<module>[^ ]+)\.\.\./
+                print "D"
               when /^- (?<module>[^ ]+) in (?<path>.+)$/
                 print "."
               when ""
@@ -144,12 +146,10 @@ module MuxTf
               end
               case stripped_line
               when /^- (?<module>[^ ]+) in (?<path>.+)$/
-                # info = $~.named_captures
-                # log "- #{info["module"]}", depth: 2
                 print "."
               when /^Downloading (?<repo>[^ ]+) (?<version>[^ ]+) for (?<module>[^ ]+)\.\.\./
-                # info = $~.named_captures
-                # log "Downloading #{info["module"]} from #{info["repo"]} @ #{info["version"]}"
+                print "D"
+              when /^Downloading (?<repo>[^ ]+) for (?<module>[^ ]+)\.\.\./
                 print "D"
               when ""
                 puts
@@ -223,6 +223,9 @@ module MuxTf
               end
 
               log Paint[line, :yellow], depth: 1
+            when :none
+              next if line == ""
+              p [state, line]
             else
               p [state, line]
             end
@@ -242,6 +245,8 @@ module MuxTf
             log "#{Paint[dinfo["severity"].capitalize, color]}: #{dinfo["summary"]}", depth: 3
             if dinfo["detail"]&.include?("terraform init")
               remedies << :init
+            elsif /there is no package for .+ cached in/.match?(dinfo["summary"])
+              remedies << :init
             else
               log dinfo["detail"], depth: 4 if dinfo["detail"]
               if dinfo["range"]

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport