mux_tf 0.15.0 → 0.16.0

data/lib/mux_tf/plan_summary_handler.rb

@@ -33,7 +33,7 @@ module MuxTf
         case action
         when "create", "add"
           :green
-        when "update", "change"
+        when "update", "change", "import-update"
           :yellow
         when "delete", "remove"
           :red
@@ -64,6 +64,10 @@ module MuxTf
           "±"
         when "read"
           ">"
+        when "import"
+          "→"
+        when "import-update"
+          "↗︎"
         else
           action
         end
@@ -94,7 +98,7 @@ module MuxTf
       end
     end
 
-    def initialize(data) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def initialize(data)
       @parts = []
 
       data["output_changes"]&.each do |output_name, v|
@@ -138,6 +142,14 @@ module MuxTf
         case v["change"]["actions"]
         when ["no-op"]
           # do nothing
+          if v["change"]["importing"]
+            parts << {
+              type: "resource",
+              action: "import",
+              address: v["address"],
+              deps: find_deps(data, v["address"])
+            }
+          end
         when ["create"]
           parts << {
             type: "resource",
@@ -146,9 +158,10 @@ module MuxTf
             deps: find_deps(data, v["address"])
           }
         when ["update"]
+          # ap [v["change"]["actions"], v["change"]["importing"]]
           parts << {
             type: "resource",
-            action: "update",
+            action: v["change"]["importing"] ? "import-update" : "update",
             address: v["address"],
             deps: find_deps(data, v["address"])
           }
@@ -198,7 +211,7 @@ module MuxTf
       parts.select { |part| part[:type] == "output" }
     end
 
-    def summary # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def summary
       # resources
       resource_summary = {}
       resource_parts.each do |part|
@@ -233,11 +246,9 @@ module MuxTf
     end
 
     def flat_summary
-      result = []
-      resource_parts.each do |part|
-        result << "[#{self.class.format_action(part[:action])}] #{self.class.format_address(part[:address])}"
+      resource_parts.map do |part|
+        "[#{self.class.format_action(part[:action])}] #{self.class.format_address(part[:address])}"
       end
-      result
     end
 
     def sensitive_summary(before_value, after_value)
@@ -265,7 +276,20 @@ module MuxTf
       result
     end
 
-    def nested_summary # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def simple_summary(&printer)
+      printer = method(:puts) if printer.nil?
+
+      flat_summary.each do |line|
+        printer.call line
+      end
+      output_summary.each do |line|
+        printer.call line
+      end
+      printer.call ""
+      printer.call summary
+    end
+
+    def nested_summary
       result = []
       parts = resource_parts.deep_dup
       until parts.empty?
@@ -305,8 +329,7 @@ module MuxTf
       if result.empty?
         throw :abort, "nothing selected"
       else
-        log "Re-running apply with the selected resources ..."
-        MuxTf::Cli::Current.run_plan(targets: result)
+        result
       end
     end
 
@@ -314,22 +337,6 @@ 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 pastel.yellow("terraform plan exited with an unknown exit code: #{exit_code}")
-        [:unknown, meta]
-      end
-    end
-
     def prune_unchanged_deps(_parts)
       valid_addresses = resource_parts.map { |part| part[:address] }
 
@@ -338,7 +345,7 @@ module MuxTf
       end
     end
 
-    def find_deps(data, address) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def find_deps(data, address)
       result = []
 
       m = address.match(/\[(.+)\]$/)
@@ -358,7 +365,7 @@ module MuxTf
       resource, parent_address = find_config(data["configuration"], "root_module", address, [])
       if resource
         deps = []
-        resource["expressions"]&.each do |_k, v|
+        resource["expressions"]&.each_value do |v|
           deps << v["references"] if v.is_a?(Hash) && v["references"]
         end
         result += deps.map { |s| (parent_address + [s]).join(".") }

data/lib/mux_tf/plan_utils.rb

@@ -21,7 +21,7 @@ module MuxTf
         puts msg.join(" - ")
       end
 
-      def update_placeholders(dst, src, placeholder) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+      def update_placeholders(dst, src, placeholder)
         return unless src
 
         case src
@@ -104,7 +104,10 @@ module MuxTf
         else
           false
         end
-      rescue Psych::SyntaxError => e
+      rescue Psych::DisallowedClass => e
+        ap e
+        false
+      rescue Psych::SyntaxError => e # rubocop:disable Lint/DuplicateBranch
         ap e
         false
       end
@@ -115,6 +118,10 @@ module MuxTf
           pastel.green(symbol)
         when "~"
           pastel.yellow(symbol)
+        when "-"
+          pastel.red(symbol)
+        when "?"
+          pastel.orange(symbol)
         else
           warning "Unknown symbol: #{symbol.inspect}"
           symbol
@@ -143,7 +150,7 @@ module MuxTf
         }.join("\n")
       end
 
-      def in_display_representation(value) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/MethodLength
+      def in_display_representation(value)
         if valid_json?(value)
           json_body = JSON.pretty_generate(JSON.parse(value))
           wrap(json_body, prefix: "json(", suffix: ")", color: :gray)
@@ -251,12 +258,21 @@ module MuxTf
 
       def get_pretty_action_and_symbol(actions)
         case actions
+        when ["delete"]
+          pretty_action = "delete"
+          symbol = "-"
         when ["update"]
           pretty_action = "updated in-place"
           symbol = "~"
         when ["create"]
           pretty_action = "created"
           symbol = "+"
+        when %w[delete create]
+          pretty_action = "replaced (delete first)"
+          symbol = "±"
+        when ["read"]
+          pretty_action = "read"
+          symbol = ">"
         else
           warning "Unknown action: #{actions.inspect}"
           pretty_action = actions.inspect
@@ -286,7 +302,7 @@ module MuxTf
       #         EOT
       #         # (12 unchanged attributes hidden)
       #     }
-      def tf_show_json_resource(resource) # rubocop:disable Metrics/AbcSize
+      def tf_show_json_resource(resource)
         pretty_action, symbol = get_pretty_action_and_symbol(resource["change"]["actions"])
 
         output = []

data/lib/mux_tf/resource_tokenizer.rb

@@ -6,7 +6,7 @@ module MuxTf
       tokenize(resource).map(&:last)
     end
 
-    def self.tokenize(resource) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def self.tokenize(resource)
       result = []
       n = 0
       pn = 0

data/lib/mux_tf/stderr_line_handler.rb

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+require "English"
+module MuxTf
+  class StderrLineHandler
+    include PiotrbCliUtils::Util
+    include Coloring
+
+    include ErrorHandlingMethods
+
+    attr_reader :meta
+
+    def initialize(operation: nil)
+      @operation = operation
+      @held_messages = []
+      @parser = StatefulParser.new(normalizer: pastel.method(:strip))
+      @meta = {}
+      setup_error_handling(@parser, from_states: [:none])
+    end
+
+    def transform_paths!(hash, key)
+      return unless hash[key]
+
+      if key == "prefix"
+        hash[key].strip!
+        hash[key].gsub!(/^\[/, "")
+        hash[key].gsub!(/\]$/, "")
+      end
+
+      hash[key].gsub!("#{Dir.getwd}/", "")
+      hash[key].gsub!(Dir.getwd, "")
+
+      hash[key].gsub!($LAST_MATCH_INFO[1], "<cache>/") if hash[key].match(%r{(\.terragrunt-cache/[^/]+/[^/]+/)})
+
+      hash
+    end
+
+    def handle(raw_line)
+      return if raw_line.strip.empty?
+
+      if raw_line =~ /Error when retrieving token from sso: Token has expired and refresh failed/
+        log "#{pastel.red('error')}: SSO Session expired.", depth: 2
+        return
+      end
+
+      # [✘] error when retrieving credentials from custom process. please login using 'granted sso login --sso-start-url https://janeapp.awsapps.com/start --sso-region us-east-1'
+      if raw_line =~ /error when retrieving credentials from custom process. please login using '([^']+)'/
+        unless @sso_expired
+          @sso_expired = true
+          log "#{pastel.red('error')}: SSO Session expired.", depth: 2
+          log "#{pastel.red('error')}: Run: #{$LAST_MATCH_INFO[1]}", depth: 2
+        end
+        return
+      end
+
+      if raw_line.strip[0] == "{" && raw_line.strip[-1] == "}"
+        begin
+          # assuming that stderr is JSON and TG logs
+          parsed_line = JSON.parse(raw_line)
+          transform_paths!(parsed_line, "msg")
+          transform_paths!(parsed_line, "prefix")
+          parsed_line["msg"].gsub!("#{Dir.getwd}/", "")
+          parsed_line["prefix"]&.strip!&.gsub!(/^\[/, "")&.gsub!(/\]$/, "")
+          parsed_line["prefix"]&.gsub!(Dir.getwd, "")
+          if @operation == :plan
+            handle_plan_json(parsed_line)
+          else
+            log format_tg_log_line(parsed_line), depth: 2
+          end
+        rescue JSON::ParserError => e
+          log "#{pastel.red('error')}: failed to parse JSON: #{e.message}", depth: 2
+          log raw_line.rstrip, depth: 2
+        end
+      else
+        @parser.parse(raw_line.rstrip) do |state, line|
+          # log raw_line.rstrip, depth: 2
+          log_unhandled_line(state, line, reason: "unexpected state in StderrLineHandler") unless handle_error_states(@meta, state, line)
+        end
+      end
+    end
+
+    def handle_plan_json(parsed_line)
+      if parsed_line["msg"] =~ /terraform invocation failed in/
+        @held_messages << format_tg_log_line(parsed_line)
+      elsif parsed_line["msg"] =~ /1 error occurred/ && parsed_line["msg"] =~ /exit status 2\n/
+        # 2 = Succeeded with non-empty diff (changes present)
+        # clear the held messages and swallow up this message too
+        @held_messages = []
+      else
+        # flush
+        log format_tg_log_line(parsed_line), depth: 2
+      end
+    end
+
+    def flush
+      @held_messages.each do |msg|
+        log msg, depth: 2
+      end
+      @held_messages = []
+    end
+
+    def do_print_errors
+      print_errors(@meta) if @meta[:errors] && !@meta[:errors].empty?
+    end
+
+    def merge_meta_into(other_meta)
+      [:errors, :warnings].each do |type|
+        if @meta[type]
+          other_meta[type] ||= []
+          other_meta[type] += @meta[type]
+        end
+      end
+
+      extra_keys = @meta.keys - [:errors, :warnings]
+      return unless extra_keys.any?
+
+      log "Unhandled keys in stderr_handler.meta: #{extra_keys.inspect}"
+      log @meta.inspect
+    end
+
+    private
+
+    def format_tg_log_line(line_data)
+      # {
+      #   "level"=>"error",
+      #   "msg"=>"terraform invocation failed in /Users/piotr/Work/janepods/accounts/eks-dev/unstable-1/kluster/.terragrunt-cache/Gqer3b7TGI4swB-Nw7Pe5DUIrus/JkQqfrQedXyGMwcl4yYfGocMcvk/modules/kluster",
+      #   "prefix"=>"[/Users/piotr/Work/janepods/accounts/eks-dev/unstable-1/kluster] ",
+      #   "time"=>"2024-02-28T16:14:28-08:00"
+      # }
+
+      msg = ""
+      msg += case line_data["level"]
+             when "info"
+               pastel.cyan(line_data["level"])
+             when "error"
+               pastel.red(line_data["level"])
+             else
+               pastel.orange(line_data["level"])
+             end
+      msg += ": #{line_data['msg']}"
+      msg += " [#{line_data['prefix']}]" if line_data["prefix"] && !line_data["prefix"].empty?
+      msg
+    end
+  end
+end

data/lib/mux_tf/terraform_helpers.rb

@@ -11,6 +11,30 @@ module MuxTf
       run_terraform(tf_prepare_command(["force-unlock", "-force", id], need_auth: true))
     end
 
+    def tf_stream_helper(cmd, operation:, echo_stdout: false, &block)
+      # stdout = ""
+
+      stderr_handler = StderrLineHandler.new(operation: operation)
+
+      result_struct = stream_terraform(cmd, split_streams: true) { |(stream, raw_line)|
+        case stream
+        when :command
+          log "Running command: #{raw_line.strip} ...", depth: 2
+        when :stdout
+          # stdout += raw_line
+          print raw_line if echo_stdout
+          block&.call(:stdout, raw_line)
+        when :stderr
+          stderr_handler.handle(raw_line)
+        end
+      }
+
+      stderr_handler.flush
+      stderr_handler.do_print_errors
+
+      result_struct
+    end
+
     def tf_apply(filename: nil, targets: [])
       args = []
       args << filename if filename
@@ -21,12 +45,22 @@ module MuxTf
       end
 
       cmd = tf_prepare_command(["apply", *args], need_auth: true)
-      run_terraform(cmd)
+
+      tf_stream_helper(cmd, operation: :apply, echo_stdout: true)
     end
 
     def tf_validate
       cmd = tf_prepare_command(["validate", "-json"], need_auth: true)
-      capture_terraform(cmd, json: true)
+
+      stdout = ""
+
+      tf_stream_helper(cmd, operation: :validate) do |stream, raw_line|
+        stdout += raw_line if stream == :stdout
+      end
+
+      throw :abort, false if stdout.strip.empty?
+
+      JSON.parse(stdout)
     end
 
     def tf_init(input: nil, upgrade: nil, reconfigure: nil, color: true, &block)
@@ -37,10 +71,11 @@ module MuxTf
       args << "-no-color" unless color
 
       cmd = tf_prepare_command(["init", *args], need_auth: true)
-      stream_or_run_terraform(cmd, &block)
+      stream_terraform(cmd, split_streams: true, &block)
     end
 
-    def tf_plan(out:, color: true, detailed_exitcode: nil, compact_warnings: false, input: nil, targets: [], json: false, &block) # rubocop:disable Metrics/CyclomaticComplexity
+    def tf_plan(out:, color: true, detailed_exitcode: nil, compact_warnings: false, input: nil, targets: [], json: false, split_streams: false,
+                &block)
       args = []
       args += ["-out", out]
       args << "-input=#{input.inspect}" unless input.nil?
@@ -55,7 +90,7 @@ module MuxTf
       end
 
       cmd = tf_prepare_command(["plan", *args], need_auth: true)
-      stream_or_run_terraform(cmd, split_streams: json, &block)
+      stream_or_run_terraform(cmd, split_streams: json || split_streams, &block)
     end
 
     def tf_show(file, json: false, capture: false)
@@ -132,7 +167,10 @@ module MuxTf
           stderr_thread.join
           output_queue.close
         end
-        yield(output_queue.pop) until output_queue.closed?
+        until output_queue.closed? && output_queue.empty?
+          value = output_queue.pop
+          yield(value) unless value.nil?
+        end
         wait_thr.value # Process::Status object returned.
       end
     end

data/lib/mux_tf/tmux.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "shellwords"
+require "open3"
 
 module MuxTf
   module Tmux
@@ -23,6 +24,13 @@ module MuxTf
         panes.find { |pane| pane[:name] == name }
       end
 
+      def list_panes
+        `tmux list-panes -F "\#{pane_id},\#{pane_index},\#{pane_title}"`.strip.split("\n").map do |row|
+          x = row.split(",")
+          { id: x[0], index: x[1], name: x[2] }
+        end
+      end
+
       def list_windows
         `tmux list-windows -F "\#{window_id},\#{window_index},\#{window_name}"`.strip.split("\n").map do |row|
           x = row.split(",")
@@ -30,8 +38,15 @@ module MuxTf
         end
       end
 
