mux_tf 0.4.8 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9360bb62c3df497bb64e7cbbab15025e1a9f3618b74a3469db097329832f365e
-  data.tar.gz: 646cb9832629e10c63c9a80982ce931d22fc1dd9c32f32dfc79edd9f8e864ba9
+  metadata.gz: ad025779e41606eb4bd006dd9e796127b0e327e53611721ae4ca7186658987a7
+  data.tar.gz: dc4758018d33671a6a0f3cc3ce65b0976e1ae35753ec66c9ffa2e647f3f1845d
 SHA512:
-  metadata.gz: fb7fed0568c1d001a168623a0071c469f3be6b812235f962901f63505108869dfee859f62f2ac773f444b4a128552ca487711f6d7b4ce117d0008bfa30f6b056
-  data.tar.gz: d31b175be20f0b94d02c9bff65b27925984463b268d1dd3378a2d347e42b7f476aa1a1264b6c74c4fa03a64a3c03d39e0f0b1a6a8b318bde346ee7b5c6e3dc8c
+  metadata.gz: dd2cafd746e7eb24bccf066475b9b95a9b5201624ac14fa462666644a2ea8b0a35c1bbb8a78d31987884f43477c37efbdec480babd2050a9d4699b78e07f2cb6
+  data.tar.gz: 7d54a48d72d7129cac2eec2287d4e78244fe857cf67a838213a0c0c00c59fa7e0fcaf77af8b592b8108083618b4d9fd46d83d6e998d17cdc9b888c77c48098dd

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,7 +15,7 @@ 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(: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])
@@ -26,9 +26,9 @@ module MuxTf
         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) { |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

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,62 @@
+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
+        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] == "]"
+          # 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.8"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.2
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-08-04 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