From bddac97aaf3d2aff313820e824d59e092cd10f66 Mon Sep 17 00:00:00 2001 From: Tung Nguyen Date: Fri, 4 Dec 2020 01:23:56 +0000 Subject: [PATCH] fix find placeholder stack so config/terraform only builds for stacks * fixes #66 --- lib/terraspace/cli/build/placeholder.rb | 8 ++++---- lib/terraspace/mod.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/terraspace/cli/build/placeholder.rb b/lib/terraspace/cli/build/placeholder.rb index fec0c8f1..5278c3ae 100644 --- a/lib/terraspace/cli/build/placeholder.rb +++ b/lib/terraspace/cli/build/placeholder.rb @@ -18,17 +18,17 @@ def 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 diff --git a/lib/terraspace/mod.rb b/lib/terraspace/mod.rb index 3102086c..5ada6a05 100644 --- a/lib/terraspace/mod.rb +++ b/lib/terraspace/mod.rb @@ -19,7 +19,7 @@ def initialize(name, options={}) 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