terraspace 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfdfafd180a61f7e43131770457ffa446c8bae59d3db9e68c9b9a8930fa6ca88
-  data.tar.gz: 684480a5c4454ee457c5e236574ace9424a514d0822c2693190de41354aea40d
+  metadata.gz: 57c0c4f1c1fce5c1dd8fcd7447f5bc5a82e17d66e5353f4d092d492c137021e5
+  data.tar.gz: 81a4ba08410e898a1dd057625ca556392e746c4b48a3453874472c60424c3949
 SHA512:
-  metadata.gz: 73bef840c84345011a8246128537d81d76fee4c73215ac3856e43814e04304bfcf16d54213eee2fb940650f3fe4c13df249d1476805090cc0fbd7524f00fed00
-  data.tar.gz: a4b3f901aa19c01de17a059bd907197d4b2f8276a72de4ea29381ee803291ea9e4f33cc8c9667358247868297fb3b784dab1f0b127c7a04a98f37a56c4e2a773
+  metadata.gz: e629795fd75ad23d343ec28390e76756650f11740c6b380ad3df87cb216f7a998acfea282ebb1a1399343c3db2b5abe452705bb82fd61e76a8cd1a2ca258300b
+  data.tar.gz: 7104217cb56ee3ba2317d4d2abe0d4f760fe35de359903349a97bef4c2de3c92aaff3e0605789fd9e970f8a841a2203dedc9d740d9bddf127d2555a3f3818f30

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.0.6] - 2022-01-24
+- [#195](https://github.com/boltops-tools/terraspace/pull/195) improve autodetection for plugin expander for backend like remote
+
 ## [1.0.5] - 2022-01-23
 - [#194](https://github.com/boltops-tools/terraspace/pull/194) ability to allow and deny envs, regions, and stacks
 

data/lib/terraspace/app.rb

@@ -33,6 +33,8 @@ module Terraspace
       config.all.consider_allow_deny_stacks = true
 
       config.auto_create_backend = true
+      config.autodetect = ActiveSupport::OrderedOptions.new
+      config.autodetect.expander = nil
       config.build = ActiveSupport::OrderedOptions.new
       config.build.cache_dir = ":CACHE_ROOT/:REGION/:ENV/:BUILD_DIR"
       config.build.cache_root = nil # defaults to /full/path/to/.terraspace-cache

data/lib/terraspace/autodetect.rb

@@ -2,13 +2,9 @@ module Terraspace
   class Autodetect
     def plugin
       plugins = Terraspace::Plugin.meta.keys
-      if plugins.size == 1
-        plugins.first
-      else
-        precedence = %w[aws azurerm google]
-        precedence.find do |p|
-          plugins.include?(p)
-        end
+      precedence = %w[aws azurerm google]
+      precedence.find do |p|
+        plugins.include?(p)
       end
     end
   end

data/lib/terraspace/compiler/expander/backend.rb

@@ -12,7 +12,7 @@ class Terraspace::Compiler::Expander
       @mod = mod
     end
 
-    COMMENT = /^\s+#/
+    COMMENT = /^\s*#/
     # Works for both backend.rb DSL and backend.tf ERB
     def detect
       return nil unless src_path # no backend file. returning nil means a local backend

data/lib/terraspace/compiler/expander.rb

@@ -3,8 +3,8 @@ module Terraspace::Compiler
     extend Memoist
     delegate :expand, :expansion, to: :expander
 
-    def initialize(mod, name)
-      @mod, @name = mod, name
+    def initialize(mod, backend=nil)
+      @mod, @backend = mod, backend
     end
 
     def expander
@@ -12,27 +12,51 @@ module Terraspace::Compiler
     end
     memoize :expander
 
+    # IE: TerraspacePluginAws::Interfaces::Expander
     def expander_class
-      # IE: TerraspacePluginAws::Interfaces::Expander
-      klass_name = Terraspace::Plugin.klass("Expander", backend: @name)
-      klass_name ? klass_name.constantize : Terraspace::Plugin::Expander::Generic
-    rescue NameError
+      class_name = expander_class_name
+      class_name ? class_name.constantize : Terraspace::Plugin::Expander::Generic
+    rescue NameError => e
+      logger.debug "#{e.class}: #{e.message}"
       Terraspace::Plugin::Expander::Generic
     end
 
+    def expander_class_name
+      plugin = Terraspace.config.autodetect.expander # contains plugin name. IE: aws, azurerm, google
+      if plugin
+        # early return for user override of autodetection
+        return Terraspace::Plugin.klass("Expander", plugin: plugin) # can return nil
+      end
+
+      backend = @backend || parse_backend
+      class_name = Terraspace::Plugin.klass("Expander", backend: backend) # can return nil
+      unless class_name
+        backend = plugin_backend
+        class_name = Terraspace::Plugin.klass("Expander", backend: backend) # can return nil
+      end
+      class_name
+    end
+
+    # autodetect by parsing backend.tf or backend.rb
+    def parse_backend
+      Backend.new(@mod).detect
+    end
+
+    # autodetect by looking up loaded plugins
+    def plugin_backend
+      plugin = Terraspace::Autodetect.new.plugin # IE: aws, azurerm, google
+      if plugin
+        data = Terraspace::Plugin.meta[plugin]
+        data[:backend] # IE: s3, azurerm, gcs
+      end
+    end
+
     class << self
       extend Memoist
-
       def autodetect(mod, opts={})
-        backend = opts[:backend] || find_backend(mod)
-        new(mod, backend)
+        new(mod, opts)
       end
       memoize :autodetect
-
-      def find_backend(mod)
-        Backend.new(mod).detect
-      end
-      memoize :find_backend
     end
   end
 end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport