mux_tf 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72095840d17350f49c8cd49b97dc28db32948d51f17c572b5addaa51e6f01d6f
-  data.tar.gz: 51a4a8c094983a7d0c09b4fb61ace1c23a387cd24e4f13cd7b55653ec98fbacb
+  metadata.gz: a1742588983c720769618427118003ad76ab69f8be2035b19f8c779ab1876669
+  data.tar.gz: 12563430cfe99792a995675611a0dbd8aad9582d6ed063c0a38335dec1bac6b0
 SHA512:
-  metadata.gz: 7855009e15efa1a70256b9afc2cfa64452feff27a95aad28e2eb6171a70ad69ceee864b92d4e1cd41ee5cc296e68739c6d64fa86c599c8dde996bed4aef44a08
-  data.tar.gz: 6a27ffa3d8305525f5e1f7861f448253a3f81d1e5b4c5af82f255abc2232a476e91cd589f747c9a5e8858a9ec880bcf8c4d2911265e81228337fe10f4514a46a
+  metadata.gz: 302ebae8183b41dfb4c7218d95dcdf9d0117df023caf80c6a38ec9969071b6af55d538e73eb08e6ef275816e6dc29220277c4b731202df9f5f30b9f4e3013c5c
+  data.tar.gz: 3af421ee73ec82cb62d0b9e8ae41c9a220b5feae31dda1328b14c71aa8d6e02b5acd858da13fe606ecfcfeaf290f99a9d7b0806b0b2f9ea40e752d5f8d544bc6

data/exe/tf_current

@@ -2,8 +2,9 @@
 # frozen_string_literal: true
 
 begin
-  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
+  $LOAD_PATH.unshift File.expand_path(File.join(__dir__, "..", "lib"))
 
+  require "deps"
   require "mux_tf"
 
   MuxTf::Cli.run(:current, ARGV)

data/exe/tf_mux

@@ -2,8 +2,9 @@
 # frozen_string_literal: true
 
 begin
-  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
+  $LOAD_PATH.unshift File.expand_path(File.join(__dir__, "..", "lib"))
 
+  require "deps"
   require "mux_tf"
 
   MuxTf::Cli.run(:mux, ARGV)

data/exe/tf_plan_summary

@@ -2,8 +2,9 @@
 # frozen_string_literal: true
 
 begin
-  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
+  $LOAD_PATH.unshift File.expand_path(File.join(__dir__, "..", "lib"))
 
+  require "deps"
   require "mux_tf"
 
   MuxTf::Cli.run(:plan_summary, ARGV)

data/lib/mux_tf.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "./deps"
-
 require "English"
 
 require "shellwords"
@@ -22,6 +20,7 @@ require "tty-table"
 require "dotenv"
 
 require_relative "./mux_tf/version"
+require_relative "./mux_tf/resource_tokenizer"
 require_relative "./mux_tf/cli"
 require_relative "./mux_tf/tmux"
 require_relative "./mux_tf/terraform_helpers"

data/lib/mux_tf/cli/current.rb

@@ -103,9 +103,9 @@ module MuxTf
           tf_validate.parsed_output
         end
 
-        def create_plan(filename)
+        def create_plan(filename, targets: [])
           log "Preparing Plan ...", depth: 1
-          exit_code, meta = PlanFormatter.pretty_plan(filename)
+          exit_code, meta = PlanFormatter.pretty_plan(filename, targets: targets)
           case exit_code
           when 0
             [:ok, meta]
@@ -276,8 +276,8 @@ module MuxTf
           end
         end
 
-        def run_plan
-          plan_status, @plan_meta = create_plan(PLAN_FILENAME)
+        def run_plan(targets: [])
+          plan_status, @plan_meta = create_plan(PLAN_FILENAME, targets: targets)
 
           case plan_status
           when :ok

data/lib/mux_tf/plan_formatter.rb

@@ -6,7 +6,7 @@ module MuxTf
     extend PiotrbCliUtils::Util
 
     class << self
-      def pretty_plan(filename)
+      def pretty_plan(filename, targets: [])
         pastel = Pastel.new
 
         phase = :init
@@ -15,8 +15,8 @@ module MuxTf
 
         parser = StatefulParser.new(normalizer: pastel.method(:strip))
         parser.state(:info, /^Acquiring state lock/)
-        parser.state(:error, /Error locking state/, %i[none blank info])
-        parser.state(:refreshing, /^.+: Refreshing state... \[id=/, %i[none])
+        parser.state(:error, /(╷|Error locking state|Error:)/, %i[none blank info])
+        parser.state(:refreshing, /^.+: Refreshing state... \[id=/, %i[none info])
         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])
@@ -28,7 +28,7 @@ module MuxTf
 
         parser.state(:plan_error, /^Error: /, %i[refreshing refresh_done])
 
