terraspace 0.6.23 → 0.7.0

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

@@ -16,7 +16,7 @@ class Terraspace::Terraform::Api
 
     # backend may be overridden in classes including this Concern
     def backend
-      Terraspace::Compiler::Backend::Parser.new(@mod).result
+      Terraspace::Terraform::Runner::Backend::Parser.new(@mod).result
     end
     memoize :backend
 

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

@@ -18,23 +18,28 @@ module Terraspace::Terraform::Args
     memoize :build
 
     def args
+      terraform_args + var_file_args
+    end
+
+    def env_vars
+      build
+      dig("env", {})
+    end
+
+  private
+    def terraform_args
       build
       args = dig("args")
       args.compact.flatten
     end
 
-    def var_files
+    def var_file_args
       build
       var_files = dig("var_files")
       var_files.select! { |f| var_file_exist?(f) }
       var_files.map { |f| "-var-file=#{f}" }
     end
 
-    def env_vars
-      build
-      dig("env", {})
-    end
-
     def var_file_exist?(var_file)
       File.exist?("#{@mod.cache_dir}/#{var_file}")
     end

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

@@ -0,0 +1,110 @@
+module Terraspace::Terraform::Args
+  class Pass
+    def initialize(mod, name, options={})
+      @mod, @name, @options = mod, name.underscore, options
+    end
+
+    # map to terraform options and only allow valid terraform options
+    # Arg Examples:
+    #   -refresh-only
+    #   -refresh=false
+    #   -var 'foo=bar'
+    def args
+      args = pass_args.select do |arg|
+        arg_name = get_arg_name(arg)
+        terraform_arg_types.include?(arg_name)
+      end
+
+      args.map { |arg| "-#{arg}" } # add back in the leading single dash (-)
+    end
+
+  private
+    def pass_args
+      args = (@options[:args] || []).map do |o|
+        o.sub(/^-{1,2}/,'') # strips the - or --
+      end
+      reconstruct_hash_args(args)
+    end
+
+    # Thor parses CLI args -var 'foo=bar'
+    # as:
+    #    ["-var", "foo=bar"]
+    # instead of:
+    #    ["-var 'foo=bar'"]
+    #
+    # So reconstruct it to what works with terraform CLI args
+    def reconstruct_hash_args(args)
+      result = []
+      flatten = []
+      skip = false
+      args.each do |arg|
+        arg_type = terraform_arg_types[arg]
+        if arg_type == :hash || skip
+          skip = true
+          if flatten.size == 1
+            flatten << "'#{arg}'" # surround hash value with single quotes
+          else
+            flatten << arg
+          end
+          if flatten.size == 2 # time to grab value and end skipping
+            result << flatten.join(' ')
+            # reset flags
+            skip = false
+            flatten = []
+          end
+          next if skip
+        else
+          result << arg # boolean (-no-color) or assignment (-refresh=false)
+        end
+      end
+      result
+    end
+
+    # Parses terraform COMMAND -help output for arg types.
+    # Return Example:
+    #
+    #     {
+    #       destroy: :boolean,
+    #       refresh: :assignment,
+    #       var: :hash,
+    #     }
+    #
+    def terraform_arg_types
+      out = terraform_help(@name)
+      lines = out.split("\n")
+      lines.select! do |line|
+        line =~ /^  -/
+      end
+      lines.inject({}) do |result, line|
+        # in:  "  -replace=resource   Force replacement of a particular resource instance using",
+        # out: "-replace=resource   Force replacement of a particular resource instance using",
+        line.sub!('  -', '') # remove leading whitespace and -
+
+        # in:  "  -var 'foo=bar'      Set a value for one of the input variables in the root",
+        # out: "var"
+        # in:  "  -refresh=false      Skip checking for external changes to remote objects",
+        # out: "refresh"
+        arg_name = get_arg_name(line)
+
+        if line.match(/'\w+=\w+'/)  # hash. IE: -var 'foo=bar'
+          result[arg_name] = :hash
+        elsif line.match(/\w+=/)    # value IE: -refresh=false
+          result[arg_name] = :assignment # can include string and numeric values
+        else                        # boolean    IE: -refresh-only
+          result[arg_name] = :boolean
+        end
+        result
+      end
+    end
+
+    def get_arg_name(line)
+      line.sub(/\s+.*/,'').split('=').first # strips everything except arg name only
+    end
+
+    @@terraform_help = {}
+    def terraform_help(name)
+      @@terraform_help[name] ||= `terraform #{name} -help`
+    end
+  end
+end
+

data/lib/terraspace/terraform/args/{default.rb → thor.rb}

@@ -1,7 +1,7 @@
 require "tempfile"
 
 module Terraspace::Terraform::Args
-  class Default
+  class Thor
     def initialize(mod, name, options={})
       @mod, @name, @options = mod, name.underscore, options
       @quiet = @options[:quiet].nil? ? true : @options[:quiet]
@@ -81,7 +81,6 @@ module Terraspace::Terraform::Args
 
     def output_args
       args = []
-      args << "-json" if @options[:format] == "json"
       args << "> #{expanded_out}" if @options[:out]
       args
     end
@@ -98,7 +97,6 @@ module Terraspace::Terraform::Args
 
     def show_args
       args = []
-      args << " -json" if @options[:json]
       plan = @options[:plan]
       if plan
         copy_to_cache(@options[:plan])

data/lib/terraspace/{compiler → terraform/runner}/backend/parser.rb

@@ -1,6 +1,6 @@
 require "hcl_parser"
 
-class Terraspace::Compiler::Backend
+class Terraspace::Terraform::Runner::Backend
   class Parser
     extend Memoist
 

data/lib/terraspace/{compiler → terraform/runner}/backend.rb

@@ -1,6 +1,7 @@
-module Terraspace::Compiler
+class Terraspace::Terraform::Runner
   class Backend
     extend Memoist
+    include Terraspace::Compiler::CommandsConcern
 
     def initialize(mod)
       @mod = mod
@@ -9,6 +10,9 @@ module Terraspace::Compiler
     @@created = {}
     def create
       return if @@created[cache_key]
+      return if Terraspace.config.auto_create_backend == false
+      return unless requires_backend?
+
       # set immediately, since local storage wont reach bottom.
       # if fail for other backends, there will be an exception anyway
       @@created[cache_key] = true
@@ -16,6 +20,7 @@ module Terraspace::Compiler
       klass = backend_interface(backend_name)
       return unless klass # in case auto-creation is not supported for specific backend
 
+      # IE: TerraspacePluginAws::Interfaces::Backend.new
       interface = klass.new(backend_info)
       interface.call
     end
@@ -44,5 +49,13 @@ module Terraspace::Compiler
       klass_name.constantize if klass_name
     rescue NameError
     end
+
+    def requires_backend?
+      command_is?(requires_backend_commands)
+    end
+
+    def requires_backend_commands
+      %w[down init output plan providers refresh show up validate]
+    end
   end
 end

data/lib/terraspace/terraform/runner/retryer.rb

@@ -9,7 +9,7 @@ class Terraspace::Terraform::Runner
     end
 
     def retry?
-      max_retries = ENV['TS_MAX_RETRIES'] ? ENV['TS_MAX_RETRIES'].to_i : 3
+      max_retries = ENV['TS_MAX_RETRIES'] ? ENV['TS_MAX_RETRIES'].to_i : 1
       if @retries <= max_retries && !@stop_retrying
         true # will retry
       else

data/lib/terraspace/terraform/runner.rb

@@ -16,12 +16,37 @@ module Terraspace::Terraform
       end
     end
 
+    # default at end in case of redirection. IE: terraform output > /path
+    def args
+      args = custom.args + thor.args + pass.args
+      args.uniq
+    end
+
+    # From config/args/terraform.rb https://terraspace.cloud/docs/config/args/terraform/
+    def custom
+      Args::Custom.new(@mod, @name)
+    end
+    memoize :custom
+
+    # From Thor defined/managed cli @options
+    def thor
+      Args::Thor.new(@mod, @name, @options)
+    end
+    memoize :thor
+
+    # From Thor passthrough cli @options[:args]
+    def pass
+      Args::Pass.new(@mod, @name, @options)
+    end
+    memoize :pass
+
     def terraform(name, *args)
       current_dir_message # only show once
 
       params = args.flatten.join(' ')
       command = "terraform #{name} #{params}".squish
       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)
