terraspace 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec0e35f7878a3c4b0b7b1f2b12707f76bfbf6e81b47e04c50822cedd9e9baf1
-  data.tar.gz: 055d46279e41f268502ed3d0035ef0d3c28d5a03027810a628e5a5c51b4aec77
+  metadata.gz: f43880b8fc93060a328decf3fa5ac770253341995ec800e6d38b86f7696d5912
+  data.tar.gz: 9337cb32f020b54e5693aa2dde06960c22a8fd8755ff55bf1ebb0ebf4cd2fccf
 SHA512:
-  metadata.gz: 4cea499e91524e6b151bd3e9773fd9c41fa9c586b49d6c084e6b286b81e34b1f76838d9eb8a1adb6fc4aea8095ab047269f27e53ca30b6cc7ba0f6bb69204f44
-  data.tar.gz: ce9291d9769eca58a5e9debb70a8721d9bb2e2897096fd089898f56ae7f793f5300e830b4ee2306a9f74e25f7248c8748e954f8dc33c2de42884e31e615fb61d
+  metadata.gz: '09047e18b86cf30f2a013c7c20f864ef3540120f7f70c12bae854f80f60f952a84e109811ab59aa078e331c0fc34134c9f84dd85f73d7dab5c08ee2208454c17'
+  data.tar.gz: 69eb21940249f6566de22d88dd33165d4265aed490deafc81659ac59d04f7c9b1436ae4b2cbdc09e74f6279e82fdbaa620001610fd2022584dcc599e23bda10e

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,36 @@
 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.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
+- introduce stack-level test concept and change project-level test concept
+- generators: standardize and unifiy new test
+- new generators: arg, hook, helper
+- clean up Terraspace check project
+- setup up autoloader and bundler/setup earlier. removes need for shim
+- test generator plugin autodetection
+- remove internal run_generator_hook_script
+- stack-level args customization support
+- improve test output noise-level
+- new setting: config.terraform.plugin_cache.purge_on_error
+- quiet option for project generator
+
+## [0.4.4]
+- #50 retry logic for shared cache error
+- #51 fix cloud sync: call build first
+
+## [0.4.3]
+* #49 add info --path option
+
+## [0.4.2]
+* #48 add logs pid option
+* default to input false, encourage set tfvars
+
 ## [0.4.1]
 * #47 `terraspace list` fix and `terraspace all init` help updates
 

data/README.md

@@ -29,68 +29,96 @@ Here are commands to get started:
 * The `up` command creates an s3 bucket.
 * The `down` command cleans up and deletes the bucket.
 
-The default plugin is aws. Other plugins also supported are: google and azurerm.
+The default plugin is aws. Major cloud providers are supported: [aws](https://terraspace.cloud/docs/learn/aws/), [azurerm](https://terraspace.cloud/docs/learn/azure/), [google](https://terraspace.cloud/docs/learn/gcp/).
 
 ## Usage
 
 Create infrastructure:
 
-    $ terraspace up demo -y
+    $ terraspace up demo
     Building .terraspace-cache/us-west-2/dev/stacks/demo
     Current directory: .terraspace-cache/us-west-2/dev/stacks/demo
-    => terraform init -get > /tmp/terraspace/out/terraform-init20200824-21379-bkfvnh.out
-    Built in .terraspace-cache/us-west-2/dev/stacks/demo
-    => terraform apply -auto-approve
-    random_pet.bucket: Creating...
-    random_pet.bucket: Creation complete after 0s [id=amusing-mouse]
-    module.bucket.aws_s3_bucket.this: Creating...
-    module.bucket.aws_s3_bucket.this: Creation complete after 1s [id=bucket-amusing-mouse]
-
+    => terraform init -get >> /tmp/terraspace/log/init/demo.log
+    => terraform apply
     Apply complete! Resources: 2 added, 0 changed, 0 destroyed.
-
-    Outputs:
-
-    bucket_name = bucket-amusing-mouse
     $
 
 Destroy infrastructure:
 
-    $ terraspace down demo -y
+    $ terraspace down demo
     Building .terraspace-cache/us-west-2/dev/stacks/demo
     Current directory: .terraspace-cache/us-west-2/dev/stacks/demo
-    => terraform init -get > /tmp/terraspace/out/terraform-init20200824-21379-bkfvnh.out
-    Built in .terraspace-cache/us-west-2/dev/stacks/demo
-    => terraform destroy -auto-approve
-    random_pet.bucket: Refreshing state... [id=amusing-mouse]
-    module.bucket.aws_s3_bucket.this: Refreshing state... [id=bucket-amusing-mouse]
-    module.bucket.aws_s3_bucket.this: Destroying... [id=bucket-amusing-mouse]
-    module.bucket.aws_s3_bucket.this: Destruction complete after 1s
-    random_pet.bucket: Destroying... [id=amusing-mouse]
-    random_pet.bucket: Destruction complete after 0s
-
+    => terraform destroy
     Destroy complete! Resources: 2 destroyed.
     $
 
+* Blog: [Introducing Terraspace: The Terraform Framework](https://blog.boltops.com/2020/08/22/introducing-terraspace-the-terraform-framework)
+* Docs: [Terraspace Intro](https://terraspace.cloud/docs/intro/)
+
 ## Deploy Multiple Stacks
 
 To deploy all the infrastructure stacks:
 
-    terraspace all up
+    $ terraspace all up
+    Will run:
+        terraspace up vpc      # batch 1
+        terraspace up mysql    # batch 2
+        terraspace up redis    # batch 2
+        terraspace up instance # batch 3
+    Are you sure? (y/N)
 
 To choose multiple stacks to deploy
 
-    terraspace all up instance vpc
+    $ terraspace all up mysql redis
+    Will run:
+        terraspace up vpc   # batch 1
+        terraspace up mysql # batch 2
+        terraspace up redis # batch 2
+    Are you sure? (y/N)
+
+When you use the all command, the dependency graph is calculated and the stacks are deployed in the right order.
+
+* Blog: [Terraspace All: Deploy Multiple Stacks or Terraform Modules At Once](https://blog.boltops.com/2020/09/19/terraspace-all-deploy-multiple-stacks-at-once)
+* Docs: [Deploy Multiple Stacks](https://terraspace.cloud/docs/intro/deploy-all/).
+
+## Terrafile
 
-When you use the all command, the dependency graph is calculated and the stacks are deployed in the right order. To learn more: [Deploy Multiple Stacks](https://terraspace.cloud/docs/intro/deploy-all/).
+Terraspace makes it easy to use Terraform modules sourced from your own git repositories, other git repositories, or the Terraform Registry. Use any module you want:
+
+Terrafile:
+
+```ruby
+# GitHub repo
+mod "s3", source: "boltops-tools/terraform-aws-s3", tag: "v0.1.0"
+# Terraform registry
+mod "sg", source: "terraform-aws-modules/security-group/aws", version: "3.10.0"
+```
+
+To install modules:
+
+    terraspace bundle
+
+* Blog: [Terraspace Terrafile: Using Git and Terraform Registry Modules](https://blog.boltops.com/2020/10/18/terraspace-terrafile-using-git-repos-and-terraform-registry-modules)
+* Docs: [Terrafile](https://terraspace.cloud/docs/terrafile/)
 
 ## Features
 
 * [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/).
-* [Configurable CLI](https://terraspace.cloud/docs/cli/): Configurable [CLI Hooks](https://terraspace.cloud/docs/cli/hooks/) and [CLI Args](https://terraspace.cloud/docs/cli/args/) allow you to adjust the underlying terraform command.
+* [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.
 * [Terraform Cloud and Terraform Enterprise Support](https://terraspace.cloud/docs/cloud/): TFC and TFE are both supported. Terraspace adds additional conveniences to make working with Terraform Cloud Workspaces easier.
 
-For more info: [terraspace.cloud](https://terraspace.cloud)
+## Comparison
+
+Here are some useful comparisons to help you compare Terraspace vs other tools in the ecosystem:
+
+* [Terraspace vs Custom Solution](https://terraspace.cloud/docs/vs/custom/)
+* [Terraspace vs Terraform](https://terraspace.cloud/docs/vs/terraform/)
+* [Terraform vs Terragrunt vs Terraspace](https://blog.boltops.com/2020/09/28/terraform-vs-terragrunt-vs-terraspace)
+
+More info: [terraspace.cloud](https://terraspace.cloud)

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

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

data/lib/templates/base/helper/%name%_helper.rb.tt

@@ -0,0 +1,2 @@
+module <%= helper_class %>
+end

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

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

data/lib/terraspace.rb

@@ -1,6 +1,10 @@
 $stdout.sync = true unless ENV["TS_STDOUT_SYNC"] == "0"
 
 $:.unshift(File.expand_path("../", __FILE__))
+
+require "terraspace/autoloader"
+Terraspace::Autoloader.setup
+
 require "active_support/concern"
 require "active_support/core_ext/class"
 require "active_support/core_ext/hash"
@@ -18,16 +22,15 @@ require "set"
 require "terraspace/ext"
 require "terraspace/version"
 
-require "terraspace/autoloader"
-Terraspace::Autoloader.setup
-
 DslEvaluator.backtrace_reject = "lib/terraspace"
 
 module Terraspace
   extend Core # for Terraspace.root
   class Error < StandardError; end
-  class InitRequiredError < Error; end
+
   class BucketNotFoundError < Error; end
+  class InitRequiredError < Error; end
+  class SharedCacheError < Error; end
 end
 
 Terraspace::Booter.boot

data/lib/terraspace/all/base.rb

@@ -2,7 +2,6 @@ module Terraspace::All
   class Base
     def initialize(options={})
       @options = options
-      Terraspace.check_project! unless ENV['TS_TEST']
     end
   end
 end

data/lib/terraspace/app.rb

@@ -47,6 +47,7 @@ module Terraspace
       config.terraform.plugin_cache = ActiveSupport::OrderedOptions.new
       config.terraform.plugin_cache.dir = ENV['TF_PLUGIN_CACHE_DIR'] || "#{Terraspace.tmp_root}/plugin_cache"
       config.terraform.plugin_cache.enabled = true
+      config.terraform.plugin_cache.purge_on_error = true
       config.test_framework = "rspec"
       config
     end

data/lib/terraspace/autoloader.rb

@@ -1,8 +1,15 @@
-require "terraspace/bundle"
-Terraspace::Bundle.setup
+if File.exist?("config/app.rb")
+  require "terraspace/bundle"
+  Terraspace::Bundle.setup
+end
 require "zeitwerk"
 
 module Terraspace
+  # These modules are namespaces for user-defined custom helpers
+  module Module; end
+  module Project; end
+  module Stack; end
+
   class Autoloader
     class Inflector < Zeitwerk::Inflector
       def camelize(basename, _abspath)
@@ -16,10 +23,20 @@ module Terraspace
         loader = Zeitwerk::Loader.new
         loader.inflector = Inflector.new
         loader.push_dir(File.dirname(__dir__)) # lib
+        loader.push_dir(project_helpers, namespace: Terraspace::Project) if File.exist?(project_helpers)
         loader.log! if ENV["TS_AUTOLOAD_LOG"]
-        loader.ignore("#{__dir__}/core_ext.rb")
+        loader.ignore("#{__dir__}/ext.rb")
         loader.setup
       end
+
+      def project_helpers
+        "#{ts_root}/config/helpers"
+      end
+
+      # Duplicate definition because autoloader logic runs very early and doesnt have access to core methods yet
+      def ts_root
+        ENV['TS_ROOT'] || Dir.pwd
+      end
     end
   end
 end

data/lib/terraspace/cli.rb

@@ -86,6 +86,7 @@ module Terraspace
     long_desc Help.text(:info)
     instance_option.call
     option :format, desc: "Output formats: #{CliFormat.formats.join(', ')}"
+    option :path, desc: "Print path to built path"
     def info(mod)
       Info.new(options.merge(mod: mod)).run
     end
@@ -110,6 +111,7 @@ module Terraspace
     option :follow, aliases: %w[f], type: :boolean, desc: "Follow the log in live tail fashion. Must specify a stack if using this option."
     option :limit, aliases: %w[n], default: 10, type: :numeric, desc: "Number of lines to limit showing. Only applies in no-follow mode."
     option :all, aliases: %w[a], type: :boolean, desc: "All mode turns off the limit. Defaults to all if a single log is specified. Only applies in no-follow mode."
+    option :pid, aliases: %w[p], desc: "Filter by pid. Defaults to the last pid at the bottom of the log file."
     def logs(action=nil, stack=nil)
       Logs.new(@options.merge(action: action, stack: stack)).run
     end

data/lib/terraspace/cli/bundle.rb

@@ -7,7 +7,6 @@ class Terraspace::CLI
     end
 
     def run
-      Terraspace.check_project!
       TerraspaceBundler.config.deep_merge!(Terraspace.config.bundle)
       TerraspaceBundler::CLI.start(args)
     end

data/lib/terraspace/cli/clean/base.rb

@@ -5,7 +5,6 @@ class Terraspace::CLI::Clean
 
     def initialize(options={})
       @options = options
-      Terraspace.check_project!
     end
 
     def pretty(path)

data/lib/terraspace/cli/clean/cache.rb

@@ -1,7 +1,6 @@
 class Terraspace::CLI::Clean
   class Cache < Base
     def run
-      Terraspace.check_project!
       paths = [Terraspace.cache_root, Terraspace.tmp_root]
       are_you_sure?(paths)
       paths.each do |path|

data/lib/terraspace/cli/cloud.rb

@@ -16,6 +16,7 @@ class Terraspace::CLI
 
     desc "destroy STACK", "Destroy workspace by specifying the stack"
     long_desc Help.text("cloud:destroy")
+    yes_option.call
     def destroy(mod)
       Workspace.new(options.merge(mod: mod)).destroy
     end
@@ -24,6 +25,7 @@ class Terraspace::CLI
     long_desc Help.text("cloud:sync")
     yes_option.call
     def sync(*stacks)
+      Terraspace::CLI::Build::Placeholder.new(options).build
       Syncer.new(options.merge(stacks: stacks, override_auto_sync: true)).run
     end
 

data/lib/terraspace/cli/help/logs.md

@@ -12,12 +12,12 @@ Note, Terraspace automatically checks every second for new logs and adds them to
 
 View last 10 lines of each log file.
 
-    terraspace logs up network # view up log on specific stack
+    terraspace logs up network # view up log on a specific stack
     terraspace logs up         # view all up logs
     terraspace logs down       # view all down logs
     terraspace logs            # view all logs: up, down, etc
 
-By default, the log command shows the last 10 lines of the logs for each log file. You can use the `-n` option to adjust this.
+By default, the logs command shows the last 10 lines for each log file. You can use the `-n` option to adjust this.
 
     terraspace logs -n 2       # view last 2 lines of all logs: up, down, etc
 
@@ -31,14 +31,14 @@ Note, if both an action and stack is specified, then it defaults to showing all
 
 To tail logs, use the `-f` option.
 
-    terraspace logs up network -f # view up log on specific stack
+    terraspace logs up network -f # view up log on a specific stack
     terraspace logs up -f         # view all up logs
     terraspace logs down -f       # view all down logs
     terraspace logs -f            # view all logs: up, down, etc
 
 ## Timestamps
 
-The timestamps are shown by default when you are looking for multiple files.  When you specify both the action and stack for a single log file, then timestamps are not shown.
+The timestamps are shown by default when you are looking for multiple files.  When you specify both the action and stack for a single log file, the timestamps are not shown.
 
     terraspace logs up         # timestamps will be shown in this case
     terraspace logs up network # timestamps not be shown in this case

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

@@ -0,0 +1,19 @@
+## Examples
+
+Project-level arg:
+
+    $ terraspace new arg --type project
+          create  config/args
+          create  config/args/terraform.rb
+
+Stack-level arg:
+
+    $ terraspace new arg demo --type stack
+          create  app/stacks/demo/config/args
+          create  app/stacks/demo/config/args/terraform.rb
+
+Module-level arg:
+
+    $ terraspace new arg example --type module
+          create  app/modules/example/config/args
+          create  app/modules/example/config/args/terraform.rb

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

@@ -0,0 +1,39 @@
+## Project Examples
+
+Conventionally name the helper custom.
+
+    $ terraspace new helper custom --type project
+          create  config/helpers
+          create  config/helpers/custom_helper.rb
+
+## Stack Examples
+
+Conventionally name the helper to be the same as the stack name.
+
+    $ terraspace new helper demo --type stack
+          create  app/stacks/demo/config/helpers
+          create  app/stacks/demo/config/helpers/demo_helper.rb
+    $
+
+Explictly name helper method. IE: custom here.
+
+    $ terraspace new helper demo --type stack --name custom
+          create  app/stacks/demo/config/helpers
+          create  app/stacks/demo/config/helpers/custom_helper.rb
+    $
+
+## Module Examples
+
+Conventionally name the helper to be the same as the module name.
+
+    $ terraspace new helper example --type module
+          create  app/module/example/config/helpers
+          create  app/module/example/config/helpers/example_helper.rb
+    $
+
+Explictly name helper method. IE: custom here.
+
+    $ terraspace new helper example --type module --name custom
+          create  app/module/example/config/helpers
+          create  app/module/example/config/helpers/custom_helper.rb
+    $