terraspace 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbf29f1226e7dc336c0eaf99892e158aff3b804bd56bbd1dc744fd17a65c6ff0
-  data.tar.gz: 6c32f1fe94e9dc53f6ddbfca3cef7c1178a11d788b32ad6ad3fdc88d64e268fa
+  metadata.gz: 2c1f2eeedf81924675273ea090cf485919fe3fa74f178dad36cb49a92a91cbc7
+  data.tar.gz: cb925de348699c79e71a86a8a17c518ead35ed3c1efd8d1639938019ea93f2b9
 SHA512:
-  metadata.gz: b5e45213f23aaed8b4348d4a68179b2706577d6cdf7cf2588f979feb6433e742851392331a8d2909be4a745b6ef9089c419d22d4dd6140ec981c536e809c29df
-  data.tar.gz: f9e436d5ee96f410c66d673819a789ffdca814f8d53c8f7c97b2b005c9d2bd5cd48fc9a6619407ec7da42e0d3ca503666a5e3d2f2124f30b211a22ba87ec7075
+  metadata.gz: 5013095abeeb89a2229bd85d197dd424f5675e69b23f5c24752c6d70ac4d461c00762c9d2025c01d64066622a1d342dfdf1fe4a06d8125ad10329a569f79de31
+  data.tar.gz: a5d2374d71923a9df87cd7ecd045b196017c101562265aca253a998ced96646896aab5af5e1a77f26e5cb8bb960628fc0c716a8519a4e21387d4a5afbe1c991b

data/.cody/aws/bin/build.sh

@@ -10,6 +10,6 @@ export PATH=~/bin:$PATH # ~/bin/terraspace wrapper
 set -x
 terraspace new project infra --examples
 cd infra
-terraspace new bootstrap_test
-terraspace new project_test demo --examples
+terraspace new test demo --type stack
+cd app/stacks/demo
 terraspace test

data/.cody/azurerm/bin/build.sh

@@ -17,6 +17,6 @@ export ARM_TENANT_ID=$(cat ~/.azure/app-client.json | jq -r '.tenant_id')
 set -x
 terraspace new project infra --examples --plugin azurerm
 cd infra
-terraspace new bootstrap_test
-terraspace new project_test demo --examples --plugin azurerm
+terraspace new test demo --type stack
+cd app/stacks/demo
 terraspace test

data/.cody/google/bin/build.sh

@@ -14,6 +14,6 @@ export GOOGLE_PROJECT=$(cat $GOOGLE_APPLICATION_CREDENTIALS | jq -r '.project_id
 set -x
 terraspace new project infra --examples --plugin google
 cd infra
-terraspace new bootstrap_test
-terraspace new project_test demo --examples --plugin google
+terraspace new test demo --type stack
+cd app/stacks/demo
 terraspace test

data/.github/ISSUE_TEMPLATE.md

@@ -2,6 +2,6 @@ Please fill out one of the templates on https://github.com/boltops-tools/terrasp
 
 If you want to ask a question please do so on sites like StackOverflow.
 
-To be sensitive to everyone's time, we may close issues asking questions without comment. Here are some additional options also https://terraspace.cloud/docs/support/ 👌
+To be sensitive to everyone's time, we may close issues asking questions without comment. Here are some additional options also https://terraspace.cloud/support/ 👌
 
 Thank you!

data/CHANGELOG.md

@@ -3,6 +3,25 @@
 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.5.5] - 2020-11-27
