terraspace 0.3.5 → 0.4.3

data/lib/terraspace/hooks/concern.rb

@@ -0,0 +1,9 @@
+module Terraspace::Hooks
+  module Concern
+    def run_hooks(dsl_file, name, &block)
+      hooks = Builder.new(@mod, "#{Terraspace.root}/config/hooks/#{dsl_file}", name)
+      hooks.build # build hooks
+      hooks.run_hooks(&block)
+    end
+  end
+end

data/lib/terraspace/{terraform/hooks → hooks}/dsl.rb

@@ -1,4 +1,4 @@
-module Terraspace::Terraform::Hooks
+module Terraspace::Hooks
   module Dsl
     def before(*commands, **props)
       commands.each do |name|
@@ -13,7 +13,8 @@ module Terraspace::Terraform::Hooks
     end
 
     def each_hook(type, name, props={})
-      @hooks[type][name] = props
+      @hooks[type][name] ||= []
+      @hooks[type][name] << props
     end
   end
 end

data/lib/terraspace/hooks/runner.rb

@@ -0,0 +1,23 @@
+module Terraspace::Hooks
+  class Runner
+    include Terraspace::Util
+
+    def initialize(mod, hook)
+      @mod, @hook = mod, hook
+      @execute = @hook["execute"]
+    end
+
+    def run
+      case @execute
+      when String
+        Terraspace::Shell.new(@mod, @execute, exit_on_fail: @hook["exit_on_fail"]).run
+      when -> (e) { e.respond_to?(:public_instance_methods) && e.public_instance_methods.include?(:call) }
+        @execute.new.call
+      when -> (e) { e.respond_to?(:call) }
+        @execute.call
+      else
+        logger.warn "WARN: execute option not set for hook: #{@hook.inspect}"
+      end
+    end
+  end
+end

data/lib/terraspace/mod.rb

@@ -34,8 +34,17 @@ module Terraspace
       Terraspace.check_project!
       return if root
 
-      pretty_paths = paths.map { |p| Terraspace::Util.pretty_path(p) }
-      logger.error "ERROR: Unable to find #{@name.color(:green)} module. Searched paths: #{pretty_paths}"
+      pretty_paths = paths.map { |p| Terraspace::Util.pretty_path(p) }.join(", ")
+      logger.error <<~EOL
+        ERROR: Unable to find #{@name.color(:green)}. Searched paths:
+
+            #{pretty_paths}
+
+        To see available stacks, try running:
+
+            terraspace list
+
+      EOL
       ENV['TS_TEST'] ? raise : exit(1)
     end
 

data/lib/terraspace/plugin/summary/interface.rb

@@ -64,7 +64,9 @@ module Terraspace::Plugin::Summary
 
     def show_each(path)
       data = JSON.load(IO.read(path))
+      return unless data # edge case: blank file
       resources = data['resources']
+      return unless resources
       remove_statefile(path) if resources && resources.size == 0 && !ENV['TS_KEEP_EMPTY_STATEFILES']
       return unless resources && resources.size > 0
 
@@ -75,7 +77,7 @@ module Terraspace::Plugin::Summary
         identifier = r['instances'].map do |i|
           i['attributes']['name'] || i['attributes']['id']
         end.join(',')
-        return if @options[:short]
+        return unless @options[:details]
         logger.info "    #{r['type']} #{r['name']}: #{identifier}"
       end
     end

data/lib/terraspace/shell.rb

@@ -6,7 +6,8 @@ module Terraspace
 
     def initialize(mod, command, options={})
       @mod, @command, @options = mod, command, options
-      @error_type, @error_messages = nil, ''
+      # error_messages holds aggregation of all error lines
+      @known_error, @error_messages = nil, ''
     end
 
     # requires @mod to be set
@@ -32,10 +33,9 @@ module Terraspace
       Open3.popen3(env, @command, chdir: @mod.cache_dir) do |stdin, stdout, stderr, wait_thread|
         mimic_terraform_input(stdin, stdout)
         while err = stderr.gets
-          @error_type ||= known_error_type(err)
-          if @error_type
-            @error_messages << err
-          else
+          @error_messages << err # aggregate all error lines
+          @known_error ||= known_error_type(err)
+          unless @known_error
             # Sometimes may print a "\e[31m\n" which like during dependencies fetcher init
             # suppress it so dont get a bunch of annoying "newlines"
             next if err == "\e[31m\n" && @options[:suppress_error_color]
@@ -49,8 +49,8 @@ module Terraspace
     end
 
     def known_error_type(err)
-      if reinitialization_required?(err)
-        :reinitialization_required
+      if reinit_required?(err)
+        :reinit_required
       elsif bucket_not_found?(err)
         :bucket_not_found
       end
@@ -61,7 +61,12 @@ module Terraspace
       err.include?("Failed to get existing workspaces")
     end
 
-    def reinitialization_required?(err)
+    def reinit_required?(err)
+      # Example error: https://gist.github.com/tongueroo/f7e0a44b64f0a2e533089b18f331c21e
+      squeezed = @error_messages.gsub("\n", ' ').squeeze(' ') # remove double whitespaces and newlines
+      general_check = squeezed.include?("terraform init") && squeezed.include?("Error:")
+
+      general_check ||
       err.include?("reinitialization required") ||
       err.include?("terraform init") ||
       err.include?("require reinitialization")
@@ -71,9 +76,9 @@ module Terraspace
       return if status == 0
 
       exit_on_fail = @options[:exit_on_fail].nil? ? true : @options[:exit_on_fail]
-      if @error_type == :reinitialization_required
+      if @known_error == :reinit_required
         raise InitRequiredError.new(@error_messages)
-      elsif @error_type == :bucket_not_found
+      elsif @known_error == :bucket_not_found
         raise BucketNotFoundError.new(@error_messages)
       elsif exit_on_fail
         logger.error "Error running command: #{@command}".color(:red)

data/lib/terraspace/terraform/args/custom.rb

@@ -7,7 +7,7 @@ module Terraspace::Terraform::Args
     attr_accessor :name
     def initialize(mod, name)
       @mod, @name = mod, name
-      @file = "#{Terraspace.root}/config/cli/args.rb"
+      @file = "#{Terraspace.root}/config/args/terraform.rb"
       @commands = {}
     end
 

data/lib/terraspace/terraform/args/default.rb

@@ -26,7 +26,7 @@ module Terraspace::Terraform::Args
         args << var_files.map { |f| "-var-file #{Dir.pwd}/#{f}" }.join(' ')
       end
 
-      args << input_option if input_option
+      args << input_option
 
       # must be at the end
       plan = @options[:plan]
@@ -45,27 +45,17 @@ module Terraspace::Terraform::Args
     end
 
     def input_option
-      option = nil
-      if @options[:auto] && @options[:input].nil?
-        option = " -input=false"
-      end
-      unless @options[:input].nil?
-        input = @options[:input] ? "true" : "false"
-        option = " -input=#{input}" # = sign required for apply when there's a plan at the end. so input=false works input false doesnt
-      end
-      option
+      option = if @options[:auto]
+                 "false"
+               else
+                 @options[:input] ? @options[:input] : "false"
+               end
+      " -input=#{option}"
     end
 
     def init_args
       args = "-get"
-      if @options[:auto] && @options[:input].nil?
-        args << " -input=false"
-      end
-      unless @options[:input].nil?
-        input = @options[:input] ? "true" : "false"
-        args << " -input=#{input}"
-      end
-
+      args << input_option
       args << " -reconfigure" if @options[:reconfigure]
 
       # must be at the end
@@ -86,7 +76,7 @@ module Terraspace::Terraform::Args
 
     def plan_args
       args = []
-      args << input_option if input_option
+      args << input_option
       args << "-destroy" if @options[:destroy]
       args << "-out #{expanded_out}" if @options[:out]
       args

data/lib/terraspace/terraform/remote_state/output_proxy.rb

@@ -11,18 +11,18 @@ module Terraspace::Terraform::RemoteState
     # Should always return a String
     def to_s
       if @mod.resolved
-        # Dont use NullObject wrapper because Integer get changed to Strings.
+        # Dont use Unresolved wrapper because Integer get changed to Strings.
         # Want raw value to be used for the to_json call
         value = @raw.nil? ? mock_or_error : @raw
         value.to_json
       else
-        NullObject.new # to_s => (unresolved)
+        Unresolved.new
       end
     end
 
     def to_ruby
       data = @raw.nil? ? mock_or_error : @raw
-      @mod.resolved ? data : NullObject.new
+      @mod.resolved ? data : Unresolved.new
     end
 
   private

data/lib/terraspace/terraform/remote_state/{null_object.rb → unresolved.rb}

@@ -1,5 +1,5 @@
 module Terraspace::Terraform::RemoteState
-  class NullObject
+  class Unresolved
     def to_a
       []
     end

data/lib/terraspace/terraform/runner.rb

@@ -1,6 +1,7 @@
 module Terraspace::Terraform
   class Runner < Terraspace::CLI::Base
     extend Memoist
+    include Terraspace::Hooks::Concern
     include Terraspace::Util
 
     attr_reader :name
@@ -20,8 +21,8 @@ module Terraspace::Terraform
       current_dir_message # only show once
 
       params = args.flatten.join(' ')
-      command = "terraform #{name} #{params}"
-      run_hooks(name) do
+      command = "terraform #{name} #{params}".squish
+      run_hooks("terraform.rb", name) do
         Terraspace::Shell.new(@mod, command, @options.merge(env: custom.env_vars)).run
       end
     rescue Terraspace::InitRequiredError => e
@@ -53,12 +54,6 @@ module Terraspace::Terraform
       @options[:quiet] ? logger.debug(msg) : logger.info(msg)
     end
 
-    def run_hooks(name, &block)
-      hooks = Hooks::Builder.new(@mod, name)
-      hooks.build # build hooks
-      hooks.run_hooks(&block)
-    end
-
     def args
       # base at end in case of redirection. IE: terraform output > /path
       custom.args + custom.var_files + default.args

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.3.5"
+  VERSION = "0.4.3"
 end

data/spec/terraspace/{terraform/hooks → hooks}/builder_spec.rb

@@ -1,7 +1,6 @@
-describe Terraspace::Terraform::Hooks::Builder do
+describe Terraspace::Hooks::Builder do
   let(:builder) do
-    builder = described_class.new(mod, name)
-    builder.instance_variable_set(:@file, file) # override @file for spec
+    builder = described_class.new(mod, dsl_file, name)
     builder
   end
   let(:mod) do
@@ -11,7 +10,7 @@ describe Terraspace::Terraform::Hooks::Builder do
   end
 
   context "single" do
-    let(:file) { fixture("terraform/hooks/single.rb") }
+    let(:dsl_file) { fixture("terraform/hooks/single.rb") }
     let(:name) { "apply" }
     it "build creates the @hooks structure" do
       hooks = builder.build
@@ -25,7 +24,7 @@ describe Terraspace::Terraform::Hooks::Builder do
   end
 
   context "multiple" do
-    let(:file) { fixture("terraform/hooks/multiple.rb") }
+    let(:dsl_file) { fixture("terraform/hooks/multiple.rb") }
     let(:name) { "apply" }
     it "build creates the @hooks structure" do
       hooks = builder.build

data/spec/terraspace/terraform/remote_state/output_proxy_spec.rb

@@ -1,4 +1,4 @@
-NullObject = Terraspace::Terraform::RemoteState::NullObject
+Unresolved = Terraspace::Terraform::RemoteState::Unresolved
 
 describe Terraspace::Terraform::RemoteState::OutputProxy do
   let(:proxy) do
@@ -10,9 +10,9 @@ describe Terraspace::Terraform::RemoteState::OutputProxy do
 
   context "unresolved" do
     before(:each) { mod.resolved = false }
-    it "always return NullObject" do
+    it "always return Unresolved" do
       value = proxy.to_s
-      expect(value).to be_a(NullObject)
+      expect(value).to be_a(Unresolved)
       expect(value.to_str).to eq "(unresolved)"
     end
   end

data/terraspace.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "memoist"
   spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
-  spec.add_dependency "terraspace-bundler", "~> 0.2.0"
+  spec.add_dependency "terraspace-bundler", "~> 0.3.0"
   spec.add_dependency "thor"
   spec.add_dependency "tty-tree"
   spec.add_dependency "zeitwerk"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -470,6 +470,10 @@ files:
 - lib/terraspace/cli/bundle.rb
 - lib/terraspace/cli/check_setup.rb
 - lib/terraspace/cli/clean.rb
+- lib/terraspace/cli/clean/all.rb
+- lib/terraspace/cli/clean/base.rb
+- lib/terraspace/cli/clean/cache.rb
+- lib/terraspace/cli/clean/logs.rb
 - lib/terraspace/cli/cloud.rb
 - lib/terraspace/cli/cloud/runs.rb
 - lib/terraspace/cli/commander.rb
@@ -477,6 +481,7 @@ files:
 - lib/terraspace/cli/help.rb
 - lib/terraspace/cli/help/all/down.md
 - lib/terraspace/cli/help/all/graph.md
+- lib/terraspace/cli/help/all/init.md
 - lib/terraspace/cli/help/all/output.md
 - lib/terraspace/cli/help/all/plan.md
 - lib/terraspace/cli/help/all/providers.md
@@ -487,7 +492,9 @@ files:
 - lib/terraspace/cli/help/build.md
 - lib/terraspace/cli/help/bundle.md
 - lib/terraspace/cli/help/check_setup.md
