mux_tf 0.3.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab900407c76f197de3a2833c0cae7c3e6fd1b6b588b6bb12e7bb8165e6ec986a
-  data.tar.gz: f64d06ba3509348a8327e3de628392d1dd72966a0ec42e278dd24a11c4cb39ce
+  metadata.gz: 4bd3960b0080f99acf0d83a006d8a49fff87e31c93fc4fe2b86524abb3b98357
+  data.tar.gz: b03d2cf165991634502a75e624c69f22dd5adce5eb0ad9565368a667248b45a5
 SHA512:
-  metadata.gz: cbb46136fb879b83bb40279a7b3cfdab5849e65f22381946ca0124419c19f5b55dc07fbb9034bbab56adb19da085b7fa50b53ae777d85798d572eee033d4c956
-  data.tar.gz: ec8dc1357c7a26af9ba58563c097e6cc704fe2fb351f8fe1176063a2645927a1b7b9a7bf2177b304bd51c0d69b5881b18a64cac292781bc8c642e7bf9974029d
+  metadata.gz: 6d27554cd534c7c75ee592213863989e35a3f6ce1e6bd466103ea35cbe483193d7ab7746b251b3bd085e2242015ae5f2aad3c7d5d06c59eff198f7b917d6cdf2
+  data.tar.gz: c1de1a658d5dffb6bf63be73260c90a358d5d8fe8b52669683c73ad72502bb679b72f94e6cd08c6f53b7ddc23beaf5060ed505d33dec82df4b709b6e0c3836dc

data/lib/mux_tf/cli/current.rb

@@ -80,9 +80,16 @@ module MuxTf
         def process_remedies(remedies)
           if remedies.delete? :init
             log "Running terraform init ...", depth: 2
-            tf_init
-            remedies = PlanFormatter.process_validation(validate)
-            process_remedies(remedies)
+            remedies = PlanFormatter.init_status_to_remedies(*PlanFormatter.run_tf_init)
+            if process_remedies(remedies)
+              remedies = PlanFormatter.process_validation(validate)
+              return false unless process_remedies(remedies)
+            end
+          end
+          if remedies.delete? :reconfigure
+            log "Running terraform init ...", depth: 2
+            remedies = PlanFormatter.init_status_to_remedies(*PlanFormatter.run_tf_init(reconfigure: true))
+            return false unless process_remedies(remedies)
           end
           unless remedies.empty?
             log "unprocessed remedies: #{remedies.to_a}", depth: 1
@@ -154,6 +161,7 @@ module MuxTf
           root_cmd.add_command(shell_cmd)
           root_cmd.add_command(force_unlock_cmd)
           root_cmd.add_command(upgrade_cmd)
+          root_cmd.add_command(reconfigure_cmd)
           root_cmd.add_command(interactive_cmd)
 
           root_cmd.add_command(exit_cmd)
@@ -170,7 +178,8 @@ module MuxTf
           define_cmd("apply", summary: "Apply the current plan") do |_opts, _args, _cmd|
             status = tf_apply(filename: PLAN_FILENAME)
             if status.success?
-              throw :stop, :done
+              plan_status = run_plan
+              throw :stop, :done if plan_status == :ok
             else
               log "Apply Failed!"
             end
@@ -238,6 +247,16 @@ module MuxTf
           end
         end
 
+        def reconfigure_cmd
+          define_cmd("reconfigure", summary: "Reconfigure modules/plguins") do |_opts, _args, _cmd|
+            status, meta = PlanFormatter.run_tf_init(reconfigure: true)
+            if status != 0
+              log meta.inspect unless meta.empty?
+              log "Reconfigure Failed!"
+            end
+          end
+        end
+
         def interactive_cmd
           define_cmd("interactive", summary: "Apply interactively") do |_opts, _args, _cmd|
             plan = PlanSummaryHandler.from_file(PLAN_FILENAME)
@@ -271,10 +290,11 @@ module MuxTf
           when :unknown
             # nothing
           end
+          plan_status
         end
 
         def run_upgrade
-          exit_code, meta = PlanFormatter.process_upgrade
+          exit_code, meta = PlanFormatter.run_tf_init(upgrade: true)
           case exit_code
           when 0
             [:ok, meta]

data/lib/mux_tf/plan_formatter.rb

@@ -6,13 +6,9 @@ module MuxTf
     extend PiotrbCliUtils::Util
 
     class << self
-      # include CommandHelpers
-
       def pretty_plan(filename)
         pastel = Pastel.new
 
-        plan_output = String.new
-
         phase = :init
 
         meta = {}
@@ -31,7 +27,6 @@ module MuxTf
         parser.state(:plan_error, /^Error: /, %i[refreshing refresh_done])
 
         status = tf_plan(out: filename, detailed_exitcode: true, compact_warnings: true) { |raw_line|
-          plan_output << raw_line
           parser.parse(raw_line.rstrip) do |state, line|
             case state
             when :none
@@ -87,10 +82,21 @@ module MuxTf
         [status.status, meta]
       end
 
-      def process_upgrade
-        pastel = Pastel.new
+      def init_status_to_remedies(status, meta)
+        remedies = Set.new
+        if status != 0
+          if meta[:need_reconfigure]
+            remedies << :reconfigure
+          else
+            p [status, meta]
+            remedies << :unknown
+          end
+        end
+        remedies
+      end
 
-        plan_output = String.new
+      def run_tf_init(upgrade: nil, reconfigure: nil)
+        pastel = Pastel.new
 
         phase = :init
 
@@ -98,24 +104,39 @@ module MuxTf
 
         parser = StatefulParser.new(normalizer: pastel.method(:strip))
 
-        parser.state(:modules, /^Upgrading modules\.\.\./)
-        parser.state(:backend, /^Initializing the backend\.\.\./, [:modules])
+        parser.state(:modules_init, /^Initializing modules\.\.\./)
+        parser.state(:modules_upgrade, /^Upgrading modules\.\.\./)
+        parser.state(:backend, /^Initializing the backend\.\.\./, [:modules_init, :modules_upgrade])
         parser.state(:plugins, /^Initializing provider plugins\.\.\./, [:backend])
 
         parser.state(:plugin_warnings, /^$/, [:plugins])
+        parser.state(:backend_error, /Error:/, [:backend])
+
+        status = tf_init(upgrade: upgrade, reconfigure: reconfigure) { |raw_line|
+          stripped_line = pastel.strip(raw_line.rstrip)
 
-        status = tf_init(upgrade: true, color: false) { |raw_line|
-          plan_output << raw_line
           parser.parse(raw_line.rstrip) do |state, line|
             case state
-            when :modules
+            when :modules_init
+              if phase != state
+                phase = state
+                log "Initializing modules ", depth: 1
+                next
+              end
+              case stripped_line
+              when ""
+                puts
+              else
+                p [state, stripped_line]
+              end
+            when :modules_upgrade
               if phase != state
                 # first line
                 phase = state
                 log "Upgrding modules ", depth: 1, newline: false
                 next
               end
-              case line
+              case stripped_line
               when /^- (?<module>[^ ]+) in (?<path>.+)$/
                 # info = $~.named_captures
                 # log "- #{info["module"]}", depth: 2
@@ -127,7 +148,7 @@ module MuxTf
               when ""
                 puts
               else
-                p [state, line]
+                p [state, stripped_line]
               end
             when :backend
               if phase != state
@@ -136,11 +157,20 @@ module MuxTf
                 log "Initializing the backend ", depth: 1, newline: false
                 next
               end
-              case line
+              case stripped_line
+              when /^Successfully configured/
+                log line, depth: 2
+              when /unless the backend/
+                log line, depth: 2
               when ""
                 puts
               else
-                p [state, line]
+                p [state, stripped_line]
+              end
+            when :backend_error
+              if raw_line.match "terraform init -reconfigure"
+                meta[:need_reconfigure] = true
+                log Paint["module needs to be reconfigured", :red], depth: 2
               end
             when :plugins
               if phase != state
@@ -149,7 +179,25 @@ module MuxTf
                 log "Initializing provider plugins ...", depth: 1
                 next
               end
-              case line
+              case stripped_line
+              when /^- (?<module>.+) is built in to Terraform$/
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [BUILTIN] #{info["module"]}", depth: 2
+              when /^- Finding (?<module>[^ ]+) versions matching "(?<version>.+)"\.\.\./
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [FIND] #{info["module"]} matching #{info["version"].inspect}", depth: 2
+              when /^- Finding latest version of (?<module>.+)\.\.\.$/
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [FIND] #{info["module"]}", depth: 2
+              when /^- Installing (?<module>[^ ]+) v(?<version>.+)\.\.\.$/
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [INSTALLING] #{info["module"]} v#{info["version"]}", depth: 2
+              when /^- Installed (?<module>[^ ]+) v(?<version>.+) \(signed by( a)? (?<signed>.+)\)$/
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [INSTALLED] #{info["module"]} v#{info["version"]} (#{info["signed"]})", depth: 2
+              when /^- Using previously-installed (?<module>[^ ]+) v(?<version>.+)$/
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [USING] #{info["module"]} v#{info["version"]}", depth: 2
               when /^- Downloading plugin for provider "(?<provider>[^"]+)" \((?<provider_path>[^)]+)\) (?<version>.+)\.\.\.$/
                 info = $LAST_MATCH_INFO.named_captures
                 log "- #{info["provider"]} #{info["version"]}", depth: 2

data/lib/mux_tf/plan_summary_handler.rb

@@ -3,6 +3,8 @@
 module MuxTf
   class PlanSummaryHandler
     extend TerraformHelpers
+    include TerraformHelpers
+    include PiotrbCliUtils::Util
 
     def self.from_file(file)
       data = data_from_file(file)

data/lib/mux_tf/terraform_helpers.rb

@@ -26,10 +26,11 @@ module MuxTf
       capture_terraform(cmd, json: true)
     end
 
-    def tf_init(input: nil, upgrade: nil, color: true, &block)
+    def tf_init(input: nil, upgrade: nil, reconfigure: nil, color: true, &block)
       args = []
       args << "-input=#{input.inspect}" unless input.nil?
       args << "-upgrade" unless upgrade.nil?
+      args << "-reconfigure" unless reconfigure.nil?
       args << "-no-color" unless color
 
       cmd = tf_prepare_command(["init", *args], need_auth: true)

data/lib/mux_tf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Piotr Banasik
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - piotr@jane.app
 executables:
@@ -155,7 +155,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/piotrb/mux_tf
   source_code_uri: https://github.com/piotrb/mux_tf
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Terraform Multiplexing Scripts
 test_files: []