terraspace 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec0e35f7878a3c4b0b7b1f2b12707f76bfbf6e81b47e04c50822cedd9e9baf1
-  data.tar.gz: 055d46279e41f268502ed3d0035ef0d3c28d5a03027810a628e5a5c51b4aec77
+  metadata.gz: 0174dca33a15bfe2c0eb0a1e0f573599ab7de2850d746e6f0be4e34aec573e39
+  data.tar.gz: 4d2b91fb5631d3fa1c32379845cc1f3d677238edc7133015cf99050e874339f4
 SHA512:
-  metadata.gz: 4cea499e91524e6b151bd3e9773fd9c41fa9c586b49d6c084e6b286b81e34b1f76838d9eb8a1adb6fc4aea8095ab047269f27e53ca30b6cc7ba0f6bb69204f44
-  data.tar.gz: ce9291d9769eca58a5e9debb70a8721d9bb2e2897096fd089898f56ae7f793f5300e830b4ee2306a9f74e25f7248c8748e954f8dc33c2de42884e31e615fb61d
+  metadata.gz: b624c36518fd03e4b03c8ddba62dc196ea656f26921086ddb3dec4859f613b3da2534f0320f0c6197a53fd31d9f5a44ad98f5c5c4b3914164185707a42eb007e
+  data.tar.gz: 87b7625d52efd046193ec7ed9abfb7e311b7b143d70e492db84e60cccb4b90fea872d1f6333901d95a6c9af7d07bf2d5027980aa482794d5f60b27ed9a8e3e41

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.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,59 +29,77 @@ 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
 
@@ -89,8 +107,17 @@ When you use the all command, the dependency graph is calculated and the stacks
 * [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/).
 * [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/).
+* [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/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.
 * [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/terraspace/cli.rb

@@ -110,6 +110,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/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/logs/concern.rb

@@ -17,6 +17,7 @@ class Terraspace::CLI::Logs
 
     # [2020-09-06T21:58:25 #11313 terraspace up b1]:
     def pid(line)
+      return @options[:pid] if @options && @options[:pid] # Terraspace::All::Summary: doesnt have @options set
       md = line.match(/:\d{2} #(\d+) /)
       md[1] if md
     end

data/lib/terraspace/terraform/args/default.rb

@@ -26,7 +26,7 @@ module Terraspace::Terraform::Args
         args << var_files.map { |f| "-var-file #{Dir.pwd}/#{f}" }.join(' ')
       end
 
-      args << input_option if input_option
+      args << input_option
 
       # must be at the end
       plan = @options[:plan]
@@ -45,27 +45,17 @@ module Terraspace::Terraform::Args
     end
 
     def input_option
-      option = nil
-      if @options[:auto] && @options[:input].nil?
-        option = " -input=false"
-      end
-      unless @options[:input].nil?
-        input = @options[:input] ? "true" : "false"
-        option = " -input=#{input}" # = sign required for apply when there's a plan at the end. so input=false works input false doesnt
-      end
-      option
+      option = if @options[:auto]
+                 "false"
+               else
+                 @options[:input] ? @options[:input] : "false"
+               end
+      " -input=#{option}"
     end
 
     def init_args
       args = "-get"
-      if @options[:auto] && @options[:input].nil?
-        args << " -input=false"
-      end
-      unless @options[:input].nil?
-        input = @options[:input] ? "true" : "false"
-        args << " -input=#{input}"
-      end
-
+      args << input_option
       args << " -reconfigure" if @options[:reconfigure]
 
       # must be at the end
@@ -86,7 +76,7 @@ module Terraspace::Terraform::Args
 
     def plan_args
       args = []
-      args << input_option if input_option
+      args << input_option
       args << "-destroy" if @options[:destroy]
       args << "-out #{expanded_out}" if @options[:out]
       args

data/lib/terraspace/terraform/runner.rb

@@ -21,7 +21,7 @@ module Terraspace::Terraform
       current_dir_message # only show once
 
       params = args.flatten.join(' ')
-      command = "terraform #{name} #{params}"
+      command = "terraform #{name} #{params}".squish
       run_hooks("terraform.rb", name) do
         Terraspace::Shell.new(@mod, command, @options.merge(env: custom.env_vars)).run
       end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport