terraspace 0.6.18 → 0.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e9189f05ef673a6396db763930b35127404e8af22ad2eeaf946ed0fc0d8555
-  data.tar.gz: 1b147be3d3e63f5c150c9b7c2b92241d2e627964216af53da2be8cfa10776bbc
+  metadata.gz: 2fc510d1165404c449bcc9e3fe0af371d979aa5babc28e8531097f3ccd50c6eb
+  data.tar.gz: 95a69d72a293c58ff9435a162dbb20383dc8ee6dea8e681a5b8ab672cf90bbd2
 SHA512:
-  metadata.gz: c76b456a1750b9bbbc9dc0e8b6c7ec79030d2edefd57bee80e43799c958fa608ac953b299f51f7422caccca1bc1047c2243a518fb03982b78354900f64168f64
-  data.tar.gz: bc80c886871337ca4c04029a0881453bdf0630acfda8996ca47fc18d12981224ff33ef816c9a79a189a5990682a2c93ae983f4ed42849099ea43c7b81453dbc1
+  metadata.gz: c143d467df63cffe80862bec7ed0d06bc6edec50485b8a885d04a19f9f8d5a7a699dd494ff4daf074e303b50a1fc0f788340e6cd00bb42c875c834a05262b864
+  data.tar.gz: 90e43491736d1f3e43081d51bd9b0100a1641a3aaed71bac5eff71492a19298d0e56da762f79c07ff679e420509ce37e638974a643cc0633cde581c860e051fb

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 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.19] - 2021-11-24
+- [#149](https://github.com/boltops-tools/terraspace/pull/149) change default fallback mod strategy to Mod::Tf instead of Mod::Pass for ERB support
+- [#152](https://github.com/boltops-tools/terraspace/pull/152) fix naming typo in cli help
+- [#153](https://github.com/boltops-tools/terraspace/pull/153) only remove and create log dir if it exists
+- [#155](https://github.com/boltops-tools/terraspace/pull/155) add terraspace bundle example cli help
+- [#157](https://github.com/boltops-tools/terraspace/pull/157) handle edge case: Enter a value chopped off
+- [#158](https://github.com/boltops-tools/terraspace/pull/158) use pass strategy for binary files
+- [#159](https://github.com/boltops-tools/terraspace/pull/159) process terraform.tfvars file with erb, change default processing strategy back to pass
+
 ## [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

data/lib/terraspace/cli/clean/logs.rb

@@ -4,7 +4,6 @@ class Terraspace::CLI::Clean
       action = @options[:truncate] ? "truncate" : "remove"
       are_you_sure?(action)
       @options[:truncate] ? truncate : remove
-      logger.info "Logs #{action}d" # IE: Logs truncated or Logs removed
     end
 
     def truncate
@@ -14,6 +13,7 @@ class Terraspace::CLI::Clean
     end
 
     def remove
+      return unless File.exist?(log_root)
       puts "Removing all files in #{pretty_log_root}/" unless @options[:mute]
       FileUtils.rm_rf(log_root)
       FileUtils.mkdir_p(log_root)

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

@@ -16,3 +16,9 @@
 ## Info on a module
 
     terraspace bundle info MODULE
+
+## Import Example As Stack
+
+You can import a module's example as a stack.
+
+    terraspace bundle example MODULE EXAMPLE

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

@@ -1,4 +1,4 @@
-Typically, Terrasapce auto init should handle initialization. You can run init if you need to though.
+Typically, Terraspace auto init should handle initialization. You can run init if you need to though.
 
 ## Example
 

data/lib/terraspace/compiler/strategy/mod/tfvars.rb

@@ -0,0 +1,4 @@
+class Terraspace::Compiler::Strategy::Mod
+  class Tfvars < Tf
+  end
+end

data/lib/terraspace/compiler/strategy/mod.rb

@@ -1,3 +1,5 @@
+require "open3"
+
 module Terraspace::Compiler::Strategy
   class Mod < AbstractBase
     def run
@@ -9,8 +11,15 @@ module Terraspace::Compiler::Strategy
     def strategy_class(path)
       ext = File.extname(path).sub('.','')
       return Mod::Pass if ext.empty? # infinite loop without this
-      return Mod::Pass if Terraspace.pass_file?(path)
+      return Mod::Pass if Terraspace.pass_file?(path) or !text_file?(path)
+      # Fallback to Mod::Tf for all other files. ERB useful for terraform.tfvars
       "Terraspace::Compiler::Strategy::Mod::#{ext.camelize}".constantize rescue Mod::Pass
     end
+
+    # Thanks: https://stackoverflow.com/questions/2355866/ruby-how-to-determine-if-file-being-read-is-binary-or-text
+    def text_file?(filename)
+      file_type, status = Open3.capture2e("file", filename)
+      status.success? && file_type.include?("text")
+    end
   end
 end

data/lib/terraspace/shell.rb

@@ -71,8 +71,49 @@ module Terraspace
     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
+      # Regular prompt
+      line.include?("Enter a value:") ||
+      # Edge case: When buffer is very large buffer.split("\n") only gives 8192 chars at a time
+      line.size == 8192 && line[-1] != "\n" ||
+      # Edge case: "value:" chopped off "Enter a" and "value" prompt
+      # Very hard to reproduce. Happens 1/5 times on terraspace up autoscaling example.
+      # Sometimes lines come in as:
+      #   [...,"  Only 'yes' will be accepted to approve.", "", "  \e[1mEnter a"]
+      #   [" value:\e[0m \e[0m"]
+      line.match(/Enter a$/) || line.match(/^ value:/) # chopped off prompt
+      # line.include?(" value:") && lines.last.match(/Enter a$/) # chopped off prompt
+    end
+
+    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, newline: newline)
+      else
+        logger.info(line)
+      end
+    end
+
+    def handle_input(stdin, line)
+      # Edge case: "value:" chopped off "Enter a" and "value" prompt
+      #   This means "Enter a value:" is not needed but leaving it for now
+      patterns = [
+        /^ value:/,
+        "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
+      ]
+      matched = patterns.any? do |pattern|
+        if pattern.is_a?(String)
+          line.include?(pattern)
+        else # Regexp
+          line.match(pattern)
+        end
+      end
+      if matched
+        answer = $stdin.gets
+        stdin.write_nonblock(answer)
+      end
     end
 
     def handle_stderr(line)
@@ -91,17 +132,6 @@ module Terraspace
       files.find { |f| !f.eof }.nil?
     end
 
-    def handle_input(stdin, line)
-      patterns = [
-        "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) }
-        answer = $stdin.gets
-        stdin.write_nonblock(answer)
-      end
-    end
-
     def exit_status(status)
       return if status == 0
 
@@ -113,16 +143,5 @@ module Terraspace
         exit status
       end
     end
-
-    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, newline: newline)
-      else
-        logger.info(line)
-      end
-    end
   end
 end

data/lib/terraspace/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.19
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -615,6 +615,7 @@ files:
 - lib/terraspace/compiler/strategy/mod/pass.rb
 - lib/terraspace/compiler/strategy/mod/rb.rb
 - lib/terraspace/compiler/strategy/mod/tf.rb
+- lib/terraspace/compiler/strategy/mod/tfvars.rb
 - lib/terraspace/compiler/strategy/tfvar.rb
 - lib/terraspace/compiler/strategy/tfvar/base.rb
 - lib/terraspace/compiler/strategy/tfvar/layer.rb