terraspace 2.2.3 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 265cf001f291f8f16ba281504b5a10caad4931680320781c9fa57ea996d6eba0
-  data.tar.gz: cfc3a6bc5c3210a5b6edf60d085f9a3487535052c01b573360d18eab44bafec0
+  metadata.gz: cea629f7a076ccbe0f682b3037fda1e69fe8f7658243e502103b395ff0396351
+  data.tar.gz: ab8d340084aef5691796484d2942469262978ac848b8fc6f33d54b49d60609e7
 SHA512:
-  metadata.gz: 4373aff69d41d00c1533545927ace7b2ebc9ef0d93449483c5ff5cf0960cbb5d935b1f4f20d21fa00bc79c23d722cde6d4e31c2ad215f78a3a9cd8fc5cf000e9
-  data.tar.gz: 51773b55e7e9e51719e2c803294dba300ce7bbb9b1ab0ed5fa967313f204e3859943ab406c5228b7222e38ddc0296e80db8feba1622751f821e787a6b4b2ec4b
+  metadata.gz: 421a85f27bc4fb0906de29037eba4f7e3d852b8c0ce60191e911ccd615a04897a3d631e7c742eba8006e681f893d6715097910fd71a558b0931e36d3d8a0d881
+  data.tar.gz: 94c6f9f9a605a8e151576efb54d0326e7a6a0d8d18736edc9607bb04b35c158040d801d58ff50cf2567db21013095a531914c501ca19609b672f35c4450f0baf

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.5] - 2023-05-02
+- [#301](https://github.com/boltops-tools/terraspace/pull/301) Speed boast copy modules
+
+## [2.2.4] - 2023-04-19
+- [#293](https://github.com/boltops-tools/terraspace/pull/293) terrraspace import cli help fix
+- [#299](https://github.com/boltops-tools/terraspace/pull/299) fix expansion for the case of ENV var is not set
+
 ## [2.2.3] - 2022-12-11
 - [#283](https://github.com/boltops-tools/terraspace/pull/283) update terraspace new cli help
 - [#285](https://github.com/boltops-tools/terraspace/pull/285) Only generate output files with content

data/lib/terraspace/app.rb

@@ -43,6 +43,9 @@ module Terraspace
       config.build.default_pass_files = ["/files/"]
       config.build.pass_files = []
       config.build.dependency_words = []
+      # copy_modules = nil  # => Will show a warning and default to true
+      # copy_modules = true # => Will be default in next major version
+      config.build.copy_modules = nil # speed improvement
 
       config.bundle = ActiveSupport::OrderedOptions.new
       config.bundle.logger = ts_logger

data/lib/terraspace/builder.rb

@@ -69,7 +69,7 @@ module Terraspace
       with_each_mod(type_dir) do |mod|
         is_root_module = mod.cache_dir == @mod.cache_dir
         next if is_root_module # handled by build_stacks
-        Compiler::Perform.new(mod).compile
+        Compiler::Perform.new(mod, type_dir: type_dir).compile
       end
     end
 

data/lib/terraspace/cli.rb

@@ -109,7 +109,7 @@ module Terraspace
       Fmt.new(options.merge(mod: mod)).run
     end
 
-    desc "import ADDR ID", "Import existing infrastructure into your Terraform state"
+    desc "import STACK ADDR ID", "Import existing infrastructure into your Terraform state"
     long_desc Help.text(:import)
     def import(mod, addr, id)
       Import.new(options.merge(mod: mod, addr: addr, id: id)).run

data/lib/terraspace/compiler/perform.rb

@@ -3,8 +3,9 @@ module Terraspace::Compiler
     include CommandsConcern
     include Basename
 
-    def initialize(mod)
-      @mod = mod
+    def initialize(mod, options={})
+      # options for type_dir
+      @mod, @options = mod, options
     end
 
     def compile
@@ -60,7 +61,7 @@ module Terraspace::Compiler
     end
 
     def compile_mod_file(src_path)
-      content = Strategy::Mod.new(@mod, src_path).run
+      content = Strategy::Mod.new(@mod, src_path, @options).run
       Writer.new(@mod, src_path: src_path).write(content)
     end
 

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

@@ -1,7 +1,8 @@
 module Terraspace::Compiler::Strategy
   class AbstractBase
-    def initialize(mod, src_path)
-      @mod, @src_path = mod, src_path
+    def initialize(mod, src_path, options={})
+      # options for type_dir
+      @mod, @src_path, @options = mod, src_path, options
     end
   end
 end

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

@@ -1,5 +1,7 @@
 module Terraspace::Compiler::Strategy
   class Mod < AbstractBase
+    include Terraspace::Util::Logging
+
     def run
       klass = strategy_class(@src_path)
       strategy = klass.new(@mod, @src_path) # IE: Terraspace::Compiler::Strategy::Mod::Rb.new
@@ -7,6 +9,9 @@ module Terraspace::Compiler::Strategy
     end
 
     def strategy_class(path)
+      # Significant speed improvement
+      return Mod::Pass if copy_modules?
+
       ext = File.extname(path).sub('.','')
       return Mod::Pass if ext.empty? # infinite loop without this
       return Mod::Pass if Terraspace.pass_file?(path) or !text_file?(path)
@@ -14,6 +19,39 @@ module Terraspace::Compiler::Strategy
       "Terraspace::Compiler::Strategy::Mod::#{ext.camelize}".constantize rescue Mod::Pass
     end
 
+    @@copy_modules_warned = false
+    def copy_modules?
+      return false unless @options[:type_dir] == "modules"
+
+      copy_modules = Terraspace.config.build.copy_modules
+      if copy_modules.nil? && @@copy_modules_warned == false
+        logger.info "WARN: config.build.copy_modules is not set. Defaulting to true.".color(:yellow)
+        logger.info <<~EOL
+        The terraspace building behavior is to copy modules from
+        the app/modules folder to the .terraspace-cache for speed.
+        Most do not need app/modules to be compiled.
+        Other files like app/stacks and tfvars files are still compiled.
+        This is a change from previous versions of Terraspace, where
+        all files were compiled.
+
+        You can turn this warning off by setting:
+
+        .terraspace/config.rb
+
+            Terraspace.configure do |config|
+              config.build.copy_modules = true
+            end
+
+        In future Terraspace versions, the default will be true.
+        There will be no warning message, but it will still be configurable.
+        EOL
+        copy_modules = true
+        @@copy_modules_warned = true
+      end
+
+      copy_modules
+    end
+
   private
     def text_file?(filename)
       TextFile.new(filename).check

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

@@ -84,7 +84,7 @@ module Terraspace::Plugin::Expander
       elsif !ENV[name].blank?
         return ENV[name]
       else
-        return unexpanded
+        return ''
       end
       if downcase == "namespace" && Terraspace.config.layering.enable_names.expansion
         value = friendly_name(value)

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "2.2.3"
+  VERSION = "2.2.5"
 end

data/spec/terraspace/provider/expander/generic_spec.rb

@@ -3,7 +3,7 @@ describe Terraspace::Plugin::Expander::Generic do
   let(:props) do
     {
       bucket:         "my-bucket",
-      key:            ":env/:build_dir/terraform.tfstate", # variable notation expanded by terraspace
+      key:            ":env/:TEAM/:ENVNOTSET/:build_dir/terraform.tfstate", # variable notation expanded by terraspace
       region:         "us-west-2",
       encrypt:        true,
       dynamodb_table: "terraform_locks"
@@ -15,12 +15,14 @@ describe Terraspace::Plugin::Expander::Generic do
     mod
   end
 
+  before { stub_const('ENV', {'TEAM' => 'backend'}) }
+
   context "default path" do
     it "expand" do
       result = expander.expand(props)
       expect(result).to eq({
         bucket: "my-bucket",
-        key: "dev/stacks/core/terraform.tfstate",
+        key: "dev/backend/stacks/core/terraform.tfstate",
         region: "us-west-2",
         encrypt: true,
         dynamodb_table: "terraform_locks"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.5
 platform: ruby
 authors:
 - Tung Nguyen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-11 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -346,7 +346,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tung@boltops.com
 executables:
@@ -950,7 +950,7 @@ metadata:
   homepage_uri: https://terraspace.cloud
   source_code_uri: https://github.com/boltops-tools/terraspace
   changelog_uri: https://github.com/boltops-tools/terraspace/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -966,7 +966,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.26
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'
 test_files: