terraspace 0.5.7 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7497c859165e1d927b8ac4e7b50133b3eec5c807e2e9c8d3e088f7ff69327570
-  data.tar.gz: f3502a6e9983e8ffc93b8ffc9c380f2c2d46771c5719f7e5da5ce9060debb68d
+  metadata.gz: 85fe397ec78c3f7aef5a84305c0a1f64bb6c8f1fe600f42b0d6595de4b5e579b
+  data.tar.gz: 5549151c17289da5bf06dcdbae93437cd53ec338c1e8f6649fef7f2c71eb21da
 SHA512:
-  metadata.gz: e5c718910a1da711fde1b5bb5282eb12f66af3c2336aa332fbf1f0320ffcb2b6daffe7c98ea02fb4b266030a314ad974d411bff34b90bac520240f7e4d495d26
-  data.tar.gz: cfdbd1ae125224dea80efb7bdfdf4b251e7767b49bb05ed38d735fda7c8eab29f86e88335b648873fbd5bcaf9c40ea37b9b845cc0b9ed6b4d0e3148d248f9b54
+  metadata.gz: 3155ac6e54e382836f73fa2bd3904544bbc9be86eb9a7f4a140a78062e83c320c493efc67fa92db0fa5d5a7e994d8293b674f324f70ff39b5242130883d6c28c
+  data.tar.gz: 368950badea2768a4221593d65eadda27c3a84eb4f2f1a9b4af0e5a53da05faa67cbfff8d99850d846c2e64aa110bd347178866e2caa05e9e084c8411489a9af

data/.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 Please fill out one of the templates on https://github.com/boltops-tools/terraspace/issues/new/choose
 
-If you want to ask a question please do so on sites like StackOverflow.
+If you want to ask a question please do so in the Terraspace category in the BoltOps Community forum: https://community.boltops.com
 
-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/ 👌
+To be sensitive to everyone's time, we may close issues asking questions without comment. Posting your questions in the Terraspace community forum is the best place. It also benefits others by making the questions easier to find. Here are some additional options also https://terraspace.cloud/support/ 👌
 
 Thank you!

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,7 +15,8 @@ issue may be closed without comment. If you repeatedly fail to provide enough
 details, you may be blocked from ever submitting issues to Terraspace again.
 Please use your best judgment. 👍
 
-If you are unsure this is a bug in Terraspace, please consider asking your question at sites like StackOverflow.
+If you are unsure this is a bug in Terraspace, please consider asking your question at:
+https://community.boltops.com
 
 Thanks!
 -->
@@ -26,8 +27,8 @@ Thanks!
 Make sure that you've done all of these.  To mark a checkbox done, replace [ ] with [x]. Or after you create the issue you can click the checkbox.
 -->
 