@@ -58,21 +83,6 @@ module Terraspace::Terraform
       @options[:quiet] ? logger.debug(msg) : logger.info(msg)
     end
 
-    def args
-      # base at end in case of redirection. IE: terraform output > /path
-      custom.args + custom.var_files + default.args
-    end
-
-    def custom
-      Args::Custom.new(@mod, @name)
-    end
-    memoize :custom
-
-    def default
-      Args::Default.new(@mod, @name, @options)
-    end
-    memoize :default
-
   private
     def time_took
       t1 = Time.now

data/lib/terraspace/terraform/tfc/sync.rb

@@ -35,7 +35,7 @@ module Terraspace::Terraform::Tfc
 
     # already memoized in Api::Client
     def backend
-      Terraspace::Compiler::Backend::Parser.new(@mod).result
+      Terraspace::Terraform::Runner::Backend::Parser.new(@mod).result
     end
   end
 end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.6.23"
+  VERSION = "0.7.0"
 end

data/spec/terraspace/terraform/args/custom_spec.rb

@@ -20,10 +20,10 @@ describe Terraspace::Terraform::Args::Custom do
       expect(custom.args).to eq(["-lock-timeout=20m"])
     end
 
-    it "var_files" do
+    it "var_file_args" do
       custom.evaluate_file(file)
       allow(custom).to receive(:var_file_exist?).and_return(true)
-      expect(custom.var_files).to eq(["-var-file=a.tfvars", "-var-file=b.tfvars"])
+      expect(custom.send(:var_file_args)).to eq(["-var-file=a.tfvars", "-var-file=b.tfvars"])
     end
   end
 
@@ -41,10 +41,10 @@ describe Terraspace::Terraform::Args::Custom do
       expect(custom.args).to eq(["-lock-timeout=20m"])
     end
 
-    it "var_files" do
+    it "var_file_args" do
       custom.evaluate_file(file)
       allow(custom).to receive(:var_file_exist?).and_return(true)
-      expect(custom.var_files).to eq([])
+      expect(custom.send(:var_file_args)).to eq([])
     end
   end
 end

data/spec/terraspace/terraform/args/pass_spec.rb

@@ -0,0 +1,101 @@
+describe Terraspace::Terraform::Args::Pass do
+  let(:pass) do
+    described_class.new(mod, name, options)
+  end
+  let(:mod) { double(:mod).as_null_object }
+  let(:options) { {args: args} }
+  # defaults
+  let(:name) { "plan" }
+  let(:args) { [] }
+
+  context "boolean flag" do
+    let(:args) { ["-refresh-only"] }
+    it "pass through args" do
+      args = pass.args
+      expect(args).to eq ["-refresh-only"]
+    end
+  end
+
+  context "assignment arg" do
+    context "-refresh=false" do
+      let(:args) { ["-refresh=false"] }
+      it "pass through args" do
+        args = pass.args
+        expect(args).to eq ["-refresh=false"]
+      end
+    end
+
+    context "-lock-timeout=5s" do
+      let(:args) { ["-lock-timeout=5s"] }
+      it "pass through args" do
+        args = pass.args
+        expect(args).to eq ["-lock-timeout=5s"]
+      end
+    end
+
+    context "-var-file=filename -lock-timeout=5s" do
+      let(:args) { ["-var-file=filename', '-lock-timeout=5s"] }
+      it "pass through args" do
+        args = pass.args
+        expect(args).to eq ["-var-file=filename', '-lock-timeout=5s"]
+      end
+    end
+
+    # normalizes -- to -
+    context "--var-file=filename --lock-timeout=5s" do
+      let(:args) { ["--var-file=filename", "--lock-timeout=5s"] }
+      it "pass through args" do
+        args = pass.args
+        expect(args).to eq ["-var-file=filename", "-lock-timeout=5s"]
+      end
+    end
+  end
+
+  context "hash arg" do
+    context "-var 'foo=bar'" do
+      let(:args) { ["-var 'foo=bar'"] }
+      it "pass through args" do
+        args = pass.args
+        expect(args).to eq ["-var 'foo=bar'"]
+      end
+    end
+
+    context "['-var', 'foo=bar'] improperly passed due to Thor CLI parsing" do
+      let(:args) { ["-var", "foo=bar"] }
+      it "reconstruct to work with terraform cli" do
+        args = pass.send(:pass_args)
+        expect(args).to eq ["var 'foo=bar'"]
+      end
+    end
+  end
+
+  # Works at the parsing level. Also works at Thor CLI parsing level. To test:
+  #
+  #     terraspace plan demo -refresh=false -no-color -var 'foo=bar' -var 'foo2=bar2'
+  #
+  # Results in:
+  #
+  #     terraform plan -input=false -refresh=false -no-color -var 'foo=bar' -var 'foo2=bar2'
+  #
+  context "multiple hash arg" do
+    context "-var 'foo=bar' -var 'foo2=bar2'" do
+      let(:args) { ["-var 'foo=bar'", "-var 'foo2=bar2'"] }
+      it "pass through args" do
+        args = pass.args
+        expect(args).to eq ["-var 'foo=bar'", "-var 'foo2=bar2'"]
+      end
+    end
+  end
+
+  # Could mock out Pass#terraform_help with fixtures,
+  # but will call out to terraform in specs so to see breakage more quickly.
+  context "terraform_arg_types" do
+    it "parses help output to determine arg types" do
+      args = pass.send(:terraform_arg_types)
+      # checking specific keys so spec is more robust to terraform cli changes
+      expect(args['destroy']).to eq(:boolean)
+      expect(args['refresh']).to eq(:assignment)
+      expect(args['var']).to eq(:hash)
+    end
+  end
+end

data/terraspace.gemspec

@@ -29,15 +29,13 @@ 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.4.0"
+  spec.add_dependency "rexml"
+  spec.add_dependency "terraspace-bundler", "~> 0.4.4"
   spec.add_dependency "thor"
   spec.add_dependency "tty-tree"
   spec.add_dependency "zeitwerk"
 
   # core baseline plugins
-  spec.add_dependency "terraspace_plugin_aws", "~> 0.3.0"
-  spec.add_dependency "terraspace_plugin_azurerm", "~> 0.3.0"
-  spec.add_dependency "terraspace_plugin_google", "~> 0.3.0"
   spec.add_dependency "rspec-terraspace", "~> 0.3.0"
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.6.23
+  version: 0.7.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,20 +164,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terraspace-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -220,48 +234,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: terraspace_plugin_aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: terraspace_plugin_azurerm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: terraspace_plugin_google
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-terraspace
   requirement: !ruby/object:Gem::Requirement
@@ -373,6 +345,10 @@ files:
 - ".cody/google/buildspec.yml"
 - ".cody/google/project.rb"
 - ".cody/google/role.rb"
+- ".cody/none/bin/build.sh"
+- ".cody/none/buildspec.yml"
+- ".cody/none/project.rb"
+- ".cody/none/role.rb"
 - ".cody/shared/script/install.sh"
 - ".cody/shared/script/install/terraform.sh"
 - ".cody/shared/script/install/terraspace.sh"
@@ -410,6 +386,18 @@ files:
 - lib/templates/base/project/Terrafile
 - lib/templates/base/project/config/app.rb
 - lib/templates/base/shim/terraspace
+- lib/templates/examples/hcl/module/main.tf
+- lib/templates/examples/hcl/module/outputs.tf
+- lib/templates/examples/hcl/module/variables.tf
+- lib/templates/examples/hcl/stack/main.tf
+- lib/templates/examples/hcl/stack/outputs.tf
+- lib/templates/examples/hcl/stack/variables.tf
+- lib/templates/examples/ruby/module/main.rb
+- lib/templates/examples/ruby/module/outputs.rb
+- lib/templates/examples/ruby/module/variables.rb
+- lib/templates/examples/ruby/stack/main.rb
+- lib/templates/examples/ruby/stack/outputs.rb
+- lib/templates/examples/ruby/stack/variables.rb
 - lib/templates/hcl/module/main.tf
 - lib/templates/hcl/module/outputs.tf
 - lib/templates/hcl/module/variables.tf
@@ -477,6 +465,7 @@ files:
 - lib/terraspace/all/summary.rb
 - lib/terraspace/app.rb
 - lib/terraspace/app/inits.rb
+- lib/terraspace/autodetect.rb
 - lib/terraspace/autoloader.rb
 - lib/terraspace/booter.rb
 - lib/terraspace/builder.rb
@@ -487,7 +476,6 @@ files:
 - lib/terraspace/cli/base.rb
 - lib/terraspace/cli/build/placeholder.rb
 - 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
@@ -497,6 +485,7 @@ files:
 - lib/terraspace/cli/completer.rb
 - lib/terraspace/cli/completer/script.rb
 - lib/terraspace/cli/completer/script.sh
+- lib/terraspace/cli/concern.rb
 - lib/terraspace/cli/concerns/source_dirs.rb
 - lib/terraspace/cli/down.rb
 - lib/terraspace/cli/fmt.rb
@@ -564,6 +553,7 @@ files:
 - lib/terraspace/cli/logs/concern.rb
 - lib/terraspace/cli/new.rb
 - lib/terraspace/cli/new/arg.rb
+- lib/terraspace/cli/new/example.rb
 - lib/terraspace/cli/new/git_hook.rb
 - lib/terraspace/cli/new/helper.rb
 - lib/terraspace/cli/new/helpers.rb
@@ -581,6 +571,8 @@ files:
 - lib/terraspace/cli/new/stack.rb
 - lib/terraspace/cli/new/test.rb
 - lib/terraspace/cli/seed.rb
+- lib/terraspace/cli/setup.rb
+- lib/terraspace/cli/setup/check.rb
 - lib/terraspace/cli/state.rb
 - lib/terraspace/cli/summary.rb
 - lib/terraspace/cli/test.rb
@@ -589,8 +581,6 @@ files:
 - lib/terraspace/cli/tfc_concern.rb
 - lib/terraspace/cli/up.rb
 - lib/terraspace/command.rb
-- lib/terraspace/compiler/backend.rb
-- lib/terraspace/compiler/backend/parser.rb
 - lib/terraspace/compiler/basename.rb
 - lib/terraspace/compiler/builder.rb
 - lib/terraspace/compiler/builder/skip.rb
@@ -621,6 +611,7 @@ files:
 - lib/terraspace/compiler/erb/helpers.rb
 - lib/terraspace/compiler/erb/render.rb
 - lib/terraspace/compiler/expander.rb
+- lib/terraspace/compiler/expander/backend.rb
 - lib/terraspace/compiler/helper_extender.rb
 - lib/terraspace/compiler/select.rb
 - lib/terraspace/compiler/strategy/abstract_base.rb
@@ -690,9 +681,10 @@ files:
 - lib/terraspace/terraform/api/vars/rb.rb
 - lib/terraspace/terraform/api/workspace.rb
 - lib/terraspace/terraform/args/custom.rb
-- lib/terraspace/terraform/args/default.rb
 - lib/terraspace/terraform/args/dsl.rb
+- lib/terraspace/terraform/args/pass.rb
 - lib/terraspace/terraform/args/shorthands.rb
+- lib/terraspace/terraform/args/thor.rb
 - lib/terraspace/terraform/ihooks/after/plan.rb
 - lib/terraspace/terraform/ihooks/base.rb
 - lib/terraspace/terraform/ihooks/before/plan.rb
@@ -702,6 +694,8 @@ files:
 - lib/terraspace/terraform/remote_state/output_proxy.rb
 - lib/terraspace/terraform/remote_state/unresolved.rb
 - lib/terraspace/terraform/runner.rb
+- lib/terraspace/terraform/runner/backend.rb
+- lib/terraspace/terraform/runner/backend/parser.rb
 - lib/terraspace/terraform/runner/retryer.rb
 - lib/terraspace/terraform/tfc/runs.rb
 - lib/terraspace/terraform/tfc/runs/base.rb
@@ -844,6 +838,7 @@ files:
 - spec/terraspace/seeder/content_spec.rb
 - spec/terraspace/seeder_spec.rb
 - spec/terraspace/terraform/args/custom_spec.rb
+- spec/terraspace/terraform/args/pass_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
@@ -997,6 +992,7 @@ test_files:
 - spec/terraspace/seeder/content_spec.rb
 - spec/terraspace/seeder_spec.rb
 - spec/terraspace/terraform/args/custom_spec.rb
+- spec/terraspace/terraform/args/pass_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