+- fix link
+
+## [0.5.4] - 2020-11-27
+- fix check setup when terraform not found
+
+## [0.5.3] - 2020-11-27
+- [#60](https://github.com/boltops-tools/terraspace/pull/60) fix terraspace check_setup, use type and allow to run outside project
+- improve terraform is not installed message
+
+## [0.5.2] - 2020-11-27
+- [#59](https://github.com/boltops-tools/terraspace/pull/59) only run bundler/setup within terraspace project and check standalone install
+- fix terraspace help
+- fix terraspace setup check when terraform is not installed
+
+## [0.5.1] - 2020-11-17
+- [#56](https://github.com/boltops-tools/terraspace/pull/56) fix arg and hook generators
+- fix ci build
+
 ## [0.5.0] - 2020-11-15
 - [#55](https://github.com/boltops-tools/terraspace/pull/55) custom helpers support
 - plugin helpers support: aws_secret, aws_ssm, google_secret, etc

data/README.md

@@ -105,8 +105,9 @@ To install modules:
 
 * [Config Structure](https://terraspace.cloud/docs/config/): A common config structure that gets materializes with the deployed module. Configs can be dynamically controlled to keep your code DRY. You can override the settings if needed, like for using existing backends. See: [Existing Backends](https://terraspace.cloud/docs/state/existing/).
 * [Generators](https://terraspace.cloud/docs/generators/): Built-in generators to quickly create the starter module. Focus on code instead of boilerplate structure.
-* [Tfvars](https://terraspace.cloud/docs/tfvars/) & [Layering](https://terraspace.cloud/docs/tfvars/layering/): Use the same code with different tfvars to create multiple environments. Terraspace conventionally loads tfvars from the `tfvars` folder. Rich layering support allows you to build different environments like dev and prod with the same code.  Examples are in [Full Layering](https://terraspace.cloud/docs/tfvars/full-layering/).
+* [Multiple Environments](https://terraspace.cloud/docs/patterns/multiple-envs/): [Tfvars](https://terraspace.cloud/docs/tfvars/) & [Layering](https://terraspace.cloud/docs/tfvars/layering/) allow you to the same code with different tfvars to create multiple environments. Terraspace conventionally loads tfvars from the `tfvars` folder. Rich layering support allows you to build different environments like dev and prod with the same code.  Examples are in [Full Layering](https://terraspace.cloud/docs/tfvars/full-layering/).
 * [Deploy Multiple Stacks](https://terraspace.cloud/docs/intro/deploy-all/): The ability to deploy multiple stacks with a single command. Terraspace calculates the [dependency graph](https://terraspace.cloud/docs/dependencies/) and deploys stacks in the right order. You can also target specific stacks and deploy [subgraphs](https://terraspace.cloud/docs/dependencies/subgraphs/).
+* [Secrets Support](https://terraspace.cloud/docs/helpers/aws/secrets/): Terraspace has built-in secrets support for [AWS Secrets Manager](https://terraspace.cloud/docs/helpers/aws/secrets/), [AWS SSM Parameter Store](https://terraspace.cloud/docs/helpers/aws/ssm/), [Azure Key Vault](https://terraspace.cloud/docs/helpers/azure/secrets/), [Google Secrets Manager](https://terraspace.cloud/docs/helpers/google/secrets/). Easily set variables from Cloud secrets providers.
 * [Terrafile](https://terraspace.cloud/docs/terrafile/): Terraspace makes it easy to use Terraform modules sourced from your own git repositories, other git repositories, or the Terraform Registry. The git repos can be private or public. This is an incredibly powerful feature of Terraspace because it opens up a world of modules for you to use.  Use any module you want.
 * [Configurable CLI](https://terraspace.cloud/docs/config/args/): Configurable [CLI Hooks](https://terraspace.cloud/docs/config/hooks/) and [CLI Args](https://terraspace.cloud/docs/config/args/) allow you to adjust the underlying terraform command.
 * [Testing](https://terraspace.cloud/docs/testing/): A testing framework that allows you to create test harnesses, deploy real-resources, and have higher confidence that your code works.

data/lib/templates/base/arg/terraform.rb.tt

@@ -1,3 +1,3 @@
-command("<%= arg_name %>",
+command("<%= name %>",
   args: ["-lock-timeout=22m"],
 )

data/lib/templates/base/hook/%kind%.rb.tt

@@ -1,7 +1,7 @@
-before("<%= hook_name %>",
-  execute: "echo '<%= hook_path %>: test <%= type %> before hook for <%= kind %> <%= hook_name %>'",
+before("<%= name %>",
+  execute: "echo '<%= hook_path %>: test <%= type %> before hook for <%= kind %> <%= name %>'",
 )
 
-after("<%= hook_name %>",
-  execute: "echo '<%= hook_path %>: test <%= type %> after hook for <%= kind %> <%= hook_name %>'"
+after("<%= name %>",
+  execute: "echo '<%= hook_path %>: test <%= type %> after hook for <%= kind %> <%= name %>'"
 )

data/lib/terraspace/autoloader.rb

@@ -1,7 +1,5 @@
-if File.exist?("config/app.rb")
-  require "terraspace/bundle"
-  Terraspace::Bundle.setup
-end
+require "terraspace/bundle"
+Terraspace::Bundle.setup
 require "zeitwerk"
 
 module Terraspace

data/lib/terraspace/bundle.rb

@@ -8,6 +8,7 @@ module Terraspace
     #
     def setup
       return unless gemfile?
+      return unless terraspace_project?
       Kernel.require "bundler/setup"
       Bundler.setup # Same as Bundler.setup(:default)
     rescue LoadError => e
@@ -16,12 +17,17 @@ module Terraspace
 
     def require
       return unless gemfile?
+      return unless terraspace_project?
       Kernel.require "bundler/setup"
       Bundler.require(*bundler_groups)
     rescue LoadError => e
       handle_error(e)
     end
 
+    def terraspace_project?
+      File.exist?("config/app.rb")
+    end
+
     def handle_error(e)
       puts e.message
       return if e.message.include?("already activated")

data/lib/terraspace/cli/check_setup.rb

@@ -17,7 +17,7 @@ class Terraspace::CLI
         puts "Detected #{terraform_version_message}"
         check_required_version!
       else
-        puts "Terraform not installed. Unable to detect a terraform command. Please double check that terraform is installed."
+        puts terraform_is_not_installed
         exit 1
       end
     end
@@ -38,7 +38,19 @@ class Terraspace::CLI
       ARGV[0] == "check_setup"
     end
 
+    def terraform_is_not_installed
+      <<~EOL
+        Terraform not installed. Unable to detect a terraform command. Please double check that terraform is installed.
+        See: https://terraspace.cloud/docs/install/terraform/
+      EOL
+    end
+
     def ok?
+      unless terraform_bin
+        puts terraform_is_not_installed
+        exit 1
+      end
+
       version = terraform_version_message.sub(/.*v/,'') # => 0.12.24
       unless version.match(/\d+\.\d+\.\d+/) # just parse did not find the version number
         puts "WARN: Unable to get the terraform version".color(:yellow)
@@ -52,8 +64,10 @@ class Terraspace::CLI
     end
 
     def terraform_bin
-      bin_path = `which terraform 2>&1`.strip
-      bin_path if $?.success?
+      out = `type terraform 2>&1`.strip
+      return unless $?.success?
+      md = out.match(/is (.*)/)
+      md[1] if md
     end
     memoize :terraform_bin
 

data/lib/terraspace/command.rb

@@ -30,6 +30,7 @@ module Terraspace
       include Terraspace::Util::Logging
 
       def dispatch(m, args, options, config)
+        check_standalone_install!
         check_project!(args.first)
 
         # Allow calling for help via:
@@ -58,9 +59,42 @@ module Terraspace
         super
       end
 
+      def check_standalone_install!
+        return unless opt?
+        version_manager = "rvm" if rvm?
+        version_manager = "rbenv" if rbenv?
+        if rbenv? || rvm?
+          puts <<~EOL.color(:yellow)
+            WARN: It looks like a standalone Terraspace install and #{version_manager} is also in use.
+            Different gems from the standalone Terraspace install and #{version_manager} can cause all kinds of trouble.
+            Please install Terraspace as a gem instead and remove the standalone Terraspace /opt/terraspace installation.
+            See: https://terraspace.cloud/docs/install/gem/
+          EOL
+        end
+      end
+
+      def opt?
+        paths = ENV['PATH'].split(':')
+        opt = paths.detect { |p| p.include?('/opt/terraspace') }
+        opt && File.exist?('/opt/terraspace')
+      end
+
+      def rvm?
+        paths = ENV['PATH'].split(':')
+        rvm = paths.detect { |p| p.include?('/rvm/') || p.include?('/.rvm/') }
+        rvm && system("type rvm > /dev/null 2>&1")
+      end
+
+      def rbenv?
+        paths = ENV['PATH'].split(':')
+        rbenv = paths.detect { |p| p.include?('/rbenv/') || p.include?('/.rbenv/') }
+        rbenv && system("type rbenv > /dev/null 2>&1")
+      end
+
       def check_project!(command_name)
         return if subcommand?
-        return if %w[-h -v completion completion_script help new test version].include?(command_name)
+        return if command_name.nil?
+        return if %w[-h -v check_setup completion completion_script help new test version].include?(command_name)
         return if File.exist?("#{Terraspace.root}/config/app.rb")
         logger.error "ERROR: It doesnt look like this is a terraspace project. Are you sure you are in a terraspace project?".color(:red)
         ENV['TS_TEST'] ? raise : exit(1)

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.5.0"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport