terraspace 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6c8809128dbbbf51d0f654c92784a879c88cab49d31e15e2a1d827c4b40d051
-  data.tar.gz: c557bd4692fddd9a1bf859a986566780cb6ccd6024dcdb3e7979138a42f1e00e
+  metadata.gz: c07e843df9e61e62be834feba56f4d5fa058f3dbb130ed7e15edca66ef23e22d
+  data.tar.gz: a7d7c3946e2485ccb369a5d76d413118aed14592750880a48990ca83cdca5bca
 SHA512:
-  metadata.gz: 8b28d7d1b8565fa0f646fda57163b6d21486db7e7f704ebe657a219335e66504206769e487cec9dc3f30da06ac793e28d81b1709ebd4c32a39a70a5d8668be05
-  data.tar.gz: 1a09efc8d460c9267371aca9dbb130e4dbb1c9268ea870e19d6a9734aa48e0134b3cee09aedfe894acfd2c7e956a1fed4bf7b38cad9cf9b13b935802bd2fa4a7
+  metadata.gz: 026aa5128ce2bea7deb3e5b0fdb6e99c7cf50297c20f5292bbe6896dabb0ba995e62ecd14526ea2ea7e8e1a4be3895e29021620a89b26df49ad34ee0b95ffd1d
+  data.tar.gz: c2df058d2fe9848834fc4e166c1382ccb0e782170fb52f8fd264e4e948a1032916cc9d77662eac1969f4d2101e66b3655e07d944b217e5749581ac0d3ec04916

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.
 
+## [1.1.1] - 2022-02-02
+- [#199](https://github.com/boltops-tools/terraspace/pull/199) build required dependent stacks as part of terraspace up
+
 ## [1.1.0] - 2022-01-30
 - [#196](https://github.com/boltops-tools/terraspace/pull/196) terraspace all: build modules in batches and only each specific stack
 - [#197](https://github.com/boltops-tools/terraspace/pull/197) all plan --output and all up --plan options

data/lib/terraspace/all/runner.rb

@@ -54,13 +54,13 @@ module Terraspace::All
     end
 
     def build_modules
-      builder = Terraspace::Builder.new(@options.merge(mod: "placeholder", quiet: true, clean: true))
-      builder.build(modules: true, stack: false)
+      builder = Terraspace::Builder.new(@options.merge(mod: "placeholder", clean: true, quiet: true, include_stacks: :none))
+      builder.build(modules: true)
     end
 
     def build_stack(name)
-      builder = Terraspace::Builder.new(@options.merge(mod: name, quiet: true, clean: false))
-      builder.build(modules: false, stack: true)
+      builder = Terraspace::Builder.new(@options.merge(mod: name, clean: false, quiet: true, include_stacks: :root_only))
+      builder.build(modules: false)
     end
 
     def wait_for_child_proccess

data/lib/terraspace/app.rb

@@ -16,7 +16,7 @@ module Terraspace
       config.all = ActiveSupport::OrderedOptions.new
       config.all.concurrency = 5
       config.all.exit_on_fail = ActiveSupport::OrderedOptions.new
-      config.all.exit_on_fail.down = true
+      config.all.exit_on_fail.down = false
       config.all.exit_on_fail.plan = true
       config.all.exit_on_fail.up = true
 

data/lib/terraspace/builder/children.rb

@@ -0,0 +1,42 @@
+class Terraspace::Builder
+  class Children
+    include Terraspace::Util::Logging
+
+    def initialize(mod, options={})
+      @mod, @options = mod, options
+      @queue = []
+    end
+
+    def build
+      dependencies = Terraspace::Dependency::Registry.data
+      # Find out if current deploy stack contains dependency
+      found = dependencies.find do |parent_child|
+        parent, _ = parent_child.split(':')
+        parent == @mod.name
+      end
+      return unless found
+
+      # Go down graph children, which are the dependencies to build a queue
+      parent, _ = found.split(':')
+      node = Terraspace::Dependency::Node.find_by(name: parent)
+      build_queue(node)
+
+      logger.debug "Terraspace::Builder::Children @queue #{@queue}"
+
+      # Process queue in reverse order to build leaf nodes first
+      @queue.reverse.each do |node|
+        mod = Terraspace::Mod.new(node.name, @options)
+        Terraspace::Compiler::Perform.new(mod).compile
+      end
+    end
+
+    # Use depth first traversal to build queue
+    def build_queue(node)
+      node.children.each do |child|
+        @queue << child
+        build_queue(child)
+      end
+      @queue
+    end
+  end
+end

data/lib/terraspace/builder.rb

@@ -4,23 +4,40 @@ module Terraspace
     include Compiler::DirsConcern
     include Hooks::Concern
 
+    # @include_stacks can be 3 values: root_with_children, none, root_only
+    #
+    #     none: dont build any stacks at all. used by `terraspace all up`
+    #     root_only: only build root stack. used by `terraspace all up`
+    #     root_with_children: build all parent stacks as well as the root stack. normal `terraspace up`
+    #
+    def initialize(options={})
+      super
+      @include_stacks = @options[:include_stacks] || :root_with_children
+    end
+
     def run
       return if @options[:build] == false
       Terraspace::CLI::Setup::Check.check!
       check_allow!
       @mod.root_module = true
       clean
+      resolve_dependencies if @include_stacks == :root_with_children
       build
     end
 
-    def build(modules: true, stack: true)
+    def resolve_dependencies
+      resolver = Terraspace::Dependency::Resolver.new(@options.merge(quiet: true))
+      resolver.resolve # returns batches
+    end
+
+    def build(modules: true)
       build_dir = Util.pretty_path(@mod.cache_dir)
       placeholder_stack_message
       logger.info "Building #{build_dir}" unless @options[:quiet] # from terraspace all
       FileUtils.mkdir_p(@mod.cache_dir) # so terraspace before build hooks work
       run_hooks("terraspace.rb", "build") do
         build_dir("modules") if modules
-        build_root_module if stack
+        build_stacks
         logger.info "Built in #{build_dir}" unless @options[:quiet] # from terraspace all
       end
     end
@@ -29,16 +46,23 @@ module Terraspace
       Allow.new(@mod).check!
     end
 
-    def build_root_module
-      @mod.resolved = true
-      Compiler::Perform.new(@mod).compile
+    def build_stacks
+      return if @include_stacks == :none
+      build_children_stacks if @include_stacks == :root_with_children
+      Compiler::Perform.new(@mod).compile # @include_stacks :root or :root_with_children
+    end
+
+    # Build stacks that are part of the dependency graph. Because .terraspace-cache folders
+    # need to exist so `terraform state pull` works to get the state info.
+    def build_children_stacks
+      children = Children.new(@mod, @options)
+      children.build
     end
 
     def build_dir(type_dir)
       with_each_mod(type_dir) do |mod|
-        mod.resolved = true
         is_root_module = mod.cache_dir == @mod.cache_dir
-        next if is_root_module # handled by build_root_module
+        next if is_root_module # handled by build_stacks
         Compiler::Perform.new(mod).compile
       end
     end

data/lib/terraspace/dependency/resolver.rb

@@ -8,6 +8,7 @@ module Terraspace::Dependency
 
     def resolve
       with_each_mod("stacks") do |mod|
+        mod.resolved = false
         Terraspace::Compiler::Perform.new(mod).compile_tfvars(write: false)
       end
 

data/lib/terraspace/mod.rb

@@ -15,6 +15,7 @@ module Terraspace
       @name, @options = placeholder(name), options
       @consider_stacks = options[:consider_stacks].nil? ? true : options[:consider_stacks]
       @instance = options[:instance]
+      @resolved = true # more common case
     end
 
     def placeholder(name)

data/lib/terraspace/plugin/summary/interface.rb

@@ -49,7 +49,7 @@ module Terraspace::Plugin::Summary
     def download_statefiles
       return unless download?
       FileUtils.rm_rf(@dest_folder)
-      logger.info("Downloading statefiles to #{@dest_folder}")
+      logger.debug("Downloading statefiles to #{@dest_folder}")
       download # INTERFACE METHOD
     end
 

data/lib/terraspace/terraform/remote_state/fetcher.rb

@@ -48,7 +48,7 @@ module Terraspace::Terraform::RemoteState
     def output_error(type)
       msg = case type
       when :key_not_found
-        "Output #{@output_key} was not found for the #{@parent.name} tfvars file. Either #{@child.name} stack has not been deployed yet or it does not have this output: #{@output_key}"
+        "Output #{@output_key} was not found for the #{@parent.name} tfvars file. Either #{@child.name} stack has not been deployed yet or it does not have this output: #{@output_key}. Also, if local backend is being used and has been removed/cleaned, then it will also result zero-byte state.json with the 'terraform state pull' used to download the terraform state and output will not be found."
       when :state_not_found
         "Output #{@output_key} could not be looked up for the #{@parent.name} tfvars file. #{@child.name} stack needs to be deployed"
       when :bucket_not_found
@@ -63,7 +63,7 @@ module Terraspace::Terraform::RemoteState
     @@download_shown = false
     def pull
       return if @@pull_successes[cache_key]
-      logger.info "Downloading tfstate files for dependencies defined in tfvars..." unless @@download_shown || @options[:quiet]
+      logger.debug "Downloading tfstate files for dependencies defined in tfvars..." unless @@download_shown || @options[:quiet]
       @@download_shown = true
       logger.debug "Downloading tfstate for stack: #{@child.name}"
 

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/terraspace/compiler/erb/render_spec.rb

@@ -1,6 +1,10 @@
 describe Terraspace::Compiler::Erb::Render do
   let(:render) { described_class.new(mod, src_path) }
-  let(:mod)    { Terraspace::Mod.new("a1") }
+  let(:mod)    do
+    mod = Terraspace::Mod.new("a1")
+    mod.resolved = false
+    mod
+  end
 
   # Only testing mod unresolved as a sanity check and its worth the ROI.
   # The resolved would the Fetcher. We have unit tests to cover those other changes.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -490,6 +490,7 @@ files:
 - lib/terraspace/builder/allow/env.rb
 - lib/terraspace/builder/allow/region.rb
 - lib/terraspace/builder/allow/stack.rb
+- lib/terraspace/builder/children.rb
 - lib/terraspace/bundle.rb
 - lib/terraspace/cli.rb
 - lib/terraspace/cli/all.rb