terraspace 1.1.6 → 2.0.1

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

@@ -58,7 +58,7 @@ module Terraspace::Plugin::Expander
     #
     # cache_dir:
     #
-    #    :CACHE_ROOT/:REGION/:ENV/:BUILD_DIR/
+    #    :REGION/:ENV/:BUILD_DIR/
     #
     # s3 backend key:
     #
@@ -69,21 +69,24 @@ module Terraspace::Plugin::Expander
     #    :MOD_NAME-:ENV-:REGION-:INSTANCE
     #
     def strip(string)
-      string.sub(/^-+/,'').sub(/-+$/,'') # remove leading and trailing -
-            .sub(%r{/+$},'')  # only remove trailing / or else /home/ec2-user => home/ec2-user
+      string.sub(%r{/+$},'')  # only remove trailing / or else /home/ec2-user => home/ec2-user
             .sub(/:\/\//, 'TMP_KEEP_HTTP') # so we can keep ://. IE: https:// or http://
             .gsub(%r{/+},'/') # remove double slashes are more. IE: // -> / Useful of region is '' in generic expander
             .sub('TMP_KEEP_HTTP', '://')   # restore :// IE: https:// or http://
+            .sub(/^-+/,'').sub(/-+$/,'') # remove leading and trailing -
     end
 
     def var_value(unexpanded)
-      name = unexpanded.sub(':','').downcase
-      if respond_to?(name)
-        value = send(name).to_s
+      name = unexpanded.sub(':','')
+      downcase = name.downcase
+      if respond_to?(downcase)
+        value = send(downcase).to_s
+      elsif !ENV[name].blank?
+        return ENV[name]
       else
         return unexpanded
       end
-      if name == "namespace" && Terraspace.config.layering.enable_names.expansion
+      if downcase == "namespace" && Terraspace.config.layering.enable_names.expansion
         value = friendly_name(value)
       end
       value
@@ -93,9 +96,10 @@ module Terraspace::Plugin::Expander
       @mod.name
     end
 
-    def env
-      Terraspace.env
-    end
+    def app;   Terraspace.app   ; end
+    def role;  Terraspace.role  ; end
+    def env;   Terraspace.env   ; end
+    def extra; Terraspace.extra ; end
 
     def type_instance
       [type, instance].reject { |s| s.blank? }.join('-')
@@ -110,8 +114,12 @@ module Terraspace::Plugin::Expander
       Terraspace.cache_root
     end
 
+    def project
+      Terraspace.config.cloud.project
+    end
+
     # So default config works:
-    #    config.cache_dir = ":CACHE_ROOT/:REGION/:ENV/:BUILD_DIR"
+    #    config.cache_dir = ":REGION/:ENV/:BUILD_DIR"
     # For when folks configure it with the http backend for non-cloud providers
     # The double slash // will be replace with a single slash in expander/interface.rb
     def region

data/lib/terraspace/plugin.rb

@@ -7,7 +7,7 @@ module Terraspace
     # Example meta:
     #
     #    {
-    #      "aws  => {root: "/path", backend: "s3"}
+    #      "aws"    => {root: "/path", backend: "s3"}
     #      "google" => {root: "/path", backend: "gcs"},
     #    }
     #
@@ -16,6 +16,10 @@ module Terraspace
       @@meta
     end
 
+    def register(plugin, data)
+      @@meta[plugin] = data
+    end
+
     def config_classes
       @@meta.map { |plugin, data| data[:config_class] }.compact
     end
@@ -50,10 +54,6 @@ module Terraspace
       end
     end
 
-    def register(plugin, data)
-      @@meta[plugin] = data
-    end
-
     # Example return:
     #
     #      TerraspacePluginAws::Interfaces::Backend
@@ -72,6 +72,15 @@ module Terraspace
     end
     memoize :find_with
 
+    # Returns simple String: aws
+    def autodetect
+      plugins = meta.keys
+      precedence = %w[aws azurerm google]
+      precedence.find do |p|
+        plugins.include?(p)
+      end
+    end
+
     extend self
   end
 end

data/lib/terraspace/shell.rb

@@ -34,6 +34,11 @@ module Terraspace
 
     def popen3(env)
       Open3.popen3(env, @command, chdir: @mod.cache_dir) do |stdin, stdout, stderr, wait_thread|
+        # interesting. simply handling the trap and doing nothing works
+        # Think its because ctrl-c is sent to both processes.
+        # 1. we do nothing in here in the parent process
+        # 2. in the child process the ctrl-c gets sent directly to the terraform command
+        Signal.trap("INT") { }
         handle_streams(stdin, stdout, stderr)
         status = wait_thread.value.exitstatus
         exit_status(status)
@@ -112,6 +117,7 @@ module Terraspace
       end
       if matched
         answer = $stdin.gets
+        logger.stdin_capture(answer.strip)
         stdin.write_nonblock(answer)
       end
     end
@@ -139,8 +145,7 @@ module Terraspace
       if @error && @error.known?
         raise @error.instance
       elsif exit_on_fail
-        logger.error "Error running command: #{@command}".color(:red)
-        exit status
+        raise ShellError.new("Error running command: #{@command}")
       end
     end
   end

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

@@ -83,7 +83,7 @@ module Terraspace::Terraform::Args
 
     def output_args
       args = []
-      args << "> #{expand.out}" if expand.out
+      args << "> #{out_option}" if out_option
       args
     end
 
@@ -91,12 +91,18 @@ module Terraspace::Terraform::Args
       args = []
       args << input_option
       args << "-destroy" if @options[:destroy]
-      args << "-out #{expand.out}" if expand.out
+      args << "-out #{out_option}" if out_option
       # Note: based on the expand.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 out_option
+      out = expand.out
+      FileUtils.mkdir_p(File.dirname("#{@mod.cache_dir}/#{out}"))
+      out
+    end
+
     def show_args
       args = []
       plan = expand.plan

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

@@ -0,0 +1,8 @@
+module Terraspace::Terraform::Ihooks::After
+  class Apply < Terraspace::Terraform::Ihooks::Base
+    def run
+      return unless Terraspace.cloud?
+      Terraspace::Cloud::Update.new(@options.merge(stack: @mod.name, kind: "apply")).run
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Terraspace::Terraform::Ihooks::After
+  class Destroy < Terraspace::Terraform::Ihooks::Base
+    def run
+      return unless Terraspace.cloud?
+      Terraspace::Cloud::Update.new(@options.merge(stack: @mod.name, kind: "destroy")).run
+    end
+  end
+end

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

@@ -1,8 +1,11 @@
 module Terraspace::Terraform::Ihooks::After
   class Plan < Terraspace::Terraform::Ihooks::Base
+    include Terraspace::CLI::Concerns::PlanPath
+
     def run
-      return if !out_option || @options[:copy_to_root] == false
-      copy_to_root(out_option)
+      return if !@mod.out_option || @options[:copy_to_root] == false
+      @success = copy_to_root(@mod.out_option)
+      cloud_create_plan
     end
 
     def copy_to_root(file)
@@ -10,8 +13,34 @@ module Terraspace::Terraform::Ihooks::After
       name = file.sub("#{Terraspace.root}/",'')
       src = "#{@mod.cache_dir}/#{name}"
       dest = name
+      return false unless File.exist?(src) # plan wont exists if the plan errors
       FileUtils.mkdir_p(File.dirname(dest))
       FileUtils.cp(src, dest)
+      !!dest
+    end
+
+    def cloud_create_plan
+      return unless Terraspace.cloud?
+
+      unless @mod.out_option.include?("_cache2")
+        # copy absolute path directly
+        src = @mod.out_option.starts_with?('/') ? @mod.out_option : "#{@mod.cache_dir}/#{@mod.out_option}"
+        dest = "#{@mod.cache_dir}/#{plan_path}"
+        FileUtils.mkdir_p(File.dirname(dest))
+        FileUtils.cp(src, dest)
+      end
+
+      # for both:
+      #   terraspace plan demo --destroy
+      #   terraspace down demo
+      kind = destroy? ? "destroy" : "apply"
+      if Terraspace.command?("plan")
+        Terraspace::Cloud::Plan.new(@options.merge(stack: @mod.name, kind: kind)).run
+      end
+      # create update if not plan and plan failed
+      if !Terraspace.command?("plan") && !@success
+        Terraspace::Cloud::Update.new(@options.merge(stack: @mod.name, kind: kind)).run
+      end
     end
   end
 end

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

@@ -1,13 +1,17 @@
 module Terraspace::Terraform::Ihooks
   class Base < Terraspace::CLI::Base
+    include Terraspace::Cloud::Api::Concern
+
     def initialize(name, options={})
       @name = name
+      @success = options[:success]
       super(options)
     end
 
-    def out_option
-      expand = Terraspace::Terraform::Args::Expand.new(@mod, @options)
-      expand.out
+    def destroy?
+      return false if @options.nil?
+      result = @options[:args]&.include?('--destroy') || @options[:destroy]
+      !!result
     end
   end
 end

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

@@ -0,0 +1,8 @@
+module Terraspace::Terraform::Ihooks::Before
+  class Apply < Terraspace::Terraform::Ihooks::Base
+    def run
+      return unless Terraspace.cloud?
+      Terraspace::Cloud::Update.new(@options.merge(stack: @mod.name, kind: "apply")).cani?
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Terraspace::Terraform::Ihooks::Before
+  class Destroy < Terraspace::Terraform::Ihooks::Base
+    def run
+      return unless Terraspace.cloud?
+      Terraspace::Cloud::Update.new(@options.merge(stack: @mod.name, kind: "destroy")).cani?
+    end
+  end
+end

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

@@ -1,12 +1,20 @@
 module Terraspace::Terraform::Ihooks::Before
   class Plan < Terraspace::Terraform::Ihooks::Base
     def run
-      return unless out_option
-      return if out_option =~ %r{^/} # not need to create parent dir for copy with absolute path
+      cani?
 
-      name = out_option.sub("#{Terraspace.root}/",'')
+      return unless @mod.out_option
+      return if @mod.out_option =~ %r{^/} # not need to create parent dir for copy with absolute path
+
+      name = @mod.out_option.sub("#{Terraspace.root}/",'')
       dest = "#{@mod.cache_dir}/#{name}"
       FileUtils.mkdir_p(File.dirname(dest))
     end
+
+    def cani?
+      return unless Terraspace.cloud?
+      kind = destroy? ? "destroy" : "apply"
+      Terraspace::Cloud::Plan.new(@options.merge(stack: @mod.name, kind: kind)).cani?
+    end
   end
 end

data/lib/terraspace/terraform/runner.rb

@@ -14,6 +14,12 @@ module Terraspace::Terraform
       time_took do
         terraform(name, args)
       end
+
+      run_internal_hook(:after, name) # always run so plan and apply get saved to tsc
+      if @shell_error
+        logger.error @shell_error.message.color(:red)
+        exit 1 if name == "plan" && Terraspace.command?("up")
+      end
     end
 
     # default at end in case of redirection. IE: terraform output > /path
@@ -45,11 +51,17 @@ module Terraspace::Terraform
 
       params = args.flatten.join(' ')
       command = "terraform #{name} #{params}".squish
+      @shell_error = nil
       run_hooks("terraform.rb", name) do
         Backend.new(@mod).create
         run_internal_hook(:before, name)
-        Terraspace::Shell.new(@mod, command, @options.merge(env: custom.env_vars)).run
-        run_internal_hook(:after, name)
+        begin
+          Terraspace::Shell.new(@mod, command, @options.merge(env: custom.env_vars)).run
+          @success = true
+        rescue Terraspace::ShellError => exception
+          @shell_error = exception
+          @success = false
+        end
       end
     rescue Terraspace::SharedCacheError, Terraspace::InitRequiredError
       @retryer ||= Retryer.new(@mod, @options, name, $!)
@@ -63,11 +75,13 @@ module Terraspace::Terraform
 
     def run_internal_hook(type, name)
       begin
-        klass = "Terraspace::Terraform::Ihooks::#{type.to_s.classify}::#{name.classify}".constantize
-      rescue NameError
+        class_name = "Terraspace::Terraform::Ihooks::#{type.to_s.classify}::#{name.classify}"
+        klass = class_name.constantize
+      rescue NameError => e
+        logger.debug "DEBUG: #{e.class} #{e.message}".color(:red)
         return
       end
-      ihook = klass.new(name, @options)
+      ihook = klass.new(name, @options.merge(success: @success))
       ihook.run
     end
 

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "1.1.6"
+  VERSION = "2.0.1"
 end

data/lib/terraspace.rb

@@ -33,6 +33,8 @@ module Terraspace
   class BucketNotFoundError < Error; end
   class InitRequiredError < Error; end
   class SharedCacheError < Error; end
+  class ShellError < Error; end
+  class NetworkError < Error; end
 end
 
 Terraspace::Booter.boot

data/terraspace.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "tty-tree"
   spec.add_dependency "zeitwerk"
+  spec.add_dependency "zip_folder"
 
   # core baseline plugins
   spec.add_dependency "rspec-terraspace", ">= 0.3.1"