terraspace 0.6.8 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0b4566fae8a6be4cfb7907e60d1d0ec3cdf4f7426989a68e5a7c22c55b4cc5
-  data.tar.gz: 66bd6807da803a3891ba2d78b5e21e5dcf0af2e8a1ed303ceb8c9e70c6916ea7
+  metadata.gz: 381066a03744a48afd9149f20496f9c8179eb7c70e084dd1f70f341c01443c62
+  data.tar.gz: 5030206fd23d619433651f7ae266b70ddb88e0123ce56838b448661e35d4f09a
 SHA512:
-  metadata.gz: d14b3c79add9cf2075c27682ad466f4afeb474a21943868d3dc1260afd129d127387e0089fa44e08e695bb5c28080b6dcbfdcd6774c3fff244782a50dd8a4f7c
-  data.tar.gz: c54ed8c38625bccd2ce424a18b70b4ca9198a4921bf10a57e452e0c6d7b1f2ae500f9565ba123cbaa071d7fec9767fa1d263e8a315dc1427ea5d983c8309c790
+  metadata.gz: 65ec02586d40a8e5edcd93983d6f7a0a34398d8112c08b8748aa6d877421b6aa1c913ea7765aa15357f9d843170aee35efccca35debfe7137e5087a16507f0a0
+  data.tar.gz: 5e7641fbf3d8dd81c5e4da97b7f4689d42dde1ac64fb26de08ac8502cf095ba77b69e665f3eef39ca876e4e2384b82a2a6c72d7faa9e116d9f4dec2016a929e1

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.6.12] - 2021-07-26
+- [#128](https://github.com/boltops-tools/terraspace/pull/128) Improve terraspace state comands and Terraspace.argv for internal usage
+- [#129](https://github.com/boltops-tools/terraspace/pull/129) use Dir.glob(expr, File::FNM_DOTMATCH) so dotfiles are copied, allowing .terraform-version for tfenv
+- allow -h to help outside terraspace project generally
+- require rspec-terraspace 0.3.0
+- state subcommands: straight delegate args
+- Terraspace.argv for consistency with terraspace test
+
+## [0.6.11] - 2021-06-22
+- [#120](https://github.com/boltops-tools/terraspace/pull/120) version check handles a major change
+
+## [0.6.10] - 2021-06-01
+- [#117](https://github.com/boltops-tools/terraspace/pull/117) fix terraspace fmt -t all
+- clean up IO select call
+
+## [0.6.9] - 2021-05-07
+- [#112](https://github.com/boltops-tools/terraspace/pull/112) fix smart auto retry
+
 ## [0.6.8] - 2021-05-07
 - [#110](https://github.com/boltops-tools/terraspace/pull/110) fix popen deadlock with large amounts of output [#97](https://github.com/boltops-tools/terraspace/pull/97) Terraspace hangs when TF_LOG=TRACE environment variable exists #97
 

data/lib/terraspace/cli.rb

@@ -189,8 +189,8 @@ module Terraspace
 
     desc "state SUBCOMMAND STACK", "Run state."
     long_desc Help.text(:state)
-    def state(subcommand, mod)
-      State.new(options.merge(subcommand: subcommand, mod: mod)).run
+    def state(subcommand, mod, *rest)
+      State.new(options.merge(subcommand: subcommand, mod: mod, rest: rest)).run
     end
 
     desc "test", "Run test."

data/lib/terraspace/cli/check_setup.rb

@@ -35,7 +35,7 @@ class Terraspace::CLI
     end
 
     def check_command?
-      ARGV[0] == "check_setup"
+      Terraspace.argv[0] == "check_setup"
     end
 
     def terraform_is_not_installed
@@ -58,6 +58,7 @@ class Terraspace::CLI
       end
       major, minor, _ = version.split('.')
       required_major, required_minor = REQUIRED_TERRAFORM_VERSION.split('.')
+      return true if major.to_i > required_major.to_i
       x = major.to_i >= required_major.to_i
       y = minor.to_i >= required_minor.to_i
       x && y

data/lib/terraspace/cli/fmt.rb

@@ -30,7 +30,7 @@ class Terraspace::CLI
 
     def type_dirs
       type = @options[:type]
-      if type
+      if type && type != "all"
         app_source_dirs.select { |p| p.include?("/#{type.pluralize}/") }
       else
         app_source_dirs

data/lib/terraspace/cli/help/fmt.md

@@ -14,9 +14,13 @@ Format all source files.
 Format specific module or stack.
 
     $ terraspace fmt stack1
-    $ terraspace fmt module1
+    $ terraspace fmt module1 -t module
 
 Format scoping to module or stack types. In case there's a module and stack with the same name.
 
     $ terraspace fmt example -t module
-    $ terraspace fmt demo -t stacke
+    $ terraspace fmt demo -t stack
+
+Format all, so both modules and stacks:
+
+    $ terraspace fmt -t all

data/lib/terraspace/cli/help/state.md

@@ -0,0 +1,30 @@
+## Examples
+
+    terraspace state list demo
+    terraspace state mv demo
+    terraspace state pull demo
+    terraspace state push demo
+    terraspace state replace demo
+    terraspace state rm demo
+    terraspace state show demo
+
+## Args Straight Delegation
+
+The `terraspace state` command delegates to the `terraform state` commands passing the arguments straight through. Refer to the underlying `terraform` command help for arguments.  Example:
+
+    terraform state list -h
+    ...
+    Options:
+    ...
+    -id=ID              Filters the results to include only instances whose
+                          resource types have an attribute named "id" whose value
+                          equals the given id string.
+
+This means we can use the `-id` or `--id` option and terraspace will pass it straight through. Example:
+
+    terraspace state list demo --id enabled-bull
+    Building .terraspace-cache/us-west-2/dev/stacks/demo
+    Built in .terraspace-cache/us-west-2/dev/stacks/demo
+    Current directory: .terraspace-cache/us-west-2/dev/stacks/demo
+    => terraform state list --id enabled-bull
+    random_pet.this

data/lib/terraspace/cli/init.rb

@@ -98,7 +98,7 @@ class Terraspace::CLI
 
     # only top level command considered
     def calling_command
-      ARGV[0]
+      Terraspace.argv[0]
     end
   end
 end

data/lib/terraspace/command.rb

@@ -30,6 +30,9 @@ module Terraspace
       include Terraspace::Util::Logging
 
       def dispatch(m, args, options, config)
+        # Terraspace.argv provides consistency when terraspace is being called by rspec-terrspace test harness
+        Terraspace.argv = args.clone # important to clone since Thor removes the first argv
+
         check_standalone_install!
         check_project!(args.first)
 
@@ -42,7 +45,6 @@ module Terraspace
         # as well thor's normal way:
         #
         #   terraspace help command
-        help_flags = Thor::HELP_MAPPINGS + ["help"]
         if args.length > 1 && !(args & help_flags).empty?
           args -= help_flags
           args.insert(-2, "help")
@@ -59,6 +61,11 @@ module Terraspace
         super
       end
 
+      def help_flags
+        Thor::HELP_MAPPINGS + ["help"]
+      end
+      private :help_flags
+
       def check_standalone_install!
         return unless opt?
         version_manager = "rvm" if rvm?
@@ -94,6 +101,7 @@ module Terraspace
       def check_project!(command_name)
         return if subcommand?
         return if command_name.nil?
+        return if help_flags.include?(Terraspace.argv.last) # IE: -h help
         return if %w[-h -v check_setup completion completion_script help new test version].include?(command_name)
         return if File.exist?("#{Terraspace.root}/config/app.rb")
         logger.error "ERROR: It doesnt look like this is a terraspace project. Are you sure you are in a terraspace project?".color(:red)

data/lib/terraspace/compiler/builder.rb

@@ -37,7 +37,7 @@ module Terraspace::Compiler
 
     def build_config_terraform
       expr = "#{Terraspace.root}/config/terraform/**/*"
-      Dir.glob(expr).each do |path|
+      search(expr).each do |path|
         next unless File.file?(path)
         next if path.include?('config/terraform/tfvars')
         build_config_file(basename(path))
@@ -45,13 +45,13 @@ module Terraspace::Compiler
     end
 
     def build_config_file(file)
-      existing = Dir.glob("#{@mod.root}/#{file}").first
+      existing = search("#{@mod.root}/#{file}").first
       return if existing && existing.ends_with?(".tf") # do not overwrite existing backend.tf, provider.tf, etc
 
       if file.ends_with?(".rb")
-        src_path = Dir.glob("#{@mod.root}/#{basename(file)}").first # existing source. IE: backend.rb in module folder
+        src_path = search("#{@mod.root}/#{basename(file)}").first # existing source. IE: backend.rb in module folder
       end
-      src_path ||= Dir.glob("#{Terraspace.root}/config/terraform/#{file}").first
+      src_path ||= search("#{Terraspace.root}/config/terraform/#{file}").first
       build_mod_file(src_path) if src_path
     end
 
@@ -65,7 +65,7 @@ module Terraspace::Compiler
     end
 
     def with_path(path)
-      Dir.glob(path).each do |src_path|
+      search(path).each do |src_path|
         next if skip?(src_path)
         yield(src_path)
       end
@@ -80,5 +80,9 @@ module Terraspace::Compiler
       src_path.include?("#{@mod.root}/test") ||
       src_path.include?("#{@mod.root}/tfvars")
     end
+
+    def search(expr)
+      Dir.glob(expr, File::FNM_DOTMATCH)
+    end
   end
 end

data/lib/terraspace/compiler/commands_concern.rb

@@ -11,8 +11,8 @@ module Terraspace::Compiler
     def command_is?(*commands)
       commands.flatten!
       commands.map!(&:to_s)
-      commands.include?(ARGV[0]) ||                  # IE: terraspace up
-      ARGV[0] == "all" && commands.include?(ARGV[1]) # IE: terraspace all up
+      commands.include?(Terraspace.argv[0]) ||                  # IE: terraspace up
+      Terraspace.argv[0] == "all" && commands.include?(Terraspace.argv[1]) # IE: terraspace all up
     end
   end
 end

data/lib/terraspace/compiler/dsl/syntax/helpers/common.rb

@@ -19,7 +19,7 @@ module Terraspace::Compiler::Dsl::Syntax::Helpers
     #     terraspace_command('-') => "terraspace-up-demo"
     #
     def terraspace_command(separator=' ')
-      args = ARGV[0..1] || []
+      args = Terraspace.argv[0..1] || []
       command = ["terraspace"] + args
       command.join(separator)
     end

data/lib/terraspace/core.rb

@@ -58,5 +58,15 @@ module Terraspace
         i.is_a?(Regexp) ? path =~ i : path.include?(i)
       end
     end
+
+    # Terraspace.argv provides consistency when terraspace is being called by rspec-terrspace test harness
+    # So use Terraspace.argv instead of ARGV constant
+    def argv=(argv)
+      @@argv = argv
+    end
+
+    def argv
+      @@argv
+    end
   end
 end

data/lib/terraspace/shell.rb

@@ -38,12 +38,12 @@ module Terraspace
     BLOCK_SIZE = Integer(ENV['TS_BUFFER_BLOCK_SIZE'] || 102400)
     BUFFER_TIMEOUT = Integer(ENV['TS_BUFFER_TIMEOUT'] || 3600) # 3600s = 1h
     def handle_streams(stdin, stdout, stderr)
-      files = [stdout, stderr]
       # note: t=0 and t=nil means no timeout. See: https://bit.ly/2PURlCX
       t = BUFFER_TIMEOUT.to_i unless BUFFER_TIMEOUT.nil?
       Timeout::timeout(t) do
+        files = [stdout, stderr]
         until all_eof?(files) do
-          ready = IO.select(files, nil, nil, 0.1)
+          ready = IO.select(files)
           next unless ready
 
           readable = ready[0]
@@ -53,14 +53,30 @@ module Terraspace
 
             lines = buffer.split("\n")
             lines.each do |line|
-              terraform_to_stdout(line)
-              handle_input(stdin, line)
+              if f.fileno == stdout.fileno
+                handle_stdout(line)
+                handle_input(stdin, line)
+              else
+                handle_stderr(line)
+              end
             end
           end
         end
       end
     end
 
+    def handle_stderr(line)
+      @error ||= Error.new
+      @error.lines << line # aggregate all error lines
+
+      return if @error.known?
+      # Sometimes may print a "\e[31m\n" which like during dependencies fetcher init
+      # suppress it so dont get a bunch of annoying "newlines"
+      return if line == "\e[31m\n" && @options[:suppress_error_color]
+
+      logger.error(line)
+    end
+
     def all_eof?(files)
       files.find { |f| !f.eof }.nil?
     end
@@ -93,7 +109,7 @@ module Terraspace
       end
     end
 
-    def terraform_to_stdout(line)
+    def handle_stdout(line)
       prompted = line.include?('Enter a value')
       @prompt_shown ||= prompted
       return if @prompt_shown && prompted

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

@@ -11,12 +11,24 @@ module Terraspace::Terraform::Args
       # https://terraspace.cloud/docs/ci-automation/
       ENV['TF_IN_AUTOMATION'] = '1' if @options[:auto]
 
-      args_meth = "#{@name}_args"
+      args = []
+
+      if straight_delegate_args?
+        args += @options[:rest]
+        args.flatten!
+      end
+
+      args_meth = "#{@name}_args".gsub(' ', '_') # IE: apply_args, init_args
       if respond_to?(args_meth)
-        send(args_meth)
-      else
-        []
+        args += send(args_meth)
       end
+
+      args
+    end
+
+    # delegate args straight through for special commands, currently state seems to be the only case
+    def straight_delegate_args?
+      @name.include?("state") # IE: "state list", "state pull", "state show"
     end
 
     def force_unlock_args

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.6.8"
+  VERSION = "0.6.12"
 end

data/terraspace.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   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.2.0"
+  spec.add_dependency "rspec-terraspace", "~> 0.3.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.12
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -254,14 +254,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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -532,6 +532,7 @@ files:
 - lib/terraspace/cli/help/refresh.md
 - lib/terraspace/cli/help/seed.md
 - lib/terraspace/cli/help/show.md
+- lib/terraspace/cli/help/state.md
 - lib/terraspace/cli/help/summary.md
 - lib/terraspace/cli/help/test.md
 - lib/terraspace/cli/help/tfc/destroy.md