-      def new_session(name)
-        tmux %(new-session -s #{name.inspect} -d)
+      def new_session(name, cwd: nil, cmd: nil)
+        parts = [
+          "new-session",
+          "-s #{name.inspect}",
+          "-d",
+          cwd ? "-c #{cwd}" : nil,
+          cmd&.inspect
+        ].compact
+        tmux parts.join(" ")
       end
 
       def select_pane(name)
@@ -50,8 +65,23 @@ module MuxTf
         tmux "select-layout tiled"
       end
 
-      def attach(name, cc: false)
-        tmux %(#{(cc && '-CC') || ''} attach -t #{name.inspect}), raise_on_error: false
+      def attach_control(name, on_line:, on_spawn:)
+        parts = [
+          "-C",
+          "attach",
+          "-t #{name.inspect}"
+        ].compact
+        tmux parts.join(" "), raise_on_error: false, mode: :popen, on_line: on_line, on_spawn: on_spawn
+      end
+
+      def attach(name, cc: false, control: false)
+        parts = [
+          cc ? "-CC" : nil,
+          control ? "-C" : nil,
+          "attach",
+          "-t #{name.inspect}"
+        ].compact
+        tmux parts.join(" "), raise_on_error: false
       end
 
       def kill_pane(pane_id)
@@ -75,7 +105,7 @@ module MuxTf
 
         parts = [
           "split-window",
-          cwd && "-c #{cwd}",
+          cwd ? "-c #{cwd}" : nil,
           mode_part,
           "-t #{target_pane.inspect}",
           cmd&.inspect
@@ -89,7 +119,7 @@ module MuxTf
         @tmux_bin ||= `which tmux`.strip
       end
 
-      def tmux(cmd, raise_on_error: true, mode: :system)
+      def tmux(cmd, raise_on_error: true, mode: :system, on_line: nil, on_spawn: nil)
         case mode
         when :system
           # puts " => tmux #{cmd}"
@@ -102,6 +132,25 @@ module MuxTf
           true
         when :exec
           exec tmux_bin, *Shellwords.shellwords(cmd)
+        when :popen
+          Open3.popen3(tmux_bin, *Shellwords.shellwords(cmd)) do |stdin, stdout, stderr, wait_thr|
+            on_spawn&.call(stdin, wait_thr)
+            Thread.new do
+              until stdout.closed? || stdout.eof?
+                line = stdout.gets
+                on_line&.call(:stdout, line)
+              end
+            end
+            Thread.new do
+              until stderr.closed? || stderr.eof?
+                line = stderr.gets
+                on_line&.call(:stderr, line)
+              end
+            end
+            # pid = wait_thr.pid
+            exit_status = wait_thr.value
+            fail_with("`tmux #{cmd}' failed with code: #{exit_status}") if raise_on_error && exit_status != 0
+          end
         end
       end
     end

data/lib/mux_tf/version.rb

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

data/lib/mux_tf/version_check.rb

@@ -25,6 +25,6 @@ module MuxTf
       @cache ||= YamlCache.new(File.expand_path("~/.mux_tf.yaml"), default_ttl: 1.hour)
     end
 
-    module_function :has_updates?, :latest_gem_version, :current_gem_version, :cache
+    module_function :has_updates?, :latest_gem_version, :current_gem_version, :cache # rubocop:disable Style/AccessModifierDeclarations
   end
 end

data/lib/mux_tf.rb

@@ -26,19 +26,13 @@ require "diff/lcs"
 require "diff/lcs/string"
 require "diff/lcs/hunk"
 
-require_relative "mux_tf/version"
-require_relative "mux_tf/coloring"
-require_relative "mux_tf/plan_filename_generator"
-require_relative "mux_tf/resource_tokenizer"
-require_relative "mux_tf/cli"
-require_relative "mux_tf/tmux"
-require_relative "mux_tf/terraform_helpers"
-require_relative "mux_tf/plan_formatter"
-require_relative "mux_tf/version_check"
-require_relative "mux_tf/yaml_cache"
-require_relative "mux_tf/plan_summary_handler"
-require_relative "mux_tf/plan_utils"
+require "zeitwerk"
+loader = Zeitwerk::Loader.for_gem
+loader.ignore("#{__dir__}/deps.rb")
+loader.setup
 
 module MuxTf
   ROOT = File.expand_path(File.join(__dir__, ".."))
 end
+
+loader.eager_load

data/mux_tf.gemspec

@@ -29,14 +29,20 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  # below activesupport are deps which cause warnings in ruby 3.3
   spec.add_dependency "activesupport", "< 7.0.0"
+  spec.add_dependency "base64"
+  spec.add_dependency "bigdecimal"
+  spec.add_dependency "mutex_m"
+
   spec.add_dependency "awesome_print"
   spec.add_dependency "diff-lcs"
   spec.add_dependency "dotenv"
   spec.add_dependency "hashdiff"
   spec.add_dependency "pastel"
-  spec.add_dependency "piotrb_cli_utils", "~> 0.1.0"
+  spec.add_dependency "piotrb_cli_utils", "~> 0.1.1"
   spec.add_dependency "stateful_parser", "~> 0.1.1"
   spec.add_dependency "tty-prompt"
   spec.add_dependency "tty-table"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end