TerraformDevKit 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83160b993699651ff3704a83514b066c05c40ecd
-  data.tar.gz: fc6ff392be1d7ff059c3a65a7668b77940259d8d
+  metadata.gz: ac0b94822f7c2101d5399ef83c58e6e35300c888
+  data.tar.gz: ca5e44187ad6f852b98cdb7bba6692b34fe9c53a
 SHA512:
-  metadata.gz: 7530cce40200f4e8ba2bc2dc725127557e720873e158ab055f9dbf53fefc1f862bfd9eabd8c41d6c524f9505c52e1d74c94b3e8a4faf2707a6c87a485c169641
-  data.tar.gz: 7e34bb9aa5448e9ff903ae66b00366f9dbe2cfef40931352dba80a705cba89151942444ed86369ff0fe0513ea6c462a7ac15d7d212bb6b937e2c7eb7dff45363
+  metadata.gz: 9f5f86d877a2d7f76940508fc04be9d2ddfdf47986c046ecb5af838c65b07b75f88d863b04c0d8ed5d3df7131f2806b6eeba6df04d8954ff46a6fc4b035a2ce4
+  data.tar.gz: c05e5318a8b9d1e569a649fcb89bbf5e1b5db91c00ecb7ca560db65e25294dbebe0ff6b1d684b1d98d2d40cd92ff0654dbb1284bd8745aa096bf86cd6f85555a

data/README.md

@@ -119,7 +119,7 @@ Additionally, TerraformDevKit allows users to define a set of hooks that will be
 * `post_apply`: invoked after `apply` task runs
 * `pre_destroy`: invoked before `destroy` task runs
 * `post_destroy`: invoked after `destroy` task runs
-* `custom_prepare`: invoked during the preparation process, before terraform is initialized
+* `custom_prepare`: invoked during the preparation process, before terraform is initialized and the environment folder is created
 * `custom_test`: invoked during as part of the `test` task, right after `apply` completes.
 
 ### Sample Terraform Templates

data/lib/TerraformDevKit/version.rb

@@ -1,3 +1,3 @@
 module TerraformDevKit
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.3.6'.freeze
 end

data/tasks/devkit.rake

@@ -32,11 +32,7 @@ end
 
 def task_in_current_namespace(task_name, current_task)
   namespace = current_task.scope.path.to_s
-  if namespace.empty?
-    return task_name
-  end
-
-  return "#{namespace}:#{task_name}"
+  namespace.empty? ? task_name : "#{namespace}:#{task_name}"
 end
 
 def remote_state
@@ -54,13 +50,16 @@ end
 
 desc 'Prepares the environment to create the infrastructure'
 task :prepare, [:env] do |_, args|
-  puts "== Configuring environment #{args.env}"
   env = TDK::Environment.new(args.env)
 
+  puts "== Configuring environment #{env.name}"
+
   config_file = CONFIG_FILE % env.config
   puts "== Loading configuration from #{config_file}"
   TDK::Configuration.init(config_file)
 
+  invoke('custom_prepare', task, env.name, safe_invoke: true)
+
   TDK::TerraformInstaller.install_local(
     TDK::Configuration.get('terraform-version'),
     directory: BIN_PATH
@@ -77,8 +76,6 @@ task :prepare, [:env] do |_, args|
     remote_state.init(env, project_config)
   end
 
-  invoke('custom_prepare', task, args.env, safe_invoke: true)
-
   if File.exist?(File.join(env.working_dir, '.terraform'))
     get_cmd  = 'terraform get'
     get_cmd += ' -update=true' if TDK::TerraformConfigManager.update_modules?
@@ -86,7 +83,6 @@ task :prepare, [:env] do |_, args|
   else
     init_cmd  = 'terraform init'
     init_cmd += ' -upgrade=false' unless TDK::TerraformConfigManager.update_modules?
-
     TDK::Command.run(init_cmd, directory: env.working_dir)
   end
 end
@@ -94,15 +90,12 @@ end
 desc 'Shows the plan to create the infrastructure'
 task :plan, [:env] => :prepare do |_, args|
   env = TDK::Environment.new(args.env)
-  Dir.chdir(env.working_dir) do
-    system("terraform plan -out=#{PLAN_FILE}")
-  end
+  cmd = "terraform plan -out=#{PLAN_FILE}"
+  TDK::Command.run(cmd, directory: env.working_dir)
 end
 
 desc 'Creates the infrastructure'
 task :apply, [:env] => :prepare do |task, args|
-  invoke('pre_apply', task, args.env, safe_invoke: true)
-
   env = TDK::Environment.new(args.env)
 
   invoke('plan', task, env.name)
@@ -117,13 +110,14 @@ task :apply, [:env] => :prepare do |task, args|
     end
   end
 
+  invoke('pre_apply', task, env.name, safe_invoke: true)
+
   destroy_if_fails(env, task) do
-    Dir.chdir(env.working_dir) do
-      system("terraform apply \"#{PLAN_FILE}\"")
-    end
+    cmd = "terraform apply \"#{PLAN_FILE}\""
+    TDK::Command.run(cmd, directory: env.working_dir)
   end
 
-  invoke('post_apply', task, args.env, safe_invoke: true)
+  invoke('post_apply', task, env.name, safe_invoke: true)
 end
 
 desc 'Tests a local environment'
@@ -134,7 +128,7 @@ task :test, [:env] do |task, args|
   invoke('apply', task, env.name)
 
   destroy_if_fails(env, task) do
-    invoke('custom_test', task, args.env, safe_invoke: true)
+    invoke('custom_test', task, env.name, safe_invoke: true)
   end
 end
 
@@ -150,10 +144,7 @@ end
 
 desc 'Destroys the infrastructure'
 task :destroy, [:env] => :prepare do |task, args|
-  invoke('pre_destroy', task, args.env, safe_invoke: true)
-
   env = TDK::Environment.new(args.env)
-  cmd = 'terraform destroy'
 
   unless env.local_backend?
     puts Rainbow("\n\n!!!! WARNING !!!!\n\n" \
@@ -167,13 +158,10 @@ task :destroy, [:env] => :prepare do |task, args|
            "Response was: #{response}"
     end
   end
-  
-  cmd += ' -force'
 
-  Dir.chdir(env.working_dir) do
-    system(cmd)
-  end
-  invoke('pre_destroy', task, args.env, safe_invoke: true)
+  invoke('pre_destroy', task, env.name, safe_invoke: true)
+
+  TDK::Command.run('terraform destroy -force', directory: env.working_dir)
 
   unless env.local_backend?
     project_config = TDK::ProjectConfig.new(
@@ -183,7 +171,7 @@ task :destroy, [:env] => :prepare do |task, args|
     remote_state.destroy(env, project_config)
   end
 
-  invoke('post_destroy', task, args.env, safe_invoke: true)
+  invoke('post_destroy', task, env.name, safe_invoke: true)
 end
 
 desc 'Cleans an environment (infrastructure is destroyed too)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TerraformDevKit
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Victor Jimenez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler