terraspace 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7a68a82f374785998967cf8af6d56f78130d7e03e8b0d7e64e85a9483e61cd
-  data.tar.gz: 2883619576b4a57c0e049edbc2cdae9d44b6c23926e3fe85084170bed5afb6c3
+  metadata.gz: 4703e9e81e2f5a450a6f02e790024ea326970a0055c0f351b8c1cc62f4f805c9
+  data.tar.gz: 17496c6eb2902ccf90af84145fa88c532d4ac53afdfebb931260cd887c9080b2
 SHA512:
-  metadata.gz: fbbd8c9339438902bc05b507292497c7714ccf9264a0155ab4fcd51c9e7d89d8ea0fc0a94f60228273fb9830f4458269eefa259a014d14a5754692a3d7747a2a
-  data.tar.gz: e62b1db8f363a94bbea6ed69ec1a6323171ab4442ff9059f0141fc2017837167659f741b2a7bf7e88f6d643320ac2040ff4e35e6564e0725861f030cd48809d4
+  metadata.gz: fb49cea863d69660e36df977271942aff8801f518c30119697f2ca641c7257b266ec26931e790a1149e710229e5d7f988594067008cdc59584a4fb352f07a028
+  data.tar.gz: 58e52ee22af11bef98996a01662396f3f79b2ed1f05e46a435280e296aa9f2449bfd62f9a58849dd48c5e39c692ca160bebf1a8a8e10678fcf224e83788ffae9

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 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.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
+
 ## [2.2.2] - 2022-09-14
 - [#268](https://github.com/boltops-tools/terraspace/pull/268) custom config.build.dependency_words ability
 

data/lib/terraspace/cli/help/new/test.md

@@ -1,12 +1,12 @@
 ## Stack Examples
 
-    $ terraspace new test demo --type stack
+    $ terraspace new test example --type stack
     => Creating stack test: example
-           exist  app/stacks/example
           create  app/stacks/example/test/.rspec
           create  app/stacks/example/test/Gemfile
-          create  app/stacks/example/test/spec/fixtures/stack/main.tf
-          create  app/stacks/example/test/spec/fixtures/stack/outputs.tf
+          create  app/stacks/example/test/spec/fixtures/config/app.rb
+          create  app/stacks/example/test/spec/fixtures/config/terraform/provider.tf
+          create  app/stacks/example/test/spec/fixtures/tfvars/test.tfvars
           create  app/stacks/example/test/spec/main_spec.rb
           create  app/stacks/example/test/spec/spec_helper.rb
     $
@@ -15,11 +15,8 @@
 
     $ terraspace new test example --type module
     => Creating module test: example
-           exist  app/modules/example
           create  app/modules/example/test/.rspec
           create  app/modules/example/test/Gemfile
-          create  app/modules/example/test/spec/fixtures/stack/main.tf
-          create  app/modules/example/test/spec/fixtures/stack/outputs.tf
           create  app/modules/example/test/spec/main_spec.rb
           create  app/modules/example/test/spec/spec_helper.rb
     $
@@ -28,7 +25,6 @@
 
     $ terraspace new test my --type project
     => Creating test bootstrap structure
-           exist
           create  .rspec
           create  spec/spec_helper.rb
     $

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/writer.rb

@@ -34,7 +34,7 @@ module Terraspace::Compiler
       if content.respond_to?(:path) # IO filehandle
         FileUtils.cp(content.path, dest_path) # preserves permission
       else # just content
-        IO.write(dest_path, content, mode: "wb")
+        IO.write(dest_path, content, mode: "wb") unless content.nil?
       end
       logger.debug "Created #{Terraspace::Util.pretty_path(dest_path)}"
     end

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.2"
+  VERSION = "2.2.4"
 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.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Tung Nguyen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-04-19 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
@@ -965,8 +965,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'
 test_files: