terraspace 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2e48b2824f50628986b242f0d8f751795b755f54ae1cf3cda72bf7ff2447807
-  data.tar.gz: cdaec82517675a111b57f15ef081f930bc4f4712003109452dda9c79222b2ee5
+  metadata.gz: 2fec1ba076567ee419169922ed9dd183f13bd998983776f603bf36b051d7a6a7
+  data.tar.gz: a2c710787cedca1d62b788c761a9cb3bb40f43511d04ccf51fdfe44a0cdff391
 SHA512:
-  metadata.gz: 6cc7d06b5e877b2ff3a5dccf2a19c1a94028ed34f83ce8067600c1b6a0e1ba9b3a1dd27d558a7a3d6916af346b09a7eb5248536b4afc162e4268862a484b710f
-  data.tar.gz: c4293d7b1b496ea38c839113c1845d95552d11da8b041ff115ae1ecaab3b11e659a4e7f906b7b704150144ac70e48faa689e35cb75642b583db7e19a3c36ff79
+  metadata.gz: 3318d458250b2e33892740f9fd1fa47d363b2bcffb53a8c8dc8ac081e282bb3cd13be18b230841aa9c125d3fe5e832b53cf2294a51010c123ec96c831666d76d
+  data.tar.gz: 4acc67e5c612e584d96c2fd752a1b967c5fe9ce34069ec3149b5f1f6329dff56075f26a220106d20e22155d37279d50cb2e02db10bec873c7803fcadddc1e890

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: boltops-tools

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.
 
