simplygenius-atmos 0.11.8 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36463da6285364bd4cedc5c58fca1dfe1a3be224e7ab5130782cfac077c6b9b
-  data.tar.gz: 0303dd6ea2937a4f2d2c301dc817f76845fdaedb164766ed1888e8ec09fb1210
+  metadata.gz: 685baebb62604a3094114ff1616e1e044c0560ed9285c27686a4b8c3e635f964
+  data.tar.gz: 2eadc8adc7ca8574de3d9f44d1af4d7668c17de8d9b6bee7f38c5f3234f47f63
 SHA512:
-  metadata.gz: e8aeef7da3b8bdb24619d57c2ef13426956e064168b86182d3293bff860c6c67d3c4ac744baf6b09c126fa6e51850dbd18360fa007adfc6cbffc305c8f0acc9d
-  data.tar.gz: c13e39a367dd9ed322106ee213816552adb1c9387f26eef72d7e96b61453cfab851fd369cda7f67eecb81d89edae07edda786980b35201982bbae3e318420c95
+  metadata.gz: 96249401ac017e427d0a5131f8ee441d51da30b91ae5da13a42bbddc258b1f7402c30411d5d304f2680c79e88d6e62eed8bfa26f0f70bd1b85eaf5ced69fd985
+  data.tar.gz: 2025652bff07e78886a228f75e87183eb8b70ec0ec294223008f6abc4203ad9bf3cd617a39c06a521320812454c61e28d2a8c541eb9d5beb7c35b86bad4a3e3f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.11.9 (02/13/2020)
+-------------------
+
+* Automatically run init when needed for current environment [f902232](https://github.com/simplygenius/atmos/commit/f902232)
+
+
 0.11.8 (02/04/2020)
 -------------------
 

data/lib/simplygenius/atmos/commands/apply.rb

@@ -14,6 +14,9 @@ module SimplyGenius
           args = ["apply"]
           args << "--get-modules" unless Atmos.config["atmos.terraform.disable_auto_modules"].to_s == "true"
           @terraform_arguments.insert(0, *args)
+
+          self.auto_init = true
+
           super
         end
 

data/lib/simplygenius/atmos/commands/init.rb

@@ -7,7 +7,6 @@ module SimplyGenius
     module Commands
 
       class Init < Terraform
-        include FileUtils
 
         def self.description
           "Runs terraform init"
@@ -17,17 +16,7 @@ module SimplyGenius
           @terraform_arguments.insert(0, "init")
           super
 
-          if ! Atmos.config["atmos.terraform.disable_shared_plugins"]
-            home_dir = OS.windows? ? File.join("~", "Application Data") : "~"
-            shared_plugins_dir = File.expand_path(File.join(home_dir,".terraform.d", "plugins"))
-            logger.debug("Updating shared terraform plugins dir: #{shared_plugins_dir}")
-            mkdir_p(shared_plugins_dir)
-            terraform_plugins_dir = File.join(Atmos.config.tf_working_dir,'recipes', '.terraform', 'plugins')
-            if File.exist?(terraform_plugins_dir)
-              cp_r("#{terraform_plugins_dir}/.", shared_plugins_dir)
-            end
-          end
-
+          init_shared_plugins
         end
 
       end

data/lib/simplygenius/atmos/commands/plan.rb

@@ -14,6 +14,9 @@ module SimplyGenius
           args = ["plan"]
           args << "--get-modules" unless Atmos.config["atmos.terraform.disable_auto_modules"].to_s == "true"
           @terraform_arguments.insert(0, *args)
+
+          self.auto_init = true
+
           super
         end
 

data/lib/simplygenius/atmos/commands/terraform.rb

@@ -6,6 +6,9 @@ module SimplyGenius
     module Commands
 
       class Terraform < BaseCommand
+        include FileUtils
+
+        attr_accessor :auto_init
 
         def self.description
           "Runs terraform"
@@ -17,6 +20,31 @@ module SimplyGenius
           @terraform_arguments = arguments
         end
 
+        def init_automatically(auth_env, get_modules)
+          tf_init_dir = File.join(Atmos.config.tf_working_dir, '.terraform')
+          backend_initialized = File.exist?(File.join(tf_init_dir, 'terraform.tfstate'))
+          auto_init_enabled = Atmos.config["atmos.terraform.auto_init"].to_s == "true"
+
+          if auto_init && auto_init_enabled && ! backend_initialized
+            exe = TerraformExecutor.new(process_env: auth_env)
+            exe.run("init", get_modules: get_modules.present?)
+            init_shared_plugins
+          end
+        end
+
+        def init_shared_plugins
+          if ! Atmos.config["atmos.terraform.disable_shared_plugins"]
+            home_dir = OS.windows? ? File.join("~", "Application Data") : "~"
+            shared_plugins_dir = File.expand_path(File.join(home_dir,".terraform.d", "plugins"))
+            logger.debug("Updating shared terraform plugins dir: #{shared_plugins_dir}")
+            mkdir_p(shared_plugins_dir)
+            terraform_plugins_dir = File.join(Atmos.config.tf_working_dir,'recipes', '.terraform', 'plugins')
+            if File.exist?(terraform_plugins_dir)
+              cp_r("#{terraform_plugins_dir}/.", shared_plugins_dir)
+            end
+          end
+        end
+
         def execute
 
           unless Atmos.config.is_atmos_repo?
@@ -28,8 +56,11 @@ module SimplyGenius
 
           Atmos.config.provider.auth_manager.authenticate(ENV) do |auth_env|
             begin
-              exe = TerraformExecutor.new(process_env: auth_env)
               get_modules = @terraform_arguments.delete("--get-modules")
+
+              init_automatically(auth_env, get_modules)
+
+              exe = TerraformExecutor.new(process_env: auth_env)
               exe.run(*@terraform_arguments, get_modules: get_modules.present?)
             rescue TerraformExecutor::ProcessFailed => e
               logger.error(e.message)

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.11.8"
+    VERSION = "0.11.9"
   end
 end

data/templates/new/config/atmos/runtime.yml

@@ -125,3 +125,5 @@ atmos:
     working_dir_links: ['modules', 'templates', 'bin', '.terraform-version']
     # Set true if running terraform version < 0.11.x
     compat11: false
+    # Automatically run "init" if needed when using "atmos plan|apply"
+    auto_init: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler