terraspace 0.5.12 → 0.6.0

data/lib/terraspace/terraform/api/vars/base.rb

@@ -1,5 +1,7 @@
 class Terraspace::Terraform::Api::Vars
   class Base
+    include Terraspace::Util::Logging
+
     def initialize(mod, vars_path)
       @mod, @vars_path = mod, vars_path
     end

data/lib/terraspace/terraform/api/vars/json.rb

@@ -4,11 +4,23 @@ class Terraspace::Terraform::Api::Vars
       context = Terraspace::Compiler::Erb::Context.new(@mod)
       result = RenderMePretty.result(@vars_path, context: context)
 
-      data = JSON.load(result)
+      data = json_load(result)
       items = data.select do |item|
         item['data']['type'] == 'vars'
       end
       items.map { |i| i['data']['attributes'] }
     end
+
+    def json_load(result)
+      JSON.load(result)
+    rescue JSON::ParserError => e
+      # TODO: show exact line with error
+      logger.info("ERROR in json: #{e.class}: #{e.message}")
+      path = "/tmp/terraspace/debug/vars.json"
+      logger.info("Result also written to #{path} for inspection")
+      FileUtils.mkdir_p(File.dirname(path))
+      IO.write(path, result)
+      exit 1
+    end
   end
 end

data/lib/terraspace/terraform/api/workspace.rb

@@ -24,7 +24,7 @@ class Terraspace::Terraform::Api
 
     def working_directory
       cache_dir = @mod.cache_dir.sub("#{Terraspace.root}/", '')
-      prefix = Terraspace.config.cloud.working_dir_prefix # prepended to TFC Working Directory
+      prefix = Terraspace.config.tfc.working_dir_prefix # prepended to TFC Working Directory
       prefix ? "#{prefix}/#{cache_dir}" : cache_dir
     end
 
@@ -38,7 +38,8 @@ class Terraspace::Terraform::Api
       #
       #     terraspace up demo --no-init
       #
-      unless payload || options[:exit_on_fail] == false
+      exit_on_fail = options[:exit_on_fail].nil? ? true : options[:exit_on_fail]
+      if exit_on_fail && not_found_error?(payload)
         logger.error "ERROR: Unable to find the workspace: #{@name}. The workspace may not exist. Or the Terraform token may be invalid. Please double check your Terraform token.".color(:red)
         exit 1
       end
@@ -46,6 +47,12 @@ class Terraspace::Terraform::Api
     end
     memoize :details
 
+    def not_found_error?(payload)
+      return true unless payload
+      return false unless payload.key?('errors')
+      payload['errors'][0]['status'] == '404'
+    end
+
     def destroy
       # response payload from delete operation is nil
       http.delete("/organizations/#{@organization}/workspaces/#{@name}")
@@ -74,7 +81,7 @@ class Terraspace::Terraform::Api
 
     def attributes
       attrs = { name: @name }
-      config = Terraspace.config.cloud.workspace.attrs
+      config = Terraspace.config.tfc.workspace.attrs
       attrs.merge!(config)
       # Default: run on all changes since app/modules can affect app/stacks
       if config['vcs-repo'] && config['file-triggers-enabled'].nil?

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

@@ -23,7 +23,10 @@ module Terraspace::Terraform::Args
       args = auto_approve_arg
       var_files = @options[:var_files]
       if var_files
-        args << var_files.map { |f| "-var-file #{Dir.pwd}/#{f}" }.join(' ')
+        var_files.each do |file|
+          copy_to_cache(plan)
+        end
+        args << var_files.map { |f| "-var-file #{f}" }.join(' ')
       end
 
       args << input_option
@@ -31,15 +34,8 @@ module Terraspace::Terraform::Args
       # must be at the end
       plan = @options[:plan]
       if plan
-        if plan.starts_with?('/')
-          src  = plan
-          dest = src
-        else
-          src = "#{Dir.pwd}/#{plan}"
-          dest = "#{@mod.cache_dir}/#{File.basename(src)}"
-        end
-        FileUtils.cp(src, dest) unless same_file?(src, dest)
-        args << " #{dest}"
+        copy_to_cache(plan)
+        args << " #{plan}"
       end
       args
     end
@@ -79,19 +75,24 @@ module Terraspace::Terraform::Args
       args << input_option
       args << "-destroy" if @options[:destroy]
       args << "-out #{expanded_out}" if @options[:out]
+      # Note: based on the @options[:out] will run an internal hook to copy plan
+      # file back up to the root project folder for use. Think this is convenient and expected behavior.
       args
     end
 
     def show_args
       args = []
       args << " -json" if @options[:json]
-      args << " #{@options[:plan]}" if @options[:plan] # terraform show /path/to/plan
+      plan = @options[:plan]
+      if plan
+        copy_to_cache(@options[:plan])
+        args << " #{@options[:plan]}" # terraform show /path/to/plan
+      end
       args
     end
 
     def expanded_out
-      out = @options[:out]
-      out.starts_with?('/') ? out : "#{Dir.pwd}/#{out}"
+      @options[:out]
     end
 
     def destroy_args
@@ -123,5 +124,14 @@ module Terraspace::Terraform::Args
     def same_file?(src, dest)
       src == dest
     end
+
+    def copy_to_cache(file)
+      return if file =~ %r{^/} # not need to copy absolute path
+      name = file.sub("#{Terraspace.root}/",'')
+      src = name
+      dest = "#{@mod.cache_dir}/#{name}"
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp(src, dest) unless same_file?(src, dest)
+    end
   end
 end

data/lib/terraspace/terraform/ihooks/after/plan.rb

@@ -0,0 +1,17 @@
+module Terraspace::Terraform::Ihooks::After
+  class Plan < Terraspace::Terraform::Ihooks::Base
+    def run
+      return if !@options[:out] || @options[:copy_to_root] == false
+      copy_to_root(@options[:out])
+    end
+
+    def copy_to_root(file)
+      return if file =~ %r{^/} # not need to copy absolute path
+      name = file.sub("#{Terraspace.root}/",'')
+      src = "#{@mod.cache_dir}/#{name}"
+      dest = name
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp(src, dest)
+    end
+  end
+end

data/lib/terraspace/terraform/ihooks/base.rb

@@ -0,0 +1,8 @@
+module Terraspace::Terraform::Ihooks
+  class Base < Terraspace::CLI::Base
+    def initialize(name, options={})
+      @name = name
+      super(options)
+    end
+  end
+end

data/lib/terraspace/terraform/ihooks/before/plan.rb

@@ -0,0 +1,14 @@
+module Terraspace::Terraform::Ihooks::Before
+  class Plan < Terraspace::Terraform::Ihooks::Base
+    def run
+      out = @options[:out]
+      return unless out
+      return if out =~ %r{^/} # not need to create parent dir for copy with absolute path
+
+      out = @options[:out]
+      name = out.sub("#{Terraspace.root}/",'')
+      dest = "#{@mod.cache_dir}/#{name}"
+      FileUtils.mkdir_p(File.dirname(dest))
+    end
+  end
+end

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

@@ -84,7 +84,7 @@ module Terraspace::Terraform::RemoteState
     end
 
     def init
-      Terraspace::CLI::Init.new(mod: @child.name, calling_command: "apply", quiet: true, suppress_error_color: true).init
+      Terraspace::CLI::Init.new(mod: @child.name, quiet: true, suppress_error_color: true).init
       true
     rescue Terraspace::BucketNotFoundError # from Terraspace::Shell
       bucket_not_found_error

data/lib/terraspace/terraform/runner.rb

@@ -22,7 +22,9 @@ module Terraspace::Terraform
       params = args.flatten.join(' ')
       command = "terraform #{name} #{params}".squish
       run_hooks("terraform.rb", name) do
+        run_internal_hook(:before, name)
         Terraspace::Shell.new(@mod, command, @options.merge(env: custom.env_vars)).run
+        run_internal_hook(:after, name)
       end
     rescue Terraspace::SharedCacheError, Terraspace::InitRequiredError
       @retryer ||= Retryer.new(@mod, @options, name, $!)
@@ -34,6 +36,16 @@ module Terraspace::Terraform
       end
     end
 
+    def run_internal_hook(type, name)
+      begin
+        klass = "Terraspace::Terraform::Ihooks::#{type.to_s.classify}::#{name.classify}".constantize
+      rescue NameError
+        return
+      end
+      ihook = klass.new(name, @options)
+      ihook.run
+    end
+
     @@current_dir_message_shown = false
     def current_dir_message
       return if @@current_dir_message_shown

data/lib/terraspace/terraform/{cloud → tfc}/runs.rb

@@ -1,4 +1,4 @@
-module Terraspace::Terraform::Cloud
+module Terraspace::Terraform::Tfc
   class Runs < Terraspace::CLI::Base
     def list
       lister = Lister.new(@mod, @options)

data/lib/terraspace/terraform/{cloud → tfc}/runs/base.rb

@@ -1,4 +1,4 @@
-class Terraspace::Terraform::Cloud::Runs
+class Terraspace::Terraform::Tfc::Runs
   class Base
     extend Memoist
     include Terraspace::Util::Logging

data/lib/terraspace/terraform/{cloud → tfc}/runs/item_presenter.rb

@@ -1,4 +1,4 @@
-class Terraspace::Terraform::Cloud::Runs
+class Terraspace::Terraform::Tfc::Runs
   class ItemPresenter
     attr_reader :id
     def initialize(raw)

data/lib/terraspace/terraform/{cloud → tfc}/runs/lister.rb

@@ -1,4 +1,4 @@
-class Terraspace::Terraform::Cloud::Runs
+class Terraspace::Terraform::Tfc::Runs
   class Lister < Base
     def run
       build_project

data/lib/terraspace/terraform/{cloud → tfc}/runs/pruner.rb

@@ -1,4 +1,4 @@
-class Terraspace::Terraform::Cloud::Runs
+class Terraspace::Terraform::Tfc::Runs
   class Pruner < Base
     include Terraspace::Terraform::Api::Client
 

data/lib/terraspace/terraform/{cloud → tfc}/sync.rb

@@ -1,4 +1,4 @@
-module Terraspace::Terraform::Cloud
+module Terraspace::Terraform::Tfc
   class Sync < Terraspace::CLI::Base
     extend Memoist
     include Terraspace::Terraform::Api::Client
@@ -16,7 +16,7 @@ module Terraspace::Terraform::Cloud
     # So we check and create the workspace if necessary.
     def run
       # Note: workspace still gets created by `terraform init` However, variables wont be sync if returns early
-      return unless Terraspace.config.cloud.auto_sync || @options[:override_auto_sync]
+      return unless Terraspace.config.tfc.auto_sync || @options[:override_auto_sync]
       return unless workspaces_backend?
       logger.info "Syncing to Terraform Cloud: #{@mod.name} => #{workspace_name}"
       @api = Terraspace::Terraform::Api.new(@mod, remote)

data/lib/terraspace/terraform/{cloud → tfc}/syncer.rb

@@ -1,4 +1,4 @@
-module Terraspace::Terraform::Cloud
+module Terraspace::Terraform::Tfc
   class Syncer < Terraspace::CLI::Base
     extend Memoist
     include Terraspace::Compiler::DirsConcern

data/lib/terraspace/terraform/{cloud → tfc}/workspace.rb

@@ -1,4 +1,4 @@
-module Terraspace::Terraform::Cloud
+module Terraspace::Terraform::Tfc
   class Workspace < Terraspace::CLI::Base
     extend Memoist
     include Terraspace::Util::Logging
@@ -21,7 +21,7 @@ module Terraspace::Terraform::Cloud
     end
 
     def init
-      Terraspace::CLI::Init.new(@options.merge(calling_command: "cloud-setup")).run
+      Terraspace::CLI::Init.new(@options).run
     end
 
     def create
@@ -72,4 +72,3 @@ module Terraspace::Terraform::Cloud
     end
   end
 end
-

data/lib/terraspace/util/pretty.rb

@@ -12,7 +12,8 @@ module Terraspace::Util
     end
 
     def pretty_path(path)
-      ENV['TS_TEST'] ? path : path.sub("#{Terraspace.root}/",'')
+      return path if ENV['TS_TEST']
+      path.sub("#{Terraspace.root}/",'').sub(ENV['HOME'], '~')
     end
   end
 end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.5.12"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.6.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -462,6 +462,7 @@ files:
 - lib/terraspace/all/summary.rb
 - lib/terraspace/app.rb
 - lib/terraspace/app/hooks.rb
+- lib/terraspace/app/inits.rb
 - lib/terraspace/autoloader.rb
 - lib/terraspace/booter.rb
 - lib/terraspace/builder.rb
@@ -478,8 +479,6 @@ files:
 - 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
 - lib/terraspace/cli/completer.rb
 - lib/terraspace/cli/completer/script.rb
@@ -502,11 +501,6 @@ files:
 - 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
-- lib/terraspace/cli/help/cloud/runs/prune.md
-- lib/terraspace/cli/help/cloud/sync.md
 - lib/terraspace/cli/help/completion.md
 - lib/terraspace/cli/help/completion_script.md
 - lib/terraspace/cli/help/console.md
@@ -536,6 +530,11 @@ files:
 - lib/terraspace/cli/help/show.md
 - lib/terraspace/cli/help/summary.md
 - lib/terraspace/cli/help/test.md
+- lib/terraspace/cli/help/tfc/destroy.md
+- lib/terraspace/cli/help/tfc/list.md
+- lib/terraspace/cli/help/tfc/runs/list.md
+- lib/terraspace/cli/help/tfc/runs/prune.md
+- lib/terraspace/cli/help/tfc/sync.md
 - lib/terraspace/cli/help/up.md
 - lib/terraspace/cli/help/validate.md
 - lib/terraspace/cli/info.rb
@@ -562,8 +561,11 @@ files:
 - lib/terraspace/cli/new/stack.rb
 - lib/terraspace/cli/new/test.rb
 - lib/terraspace/cli/seed.rb
+- lib/terraspace/cli/state.rb
 - lib/terraspace/cli/summary.rb
 - lib/terraspace/cli/test.rb
+- lib/terraspace/cli/tfc.rb
+- lib/terraspace/cli/tfc/runs.rb
 - lib/terraspace/cli/tfc_concern.rb
 - lib/terraspace/cli/up.rb
 - lib/terraspace/command.rb
@@ -626,6 +628,7 @@ files:
 - lib/terraspace/hooks/concern.rb
 - lib/terraspace/hooks/dsl.rb
 - lib/terraspace/hooks/runner.rb
+- lib/terraspace/layering.rb
 - lib/terraspace/logger.rb
 - lib/terraspace/logger/formatter.rb
 - lib/terraspace/mod.rb
@@ -634,6 +637,7 @@ files:
 - lib/terraspace/plugin/backend/interface.rb
 - lib/terraspace/plugin/config/interface.rb
 - lib/terraspace/plugin/decorator/interface.rb
+- lib/terraspace/plugin/expander/friendly.rb
 - lib/terraspace/plugin/expander/generic.rb
 - lib/terraspace/plugin/expander/interface.rb
 - lib/terraspace/plugin/finder.rb
@@ -665,14 +669,9 @@ files:
 - lib/terraspace/terraform/args/default.rb
 - lib/terraspace/terraform/args/dsl.rb
 - lib/terraspace/terraform/args/shorthands.rb
-- lib/terraspace/terraform/cloud/runs.rb
-- lib/terraspace/terraform/cloud/runs/base.rb
-- lib/terraspace/terraform/cloud/runs/item_presenter.rb
-- lib/terraspace/terraform/cloud/runs/lister.rb
-- lib/terraspace/terraform/cloud/runs/pruner.rb
-- lib/terraspace/terraform/cloud/sync.rb
-- lib/terraspace/terraform/cloud/syncer.rb
-- lib/terraspace/terraform/cloud/workspace.rb
+- lib/terraspace/terraform/ihooks/after/plan.rb
+- lib/terraspace/terraform/ihooks/base.rb
+- lib/terraspace/terraform/ihooks/before/plan.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
@@ -680,6 +679,14 @@ files:
 - lib/terraspace/terraform/remote_state/unresolved.rb
 - lib/terraspace/terraform/runner.rb
 - lib/terraspace/terraform/runner/retryer.rb
+- lib/terraspace/terraform/tfc/runs.rb
+- lib/terraspace/terraform/tfc/runs/base.rb
+- lib/terraspace/terraform/tfc/runs/item_presenter.rb
+- lib/terraspace/terraform/tfc/runs/lister.rb
+- lib/terraspace/terraform/tfc/runs/pruner.rb
+- lib/terraspace/terraform/tfc/sync.rb
+- lib/terraspace/terraform/tfc/syncer.rb
+- lib/terraspace/terraform/tfc/workspace.rb
 - lib/terraspace/tester.rb
 - lib/terraspace/tester/finder.rb
 - lib/terraspace/tester/meta.rb