-- lib/terraspace/cli/help/clean.md
+- lib/terraspace/cli/help/clean/all.md
+- lib/terraspace/cli/help/clean/cache.md
+- lib/terraspace/cli/help/clean/logs.md
 - lib/terraspace/cli/help/cloud/destroy.md
 - lib/terraspace/cli/help/cloud/list.md
 - lib/terraspace/cli/help/cloud/runs/list.md
@@ -500,7 +507,7 @@ files:
 - lib/terraspace/cli/help/info.md
 - lib/terraspace/cli/help/init.md
 - lib/terraspace/cli/help/list.md
-- lib/terraspace/cli/help/log.md
+- lib/terraspace/cli/help/logs.md
 - lib/terraspace/cli/help/logs/remove.md
 - lib/terraspace/cli/help/logs/truncate.md
 - lib/terraspace/cli/help/new/bootstrap_test.md
@@ -526,10 +533,8 @@ files:
 - lib/terraspace/cli/info.rb
 - lib/terraspace/cli/init.rb
 - lib/terraspace/cli/list.rb
-- lib/terraspace/cli/log.rb
-- lib/terraspace/cli/log/concern.rb
 - lib/terraspace/cli/logs.rb
-- lib/terraspace/cli/logs/tasks.rb
+- lib/terraspace/cli/logs/concern.rb
 - lib/terraspace/cli/new.rb
 - lib/terraspace/cli/new/git_hook.rb
 - lib/terraspace/cli/new/helper.rb
@@ -610,6 +615,10 @@ files:
 - lib/terraspace/ext.rb
 - lib/terraspace/ext/bundler.rb
 - lib/terraspace/ext/core/module.rb
+- lib/terraspace/hooks/builder.rb
+- lib/terraspace/hooks/concern.rb
+- lib/terraspace/hooks/dsl.rb
+- lib/terraspace/hooks/runner.rb
 - lib/terraspace/logger.rb
 - lib/terraspace/logger/formatter.rb
 - lib/terraspace/mod.rb
@@ -655,13 +664,11 @@ files:
 - lib/terraspace/terraform/cloud/sync.rb
 - lib/terraspace/terraform/cloud/syncer.rb
 - lib/terraspace/terraform/cloud/workspace.rb
-- lib/terraspace/terraform/hooks/builder.rb
-- lib/terraspace/terraform/hooks/dsl.rb
 - lib/terraspace/terraform/remote_state/fetcher.rb
 - lib/terraspace/terraform/remote_state/marker/output.rb
 - lib/terraspace/terraform/remote_state/marker/pretty_tracer.rb
-- lib/terraspace/terraform/remote_state/null_object.rb
 - lib/terraspace/terraform/remote_state/output_proxy.rb
+- lib/terraspace/terraform/remote_state/unresolved.rb
 - lib/terraspace/terraform/runner.rb
 - lib/terraspace/tester.rb
 - lib/terraspace/tester/finder.rb
@@ -791,11 +798,11 @@ files:
 - spec/terraspace/dependency/graph_spec.rb
 - spec/terraspace/dependency/helper/depends_on_spec.rb
 - spec/terraspace/dependency/helper/output_spec.rb
+- spec/terraspace/hooks/builder_spec.rb
 - spec/terraspace/provider/expander/generic_spec.rb
 - spec/terraspace/seeder/content_spec.rb
 - spec/terraspace/seeder_spec.rb
 - spec/terraspace/terraform/args/custom_spec.rb
-- spec/terraspace/terraform/hooks/builder_spec.rb
 - spec/terraspace/terraform/remote_state/fetcher_spec.rb
 - spec/terraspace/terraform/remote_state/marker/output_spec.rb
 - spec/terraspace/terraform/remote_state/output_proxy_spec.rb
@@ -944,11 +951,11 @@ test_files:
 - spec/terraspace/dependency/graph_spec.rb
 - spec/terraspace/dependency/helper/depends_on_spec.rb
 - spec/terraspace/dependency/helper/output_spec.rb
+- spec/terraspace/hooks/builder_spec.rb
 - spec/terraspace/provider/expander/generic_spec.rb
 - spec/terraspace/seeder/content_spec.rb
 - spec/terraspace/seeder_spec.rb
 - spec/terraspace/terraform/args/custom_spec.rb
-- spec/terraspace/terraform/hooks/builder_spec.rb
 - spec/terraspace/terraform/remote_state/fetcher_spec.rb
 - spec/terraspace/terraform/remote_state/marker/output_spec.rb
 - spec/terraspace/terraform/remote_state/output_proxy_spec.rb