terraspace 1.1.4 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50baca1ee67aedb6160857e20b413db3e31923ee2f6bd8347723e2445d9b59ef
-  data.tar.gz: 0ac181788709d0700c0cfcd8085c375b453e84aef6333b9c93b446ff1bb30938
+  metadata.gz: 82379236de38c541366efe70b69e9393490f5da74a4aecd4a975b3b9be0af907
+  data.tar.gz: b5cb25d94d6015f01768ec6970b66221b78851ef72ef5614f0a5e54e774aaa94
 SHA512:
-  metadata.gz: ce1c04ca24e818cef35397bf9fb7cadb9e9b28838a0e15c3ec18e0e4d0b49d3bdfba4bb01e6d3e9788e5410e99c44dc827ec79a0432ae94d90fd4413c2c446ad
-  data.tar.gz: 95d7c2cea1917b0e3c919a43afadf24b2970dbd87c2d46d5b5846d62c6e9cc115751a7ab63defb74ad1c79917984262a7d9987eee1134e87d2778c9edcc3a175
+  metadata.gz: 917fc2cd69a9eab564e2c8a69e9493a04e0a2e424784e09217a79f5c3433b9a790a1bfc9669e9b68a0f53cce32565900aeb4134861faf9a9266b91d847fea39d
+  data.tar.gz: a2977e19c20a1841892f4b275623e080837ccd10359282108475cad9bdd993ccaac3d7d1f0f7e38a530b823ab4c8c2816e9564b882cb482618bd7701e306da6d

data/.cody/all/bin/build.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -eu
+
+# will build from /tmp because terraspace/Gemfile may interfere
+cd /tmp
+
+export PATH=~/bin:$PATH # ~/bin/terraspace wrapper
+
+set -x
+
+git clone https://github.com/boltops-tools/terraspace-graph-demo
+cd terraspace-graph-demo
+
+# Rewrite the Gemfile to use the local terraspace gem for testing
+cat << EOF > Gemfile
+source "https://rubygems.org"
+gem "terraspace", path: "$CODEBUILD_SRC_DIR", submodules: true
+gem "rspec-terraspace", git: "https://github.com/boltops-tools/rspec-terraspace", branch: "master"
+gem "terraspace_plugin_aws", git: "https://github.com/boltops-tools/terraspace_plugin_aws", branch: "master"
+EOF
+bundle
+
+# Uncomment to enable logger level debug
+# cat << EOF > config/app.rb
+# Terraspace.configure do |config|
+#   config.logger.level = :debug
+# end
+# EOF
+
+terraspace all up -y
+terraspace clean all -y
+terraspace all down -y

data/.cody/all/buildspec.yml

@@ -0,0 +1,10 @@
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      ruby: latest
+  build:
+    commands:
+      - .cody/shared/script/install.sh
+      - .cody/all/bin/build.sh

data/.cody/all/project.rb

@@ -0,0 +1,2 @@
+github_url("https://github.com/boltops-tools/terraspace.git")
+linux_image("aws/codebuild/amazonlinux2-x86_64-standard:3.0")

data/.cody/all/role.rb

@@ -0,0 +1,6 @@
+iam_policy(
+  "dynamodb",
+  "logs",
+  "s3",
+  "ssm",
+)

data/.pipedream/pipeline.rb

@@ -9,6 +9,7 @@ end
 stage "Build" do
   # in parallel
   codebuild(
+    "terraspace-all",
     "terraspace-aws",
     "terraspace-azurerm",
     "terraspace-google",

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 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.7] - 2022-02-22
+- [#215](https://github.com/boltops-tools/terraspace/pull/215) fix all down by building child nodes
+- [#216](https://github.com/boltops-tools/terraspace/pull/216) add codebuild project with acceptance test for terraspace all
+
+## [1.1.6] - 2022-02-21
+- [#213](https://github.com/boltops-tools/terraspace/pull/213) ability to show layers for debugging
+
+## [1.1.5] - 2022-02-21
+- [#212](https://github.com/boltops-tools/terraspace/pull/212) ability to show layers for debugging
+- show layers for debugging with logger level debug and TS_SHOW_ALL_LAYERS=1
+- stringify_keys layer friendly names map
+
 ## [1.1.4] - 2022-02-21
 - [#210](https://github.com/boltops-tools/terraspace/pull/210) write files without magic conversion, fixes #209
 - cleanup argv and root

data/lib/terraspace/all/runner.rb

@@ -68,7 +68,8 @@ module Terraspace::All
     end
 
     def build_stack(name)
-      builder = Terraspace::Builder.new(@options.merge(mod: name, clean: false, quiet: true, include_stacks: :root_only))
+      include_stacks = @command == "down" ? :root_with_children : :root_only
+      builder = Terraspace::Builder.new(@options.merge(mod: name, clean: false, quiet: true, include_stacks: include_stacks))
       builder.build(modules: false)
     end
 

data/lib/terraspace/builder/children.rb

@@ -8,19 +8,18 @@ class Terraspace::Builder
     end
 
     def build
-      dependencies = Terraspace::Dependency::Registry.data
       # Find out if current deploy stack contains dependency
-      found = dependencies.find do |parent_child|
+      dependencies = Terraspace::Dependency::Registry.data
+      root = dependencies.find do |parent_child|
         parent, _ = parent_child.split(':')
         parent == @mod.name
       end
-      return unless found
+      return unless root
 
-      # Go down graph children, which are the dependencies to build a queue
-      parent, _ = found.split(':')
-      node = Terraspace::Dependency::Node.find_by(name: parent)
+      # Go down dependency graph to build a queue for processing
+      name, _ = root.split(':')
+      node = Terraspace::Dependency::Node.find_by(name: name)
       build_queue(node)
-
       logger.debug "Terraspace::Builder::Children @queue #{@queue}"
 
       # Process queue in reverse order to build leaf nodes first

data/lib/terraspace/builder.rb

@@ -6,9 +6,15 @@ module Terraspace
 
     # @include_stacks can be 3 values: root_with_children, none, root_only
     #
+    # terraspace all:
+    #
     #     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`
+    #     root_with_children: build all children stacks as well as the root stack. normal `terraspace all down`
+    #
+    # terraspace up:
+    #
+    #     root_with_children: build all children stacks as well as the root stack. normal `terraspace up`
     #
     def initialize(options={})
       super

data/lib/terraspace/compiler/strategy/tfvar/layer.rb

@@ -32,6 +32,7 @@ class Terraspace::Compiler::Strategy::Tfvar
     extend Memoist
     include Terraspace::Layering
     include Terraspace::Plugin::Expander::Friendly
+    include Terraspace::Util
 
     def initialize(mod)
       @mod = mod
@@ -40,7 +41,11 @@ class Terraspace::Compiler::Strategy::Tfvar
     def paths
       project_paths = full_paths(project_tfvars_dir)
       stack_paths   = full_paths(stack_tfvars_dir)
-      project_paths + stack_paths
+      paths = project_paths + stack_paths
+      show_layers(paths)
+      paths.select do |path|
+        File.exist?(path)
+      end
     end
     memoize :paths
 
@@ -51,10 +56,6 @@ class Terraspace::Compiler::Strategy::Tfvar
           "#{tfvars_dir}/#{layer}.rb",
         ]
       end.flatten
-
-      layer_paths.select do |path|
-        File.exist?(path)
-      end
     end
 
     def full_layering
@@ -130,5 +131,20 @@ class Terraspace::Compiler::Strategy::Tfvar
       empty = Dir.glob("#{seed_dir}/*").empty?
       empty ? mod_dir : seed_dir
     end
+
+    @@shown_layers = {}
+    def show_layers(paths)
+      return unless @mod.resolved
+      return if @@shown_layers[@mod.name]
+      logger.debug "Layers for #{@mod.name}:"
+      paths.each do |path|
+        next unless path.include?('.tfvars')
+        show = File.exist?(path) || ENV['TS_SHOW_ALL_LAYERS']
+        logger.debug "    #{pretty_path(path)}" if show
+      end
+      logger.debug ""
+      @@shown_layers[@mod.name] = true
+    end
+
   end
 end

data/lib/terraspace/compiler/strategy/tfvar.rb

@@ -1,5 +1,7 @@
 module Terraspace::Compiler::Strategy
   class Tfvar
+    extend Memoist
+
     def initialize(mod)
       @mod = mod
       @order = 0
@@ -24,6 +26,7 @@ module Terraspace::Compiler::Strategy
     def layer_paths
       Layer.new(@mod).paths
     end
+    memoize :layer_paths
 
     # Tact on number to ensure that tfvars will be processed in desired order.
     # Also name auto.tfvars so it will automatically load

data/lib/terraspace/plugin/expander/friendly.rb

@@ -5,7 +5,8 @@ module Terraspace::Plugin::Expander
     #   Terraspace::Plugin::Expander::Interface
     def friendly_name(name)
       return '' if name.nil?
-      Terraspace.config.layering.names[name.to_sym] || name
+      names = Terraspace.config.layering.names.stringify_keys
+      names[name.to_s] || name
     end
   end
 end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "1.1.4"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -341,6 +341,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".cody/README.md"
+- ".cody/all/bin/build.sh"
+- ".cody/all/buildspec.yml"
+- ".cody/all/project.rb"
+- ".cody/all/role.rb"
 - ".cody/aws/bin/build.sh"
 - ".cody/aws/buildspec.yml"
 - ".cody/aws/project.rb"