mux_tf 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3511e5badfa499bd43efb92048717c8d597633229c4e135a51c0d57ea56d84
-  data.tar.gz: 3a2feb35ce3d7a9c4f2781b2ace26eb08ed41da0ba047b33a8b4882363878914
+  metadata.gz: d0ea81053f5625bf3418e334d5d7c0d6b8a8d37ddedf53f0f8c8e5ab90d845a4
+  data.tar.gz: 05133bedb2342a2d74a630bd2fff5bd18ff1db2b26dadcf9788c79763ba4dce5
 SHA512:
-  metadata.gz: 7559eca291ace43436b5f38ea72823187573c85e7b51029861bf98a4e3b88b9144f0997a915a9ab1e9cb581ddc04807b9a9da569dd233a47207007fae5939b57
-  data.tar.gz: 15d909df002d4ff344e2966eb2a54d3943407f6d9e910daebc84781de233f215bfa282067f7cf3eaf702811553785e785be9c5d8a437908e8b0f30d1efa911b8
+  metadata.gz: db6d757dd45d2e436f0ae475b9dc066d5a6f0b362eab0fe590b18257d620bc2c798fbe681c5533e89b6065a7c2765eccbebfc12bd6e7e1b347b581bcb94e4d60
+  data.tar.gz: 851a69520bcae89ca118e770920d85d04e446bddc2cd23877fe1ec73ef32a56c88a845752bdcad4c82ecc918f9037479acf17015323a53570aa6b25530e90c50

data/exe/tf_current

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH << File.expand_path(File.join(__dir__, '..', 'lib'))
+begin
+  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
 
-require 'mux_tf'
+  require "mux_tf"
 
-MuxTf::Cli.run(:current, ARGV)
+  MuxTf::Cli.run(:current, ARGV)
+rescue Exception => e
+  warn e.full_message
+  warn "<press enter>"
+  gets
+  exit 1
+end

data/exe/tf_mux

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH << File.expand_path(File.join(__dir__, '..', 'lib'))
+begin
+  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
 
-require 'mux_tf'
+  require "mux_tf"
 
-MuxTf::Cli.run(:mux, ARGV)
+  MuxTf::Cli.run(:mux, ARGV)
+rescue Exception => e
+  warn e.full_message
+  warn "<press enter>"
+  gets
+  exit 1
+end

data/exe/tf_plan_summary

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH << File.expand_path(File.join(__dir__, '..', 'lib'))
+begin
+  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
 
-require 'mux_tf'
+  require "mux_tf"
 
-MuxTf::Cli.run(:plan_summary, ARGV)
+  MuxTf::Cli.run(:plan_summary, ARGV)
+rescue Exception => e
+  warn e.full_message
+  warn "<press enter>"
+  gets
+  exit 1
+end

data/lib/deps.rb

@@ -0,0 +1,5 @@
+require "bundler/inline"
+
+gemfile do
+  gemspec(path: File.join(__dir__, ".."))
+end

data/lib/mux_tf.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "./deps"
+
 require "English"
 
 require "shellwords"

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/cli/mux.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bundler"
+
 module MuxTf
   module Cli
     module Mux
@@ -7,6 +9,21 @@ module MuxTf
       extend PiotrbCliUtils::ShellHelpers
 
       class << self
+        def with_clean_env
+          backup = {}
+          Bundler.with_original_env do
+            ENV.keys.grep(/^(RBENV_|RUBYLIB)/).each do |key|
+              backup[key] = ENV[key]
+              ENV.delete(key)
+            end
+            yield
+          end
+        ensure
+          backup.each do |k, v|
+            ENV[k] = v
+          end
+        end
+
         def run(_args)
           Dotenv.load(".env.mux")
 
@@ -38,9 +55,13 @@ module MuxTf
           end
 
           log "Starting new session ..."
-          Tmux.new_session project
+          with_clean_env do
+            Tmux.new_session project
+          end
           Tmux.select_pane "initial"
 
+          # Tmux.set "remain-on-exit", "on"
+
           Tmux.set_hook "pane-exited", "select-layout tiled"
           Tmux.set_hook "window-pane-changed", "select-layout tiled"
 
