terraspace 2.1.7 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 550175db9da67e3d7682fd5716c9d57aea3c3457a6b9fc57491d8d7befc4f2b0
-  data.tar.gz: 5d79ea28576b48715b6d48fa6e4d259a5c00471a631b4c6fc8c524a8f1c7d363
+  metadata.gz: 672cf9e56e84babb2bc53f8e076a13cb51aa9741416fcd6128e66b3774d335fb
+  data.tar.gz: 10417698653e7ae38863e1c9d3a1fafebb2ea937693e8c5c0f65cb14e81b1f0b
 SHA512:
-  metadata.gz: 6597079c61a475fc990edcdbd1b0ccf6cf459d29e4558ae02911c658ed2bc091bf9c85f1a09bb7202a33bd5f22bfa0df9a080850d4057a6bb478c8317e3cc680
-  data.tar.gz: 21f3bad245a3c7ff13dea9aef33714dd77c439fee0fa9073df801970be6ee40937ac30a74b331a79806222c08dac6fb05c0e344e1873d4e9bbf9a98ec16d998d
+  metadata.gz: fbb895751949a30c32caaadad94a7d24c711313ca3675bb849f8ec9ab04b21e00901051ba5914d2c6a9317cabd91345cf8efe2ed053b90f61bb56228117b2249
+  data.tar.gz: d2fcb5d16322d8a2c7bdf15be9d8108aefaee66505deb4c54acaad2339958d4a9cf4def684e4a08a44ff467f2ce9e7269a9d38924bf668634bdd93e3cd55d69d

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.2.0] - 2022-09-02
+- [#261](https://github.com/boltops-tools/terraspace/pull/261) extra layer also process env-extra
+- [#262](https://github.com/boltops-tools/terraspace/pull/262) improve graph dependency processing: replace tfvars so only output and depends_on are evaluated
+- [#263](https://github.com/boltops-tools/terraspace/pull/263) layering small improvements
+- layering small improvements: dont use layers that end with - only
+- rename env var to TS_SHOW_ALL_LAYERS to TS_LAYERING_SHOW
+
 ## [2.1.7] - 2022-08-22
 - [#259](https://github.com/boltops-tools/terraspace/pull/259) fix TS_PROJECT for ts cloud
 - builder: skip examples

data/lib/terraspace/app.rb

@@ -72,7 +72,7 @@ module Terraspace
       config.layering.enable_names = ActiveSupport::OrderedOptions.new
       config.layering.enable_names.expansion = true
       config.layering.names = {}
-      config.layering.show = false
+      config.layering.show = cast_boolean(ENV['TS_LAYERING_SHOW'])
       config.layering.mode = ENV['TS_LAYERING_MODE'] || "simple" # simple, namespace, provider
 
       config.summary = ActiveSupport::OrderedOptions.new
@@ -104,7 +104,7 @@ module Terraspace
     # so dont have to add activemodel as a dependency just for this method
     FALSE_VALUES = [nil, false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"].to_set
     def cast_boolean(value)
-      if value == ""
+      if value.nil? || value == ""
         nil
       else
         !FALSE_VALUES.include?(value)

data/lib/terraspace/compiler/erb/render.rb

@@ -6,7 +6,13 @@ module Terraspace::Compiler::Erb
 
     def build
       context = Context.new(@mod)
-      RenderMePretty.result(@src_path, context: context)
+      if @mod.resolved
+        RenderMePretty.result(@src_path, context: context)
+      else
+        # Replace contents so only the `output` and `depends_on` are evaluated
+        temp_path = Rewrite.new(@src_path).rewrite
+        RenderMePretty.result(temp_path, context: context)
+      end
     end
   end
 end

data/lib/terraspace/compiler/erb/rewrite.rb

@@ -0,0 +1,42 @@
+module Terraspace::Compiler::Erb
+  class Rewrite
+    def initialize(src_path)
+      @src_path = src_path
+    end
+
+    def rewrite
+      input = IO.read(@src_path)
+      output = replace(input)
+      tfvar_path = @src_path.sub(Terraspace.root,'')
+      temp_path = "/tmp/terraspace/rewrite#{tfvar_path}"
+      FileUtils.mkdir_p(File.dirname(temp_path))
+      IO.write(temp_path, output)
+      temp_path
+    end
+
+    # Replace contents so only the `output` and `depends_on` are evaluated
+    def replace(input)
+      lines = input.split("\n").map {|l| l+"\n"} # mimic IO.readlines
+      new_lines = lines.map do |line|
+        new_line(line)
+      end
+      new_lines.join('')
+    end
+
+    def new_line(line)
+      md = line.match(/.*(<% |<%=)/) || line.match(/.*<%$/)
+      if md
+        words = %w[output depends_on] # TODO: consider allowing user customizations
+        # IE: <%= output or <% depends_on
+        regexp = Regexp.new(".*<%.*#{words.join('|')}.*")
+        if line.match(regexp)
+          line # passthrough
+        else
+          line.sub('<%', '<%#') # replace with ERB opening comment
+        end
+      else
+        line # passthrough
+      end
+    end
+  end
+end

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

@@ -70,6 +70,7 @@ class Terraspace::Compiler::Strategy::Tfvar
         sum += layer_levels(layer) unless layer.nil?
         sum
       end
+      all = all.reject { |layer| layer.ends_with?('-') }
       all.map! do |layer|
         layer = layer.blank? ? layer : "/#{layer}"
         [
@@ -92,7 +93,7 @@ class Terraspace::Compiler::Strategy::Tfvar
         logger.info "See: http://terraspace.test/docs/layering/instance-option/"
       end
       extra = Terraspace.extra || @mod.instance
-      levels = ["base", Terraspace.env, extra].reject(&:blank?) # layer levels. @mod.instance can be nil
+      levels = ["base", Terraspace.env, extra, "#{Terraspace.env}-#{extra}"].reject(&:blank?) # layer levels. @mod.instance can be nil
       levels.map! do |i|
         # base layer has prefix of '', reject with blank so it doesnt produce '//'
         [prefix, i].reject(&:blank?).join('/')
@@ -158,11 +159,11 @@ class Terraspace::Compiler::Strategy::Tfvar
       return unless @mod.resolved
       return if @@shown_layers[@mod.name]
       logger.debug "Layers for #{@mod.name}:"
-      show = Terraspace.config.layering.show || ENV['TS_SHOW_ALL_LAYERS']
+      show = Terraspace.config.layering.show || ENV['TS_LAYERING_SHOW_ALL']
       paths.each do |path|
         next if ARGV[0] == "all" # dont show layers with all command since fork happens after build
         next unless path.include?('.tfvars')
-        if ENV['TS_SHOW_ALL_LAYERS']
+        if ENV['TS_LAYERING_SHOW_ALL']
           message = "    #{pretty_path(path)}"
           message = "#{message} (found)".color(:yellow) if File.exist?(path)
           logger.info message

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "2.1.7"
+  VERSION = "2.2.0"
 end

data/spec/terraspace/compiler/erb/render_spec.rb

@@ -13,7 +13,7 @@ describe Terraspace::Compiler::Erb::Render do
     it "build" do
       allow(Terraspace::Terraform::RemoteState::Marker::Output).to receive(:stack_names).and_return("b1")
       result = render.build
-      expect(result).to eq "length = (unresolved)"
+      expect(result).to eq "length = (unresolved)\n"
     end
   end
 end

data/spec/terraspace/compiler/erb/rewrite_spec.rb

@@ -0,0 +1,30 @@
+describe Terraspace::Compiler::Erb::Rewrite do
+  let(:rewrite) { described_class.new(src_path) }
+
+  context "has output" do
+    let(:src_path) { fixture("rewrite/dev.tfvars") }
+    it "replace" do
+      input =<<~EOL
+        length = <%= output('b1.length') %>
+        foo = <%= foo %>
+        <% depends_on "b1" %>
+        <%
+        3.times do |i|
+          puts i
+        end
+        %>
+      EOL
+      text = rewrite.replace(input)
+      expect(text).to eq <<~EOL
+        length = <%= output('b1.length') %>
+        foo = <%#= foo %>
+        <% depends_on "b1" %>
+        <%#
+        3.times do |i|
+          puts i
+        end
+        %>
+      EOL
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.2.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -703,6 +703,7 @@ files:
 - lib/terraspace/compiler/erb/context.rb
 - lib/terraspace/compiler/erb/helpers.rb
 - lib/terraspace/compiler/erb/render.rb
+- lib/terraspace/compiler/erb/rewrite.rb
 - lib/terraspace/compiler/expander.rb
 - lib/terraspace/compiler/expander/backend.rb
 - lib/terraspace/compiler/helper_extender.rb
@@ -926,6 +927,7 @@ files:
 - spec/terraspace/compiler/dsl/terraform_spec.rb
 - spec/terraspace/compiler/dsl/variable_spec.rb
 - spec/terraspace/compiler/erb/render_spec.rb
+- spec/terraspace/compiler/erb/rewrite_spec.rb
 - spec/terraspace/dependency/graph_spec.rb
 - spec/terraspace/dependency/helper/depends_on_spec.rb
 - spec/terraspace/dependency/helper/output_spec.rb
@@ -961,7 +963,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'
@@ -1083,6 +1085,7 @@ test_files:
 - spec/terraspace/compiler/dsl/terraform_spec.rb
 - spec/terraspace/compiler/dsl/variable_spec.rb
 - spec/terraspace/compiler/erb/render_spec.rb
+- spec/terraspace/compiler/erb/rewrite_spec.rb
 - spec/terraspace/dependency/graph_spec.rb
 - spec/terraspace/dependency/helper/depends_on_spec.rb
 - spec/terraspace/dependency/helper/output_spec.rb