-        status = tf_plan(out: filename, detailed_exitcode: true, compact_warnings: true) { |raw_line|
+        status = tf_plan(out: filename, detailed_exitcode: true, compact_warnings: true, targets: targets) { |raw_line|
           parser.parse(raw_line.rstrip) do |state, line|
             case state
             when :none
@@ -126,6 +126,10 @@ module MuxTf
                 next
               end
               case stripped_line
+              when /^Downloading (?<repo>[^ ]+) (?<version>[^ ]+) for (?<module>[^ ]+)\.\.\./
+                print "D"
+              when /^- (?<module>[^ ]+) in (?<path>.+)$/
+                print "."
               when ""
                 puts
               else
@@ -182,6 +186,9 @@ module MuxTf
                 next
               end
               case stripped_line
+              when /^- Reusing previous version of (?<module>.+) from the dependency lock file$/
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [FROM-LOCK] #{info["module"]}", depth: 2
               when /^- (?<module>.+) is built in to Terraform$/
                 info = $LAST_MATCH_INFO.named_captures
                 log "- [BUILTIN] #{info["module"]}", depth: 2

data/lib/mux_tf/plan_summary_handler.rb

@@ -6,6 +6,8 @@ module MuxTf
     include TerraformHelpers
     include PiotrbCliUtils::Util
 
+    PLAN_FILENAME = "foo.tfplan"
+
     def self.from_file(file)
       data = data_from_file(file)
       new data
@@ -137,11 +139,7 @@ module MuxTf
 
       if !result.empty?
         log "Re-running apply with the selected resources ..."
-        status = tf_apply(targets: result)
-        unless status.success?
-          log Paint["Failed! (#{status.status})", :red]
-          throw :abort, "Apply Failed! #{status.status}"
-        end
+        run_plan(targets: result)
       else
         throw :abort, "nothing selected"
       end
@@ -151,6 +149,48 @@ module MuxTf
 
     attr_reader :parts
 
+    def create_plan(filename, targets: [])
+      log "Preparing Plan ...", depth: 1
+      exit_code, meta = PlanFormatter.pretty_plan(filename, targets: targets)
+      case exit_code
+      when 0
+        [:ok, meta]
+      when 1
+        [:error, meta]
+      when 2
+        [:changes, meta]
+      else
+        log Paint["terraform plan exited with an unknown exit code: #{exit_code}", :yellow]
+        [:unknown, meta]
+      end
+    end
+
+    def run_plan(targets: [])
+      plan_status, @plan_meta = create_plan(PLAN_FILENAME, targets: targets)
+
+      case plan_status
+      when :ok
+        log "no changes", depth: 1
+      when :error
+        log "something went wrong", depth: 1
+      when :changes
+        log "Printing Plan Summary ...", depth: 1
+        pretty_plan_summary(PLAN_FILENAME)
+      when :unknown
+        # nothing
+      end
+      plan_status
+    end
+
+    def pretty_plan_summary(filename)
+      plan = PlanSummaryHandler.from_file(filename)
+      plan.flat_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] }
 
@@ -250,11 +290,21 @@ module MuxTf
     end
 
     def format_address(address)
-      parts = address.split(".")
-      parts.each_with_index do |part, index|
-        parts[index] = Paint[part, :cyan] if index.odd?
+      result = []
+      parts = ResourceTokenizer.tokenize(address)
+      parts.each_with_index do |(part_type, part_value), index|
+        case part_type
+        when :rt
+          result << "." if index > 0
+          result << Paint[part_value, :cyan]
+        when :rn
+          result << "."
+          result << part_value
+        when :ri
+          result << Paint[part_value, :green]
+        end
       end
-      parts.join(".")
+      result.join
     end
   end
 end

data/lib/mux_tf/resource_tokenizer.rb

@@ -0,0 +1,55 @@
+class ResourceTokenizer
+  def self.split(resource)
+    tokenize(resource).map(&:last)
+  end
+
+  def self.tokenize(resource)
+    result = []
+    n = 0
+    pn = 0
+    state = :rt
+    until n >= resource.length
+      case state
+      when :rt
+        # looking for .
+        if resource[n] == "."
+          # reached the dot ..
+          result << [:rt, resource[pn...n]]
+          pn = n + 1
+          state = :rn
+        end
+      when :rn
+        # looking for [ or .
+        if resource[n] == "."
+          # reached the dot ..
+          result << [:rn, resource[pn...n]]
+          pn = n + 1
+          state = :rt
+        end
+        if resource[n] == "["
+          # reached the open bracket
+          result << [:rn, resource[pn...n]]
+          pn = n
+          state = :ri
+        end
+      when :ri
+        # looking for ]
+        if resource[n] == "]"
+          # reached the close bracket
+          result << [:ri, resource[pn..n]]
+          pn = n + 1
+          state = :rt
+          if resource[n + 1] == "."
+            pn = n + 2
+            n += 1
+          end
+        end
+      else
+        warn "unhandled state: #{state.inspect}"
+      end
+      # p resource[n]
+      n += 1
+    end
+    result
+  end
+end

data/lib/mux_tf/terraform_helpers.rb

@@ -37,13 +37,18 @@ module MuxTf
       stream_or_run_terraform(cmd, &block)
     end
 
-    def tf_plan(out:, color: true, detailed_exitcode: nil, compact_warnings: false, input: nil, &block)
+    def tf_plan(out:, color: true, detailed_exitcode: nil, compact_warnings: false, input: nil, targets: [], &block)
       args = []
       args += ["-out", out]
       args << "-input=#{input.inspect}" unless input.nil?
       args << "-compact-warnings" if compact_warnings
       args << "-no-color" unless color
       args << "-detailed-exitcode" if detailed_exitcode
+      if targets && !targets.empty?
+        targets.each do |target|
+          args << "-target=#{target}"
+        end
+      end
 
       cmd = tf_prepare_command(["plan", *args], need_auth: true)
       stream_or_run_terraform(cmd, &block)
@@ -73,7 +78,7 @@ module MuxTf
     end
 
     def stream_or_run_terraform(args, &block)
-      if block_given?
+      if block
         stream_terraform(args, &block)
       else
         run_terraform(args)

data/lib/mux_tf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,6 +143,7 @@ files:
 - lib/mux_tf/cli/plan_summary.rb
 - lib/mux_tf/plan_formatter.rb
 - lib/mux_tf/plan_summary_handler.rb
+- lib/mux_tf/resource_tokenizer.rb
 - lib/mux_tf/terraform_helpers.rb
 - lib/mux_tf/tmux.rb
 - lib/mux_tf/version.rb
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Terraform Multiplexing Scripts