@@ -68,6 +89,8 @@ module MuxTf
 
           puts "\e]0;tmux: #{project}\007"
 
+          sleep 1
+
           log "Attaching ..."
           Tmux.attach(project, cc: !!ENV["MUXP_CC_MODE"])
           log "Done!"

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,7 @@
 module MuxTf
   class PlanSummaryHandler
     extend TerraformHelpers
+    extend PiotrbCliUtils::Util
 
     def self.from_file(file)
       data = data_from_file(file)
@@ -177,7 +178,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 do |_k, v|
           deps << v["references"] if v.is_a?(Hash) && v["references"]
         end
         result += deps.map { |s| (parent_address + [s]).join(".") }

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.0"
+  VERSION = "0.4.2"
 end

data/mux_tf.gemspec

@@ -1,40 +1,39 @@
 # frozen_string_literal: true
 
-require_relative 'lib/mux_tf/version'
+require_relative "lib/mux_tf/version"
+require "rake"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'mux_tf'
-  spec.version       = MuxTf::VERSION
-  spec.authors       = ['Piotr Banasik']
-  spec.email         = ['piotr@jane.app']
+  spec.name = "mux_tf"
+  spec.version = MuxTf::VERSION
+  spec.authors = ["Piotr Banasik"]
+  spec.email = ["piotr@jane.app"]
 
-  spec.summary       = 'Terraform Multiplexing Scripts'
+  spec.summary = "Terraform Multiplexing Scripts"
   # spec.description   = 'TODO: Write a longer description or delete this line.'
-  spec.homepage      = 'https://github.com/piotrb/mux_tf'
-  spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.homepage = "https://github.com/piotrb/mux_tf"
+  spec.license = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   # spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
   # spec.metadata['changelog_uri'] = "TODO: Put your gem's CHANGELOG.md URL here."
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.files = Rake::FileList["exe/*", "lib/**/*.rb", "*.gemspec"]
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'dotenv'
-  spec.add_dependency 'paint'
-  spec.add_dependency 'pastel'
-  spec.add_dependency 'piotrb_cli_utils', '~> 0.1.0'
-  spec.add_dependency 'stateful_parser', '~> 0.1.1'
-  spec.add_dependency 'tty-prompt'
-  spec.add_dependency 'tty-table'
+  spec.add_dependency "activesupport"
+  spec.add_dependency "dotenv"
+  spec.add_dependency "paint"
+  spec.add_dependency "pastel"
+  spec.add_dependency "piotrb_cli_utils", "~> 0.1.0"
+  spec.add_dependency "stateful_parser", "~> 0.1.1"
+  spec.add_dependency "tty-prompt"
+  spec.add_dependency "tty-table"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,14 +132,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
 - exe/tf_current
 - exe/tf_mux
 - exe/tf_plan_summary
+- lib/deps.rb
 - lib/mux_tf.rb
 - lib/mux_tf/cli.rb
 - lib/mux_tf/cli/current.rb

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-Gemfile.lock

data/Gemfile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in mux_tf.gemspec
-gemspec
-
-gem 'rake', '~> 12.0'

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 Piotr Banasik
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/README.md

@@ -1,52 +0,0 @@
-# MuxTf
-
-Terraform Module Multiplexer
-
-## Installation
-
-```shell
-gem install mux_tf
-```
-
-## Usage
-
-At the root folder of your terraform modules eg:
-
-```text
-ROOT/
-     production/ << == HERE
-                group1/
-                       cluster1/
-                                main.tf
-                       cluster2/
-                                main.tf
-                group2/
-                       cluster3/
-                                main.tf
-                       cluster4/
-                                main.tf
-     sandbox/ << == OR HERE
-             {SIMILLAR STRUCTURE}
-```
-
-## Development
-
-To install this gem onto your local machine, run `bundle exec rake install`.
-
-## Releasing
-
-To release a new version, first bump the version number by running:
-
-```shell
-gem bump -v major|minor|patch
-```
-
-And then run `rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/piotrb/mux_tf.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-# task :default => :spec