-- [ ] Upgrade Terraspace: Are you using the latest version of Terraspace? This allows Terraspace to fix issues fast.
-- [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on StackOverflow.
+- [ ] Upgrade Terraspace: Are you using the latest version of Terraspace? This allows Terraspace to fix issues fast. There's an Upgrading Guide: https://terraspace.cloud/docs/misc/upgrading/
+- [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on https://community.boltops.com
 - [ ] Code sample: Have you put together a code sample to reproduce the issue and make it available?  Code samples help speed up fixes dramatically. If it's an easily reproducible issue, then code samples are not needed. If you're unsure, please include a code sample.
 
 ## My Environment

data/.github/ISSUE_TEMPLATE/question.md

@@ -7,8 +7,8 @@ assignees: ''
 
 ---
 
-The Terraspace issue tracker IS NOT for usage questions! Please post your question at sites like StackOverflow.
+The Terraspace issue tracker IS NOT for usage questions! Please post your question on our dedicated forum at https://community.boltops.com
 
 To be sensitive to everyone's time, we may close issues asking questions without comment. If you repeatedly post questions in the issues tracker, you may be blocked from ever submitting issues to Terraspace again. Please use your best judgment. 👍
 
-Here are some additional options also https://terraspace.cloud/support/ 😁
+Posting your questions in the Terraspace community forum benefits others by grouping questions in a dedicated place. Here are some additional options also https://terraspace.cloud/support/ 😁

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 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.12] - 2021-02-27
+- [#79](https://github.com/boltops-tools/terraspace/pull/79) Fix syntax issue
+- [#85](https://github.com/boltops-tools/terraspace/pull/85) Add all.include_stacks option and fix all.ignore_stacks option when building dependency graph
+
+## [0.5.11] - 2021-02-11
+- [#76](https://github.com/boltops-tools/terraspace/pull/76) dont use auto generated plan when both yes and plan options used
+- fix plan path when 2 stacks of same name run at the same time
+
+## [0.5.10] - 2020-12-11
+- [#69](https://github.com/boltops-tools/terraspace/pull/69) require singleton earlier
+
+## [0.5.9] - 2020-12-11
+- [#68](https://github.com/boltops-tools/terraspace/pull/68) require singleton
+- fix graphviz check for format text, improve graphviz install help message
+
+## [0.5.8] - 2020-12-04
+- [#67](https://github.com/boltops-tools/terraspace/pull/67) fix find placeholder stack so config/terraform only builds for stacks
+
 ## [0.5.7] - 2020-12-02
 - [#64](https://github.com/boltops-tools/terraspace/pull/64) fix completion_script
 

data/lib/terraspace.rb

@@ -19,6 +19,7 @@ require "memoist"
 require "rainbow/ext/string"
 require "render_me_pretty"
 require "set"
+require "singleton"
 require "terraspace/ext"
 require "terraspace/version"
 

data/lib/terraspace/all/grapher.rb

@@ -109,13 +109,12 @@ module Terraspace::All
 
     # Check if Graphiz is installed and prints a user friendly message if it is not installed.
     def check_graphviz!
+      return if @options[:format] == 'text'
+
       installed = system("type dot > /dev/null 2>&1") # dot is a command that is part of the graphviz package
       return if installed
       logger.error "ERROR: It appears that the Graphviz is not installed.  Please install it to use the graph command.".color(:red)
-      if RUBY_PLATFORM =~ /darwin/
-        logger.error "You can install Graphviz with homebrew:"
-        logger.error "    brew install graphviz"
-      end
+      install_instructions
       logger.info <<~EOL
         Also consider:
 
@@ -125,5 +124,23 @@ module Terraspace::All
       EOL
       exit 1
     end
+
+    def install_instructions
+      installer = if RUBY_PLATFORM =~ /darwin/
+        "brew"
+      elsif system("type yum > /dev/null 2>&1")
+        "yum"
+      elsif system("type apt-get > /dev/null 2>&1")
+        "apt-get"
+      end
+
+      return unless installer
+      logger.error <<~EOL
+        You can install Graphviz with:
+
+            #{installer} install graphviz
+
+      EOL
+    end
   end
 end

data/lib/terraspace/app.rb

@@ -17,7 +17,8 @@ module Terraspace
       config.all.exit_on_fail = ActiveSupport::OrderedOptions.new
       config.all.exit_on_fail.down = true
       config.all.exit_on_fail.up = true
-      config.all.ignore_stacks = []
+      config.all.ignore_stacks = nil
+      config.all.include_stacks = nil
       config.allow = ActiveSupport::OrderedOptions.new
       config.allow.envs = nil
       config.allow.regions = nil

data/lib/terraspace/cli.rb

@@ -144,7 +144,7 @@ module Terraspace
     desc "seed STACK", "Build starer seed tfvars file."
     long_desc Help.text(:seed)
     option :yes, aliases: :y, type: :boolean, desc: "bypass prompts and force overwrite files"
-    option :where, desc: "where to create file. either under app or seed folder structure. values: app or stack"
+    option :where, desc: "where to create file. either under app or seed folder structure. values: seed or stack"
     init_option.call
     instance_option.call
     def seed(mod)

data/lib/terraspace/cli/build/placeholder.rb

@@ -18,17 +18,22 @@ module Terraspace::CLI::Build
       mod = @options[:mod]
       if !mod or %w[placeholder].include?(mod)
         logger.info "Building one of the modules to get backend.tf info"
-        mod = find_mod
+        mod = find_stack
       end
       Terraspace::Builder.new(@options.merge(mod: mod, init: false)).run # generate and init
       Terraspace::Mod.new(mod, @options) # mod metadata
     end
 
     # Used by: terraspace build placeholder
-    def find_mod
-      mod_path = Dir.glob("{app,vendor}/{modules,stacks}/*").last
+    def find_stack
+      stack_paths = Dir.glob("{app,vendor}/stacks/*")
+      stack_paths.select! do |path|
+        select = Terraspace::Compiler::Select.new(path)
+        select.selected?
+      end
+      mod_path = stack_paths.last
       unless mod_path
-        logger.info "No modules or stacks found."
+        logger.info "No stacks found."
         exit 0
       end
       File.basename(mod_path) # mod name

data/lib/terraspace/cli/up.rb

@@ -1,10 +1,12 @@
+require 'securerandom'
+
 class Terraspace::CLI
   class Up < Base
     include TfcConcern
 
     def run
       build
-      if @options[:yes] && !tfc?
+      if @options[:yes] && !@options[:plan] && !tfc?
         plan
         Commander.new("apply", @options.merge(plan: plan_path)).run
       else
@@ -25,8 +27,8 @@ class Terraspace::CLI
     end
 
     def plan_path
-      @@timestamp ||= Time.now.utc.strftime("%Y%m%d%H%M%S")
-      "#{Terraspace.tmp_root}/plans/#{@mod.name}-#{@@timestamp}.plan"
+      @@random ||= SecureRandom.hex
+      "#{Terraspace.tmp_root}/plans/#{@mod.name}-#{@@random}.plan"
     end
   end
 end

data/lib/terraspace/compiler/dirs_concern.rb

@@ -23,6 +23,7 @@ module Terraspace::Compiler
       names, built = [], []
       local_paths(type_dir).each do |path|
         next unless File.directory?(path)
+        next unless select_stack?(type_dir, path)
         mod_name = File.basename(path)
         next if built.include?(mod_name) # ensures modules in app folder take higher precedence than vendor folder
         names << mod_name
@@ -31,6 +32,15 @@ module Terraspace::Compiler
     end
     memoize :mod_names
 
+    # Examples:
+    #   type_dir stacks
+    #   path     /home/ec2-user/environment/downloads/infra/app/stacks/demo
+    def select_stack?(type_dir, path)
+      return true unless type_dir == "stacks"
+      select = Terraspace::Compiler::Select.new(path)
+      select.selected?
+    end
+
     def local_paths(type_dir)
       dirs("app/#{type_dir}/*") + dirs("vendor/#{type_dir}/*")
     end
@@ -40,7 +50,7 @@ module Terraspace::Compiler
     end
 
     def stack_names
-      mod_names("stacks") - Terraspace.config.all.ignore_stacks
+      mod_names("stacks")
     end
     memoize :stack_names
   end

data/lib/terraspace/compiler/select.rb

@@ -0,0 +1,28 @@
+module Terraspace::Compiler
+  class Select
+    def initialize(path)
+      @path = path
+      @stack_name = extract_stack_name(path)
+    end
+
+    def selected?
+      all = Terraspace.config.all
+      # Key difference between include_stacks vs all.include_stacks option is that
+      # the option can be nil. The local variable is guaranteed to be an Array.
+      # This simplifies the logic.
+      include_stacks = all.include_stacks || []
+      ignore_stacks  = all.ignore_stacks  || []
+
+      if all.include_stacks.nil?
+        !ignore_stacks.include?(@stack_name)
+      else
+        stacks = include_stacks - ignore_stacks
+        stacks.include?(@stack_name)
+      end
+    end
+
+    def extract_stack_name(path)
+      path.sub(%r{.*(app|vendor)/stacks/}, '')
+    end
+  end
+end

data/lib/terraspace/mod.rb

@@ -19,7 +19,7 @@ module Terraspace
 
     def placeholder(name)
       if name == "placeholder"
-        Terraspace::CLI::Build::Placeholder.new(@options).find_mod
+        Terraspace::CLI::Build::Placeholder.new(@options).find_stack
       else
         name
       end

data/lib/terraspace/shell/error.rb

@@ -13,7 +13,7 @@ class Terraspace::Shell
       if reinit_required?
         Terraspace::InitRequiredError.new(@lines)
       elsif bucket_not_found?
-        Terraspace::BucketNotFound.new(@lines)
+        Terraspace::BucketNotFoundError.new(@lines)
       elsif shared_cache_error?
         Terraspace::SharedCacheError.new(@lines)
       end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.5.7"
+  VERSION = "0.5.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.12
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -599,6 +599,7 @@ files:
 - lib/terraspace/compiler/erb/render.rb
 - lib/terraspace/compiler/expander.rb
 - lib/terraspace/compiler/helper_extender.rb
+- lib/terraspace/compiler/select.rb
 - lib/terraspace/compiler/strategy/abstract_base.rb
 - lib/terraspace/compiler/strategy/mod.rb
 - lib/terraspace/compiler/strategy/mod/base.rb
@@ -835,7 +836,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'