terradactyl 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790c643382c73bae3dc70e56e4f6cfe872454fb9908638b2c8c6543787971c0c
-  data.tar.gz: 636d761cf9091f7f7e8aa34c680aa30a4ec9a9e7f87e07b46b955ebcd706afc8
+  metadata.gz: 572d97af0265aeffbfc6144ffa01767365af13a5c927c2faeb075ab1a9c40abb
+  data.tar.gz: 9551f11afa4b79a621457e7a3b14891667deb90012164590141a958b345ef730
 SHA512:
-  metadata.gz: 25b3da672dfed59180ded6fd45cab05acaeb4abd1bed8493f5bb61febebde091db6259e40584ef0672c87ecd885cb664292379b07ca9c1edc2e85e9a18873ce0
-  data.tar.gz: 1b4901be7074aaa8240a1c6b94a326bb1914683ff4f915b7c2b4e0288f4c34cff95c3038b69535324fa44978b37ef03d52f4f74d63d994ff45dabcea3a0998e4
+  metadata.gz: 5a915631b4d0abaab3a850192e9e2201eccbe78d8abb87906458077f0565d14d86ad4b7af234e73ae0ec409a9f89051013c2d37879084ce11dac3abf585f0aba
+  data.tar.gz: fae2314dcc7db1189d60216d1ff3590570cc18714cf023442de44e3746e255d32f4c3d6f69cfc1b74302136c1588d9b9eace300842da141f7544296d01271b9a

data/.github/workflows/build-status.yml

@@ -23,4 +23,4 @@ jobs:
           bundler-cache: true
       - name: Run tests
         id: test
-        run: bundle exec rake spec
+        run: bundle exec rake doc

data/.github/workflows/validate-pullrequest.yml

@@ -26,4 +26,4 @@ jobs:
         run: bundle exec rake lint
       - name: Run tests
         id: test
-        run: bundle exec rake spec
+        run: bundle exec rake doc

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 1.4.0 (2022-09-21)
+
+NEW FEATURES:
+
+* add support for multiple stack subdirectories
+* add optional BASE_FOLDER input for most Terradactyl commands
+
+BUG FIXES:
+
+* fix StacksApplyFilterPrePlanned filtering behaviour
+
 ## 1.3.0 (2022-09-21)
 
 NEW FEATURES:

data/README.md

@@ -19,7 +19,7 @@ Terradactyl simplifies managing large heterogeneous Terraform monorepos by intro
 
 Requires Ruby 2.5 or greater.
 
-NOTE: Terraform sub-command operations are only supported between stable versions `>= 0.11.x` to `~> 0.15.x`.
+NOTE: Terraform sub-command operations are only supported between stable versions `>= 0.11.x` to `~> 1.3.x`.
 
 ## Installation
 
@@ -43,8 +43,8 @@ And then execute:
 
 Terradactyl repos rely on two simple organizational conventions:
 
-* a single project-level `terradactly.yaml`
-* a single subdirectory for your stacks
+* a single project-level `terradactyl.yaml`
+* subdirectories for your stacks
 
 ```sh
 .
@@ -140,6 +140,20 @@ NOTE: `*.tfstate*` files are not cleaned up by default for obvious reasons, so c
 
 See the [Configuration](#configuration) section for more info on how to control which files get removed during a `clean <stack>` or `clean-all` operation.
 
+#### quickplan a single stack in a non-default subdirectory
+
+If you have a setup with multiple stack subdirectories, you have one stack subdirectory that's referenced by default in the root-level terradactyl.yaml. 
+
+    $ cd examples/multi-stack-subdirectories
+
+Notice that `preprod-stacks` is the base_folder defined in the root terradactyl.yaml. By default, Terradactyl commands will run in this subdirectory.
+
+All subdirectories define their own terradactyl.yaml with customized `base_folder` and `misc.base_folder_name` settings. To run commands on stacks in non-default subdirectories from root, you must pass in the optional BASE_FOLDER input to your Terradactyl command.
+
+    $ terradactyl quickplan stack1               # this command will run quickplan on preprod-stacks/stack1
+    $ terradactyl quickplan stack1 test-stacks   # this command will run quickplan on test-stacks/stack1 
+
+
 ## Operation
 
 NOTE: `terradactyl` (symlinked as `td`) ONLY operates in the root of your monorepo. In order to execute any subcommands, your working directory must contain your project-level configuration file, otherwise you will receive this:
@@ -176,7 +190,7 @@ Terradactyl add some unique utility commands that permit you to more readily man
 Installs supporting components, namely Terraform itself...
 
     # Install the latest terraform binary
-    terradactly install terraform
+    terradactyl install terraform
 
     # Install pessimistic version
     terradactyl install terraform --version="~> 0.13.0"
@@ -201,14 +215,14 @@ Terradactyl provides a few useful meta-commands that can help you avoid repetiti
 
 Clean, initialize and plan a single stack in one operation.
 
-    terradactly quickplan <stack>
+    terradactyl quickplan <stack>
 
 #### smartapply/smartrefresh
 
 Apply or Refresh _ANY_ stack containing a plan file.
 
-    terradactly smartapply <stack>
-    terradactly smartrefresh <stack>
+    terradactyl smartapply <stack>
+    terradactyl smartrefresh <stack>
 
 ### Getting Help
 
@@ -225,6 +239,7 @@ For help on any individual sub-command do:
 As previously mentioned, configuration is hierarchical. This means you may specify:
 
 * one project-level configuration for ALL stacks
+* an overriding subdirectory configuration for all stacks within the subdirectory
 * an overriding stack-level configuration for each independent stack
 
 See [examples](examples) for different setups.
@@ -265,6 +280,7 @@ terradactyl:              <Object, Terradactyl config>
   environment:            <Object, shell environment variables>
     TF_PLUGIN_CACHE_DIR:  <String, path to common Terraform plugin directory, default=$HOME/.terraform.d/plugins>
   misc:                   <Object, misc Terradactyl settings>
+    base_folder_name:     <String, name of the stack folder. Required for multiple stack subdirectories, default=nil>
     utf8:                 <Bool, use utf8 in stdout, default=true>
     disable_color:        <Bool, disable color in stdout, default=false>
   cleanup:                <Object, Terradactyl cleanup settings>

data/examples/multi-stack-subdirectories/preprod-stacks/stack1/example.tf

@@ -0,0 +1 @@
+resource "null_resource" "baz" {}

data/examples/multi-stack-subdirectories/preprod-stacks/stack1/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    null = {
+      source = "hashicorp/null"
+    }
+  }
+  required_version = "~> 1.0.0"
+}

data/examples/multi-stack-subdirectories/preprod-stacks/stack2/example.tf

@@ -0,0 +1 @@
+resource "null_resource" "baz" {}

data/examples/multi-stack-subdirectories/preprod-stacks/stack2/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    null = {
+      source = "hashicorp/null"
+    }
+  }
+  required_version = "~> 1.0.0"
+}

data/examples/multi-stack-subdirectories/preprod-stacks/terradactyl.yaml

@@ -0,0 +1,7 @@
+---
+terradactyl:
+  base_folder: .
+  terraform:
+    version: 1.0.0
+  misc:
+    base_folder_name: preprod-stacks

data/examples/multi-stack-subdirectories/terradactyl.yaml

@@ -0,0 +1,4 @@
+terradactyl:
+  base_folder: test-stacks
+  terraform:
+    version: 0.15.1

data/examples/multi-stack-subdirectories/test-stacks/stack1/example.tf

@@ -0,0 +1 @@
+resource "null_resource" "bar" {}

data/examples/multi-stack-subdirectories/test-stacks/stack1/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    null = {
+      source = "hashicorp/null"
+    }
+  }
+  required_version = "~> 1.0.0"
+}

data/examples/multi-stack-subdirectories/test-stacks/stack2/example.tf

@@ -0,0 +1 @@
+resource "null_resource" "foo" {}

data/examples/multi-stack-subdirectories/test-stacks/stack2/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    null = {
+      source = "hashicorp/null"
+    }
+  }
+  required_version = "~> 1.0.0"
+}

data/examples/multi-stack-subdirectories/test-stacks/terradactyl.yaml

@@ -0,0 +1,7 @@
+---
+terradactyl:
+  base_folder: .
+  terraform:
+    version: 0.15.1
+  misc:
+    base_folder_name: test-stacks

data/lib/terradactyl/cli.rb

@@ -68,9 +68,15 @@ module Terradactyl
         Terradactyl::Terraform::VersionManager.latest
       end
 
-      def upgrade_stack(name)
-        @stack ||= Stack.new(name)
-        print_warning "Upgrading: #{@stack.name}"
+      # get name of base folder for printing logs
+      def base_folder_name(base_folder)
+        base_folder || config.misc.base_folder_name || config.base_folder
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      def upgrade_stack(name, base_override = nil)
+        @stack ||= Stack.new(name, base_override)
+        print_warning "Upgrading in #{config.base_folder}: #{@stack.name}"
         if @stack.upgrade.zero?
           print_ok "Upgraded: #{@stack.name}"
         else
@@ -95,10 +101,10 @@ module Terradactyl
       puts config.to_h.to_yaml
     end
 
-    desc 'stacks', 'List the stacks'
-    def stacks
+    desc 'stacks [BASE_FOLDER]', 'List the stacks, with optional base folder override'
+    def stacks(base_override = nil)
       print_ok 'Stacks:'
-      Stacks.load.each do |name|
+      Stacks.load(base_override: base_override).each do |name|
         print_dot name.to_s
       end
     end
@@ -114,49 +120,59 @@ module Terradactyl
     # * Some are useful only in pipelines. These are hidden.
     #################################################################
 
-    desc 'planpr', 'Plan stacks against origin/HEAD (used for PRs)', hide: true
-    def planpr
-      print_header 'SmartPlanning PR ...'
-      stacks = Stacks.load(filter: StacksPlanFilterGitDiffOriginBranch.new)
+    desc 'planpr [BASE_FOLDER]',
+         'Plan stacks against origin/HEAD (used for PRs), with optional base folder override',
+         hide: true
+    def planpr(base_override = nil)
+      print_header "SmartPlanning PR in #{base_folder_name(base_override)} ..."
+      stacks = Stacks.load(
+        filter: StacksPlanFilterGitDiffOriginBranch.new,
+        base_override: base_override
+      )
       validate_planpr(stacks).each do |name|
-        clean(name)
-        init(name)
-        plan(name)
+        clean(name, base_override)
+        init(name, base_override)
+        plan(name, base_override)
         @stack = nil
       end
     end
 
-    desc 'smartplan', 'Plan any stacks that differ from Git HEAD'
-    def smartplan
-      print_header 'SmartPlanning Stacks ...'
-      stacks = Stacks.load(filter: StacksPlanFilterGitDiffHead.new)
+    desc 'smartplan [BASE_FOLDER]',
+         'Plan any stacks that differ from Git HEAD, with optional base folder override'
+    def smartplan(base_override = nil)
+      print_header "SmartPlanning Stacks in #{base_folder_name(base_override)} ..."
+      stacks = Stacks.load(filter: StacksPlanFilterGitDiffHead.new, base_override: base_override)
       validate_smartplan(stacks).each do |name|
-        clean(name)
-        init(name)
-        plan(name)
+        clean(name, base_override)
+        init(name, base_override)
+        plan(name, base_override)
         @stack = nil
       end
     end
 
-    desc 'smartapply', 'Apply any stacks that contain plan files', hide: true
-    def smartapply
-      print_header 'SmartApplying Stacks ...'
-      stacks = Stacks.load(filter: StacksApplyFilterPrePlanned.new)
+    desc 'smartapply',
+         'Apply any stacks that contain plan files, with optional base folder override',
+         hide: true
+    def smartapply(base_override = nil)
+      print_header "SmartApplying Stacks in #{base_folder_name(base_override)} ..."
+      stacks = Stacks.load(filter: StacksApplyFilterPrePlanned.new, base_override: base_override)
       print_warning 'No stacks contain plan files ...' unless stacks.any?
       stacks.each do |name|
-        apply(name)
+        apply(name, base_override)
         @stack = nil
       end
       print_message "Total Stacks Modified: #{stacks.size}"
     end
 
-    desc 'smartrefresh', 'Refresh any stacks that contain plan files', hide: true
-    def smartrefresh
-      print_header 'SmartRefreshing Stacks ...'
-      stacks = Stacks.load(filter: StacksApplyFilterPrePlanned.new)
+    desc 'smartrefresh [BASE_FOLDER]',
+         'Refresh any stacks that contain plan files, with optional base folder override',
+         hide: true
+    def smartrefresh(base_override = nil)
+      print_header "SmartRefreshing Stacks in #{base_folder_name(base_override)} ..."
+      stacks = Stacks.load(filter: StacksApplyFilterPrePlanned.new, base_override: base_override)
       print_warning 'No stacks contain plan files ...' unless stacks.any?
       stacks.each do |name|
-        refresh(name)
+        refresh(name, base_override)
         @stack = nil
       end
       print_message "Total Stacks Refreshed: #{stacks.size}"
@@ -168,56 +184,57 @@ module Terradactyl
     # the `quickplan` task is an exception to this rule.
     #################################################################
 
-    desc 'upgrade NAME', 'Cleans, inits, upgrades and formats an individual stack, by name'
-    def upgrade(name)
-      clean(name)
-      init(name, backend: false)
-      upgrade_stack(name)
-      fmt(name)
+    desc 'upgrade NAME [BASE_FOLDER]',
+         'Cleans, inits, upgrades and fmts a given stack, by name & optional base folder override'
+    def upgrade(name, base_override = nil)
+      clean(name, base_override)
+      init(name, base_override, backend: false)
+      upgrade_stack(name, base_override)
+      fmt(name, base_override)
     end
 
-    desc 'quickplan NAME', 'Clean, init and plan a stack, by name'
-    def quickplan(name)
+    desc 'quickplan NAME [BASE_FOLDER]',
+         'Clean, init and plan a stack, by name & optional base folder override'
+    def quickplan(name, base_override = nil)
       print_header "Quick planning #{name} ..."
-      clean(name)
-      init(name)
-      plan(name)
+      clean(name, base_override)
+      init(name, base_override)
+      plan(name, base_override)
     end
 
-    desc 'clean-all', 'Clean all stacks'
-    def clean_all
-      print_header 'Cleaning ALL Stacks ...'
-      Stacks.load.each do |name|
-        clean(name)
+    desc 'clean-all [BASE_FOLDER]', 'Clean all stacks, by optional base folder override'
+    def clean_all(base_override = nil)
+      print_header "Cleaning ALL Stacks in #{base_folder_name(base_override)} ..."
+      Stacks.load(base_override: base_override).each do |name|
+        clean(name, base_override)
         @stack = nil
       end
     end
 
-    desc 'plan-all', 'Plan all stacks'
-    def plan_all
-      print_header 'Planning ALL Stacks ...'
-      Stacks.load.each do |name|
+    desc 'plan-all [BASE_FOLDER]', 'Plan all stacks, by optional base folder override'
+    def plan_all(base_override = nil)
+      print_header "Planning ALL Stacks in #{base_folder_name(base_override)} ..."
+      Stacks.load(base_override: base_override).each do |name|
         catch(:error) do
-          clean(name)
-          init(name)
-          plan(name)
+          clean(name, base_override)
+          init(name, base_override)
+          plan(name, base_override)
         end
         @stack = nil
       end
     end
 
-    desc 'audit-all', 'Audit all stacks'
+    desc 'audit-all [BASE_FOLDER]', 'Audit all stacks, by optional base folder override'
     options report: :optional
     method_option :report, type: :boolean
-    # rubocop:disable Metrics/AbcSize
-    def audit_all
+    def audit_all(base_override = nil)
       report = { start: Time.now.to_json }
-      print_header 'Auditing ALL Stacks ...'
-      Stacks.load.each do |name|
+      print_header "Auditing ALL Stacks in #{base_folder_name(base_override)} ..."
+      Stacks.load(base_override: base_override).each do |name|
         catch(:error) do
-          clean(name)
-          init(name)
-          audit(name)
+          clean(name, base_override)
+          init(name, base_override)
+          audit(name, base_override)
         end
         @stack = nil
       end
@@ -229,14 +246,14 @@ module Terradactyl
     end
     # rubocop:enable Metrics/AbcSize
 
-    desc 'validate-all', 'Validate all stacks'
-    def validate_all
-      print_header 'Validating ALL Stacks ...'
-      Stacks.load.each do |name|
+    desc 'validate-all [BASE_FOLDER]', 'Validate all stacks, by optional base folder override'
+    def validate_all(base_override = nil)
+      print_header "Validating ALL Stacks in #{base_folder_name(base_override)} ..."
+      Stacks.load(base_override: base_override).each do |name|
         catch(:error) do
-          clean(name)
-          init(name)
-          validate(name)
+          clean(name, base_override)
+          init(name, base_override)
+          validate(name, base_override)
         end
         @stack = nil
       end
@@ -247,9 +264,10 @@ module Terradactyl
     # * These tasks are used regularly against stacks, by name.
     #################################################################
 
-    desc 'lint NAME', 'Lint an individual stack, by name'
-    def lint(name)
-      @stack ||= Stack.new(name)
+    desc 'lint NAME [BASE_FOLDER]',
+         'Lint an individual stack, by name & optional base folder override'
+    def lint(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
       print_ok "Linting: #{@stack.name}"
       if @stack.lint.zero?
         print_ok "Formatting OK: #{@stack.name}"
@@ -259,9 +277,10 @@ module Terradactyl
       end
     end
 
-    desc 'fmt NAME', 'Format an individual stack, by name'
-    def fmt(name)
-      @stack ||= Stack.new(name)
+    desc 'fmt NAME [BASE_FOLDER]',
+         'Format an individual stack, by name & optional base folder override'
+    def fmt(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
       print_warning "Formatting: #{@stack.name}"
       if @stack.fmt.zero?
         print_ok "Formatted: #{@stack.name}"
@@ -271,12 +290,14 @@ module Terradactyl
       end
     end
 
-    desc 'init NAME', 'Init an individual stack, by name'
-    def init(name, backend: true)
-      @stack ||= Stack.new(name)
+    desc 'init NAME [BASE_FOLDER]',
+         'Init an individual stack, by name & optional base folder override'
+    # rubocop:disable Metrics/AbcSize
+    def init(name, base_override = nil, backend: true)
+      @stack ||= Stack.new(name, base_override)
       @stack.config.terraform.init.backend = backend
 
-      print_ok "Initializing: #{@stack.name}"
+      print_ok "Initializing in #{base_folder_name(base_override)}: #{@stack.name}"
       if @stack.init.zero?
         print_ok "Initialized: #{@stack.name}"
       else
@@ -286,11 +307,11 @@ module Terradactyl
       end
     end
 
-    desc 'plan NAME', 'Plan an individual stack, by name'
-    # rubocop:disable Metrics/AbcSize
-    def plan(name)
-      @stack ||= Stack.new(name)
-      print_ok "Planning: #{@stack.name}"
+    desc 'plan NAME [BASE_FOLDER]',
+         'Plan an individual stack, by name & optional base folder override'
+    def plan(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
+      print_ok "Planning in #{base_folder_name(base_override)}: #{@stack.name}"
       case @stack.plan
       when 0
         print_ok "No changes: #{@stack.name}"
@@ -309,19 +330,21 @@ module Terradactyl
     end
     # rubocop:enable Metrics/AbcSize
 
-    desc 'audit NAME', 'Audit an individual stack, by name'
-    def audit(name)
-      plan(name)
+    desc 'audit NAME [BASE_FOLDER]',
+         'Audit an individual stack, by name & optional base folder override'
+    def audit(name, base_override = nil)
+      plan(name, base_override)
       if (@stack = Stacks.dirty?(name))
         Stacks.error!(@stack)
         print_crit "Dirty stack: #{@stack.name}"
       end
     end
 
-    desc 'validate NAME', 'Validate an individual stack, by name'
-    def validate(name)
-      @stack ||= Stack.new(name)
-      print_ok "Validating: #{@stack.name}"
+    desc 'validate NAME [BASE_FOLDER]',
+         'Validate an individual stack, by name & optional base folder override'
+    def validate(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
+      print_ok "Validating in #{base_folder_name(base_override)}: #{@stack.name}"
       if @stack.validate.zero?
         print_ok "Validated: #{@stack.name}"
       else
@@ -331,18 +354,20 @@ module Terradactyl
       end
     end
 
-    desc 'clean NAME', 'Clean an individual stack, by name'
-    def clean(name)
-      @stack ||= Stack.new(name)
-      print_warning "Cleaning: #{@stack.name}"
+    desc 'clean NAME [BASE_FOLDER]',
+         'Clean an individual stack, by name & optional base folder override'
+    def clean(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
+      print_warning "Cleaning in #{config.base_folder}: #{@stack.name}"
       @stack.clean
       print_ok "Cleaned: #{@stack.name}"
     end
 
-    desc 'apply NAME', 'Apply an individual stack, by name'
-    def apply(name)
-      @stack ||= Stack.new(name)
-      print_warning "Applying: #{@stack.name}"
+    desc 'apply NAME [BASE_FOLDER]',
+         'Apply an individual stack, by name & optional base folder override'
+    def apply(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
+      print_warning "Applying in #{base_folder_name(base_override)}: #{@stack.name}"
       if @stack.apply.zero?
         print_ok "Applied: #{@stack.name}"
       else
@@ -351,10 +376,11 @@ module Terradactyl
       end
     end
 
-    desc 'refresh NAME', 'Refresh state on an individual stack, by name'
-    def refresh(name)
-      @stack ||= Stack.new(name)
-      print_crit "Refreshing: #{@stack.name}"
+    desc 'refresh NAME [BASE_FOLDER]',
+         'Refresh state on an individual stack, by name & optional base folder override'
+    def refresh(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
+      print_crit "Refreshing in #{base_folder_name(base_override)}: #{@stack.name}"
       if @stack.refresh.zero?
         print_warning "Refreshed: #{@stack.name}"
       else
@@ -363,10 +389,11 @@ module Terradactyl
       end
     end
 
-    desc 'destroy NAME', 'Destroy an individual stack, by name'
-    def destroy(name)
-      @stack ||= Stack.new(name)
-      print_crit "Destroying: #{@stack.name}"
+    desc 'destroy NAME [BASE_FOLDER]',
+         'Destroy an individual stack, by name & optional base folder override'
+    def destroy(name, base_override = nil)
+      @stack ||= Stack.new(name, base_override)
+      print_crit "Destroying in #{base_folder_name(base_override)}: #{@stack.name}"
       if @stack.destroy.zero?
         print_warning "Destroyed: #{@stack.name}"
       else

data/lib/terradactyl/config.rb

@@ -61,15 +61,16 @@ module Terradactyl
 
     private
 
-    def load_config
+    def load_config(defaults_override: nil, overlay_override: nil)
       @config = [
-        @defaults,
-        @overlay
+        defaults_override || @defaults,
+        overlay_override || @overlay
       ].inject({}) do |memo, obj|
         memo.deep_merge!(obj, overwrite_arrays: true)
         Marshal.load(Marshal.dump(memo))
       end
       @terradactyl = structify(@config).terradactyl
+
       configure_colorization
       @terradactyl
     end
@@ -120,8 +121,10 @@ module Terradactyl
 
     private_class_method :new
 
-    def load_overlay(_overload)
-      YAML.load_file(config_file)
+    def load_overlay(overload)
+      config_file_path = overload ? "./#{overload}/#{config_file}" : config_file
+
+      YAML.load_file(config_file_path)
     rescue Errno::ENOENT => e
       abort "FATAL: Could not load project file: `#{config_file}`, #{e.message}"
     end
@@ -129,6 +132,21 @@ module Terradactyl
     def config_file
       @config_file = CONFIG_PROJECT_FILE
     end
+
+    def merge_overlay(overlay_path)
+      config_file_path = overlay_path ? "./#{overlay_path}/#{config_file}" : config_file
+
+      config_to_merge = YAML.load_file(config_file_path)
+
+      # set base_folder name if it's '.'
+      if config_to_merge['terradactyl']['base_folder'] == '.'
+        config_to_merge['terradactyl']['base_folder'] = overlay_path
+      end
+
+      load_config(overlay_override: config_to_merge)
+    rescue Errno::ENOENT => e
+      abort "FATAL: Could not load project file: `#{config_file}`, #{e.message}"
+    end
   end
 
   class ConfigStack < ConfigApplication
@@ -140,14 +158,15 @@ module Terradactyl
 
     attr_reader :stack_name, :stack_path, :base_folder
 
-    def initialize(stack_name)
+    def initialize(stack_name, base_override = nil)
       @stack_name     = stack_name
       @project_config = ConfigProject.instance
-      @base_folder    = @project_config.base_folder
+      @base_folder    = base_override || @project_config.base_folder
       @stack_path     = "#{@base_folder}/#{@stack_name}"
       @config_file    = "#{@stack_path}/#{ConfigProject::CONFIG_PROJECT_FILE}"
       @defaults       = load_defaults(@project_config.to_h)
       @overlay        = load_overlay(@config_file)
+
       load_config
     end
 

data/lib/terradactyl/filters.rb

@@ -16,15 +16,11 @@ module Terradactyl
       `git ls-files .`
     end
 
-    def base_dir
-      config.base_folder
-    end
-
     def stack_name(path)
       path.split('/')[1]
     end
 
-    def sift(stacks)
+    def sift(stacks, _base_dir)
       stacks
     end
   end
@@ -42,7 +38,7 @@ module Terradactyl
       `git --no-pager diff --name-only HEAD .`
     end
 
-    def sift(stacks)
+    def sift(stacks, base_dir)
       modified = git_cmd.split.each_with_object([]) do |path, memo|
         memo << stack_name(path) if path =~ /#{base_dir}/
       end
@@ -90,8 +86,8 @@ module Terradactyl
   end
 
   class StacksApplyFilterPrePlanned < StacksApplyFilterDefault
-    def sift(stacks)
-      targets = Dir.glob('**/*.tfout').each_with_object([]) do |path, memo|
+    def sift(stacks, base_dir)
+      targets = Dir.glob("#{base_dir}/**/*.tfout").each_with_object([]) do |path, memo|
         memo << path.split('/')[1]
       end
       stacks & targets

data/lib/terradactyl/stack.rb

@@ -10,10 +10,18 @@ module Terradactyl
       new(stack_name)
     end
 
-    def initialize(stack_name)
-      @stack_name   = validate_stack_name(stack_name)
-      @stack_config = ConfigStack.new(@stack_name)
-      @tf_version   = tf_version
+    def initialize(stack_name, base_override = nil)
+      if base_override
+        # merge the terradactyl.yaml inside the provided base folder
+        config.merge_overlay(base_override)
+      else
+        config.reload
+      end
+
+      @stack_name    = validate_stack_name(stack_name)
+      @base_override = base_override
+      @stack_config  = ConfigStack.new(@stack_name, @base_override)
+      @tf_version    = tf_version
       Commands.extend_by_revision(@tf_version, self)
       print_message "Terraform version: #{@tf_version}"
       inject_env_vars

data/lib/terradactyl/stacks.rb

@@ -50,10 +50,12 @@ module Terradactyl
 
     attr_reader :filter
 
-    def initialize(filter: StacksPlanFilterDefault.new)
+    def initialize(filter: StacksPlanFilterDefault.new, base_override: nil)
+      base_folder = base_override || config.base_folder
+
       @filter   = filter
-      @base_dir = "#{Rake.original_dir}/#{config.base_folder}"
-      @stacks   = @filter.sift(stacks_all)
+      @base_dir = "#{Rake.original_dir}/#{base_folder}"
+      @stacks   = @filter.sift(stacks_all, base_folder)
     end
 
     def list

data/lib/terradactyl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Terradactyl
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terradactyl
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Brian Warsing
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,6 +185,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/multi-stack-subdirectories/preprod-stacks/stack1/example.tf
+- examples/multi-stack-subdirectories/preprod-stacks/stack1/versions.tf
+- examples/multi-stack-subdirectories/preprod-stacks/stack2/example.tf
+- examples/multi-stack-subdirectories/preprod-stacks/stack2/versions.tf
+- examples/multi-stack-subdirectories/preprod-stacks/terradactyl.yaml
+- examples/multi-stack-subdirectories/terradactyl.yaml
+- examples/multi-stack-subdirectories/test-stacks/stack1/example.tf
+- examples/multi-stack-subdirectories/test-stacks/stack1/versions.tf
+- examples/multi-stack-subdirectories/test-stacks/stack2/example.tf
+- examples/multi-stack-subdirectories/test-stacks/stack2/versions.tf
+- examples/multi-stack-subdirectories/test-stacks/terradactyl.yaml
 - examples/multi-tf-version/stacks/tfv11/example.tf
 - examples/multi-tf-version/stacks/tfv11/terradactyl.yaml
 - examples/multi-tf-version/stacks/tfv12/example.tf