mux_tf 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab900407c76f197de3a2833c0cae7c3e6fd1b6b588b6bb12e7bb8165e6ec986a
-  data.tar.gz: f64d06ba3509348a8327e3de628392d1dd72966a0ec42e278dd24a11c4cb39ce
+  metadata.gz: 00bb3571502743499452f7444772ce2eb2b83fec4ed88152f9badde93946bf0c
+  data.tar.gz: 37310310f729f91745266f0a21dd86c0db0af95b04525b1e871746b81479b752
 SHA512:
-  metadata.gz: cbb46136fb879b83bb40279a7b3cfdab5849e65f22381946ca0124419c19f5b55dc07fbb9034bbab56adb19da085b7fa50b53ae777d85798d572eee033d4c956
-  data.tar.gz: ec8dc1357c7a26af9ba58563c097e6cc704fe2fb351f8fe1176063a2645927a1b7b9a7bf2177b304bd51c0d69b5881b18a64cac292781bc8c642e7bf9974029d
+  metadata.gz: 3363c54464747c089dbdbea6f0fdffa1ba73a83bba8c5af3679206b2e8a4a8e906dc93426a596ca870219750808e4f9c1810826d11539d8aa32e1a0826c2b2db
+  data.tar.gz: 65f7838f5431964c253b59f1d7d3564c5498a43a39deb534797ba1a20ecd3731940956572aa1354171f84d8ccf2eef992c8e59e7b898a85bd55eccdf324e6a21

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)
@@ -238,6 +246,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)
@@ -274,7 +292,7 @@ module MuxTf
         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/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.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Banasik