terraspace 0.5.5 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1f2eeedf81924675273ea090cf485919fe3fa74f178dad36cb49a92a91cbc7
-  data.tar.gz: cb925de348699c79e71a86a8a17c518ead35ed3c1efd8d1639938019ea93f2b9
+  metadata.gz: 1cdf03c4bdbb78f6b313f753247facd1b5a0a81fecef5a2b2bd12e1eee5c34ee
+  data.tar.gz: '09e04997aa61e94a3eaf4ac4d455a0be4f30e401352dacf57b1e2b403977a511'
 SHA512:
-  metadata.gz: 5013095abeeb89a2229bd85d197dd424f5675e69b23f5c24752c6d70ac4d461c00762c9d2025c01d64066622a1d342dfdf1fe4a06d8125ad10329a569f79de31
-  data.tar.gz: a5d2374d71923a9df87cd7ecd045b196017c101562265aca253a998ced96646896aab5af5e1a77f26e5cb8bb960628fc0c716a8519a4e21387d4a5afbe1c991b
+  metadata.gz: fcb9519b863343ee042eb624c3fc1dd031f7de6bbb1d47c3d02bc3852d5ef68639efea275646222eacc3cbec2c83cb312f74387f425b7fd9d21d98650db47056
+  data.tar.gz: c2ad72731535c2a0c01ab112bf70d2f68d1c9e4ad10b7a1d28d6c86c7aabfdb2c706d1b0bbba8d7a5523c78c0414cce4d4f49c35e60215bd7f9a303c6b57110e

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 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.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
+
+## [0.5.6] - 2020-11-30
+- [#61](https://github.com/boltops-tools/terraspace/pull/61) allow envs and regions check feature
+- fix terraspace build before hook
+
 ## [0.5.5] - 2020-11-27
 - fix link
 

data/README.md

@@ -12,9 +12,9 @@ The Terraform Framework.
 
 Official Docs Site: [terraspace.cloud](https://terraspace.cloud)
 
-Introduction Video:
+Quick Start Demo:
 
-[![Watch the video](https://img.boltops.com/boltops/tools/terraspace/terraspace-youtube.png)](https://www.youtube.com/watch?v=O87t5q22YNc)
+[![Watch the video](https://img.boltops.com/boltops/tools/terraspace/youtube/terraspace-quick-start.png)](https://www.youtube.com/watch?v=EZfsBJx8pxQ)
 
 ## Quick Start
 
@@ -103,7 +103,7 @@ To install modules:
 
 ## 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/).
+* [DRY](https://terraspace.cloud/docs/intro/how-terraspace-works/): You can keep your code DRY. Terraspace builds your Terraform project with common `app` and `config/terraform` structure that gets built each deploy. 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.
 * [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/).

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

@@ -18,6 +18,9 @@ module Terraspace
       config.all.exit_on_fail.down = true
       config.all.exit_on_fail.up = true
       config.all.ignore_stacks = []
+      config.allow = ActiveSupport::OrderedOptions.new
+      config.allow.envs = nil
+      config.allow.regions = nil
       config.auto_create_backend = true
       config.build = ActiveSupport::OrderedOptions.new
       config.build.cache_dir = ":CACHE_ROOT/:REGION/:ENV/:BUILD_DIR"

data/lib/terraspace/builder.rb

@@ -16,7 +16,9 @@ module Terraspace
       logger.info "Building #{build_dir}" unless @options[:quiet] # from terraspace all
 
       batches = nil
+      FileUtils.mkdir_p(@mod.cache_dir) # so terraspace before build hooks work
       run_hooks("terraspace.rb", "build") do
+        check_allow!
         build_unresolved
         auto_create_backend
         batches = build_batches
@@ -26,6 +28,10 @@ module Terraspace
       batches
     end
 
+    def check_allow!
+      Allow.new(@mod).check!
+    end
+
     # Builds dependency graph and returns the batches to run
     def build_batches
       dependencies = Terraspace::Dependency::Registry.data # populated after build_unresolved

data/lib/terraspace/builder/allow.rb

@@ -0,0 +1,43 @@
+class Terraspace::Builder
+  class Allow
+    def initialize(mod)
+      @mod = mod
+    end
+
+    def check!
+      messages = []
+      unless env_allowed?
+        messages << "This env is not allowed to be used: TS_ENV=#{Terraspace.env}"
+        messages << "Allowed envs: #{config.allow.envs.join(', ')}"
+      end
+      unless region_allowed?
+        messages << "This region is not allowed to be used: Detected current region=#{current_region}"
+        messages << "Allowed regions: #{config.allow.regions.join(', ')}"
+      end
+      unless messages.empty?
+        puts "ERROR: The configs do not allow this.".color(:red)
+        puts messages
+        exit 1
+      end
+    end
+
+    def env_allowed?
+      return true unless config.allow.envs
+      config.allow.envs.include?(Terraspace.env)
+    end
+
+    def region_allowed?
+      return true unless config.allow.regions
+      config.allow.regions.include?(current_region)
+    end
+
+    def current_region
+      expander = Terraspace::Compiler::Expander.autodetect(@mod).expander
+      expander.region
+    end
+
+    def config
+      Terraspace.config
+    end
+  end
+end

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

@@ -18,17 +18,17 @@ 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
+      mod_path = Dir.glob("{app,vendor}/stacks/*").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/{completer.rb → cli/completer.rb}

@@ -1,74 +1,69 @@
-=begin
-Code Explanation:
-
-There are 3 types of things to auto-complete:
-
-  1. command: the command itself
-  2. parameters: command parameters.
-  3. options: command options
-
-Here's an example:
-
-  mycli hello name --from me
-
-  * command: hello
-  * parameters: name
-  * option: --from
-
-When command parameters are done processing, the remaining completion words will be options.  We can tell that the command params are completed based on the method arity.
-
-## Arity
-
-For example, say you had a method for a CLI command with the following form:
-
-  ufo scale service count --cluster dev
-
-It's equivalent ruby method:
-
-  scale(service, count) = has an arity of 2
-
-So typing:
-
-  ufo scale service count [TAB] # there are 3 parameters including the "scale" command according to Thor's CLI processing.
-
-So the completion should only show options, something like this:
-
-  --noop --verbose --cluster
-
-## Splat Arguments
-
-When the ruby method has a splat argument, it's arity is negative.  Here are some example methods and their arities.
-
-   ship(service) = 1
-   scale(service, count) = 2
-   ships(*services) = -1
-   foo(example, *rest) = -2
-
-Fortunately, negative and positive arity values are processed the same way. So we take simply take the absolute value of the arity and process it the same.
-
-Here are some test cases, hit TAB after typing the command:
-
-  terraspace completion
-  terraspace completion hello
-  terraspace completion hello name
-  terraspace completion hello name --
-  terraspace completion hello name --noop
-
-  terraspace completion
-  terraspace completion sub:goodbye
-  terraspace completion sub:goodbye name
-
-## Subcommands and Thor::Group Registered Commands
-
-Sometimes the commands are not simple thor commands but are subcommands or Thor::Group commands. A good specific example is the ufo tool.
-
-  * regular command: ufo ship
-  * subcommand: ufo docker
-  * Thor::Group command: ufo init
-
-Auto-completion accounts for each of these type of commands.
-=end
-module Terraspace
+# begin
+# Code Explanation:
+#
+# There are 3 types of things to auto-complete:
+#
+#   1. command: the command itself
+#   2. parameters: command parameters.
+#   3. options: command options
+#
+# Here's an example:
+#
+#   mycli hello name --from me
+#
+#   * command: hello
+#   * parameters: name
+#   * option: --from
+#
+# When command parameters are done processing, the remaining completion words will be options.  We can tell that the command params are completed based on the method arity.
+#
+# ## Arity
+#
+# For example, say you had a method for a CLI command with the following form:
+#
+#   terraspace up STACK
+#
+# It's equivalent ruby method:
+#
+#   up(mod) = has an arity of 1
+#
+# So typing:
+#
+#   terraspace up [TAB] # there is parameter including the "scale" command according to Thor's CLI processing.
+#
+# So the completion should only show options, something like this:
+#
+#   --noop --verbose --cluster
+#
+# ## Splat Arguments
+#
+# When the ruby method has a splat argument, it's arity is negative.  Here are some example methods and their arities.
+#
+#   up(mod) = 1
+#   scale(service, count) = 2
+#   bundle(*args) = -1
+#   foo(example, *rest) = -2
+#
+# Fortunately, negative and positive arity values are processed the same way. So we take simply take the absolute value of the arity and process it the same.
+#
+# Here are some test cases, hit TAB after typing the command:
+#
+#   terraspace completion
+#   terraspace completion up
+#   terraspace completion up name
+#   terraspace completion up name --
+#   terraspace completion up name --noop
+#
+# ## Subcommands and Thor::Group Registered Commands
+#
+# Sometimes the commands are not simple thor commands but are subcommands or Thor::Group commands. A good specific example is the terraspace tool.
+#
+#   * regular command: terraspace up
+#   * subcommand: terraspace all
+#   * Thor::Group command: terraspace new project
+
+# Auto-completion accounts for each of these type of commands.
+class Terraspace::CLI
   class Completer
     def initialize(command_class, *params)
       @params = params
@@ -132,7 +127,6 @@ module Terraspace
 
     def params_completion
       offset = @params.size - 1
-      offset_params = command_params[offset..-1]
       command_params[offset..-1].first
     end
 

data/lib/terraspace/{completer → cli/completer}/script.rb

@@ -1,6 +1,6 @@
-class Terraspace::Completer::Script
+class Terraspace::CLI::Completer::Script
   def self.generate
     bash_script = File.expand_path("script.sh", File.dirname(__FILE__))
-    logger.info "source #{bash_script}"
+    puts "source #{bash_script}"
   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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.10
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -465,6 +465,7 @@ files:
 - lib/terraspace/autoloader.rb
 - lib/terraspace/booter.rb
 - lib/terraspace/builder.rb
+- lib/terraspace/builder/allow.rb
 - lib/terraspace/bundle.rb
 - lib/terraspace/cli.rb
 - lib/terraspace/cli/all.rb
@@ -480,6 +481,9 @@ files:
 - lib/terraspace/cli/cloud.rb
 - lib/terraspace/cli/cloud/runs.rb
 - lib/terraspace/cli/commander.rb
+- lib/terraspace/cli/completer.rb
+- lib/terraspace/cli/completer/script.rb
+- lib/terraspace/cli/completer/script.sh
 - lib/terraspace/cli/down.rb
 - lib/terraspace/cli/help.rb
 - lib/terraspace/cli/help/all/down.md
@@ -607,9 +611,6 @@ files:
 - lib/terraspace/compiler/strategy/tfvar/rb.rb
 - lib/terraspace/compiler/strategy/tfvar/tfvars.rb
 - lib/terraspace/compiler/writer.rb
-- lib/terraspace/completer.rb
-- lib/terraspace/completer/script.rb
-- lib/terraspace/completer/script.sh
 - lib/terraspace/core.rb
 - lib/terraspace/dependency/graph.rb
 - lib/terraspace/dependency/helper/base.rb