terraspace 0.6.13 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac77946fdc6f6073084fd5a862f38676d9c37ed661941cc877c3445e338ff0e
-  data.tar.gz: fb5315dc9d3c37bf6d6a10206019b5de9c53be812ff3955161ca344fe7b12ac3
+  metadata.gz: 56e9189f05ef673a6396db763930b35127404e8af22ad2eeaf946ed0fc0d8555
+  data.tar.gz: 1b147be3d3e63f5c150c9b7c2b92241d2e627964216af53da2be8cfa10776bbc
 SHA512:
-  metadata.gz: edb6864335554ada73820a9700bb4e5b5c04ce5ebc2c4e68a54fb44d336fef33b705c78b90da8083bc48eaafae2ad5427a74f856d7b60ca558f1fe56965a6799
-  data.tar.gz: 97656cb6d7eba975df38388468b0e69168d777a9e3de91268ecfafe9b8430121d54af96aee4df72834a28425f7919a3741b833f9dca0cb45363f451b4802069a
+  metadata.gz: c76b456a1750b9bbbc9dc0e8b6c7ec79030d2edefd57bee80e43799c958fa608ac953b299f51f7422caccca1bc1047c2243a518fb03982b78354900f64168f64
+  data.tar.gz: bc80c886871337ca4c04029a0881453bdf0630acfda8996ca47fc18d12981224ff33ef816c9a79a189a5990682a2c93ae983f4ed42849099ea43c7b81453dbc1

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.18] - 2021-10-28
+- [#147](https://github.com/boltops-tools/terraspace/pull/147) improve error message output
+- [#148](https://github.com/boltops-tools/terraspace/pull/148) Improve shim wrapper generator
+
+## [0.6.17] - 2021-10-02
+- [#142](https://github.com/boltops-tools/terraspace/pull/142) improve builder skip check: check if its a dir
+
+## [0.6.16] - 2021-10-01
+- [#141](https://github.com/boltops-tools/terraspace/pull/141) terraspace output: remove extra newline at the end
+
+## [0.6.15] - 2021-10-01
+- [#140](https://github.com/boltops-tools/terraspace/pull/140) fix terraspace output and Enter a value handling
+
+## [0.6.14] - 2021-09-30
+- [#134](https://github.com/boltops-tools/terraspace/pull/134) Use file not plan for the var-files argument
+- [#139](https://github.com/boltops-tools/terraspace/pull/139) Fix terraspace output to not add extra newlines
+- terraspace list: change default to show both stacks and modules
+
 ## [0.6.13] - 2021-08-10
 - use terraspace-bundler 0.4.0
 

data/SECURITY.md

@@ -0,0 +1,3 @@
+# Security Policy
+
+Refer to: https://terraspace.cloud/docs/policies/security/

data/lib/terraspace/cli/new/shim.rb

@@ -18,7 +18,6 @@ class Terraspace::CLI::New
     end
 
     def create
-      return unless File.exist?(".git")
       dest = @path
       template "terraspace", dest
       chmod dest, 0755
@@ -44,6 +43,8 @@ class Terraspace::CLI::New
 
             export PATH=#{dir}:/$PATH
 
+        Also note, the shim wrapper contains starter code. Though it should generally work for most systems,
+        it might require adjustments depending on your system.
       EOL
     end
 

data/lib/terraspace/cli.rb

@@ -28,7 +28,7 @@ module Terraspace
       option :reconfigure, type: :boolean, desc: "Add terraform -reconfigure option"
     }
     type_option = Proc.new {
-      option :type, default: "stack", aliases: %w[t], desc: "Type: stack, module, or all"
+      option :type, default: "all", aliases: %w[t], desc: "Type: stack, module, or all"
     }
 
     desc "all SUBCOMMAND", "all subcommands"

data/lib/terraspace/compiler/builder/skip.rb

@@ -0,0 +1,28 @@
+class Terraspace::Compiler::Builder
+  class Skip
+    def initialize(mod, src_path)
+      @mod, @src_path = mod, src_path
+    end
+
+    def check?
+      return true unless File.file?(@src_path)
+
+      # skip certain folders
+      check_dirs?(
+        "config/args",
+        "config/helpers",
+        "config/hooks",
+        "test",
+        "tfvars",
+      )
+    end
+
+    def check_dirs?(*names)
+      names.flatten.detect { |name| check_dir?(name) }
+    end
+
+    def check_dir?(name)
+      @src_path.include?("#{@mod.root}/#{name}/")
+    end
+  end
+end

data/lib/terraspace/compiler/builder.rb

@@ -72,13 +72,7 @@ module Terraspace::Compiler
     end
 
     def skip?(src_path)
-      return true unless File.file?(src_path)
-      # certain folders will be skipped
-      src_path.include?("#{@mod.root}/config/args") ||
-      src_path.include?("#{@mod.root}/config/helpers") ||
-      src_path.include?("#{@mod.root}/config/hooks") ||
-      src_path.include?("#{@mod.root}/test") ||
-      src_path.include?("#{@mod.root}/tfvars")
+      Skip.new(@mod, src_path).check?
     end
 
     def search(expr)

data/lib/terraspace/logger.rb

@@ -20,8 +20,12 @@ module Terraspace
     # Used to allow terraform output to always go to stdout
     # Terraspace output goes to stderr by default
     # See: terraspace/shell.rb
-    def stdout(msg)
-      puts msg
+    def stdout(msg, newline: true)
+      if newline
+        puts msg
+      else
+        print msg
+      end
     end
   end
 end

data/lib/terraspace/shell/error.rb

@@ -2,7 +2,7 @@ class Terraspace::Shell
   class Error
     attr_accessor :lines
     def initialize
-      @lines = '' # holds aggregation of all error lines
+      @lines = [] # holds aggregation of all error lines
     end
 
     def known?
@@ -11,11 +11,11 @@ class Terraspace::Shell
 
     def instance
       if reinit_required?
-        Terraspace::InitRequiredError.new(@lines)
+        Terraspace::InitRequiredError.new(message)
       elsif bucket_not_found?
-        Terraspace::BucketNotFoundError.new(@lines)
+        Terraspace::BucketNotFoundError.new(message)
       elsif shared_cache_error?
-        Terraspace::SharedCacheError.new(@lines)
+        Terraspace::SharedCacheError.new(message)
       end
     end
 
@@ -34,7 +34,8 @@ class Terraspace::Shell
     end
 
     def message
-      @lines.gsub("\n", ' ').squeeze(' ') # remove double whitespaces and newlines
+      # For error messages, terraform lines from buffer do not contain newlines. So join with newline
+      @lines.join("\n")
     end
 
     def shared_cache_error?

data/lib/terraspace/shell.rb

@@ -20,13 +20,18 @@ module Terraspace
     def shell
       env = @options[:env] || {}
       env.stringify_keys!
-      if @options[:shell] == "system" # terraspace console
+      if system?
         system(env, @command, chdir: @mod.cache_dir)
       else
         popen3(env)
       end
     end
 
+    def system?
+      @options[:shell] == "system" || # terraspace console
+      ENV['TS_RUNNER_SYSTEM'] # allow manual override
+    end
+
     def popen3(env)
       Open3.popen3(env, @command, chdir: @mod.cache_dir) do |stdin, stdout, stderr, wait_thread|
         handle_streams(stdin, stdout, stderr)
@@ -54,7 +59,7 @@ module Terraspace
             lines = buffer.split("\n")
             lines.each do |line|
               if f.fileno == stdout.fileno
-                handle_stdout(line)
+                handle_stdout(line, newline: !suppress_newline(line))
                 handle_input(stdin, line)
               else
                 handle_stderr(line)
@@ -65,6 +70,11 @@ module Terraspace
       end
     end
 
+    def suppress_newline(line)
+      line.size == 8192 && line[-1] != "\n" || # when buffer is very large buffer.split("\n") only gives 8192 chars at a time
+      line.include?("Enter a value:") # prompt
+    end
+
     def handle_stderr(line)
       @error ||= Error.new
       @error.lines << line # aggregate all error lines
@@ -81,19 +91,14 @@ module Terraspace
       files.find { |f| !f.eof }.nil?
     end
 
-    # Terraform doesnt seem to stream the line that prompts with "Enter a value:" when using Open3.popen3
-    # Hack around it by mimicking the "Enter a value:" prompt
-    #
-    # Note: system does stream the prompt but using Open3.popen3 so we can capture output to save to logs.
     def handle_input(stdin, line)
-      # stdout doesnt seem to flush and show "Enter a value: " look for earlier output
       patterns = [
-        "Only 'yes' will be accepted", # prompt for apply. can happen on apply
+        "Enter a value:",
         "\e[0m\e[1mvar.", # prompts for variable input. can happen on plan or apply. looking for bold marker also in case "var." shows up somewhere else
       ]
       if patterns.any? { |pattern| line.include?(pattern) }
-        print "\n  Enter a value: ".bright
-        stdin.write_nonblock($stdin.gets)
+        answer = $stdin.gets
+        stdin.write_nonblock(answer)
       end
     end
 
@@ -109,16 +114,12 @@ module Terraspace
       end
     end
 
-    def handle_stdout(line)
-      prompted = line.include?('Enter a value')
-      @prompt_shown ||= prompted
-      return if @prompt_shown && prompted
-
+    def handle_stdout(line, newline: true)
       # Terraspace logger has special stdout method so original terraform output
       # can be piped to jq. IE:
       #   terraspace show demo --json | jq
       if logger.respond_to?(:stdout) && !@options[:log_to_stderr]
-        logger.stdout(line)
+        logger.stdout(line, newline: newline)
       else
         logger.info(line)
       end

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

@@ -40,7 +40,7 @@ module Terraspace::Terraform::Args
       var_files = @options[:var_files]
       if var_files
         var_files.each do |file|
-          copy_to_cache(plan)
+          copy_to_cache(file)
         end
         args << var_files.map { |f| "-var-file #{f}" }.join(' ')
       end

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

@@ -9,10 +9,11 @@ class Terraspace::Terraform::Runner
     end
 
     def retry?
-      if @retries <= 3 && !@stop_retrying
+      max_retries = ENV['TS_MAX_RETRIES'] ? ENV['TS_MAX_RETRIES'].to_i : 3
+      if @retries <= max_retries && !@stop_retrying
         true # will retry
       else
-        logger.info "ERROR: #{@exception.message}"
+        logger.info "ERROR after max retries #{max_retries}: #{@exception.message}"
         false # will not retry
       end
     end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.6.13"
+  VERSION = "0.6.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.18
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -384,6 +384,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - exe/terraspace
 - lib/templates/base/arg/terraform.rb.tt
 - lib/templates/base/git_hook/hook.sh
@@ -578,6 +579,7 @@ files:
 - lib/terraspace/compiler/backend/parser.rb
 - lib/terraspace/compiler/basename.rb
 - lib/terraspace/compiler/builder.rb
+- lib/terraspace/compiler/builder/skip.rb
 - lib/terraspace/compiler/cleaner.rb
 - lib/terraspace/compiler/cleaner/backend_change.rb
 - lib/terraspace/compiler/commands_concern.rb
@@ -849,7 +851,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'