+## [2.0.3] - 2022-07-04
+- [#237](https://github.com/boltops-tools/terraspace/pull/237) remove duplicate paths in layering
+- [#244](https://github.com/boltops-tools/terraspace/pull/244) rename _cache2 to .cache2
+- [#245](https://github.com/boltops-tools/terraspace/pull/245) set utf8 in case system is not configured with LANG=en_US.UTF-8
+
+## [2.0.2] - 2022-06-21
+- [#242](https://github.com/boltops-tools/terraspace/pull/242) :PROJECT variable: TS_PROJECT as well as config.cloud.project
+
+## [2.0.1] - 2022-06-14
+- [#240](https://github.com/boltops-tools/terraspace/pull/240) add project expander variable
+
 ## [2.0.0] - 2022-06-10
 * Terraspace Cloud Support
 
@@ -11,21 +22,20 @@ Highlights:
 * CI plugin support
 * CI plugin generator
 * VCS manual support in core for github, gitlab, bitbucket
+* Layering: simplified by removing provider layering by default.
+* Layering: new default  `config.layering.mode = "simple"`. Use `config.layering.mode = "provider"` for v1 behavior.
+* Layering: easier to debug with config.layering.show
+* Layering: App, Role, Extra level layering
 
 More:
 * Backend expander variables handle env vars in general
 * Remove config.build.cache_root option
-* Clean up Terraspace::Plugin.autodetect
 * cloud.record = "changes". dont create cloud record when no changes
-* ci generic
-* edge case TS_ENV=''
-* .cody/cloud test
 * cloud warning message when TS_TOKEN is confiugred but cloud is not yet
-* API expodential retry logic
-* plugin autodetect cleanup
+* Cloud API expodential retry logic
 * TS_EXTRA in favor of instance option, deprecate instance option
 * handle ctrl-c
-* improve acceptannce codebuild scripts
+* improve acceptance codebuild scripts
 
 ## [1.1.7] - 2022-02-22
 - [#215](https://github.com/boltops-tools/terraspace/pull/215) fix all down by building child nodes

data/lib/terraspace/cli/concerns/plan_path.rb

@@ -2,7 +2,7 @@ module Terraspace::CLI::Concerns
   module PlanPath
     # Use when --out option not used
     def plan_path
-      ".terraspace-cache/_cache2/plan/plan.binary"
+      ".terraspace-cache/.cache2/plan/plan.binary"
     end
   end
 end

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

@@ -2,7 +2,7 @@ class Terraspace::CLI::Logs
   module Concern
     # Filters for lines that belong to the last ran process pid
     def readlines(path)
-      lines = IO.readlines(path)
+      lines = IO.readlines(path).map { |l| l.force_encoding('UTF-8') }
       found = lines.reverse.find do |line|
         pid(line) # search in reverse order for lines with interesting info
       end

data/lib/terraspace/cloud/base.rb

@@ -62,7 +62,7 @@ module Terraspace::Cloud
       # terraform plan can be a kind of apply or destroy
       # terraform apply can be a kind of apply or destroy
       kind = self.class.name.to_s.split('::').last.underscore # IE: apply or destroy
-      dir = "#{@mod.cache_dir}/.terraspace-cache/_cache2/#{kind}"
+      dir = "#{@mod.cache_dir}/.terraspace-cache/.cache2/#{kind}"
       FileUtils.rm_rf(dir)
       FileUtils.mkdir_p(dir)
     end

data/lib/terraspace/cloud/folder/base.rb

@@ -11,7 +11,7 @@ class Terraspace::Cloud::Folder
     end
 
     def artifacts_path
-      "#{@mod.cache_dir}/.terraspace-cache/_cache2/artifacts/#{@type}"
+      "#{@mod.cache_dir}/.terraspace-cache/.cache2/artifacts/#{@type}"
     end
   end
 end

data/lib/terraspace/cloud/folder/package.rb

@@ -12,7 +12,7 @@ class Terraspace::Cloud::Folder
       FileUtils.rm_rf(artifacts_path)
       FileUtils.mkdir_p(File.dirname(artifacts_path))
 
-      expr = "#{@mod.cache_dir}/.terraspace-cache/_cache2/#{@type}/*"
+      expr = "#{@mod.cache_dir}/.terraspace-cache/.cache2/#{@type}/*"
       Dir.glob(expr).each do |src|
         dest = "#{artifacts_path}/#{File.basename(src)}"
         FileUtils.mkdir_p(File.dirname(dest))

data/lib/terraspace/cloud/update.rb

@@ -23,7 +23,7 @@ module Terraspace::Cloud
       clean_cache2_stage
       # .terraspace-cache/dev/stacks/demo
       Dir.chdir(@mod.cache_dir) do
-        cache2_path = ".terraspace-cache/_cache2/#{@kind}"
+        cache2_path = ".terraspace-cache/.cache2/#{@kind}"
         FileUtils.mkdir_p(cache2_path)
 
         IO.write("#{cache2_path}/#{@kind}.log", Terraspace::Logger.logs)

data/lib/terraspace/compiler/strategy/tfvar/layer.rb

@@ -41,7 +41,7 @@ class Terraspace::Compiler::Strategy::Tfvar
     def paths
       project_paths = full_paths(project_tfvars_dir)
       stack_paths   = full_paths(stack_tfvars_dir)
-      paths = project_paths + stack_paths
+      paths = (project_paths + stack_paths).uniq
       show_layers(paths)
       paths.select do |path|
         File.exist?(path)

data/lib/terraspace/core.rb

@@ -18,6 +18,14 @@ module Terraspace
       ENV['TS_EXTRA'] unless ENV['TS_EXTRA'].blank?
     end
 
+    def project
+      if ENV['TS_PROJECT'].blank?
+        config.cloud.project
+      else
+        ENV['TS_PROJECT']
+      end
+    end
+
     @@root = nil
     def root
       @@root ||= ENV['TS_ROOT'] || Dir.pwd

data/lib/terraspace/logger.rb

@@ -45,7 +45,8 @@ module Terraspace
       end
 
       def logs
-        @@buffer.join('')
+        # force_encoding https://jch.github.io/posts/2013-03-05-ruby-incompatible-encoding.html
+        @@buffer.map { |s| s.force_encoding('UTF-8') }.join('')
       end
 
       # for test framework

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

@@ -96,10 +96,11 @@ module Terraspace::Plugin::Expander
       @mod.name
     end
 
-    def app;   Terraspace.app   ; end
-    def role;  Terraspace.role  ; end
-    def env;   Terraspace.env   ; end
-    def extra; Terraspace.extra ; end
+    def app;     Terraspace.app     ; end
+    def env;     Terraspace.env     ; end
+    def extra;   Terraspace.extra   ; end
+    def project; Terraspace.project ; end
+    def role;    Terraspace.role    ; end
 
     def type_instance
       [type, instance].reject { |s| s.blank? }.join('-')

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

@@ -22,7 +22,7 @@ module Terraspace::Terraform::Ihooks::After
     def cloud_create_plan
       return unless Terraspace.cloud?
 
-      unless @mod.out_option.include?("_cache2")
+      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}"

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "2.0.0"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -388,6 +388,7 @@ files:
 - ".cody/unit/bin/build.sh"
 - ".cody/unit/buildspec.yml"
 - ".cody/unit/project.rb"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation.md"