terraspace 0.4.4 → 0.5.0

data/lib/terraspace/core.rb

@@ -51,11 +51,5 @@ module Terraspace
     def logger=(v)
       @@logger = v
     end
-
-    def check_project!
-      return if File.exist?("#{Terraspace.root}/config/app.rb")
-      logger.error "ERROR: It doesnt look like this is a terraspace project. Are you sure you are in a terraspace project?".color(:red)
-      ENV['TS_TEST'] ? raise : exit(1)
-    end
   end
 end

data/lib/terraspace/ext/core/module.rb

@@ -16,4 +16,20 @@ class Module
       include klass.constantize
     end
   end
+
+  def include_project_level_helpers
+    full_dir = "#{Terraspace.root}/config/helpers"
+    Dir.glob("#{full_dir}/**/*").each do |path|
+      regexp = Regexp.new(".*/config/helpers/")
+      klass = path.sub(regexp, '').sub('.rb','').camelize
+      klass = "Terraspace::Project::#{klass}"
+      include klass.constantize
+    end
+  end
+
+  def include_plugin_helpers
+    Terraspace::Plugin.helper_classes.each do |klass|
+      include klass # IE: TerraspacePluginAws::Interfaces::Helper
+    end
+  end
 end

data/lib/terraspace/hooks/builder.rb

@@ -7,14 +7,14 @@ module Terraspace::Hooks
 
     # IE: dsl_file: config/hooks/terraform.rb
     attr_accessor :name
-    def initialize(mod, dsl_file, name)
-      @mod, @dsl_file, @name = mod, dsl_file, name
+    def initialize(mod, file, name)
+      @mod, @file, @name = mod, file, name
       @hooks = {before: {}, after: {}}
     end
 
     def build
-      return @hooks unless File.exist?(@dsl_file)
-      evaluate_file(@dsl_file)
+      evaluate_file("#{Terraspace.root}/config/hooks/#{@file}")
+      evaluate_file("#{@mod.root}/config/hooks/#{@file}")
       @hooks.deep_stringify_keys!
     end
     memoize :build
@@ -37,11 +37,10 @@ module Terraspace::Hooks
     def run_hook(type, hook)
       return unless run?(hook)
 
-      command = File.basename(@dsl_file).sub('.rb','') # IE: kubes, kubectl, docker
+      command = File.basename(@file).sub('.rb','') # IE: terraform or terraspace
       id = "#{command} #{type} #{@name}"
       label = " label: #{hook["label"]}" if hook["label"]
-      logger.info  "Running #{id} hook.#{label}"
-      logger.debug "Hook options: #{hook}"
+      logger.info  "Hook: Running #{id} hook.#{label}".color(:cyan)
       Runner.new(@mod, hook).run
     end
 

data/lib/terraspace/hooks/concern.rb

@@ -1,7 +1,7 @@
 module Terraspace::Hooks
   module Concern
-    def run_hooks(dsl_file, name, &block)
-      hooks = Builder.new(@mod, "#{Terraspace.root}/config/hooks/#{dsl_file}", name)
+    def run_hooks(file, name, &block)
+      hooks = Builder.new(@mod, file, name)
       hooks.build # build hooks
       hooks.run_hooks(&block)
     end

data/lib/terraspace/logger.rb

@@ -2,6 +2,12 @@ require 'logger'
 
 module Terraspace
   class Logger < ::Logger
+    def initialize(*args)
+      super
+      self.formatter = Formatter.new
+      self.level = :info
+    end
+
     def format_message(severity, datetime, progname, msg)
       line = if @logdev.dev == $stdout || @logdev.dev == $stderr
         msg # super simple format if stdout

data/lib/terraspace/mod.rb

@@ -31,7 +31,6 @@ module Terraspace
     end
 
     def check_exist!
-      Terraspace.check_project!
       return if root
 
       pretty_paths = paths.map { |p| Terraspace::Util.pretty_path(p) }.join(", ")

data/lib/terraspace/plugin.rb

@@ -16,14 +16,18 @@ module Terraspace
       @@meta
     end
 
-    def layer_classes
-      @@meta.map { |plugin, data| data[:layer_class] }.compact
-    end
-
     def config_classes
       @@meta.map { |plugin, data| data[:config_class] }.compact
     end
 
+    def helper_classes
+      @@meta.map { |plugin, data| data[:helper_class] }.compact
+    end
+
+    def layer_classes
+      @@meta.map { |plugin, data| data[:layer_class] }.compact
+    end
+
     # The resource map can be used to customized the mapping from the resource "first word" to the plugin.
     #
     # resource map is in meta structure.

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

@@ -16,8 +16,8 @@ module Terraspace::Plugin::Config
     end
 
     def load_project_config
-      project_config = "#{Terraspace.root}/config/plugins/#{provider}.rb"
-      evaluate_file(project_config)
+      evaluate_file("#{Terraspace.root}/config/plugins/#{provider}.rb")
+      evaluate_file("#{Terraspace.root}/config/plugins/#{provider}/#{Terraspace.env}.rb")
     end
 
     def configure

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

@@ -0,0 +1,31 @@
+module Terraspace::Plugin::Helper
+  module Interface
+    extend ActiveSupport::Concern
+
+    # Useful for plugin helpers. Can check this only run logic after dependency resolution.
+    def resolved?
+      !!@mod.resolved
+    end
+
+    class_methods do
+      @@helper_cache = {}
+      # This method is useful to avoid double call of heavy processing logic for tfvars,
+      # since the tfvars files get evaluated twice.
+      # Note: Not setting any cache or doing any logic unless resolved.
+      def cache_helper(meth)
+        uncached_meth = "uncached_#{meth}"
+        alias_method(uncached_meth, meth)
+        define_method(meth) do |*args|
+          return unless resolved? # return nil in first unresolved pass
+          id = Marshal.dump([meth] + args)
+          exist = @@helper_cache.key?(id)
+          if exist
+            @@helper_cache[id]
+          else
+            @@helper_cache[id] = send(uncached_meth, *args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/terraspace/terraform/args/custom.rb

@@ -7,13 +7,12 @@ module Terraspace::Terraform::Args
     attr_accessor :name
     def initialize(mod, name)
       @mod, @name = mod, name
-      @file = "#{Terraspace.root}/config/args/terraform.rb"
       @commands = {}
     end
 
     def build
-      return @commands unless File.exist?(@file)
-      evaluate_file(@file)
+      evaluate_file("#{Terraspace.root}/config/args/terraform.rb")
+      evaluate_file("#{@mod.root}/config/args/terraform.rb")
       @commands.deep_stringify_keys!
     end
     memoize :build

data/lib/terraspace/terraform/runner/retryer.rb

@@ -9,7 +9,7 @@ class Terraspace::Terraform::Runner
     end
 
     def retry?
-      if @retries <= 3
+      if @retries <= 3 && !@stop_retrying
         true # will retry
       else
         logger.info "ERROR: #{@exception.message}"
@@ -36,8 +36,12 @@ class Terraspace::Terraform::Runner
       logger.debug "Retry attempt: #{@retries}"
       logger.debug "#{@exception.class}"
       logger.debug "#{@exception.message}"
-      purge_caches # Purging the cache "fixes" this terraform bug
-      reinit
+      if Terraspace.config.terraform.plugin_cache.purge_on_error # Purging the cache "fixes" this terraform bug
+        purge_caches
+        reinit
+      else
+        @stop_retrying = true
+      end
     end
 
     def init_required_error

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/spec/terraspace/terraform/args/custom_spec.rb

@@ -10,17 +10,18 @@ describe Terraspace::Terraform::Args::Custom do
     let(:file) { fixture("terraform/args/single.rb") }
     let(:name) { "apply" }
     it "build creates the @commands structure" do
+      custom.evaluate_file(file)
       commands = custom.build
       expect(commands.keys).to include("apply")
     end
 
     it "args" do
-      custom.build
+      custom.evaluate_file(file)
       expect(custom.args).to eq(["-lock-timeout=20m"])
     end
 
     it "var_files" do
-      custom.build
+      custom.evaluate_file(file)
       allow(custom).to receive(:var_file_exist?).and_return(true)
       expect(custom.var_files).to eq(["-var-file=a.tfvars", "-var-file=b.tfvars"])
     end
@@ -30,17 +31,18 @@ describe Terraspace::Terraform::Args::Custom do
     let(:file) { fixture("terraform/args/multiple.rb") }
     let(:name) { "apply" }
     it "build creates the @commands structure" do
+      custom.evaluate_file(file)
       commands = custom.build
       expect(commands.keys).to include("apply")
     end
 
     it "args" do
-      custom.build
+      custom.evaluate_file(file)
       expect(custom.args).to eq(["-lock-timeout=20m"])
     end
 
     it "var_files" do
-      custom.build
+      custom.evaluate_file(file)
       allow(custom).to receive(:var_file_exist?).and_return(true)
       expect(custom.var_files).to eq([])
     end

data/terraspace.gemspec

@@ -34,10 +34,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "zeitwerk"
 
   # core baseline plugins
-  spec.add_dependency "terraspace_plugin_aws", "~> 0.2.0"
-  spec.add_dependency "terraspace_plugin_azurerm", "~> 0.2.0"
-  spec.add_dependency "terraspace_plugin_google", "~> 0.2.0"
-  spec.add_dependency "rspec-terraspace"
+  spec.add_dependency "terraspace_plugin_aws", "~> 0.3.0"
+  spec.add_dependency "terraspace_plugin_azurerm", "~> 0.3.0"
+  spec.add_dependency "terraspace_plugin_google", "~> 0.3.0"
+  spec.add_dependency "rspec-terraspace", "~> 0.2.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -212,56 +212,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: terraspace_plugin_azurerm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: terraspace_plugin_google
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-terraspace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -385,7 +385,10 @@ files:
 - README.md
 - Rakefile
 - exe/terraspace
+- lib/templates/base/arg/terraform.rb.tt
 - lib/templates/base/git_hook/hook.sh
+- lib/templates/base/helper/%name%_helper.rb.tt
+- lib/templates/base/hook/%kind%.rb.tt
 - lib/templates/base/project/.gitignore
 - lib/templates/base/project/Gemfile.tt
 - lib/templates/base/project/README.md
@@ -510,16 +513,17 @@ files:
 - lib/terraspace/cli/help/logs.md
 - lib/terraspace/cli/help/logs/remove.md
 - lib/terraspace/cli/help/logs/truncate.md
-- lib/terraspace/cli/help/new/bootstrap_test.md
+- lib/terraspace/cli/help/new/arg.md
 - lib/terraspace/cli/help/new/example.md
 - lib/terraspace/cli/help/new/git_hook.md
+- lib/terraspace/cli/help/new/helper.md
+- lib/terraspace/cli/help/new/hook.md
 - lib/terraspace/cli/help/new/module.md
-- lib/terraspace/cli/help/new/module_test.md
 - lib/terraspace/cli/help/new/plugin.md
 - lib/terraspace/cli/help/new/project.md
-- lib/terraspace/cli/help/new/project_test.md
 - lib/terraspace/cli/help/new/shim.md
 - lib/terraspace/cli/help/new/stack.md
+- lib/terraspace/cli/help/new/test.md
 - lib/terraspace/cli/help/output.md
 - lib/terraspace/cli/help/plan.md
 - lib/terraspace/cli/help/providers.md
@@ -536,9 +540,12 @@ files:
 - lib/terraspace/cli/logs.rb
 - lib/terraspace/cli/logs/concern.rb
 - lib/terraspace/cli/new.rb
+- lib/terraspace/cli/new/arg.rb
 - lib/terraspace/cli/new/git_hook.rb
 - lib/terraspace/cli/new/helper.rb
-- lib/terraspace/cli/new/helper/plugin_gem.rb
+- lib/terraspace/cli/new/helpers.rb
+- lib/terraspace/cli/new/helpers/plugin_gem.rb
+- lib/terraspace/cli/new/hook.rb
 - lib/terraspace/cli/new/module.rb
 - lib/terraspace/cli/new/plugin.rb
 - lib/terraspace/cli/new/plugin/helper.rb
@@ -549,10 +556,7 @@ files:
 - lib/terraspace/cli/new/source/plugin.rb
 - lib/terraspace/cli/new/source/test.rb
 - lib/terraspace/cli/new/stack.rb
-- lib/terraspace/cli/new/test/base.rb
-- lib/terraspace/cli/new/test/bootstrap.rb
-- lib/terraspace/cli/new/test/module.rb
-- lib/terraspace/cli/new/test/project.rb
+- lib/terraspace/cli/new/test.rb
 - lib/terraspace/cli/seed.rb
 - lib/terraspace/cli/summary.rb
 - lib/terraspace/cli/test.rb
@@ -590,6 +594,7 @@ files:
 - lib/terraspace/compiler/erb/helpers.rb
 - lib/terraspace/compiler/erb/render.rb
 - lib/terraspace/compiler/expander.rb
+- lib/terraspace/compiler/helper_extender.rb
 - lib/terraspace/compiler/strategy/abstract_base.rb
 - lib/terraspace/compiler/strategy/mod.rb
 - lib/terraspace/compiler/strategy/mod/base.rb
@@ -630,6 +635,7 @@ files:
 - lib/terraspace/plugin/expander/generic.rb
 - lib/terraspace/plugin/expander/interface.rb
 - lib/terraspace/plugin/finder.rb
+- lib/terraspace/plugin/helper/interface.rb
 - lib/terraspace/plugin/infer_provider.rb
 - lib/terraspace/plugin/layer/interface.rb
 - lib/terraspace/plugin/meta.rb
@@ -828,7 +834,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'

data/lib/terraspace/cli/help/new/bootstrap_test.md

@@ -1,8 +0,0 @@
-## Example
-
-    $ terraspace new bootstrap_test
-    => Creating test bootstrap structure
-           exist
-          create  .rspec
-          create  spec/spec_helper.rb
-    $

data/lib/terraspace/cli/help/new/module_test.md

@@ -1,12 +0,0 @@
-## Example
-
-    $ terraspace new module_test example
-    => Creating module test: example
-           exist  app/modules/example
-          create  app/modules/example/test/.rspec
-          create  app/modules/example/test/Gemfile
-          create  app/modules/example/test/spec/fixtures/stack/main.tf
-          create  app/modules/example/test/spec/fixtures/stack/outputs.tf
-          create  app/modules/example/test/spec/main_spec.rb
-          create  app/modules/example/test/spec/spec_helper.rb
-    $