hashicorptools 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b38a77f25914cf1c9fdeffb3bd0098add1a79140
-  data.tar.gz: 117c9145ef6181e8a2c158b4e24cc55b4b99e2a6
+  metadata.gz: e8aadfd92e4ab1f16ec711239b5329c159f120e3
+  data.tar.gz: e0b7faf7ddcfc1a29879d4fae2ec85618e109c00
 SHA512:
-  metadata.gz: abec236d7c680241d658d43504cac803040f7994f07a90455f95f8fd2bb347375f29f1dc87e6a0ddce0ea209a870d11ad32dafaee6c4c20b6b629367550c0979
-  data.tar.gz: cdab94f46e5790f19caf0675c67801d32079eeac5d03036f3bc0586508385faae283b9ecd24f3ab7f4b746bcb7ef828784228ce86b7ce47d5a8c380e8a9ad27f
+  metadata.gz: 3e15c3a0b5bbdab30ca7cc9e0122c3d8727bfdcf6929a9c29f1714a26af407273c8a6af5350c7b2a8b1c0eb442b57083e7e8ef67191b795944155e6c41c0fcd8
+  data.tar.gz: 2723ea9479d0eefa176f7283eecfa9a7989a3c5d95691ee70004e51f1bd4a18402336072505595546735e64177eba86f2d74986b0f32f6a9c55bf827bbb0c4e6

data/Gemfile.lock

@@ -1,46 +1,44 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    aws-sdk (2.1.29)
-      aws-sdk-resources (= 2.1.29)
-    aws-sdk-core (2.1.29)
+    addressable (2.4.0)
+    aws-sdk (2.3.13)
+      aws-sdk-resources (= 2.3.13)
+    aws-sdk-core (2.3.13)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.1.29)
-      aws-sdk-core (= 2.1.29)
+    aws-sdk-resources (2.3.13)
+      aws-sdk-core (= 2.3.13)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
     builder (3.2.2)
-    byebug (6.0.2)
+    byebug (9.0.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     docile (1.1.5)
-    domain_name (0.5.25)
+    domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.0.1)
+    dotenv (2.1.1)
     dynect_rest (0.4.6)
       rest-client
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.12.3)
-      addressable (~> 2.3)
+    git (1.3.0)
+    github_api (0.14.0)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+      hashie (>= 3.4)
       oauth2
-    hashie (3.4.1)
-    highline (1.7.2)
+    hashie (3.4.4)
+    highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
@@ -53,26 +51,30 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    jmespath (1.1.3)
+    jmespath (1.2.4)
+      json_pure (>= 1.8.1)
     json (1.8.3)
-    jwt (1.5.0)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.8.1)
-    multi_json (1.11.0)
+    json_pure (1.8.3)
+    jwt (1.5.1)
+    mime-types (2.99.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.1)
-    rake (10.4.2)
+      rack (>= 1.2, < 3)
+    pkg-config (1.1.7)
+    rack (1.6.4)
+    rake (11.1.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.8.0)
@@ -87,7 +89,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.10.0)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -98,7 +100,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.2)
 
 PLATFORMS
   ruby
@@ -117,3 +119,6 @@ DEPENDENCIES
   rspec (~> 2.8.0)
   simplecov
   thor
+
+BUNDLED WITH
+   1.12.5

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/hashicorptools.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hashicorptools 0.0.5 ruby lib
+# stub: hashicorptools 0.0.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Nathan Woodhull"]
-  s.date = "2016-02-01"
+  s.date = "2016-08-19"
   s.description = "Wrappers for terraform and packer"
   s.email = "systems@controlshiftlabs.com"
   s.executables = ["ec2_host"]

data/lib/hashicorptools/ec2_utilities.rb

@@ -9,7 +9,13 @@ module Hashicorptools
     end
 
     def ec2
-      ec2 = AWS::EC2.new
+      reg = if self.methods.include?(:region)
+              self.region
+            else
+              'us-east-1'
+            end
+
+      AWS::EC2.new(region: reg)
     end
 
     def vpc_with_name(name)

data/lib/hashicorptools/packer.rb

@@ -84,12 +84,16 @@ module Hashicorptools
       File.join(datadir_path, 'standard-ami.json')
     end
 
+    def region
+      'us-east-1'
+    end
+
     def auto_scaling
-      @auto_scaling ||= Aws::AutoScaling::Client.new(region: 'us-east-1')
+      @auto_scaling ||= Aws::AutoScaling::Client.new(region: region)
     end
 
     def ec2_v2
-      @ec2 ||= Aws::EC2::Client.new(region: 'us-east-1')
+      @ec2 ||= Aws::EC2::Client.new(region: region)
     end
 
     def amis_in_use

data/lib/hashicorptools/terraform.rb

@@ -1,6 +1,6 @@
 module Hashicorptools
   class Terraform < Thor
-    TERRAFORM_VERSION = '0.6.11'
+    TERRAFORM_VERSION = '0.6.16'
 
     include Ec2Utilities
     include Variables
@@ -25,17 +25,14 @@ module Hashicorptools
           enforce_version!
           raise 'invalid environment' unless ['staging', 'production'].include?(options[:environment])
 
-          settings_overrides
-            .merge!({ app_environment: options[:environment] }
-            .merge(env_variable_keys)
-            .merge(settings)
-            .merge(shared_plan_variables))
+          execute(state_path, var_file_path) do
 
-          decrypt_file(state_path)
-          decrypt_file(var_file_path)
+            settings_overrides
+              .merge!({ app_environment: options[:environment] }
+              .merge(env_variable_keys)
+              .merge(settings)
+              .merge(shared_plan_variables))
 
-
-          begin
             send("before_#{cmd}")
 
             terraform_command = "terraform #{cmd} #{variables(settings_overrides)} -state #{state_path} #{var_file_param} #{config_directory}"
@@ -43,18 +40,13 @@ module Hashicorptools
             if (options[:debug])
               puts "[DEBUG] running command: '#{terraform_command}"
             end
-            if system terraform_command
+
+            result = system terraform_command
+
+            if result
               send("after_#{cmd}")
             end
-          rescue StandardError => e
-            puts e.message
-            puts e.backtrace
-          ensure
-            # need to always ensure the most recent tfstate is encrypted again.
-            encrypt_file(state_path)
-            delete_decrypted_var_file
           end
-
         end
 
         define_method "before_#{cmd}" do
@@ -69,32 +61,35 @@ module Hashicorptools
       end
 
       desc cmd, "terraform #{cmd} for shared plan"
+      option :debug, :required => false
       define_method "shared_#{cmd}" do
         enforce_version!
 
-        decrypt_file(shared_state_path)
-
-        begin
-          system "terraform #{cmd} #{variables(env_variable_keys.merge(settings))} -state #{shared_state_path} #{shared_config_directory}"
-        rescue StandardError => e
-          puts e.message
-          puts e.backtrace
-        ensure
-          # need to always ensure the most recent tfstate is encrypted again.
-          encrypt_file(shared_state_path)
+        execute(shared_state_path) do
+          terraform_command = "terraform #{cmd} #{variables(env_variable_keys.merge(settings))} -state #{shared_state_path} #{shared_config_directory}"
+          if (options[:debug])
+            puts "[DEBUG] running command: '#{terraform_command}"
+          end
+          system terraform_command
         end
       end
     end
 
-    [:shared_apply, :shared_plan, :shared_destroy, :shared_pull, :shared_refresh].each do |cmd|
-
-    end
-
     desc 'output', 'terraform output'
     option :environment, :required => true
     option :name, :required => true
     def output
-      system output_cmd(state_path, options[:name])
+      execute(state_path) do
+        system output_cmd(state_path, options[:name])
+      end
+    end
+
+    desc 'shared_output', 'terraform output for shared plan'
+    option :name, :required => true
+    def shared_output
+      execute(shared_state_path) do
+        system output_cmd(shared_state_path, options[:name])
+      end
     end
 
     desc 'taint', 'terraform taint'
@@ -102,17 +97,41 @@ module Hashicorptools
     option :name, :required => true
     option :module, :required => false
     def taint
-      if options[:module].present?
-        system "terraform taint -module #{options[:module]} -state #{state_path} #{options[:name]}"
-      else
-        system "terraform taint -state #{state_path} #{options[:name]}"
+      execute(state_path) do
+        if options[:module].present?
+          system "terraform taint -module #{options[:module]} -state #{state_path} #{options[:name]}"
+        else
+          system "terraform taint -state #{state_path} #{options[:name]}"
+        end
+      end
+    end
+
+    desc 'shared_taint', 'terraform taint for shared plan'
+    option :name, :required => true
+    option :module, :required => false
+    def shared_taint
+      execute(shared_state_path) do
+        if options[:module].present?
+          system "terraform taint -module #{options[:module]} -state #{shared_state_path} #{options[:name]}"
+        else
+          system "terraform taint -state #{shared_state_path} #{options[:name]}"
+        end
       end
     end
 
     desc 'show', 'terraform show'
     option :environment, :required => true
     def show
-      system "terraform show #{state_path}"
+      execute(state_path) do
+        system "terraform show #{state_path}"
+      end
+    end
+
+    desc 'shared_show', 'terraform show for shared plan'
+    def shared_show
+      execute(shared_state_path) do
+        system "terraform show #{shared_state_path}"
+      end
     end
 
     [ {commands: [:decrypt, :encrypt], file_path_method: :state_path, desc: 'upstream terraform changes'},
@@ -120,14 +139,18 @@ module Hashicorptools
       {commands: [:var_file_decrypt, :var_file_encrypt], file_path_method: :var_file_path, desc: 'tfvars file'} ].each do |crypto_commands|
 
         desc crypto_commands[:commands][0], "decrypt #{crypto_commands[:desc]}"
-        option :environment, :required => true
+        unless crypto_commands.to_s.match(/shared_.+/)
+          option :environment, :required => true
+        end
         define_method crypto_commands[:commands][0] do
           file_path = send(crypto_commands[:file_path_method])
           decrypt_file(file_path)
         end
 
         desc crypto_commands[:commands][1], "encrypt #{crypto_commands[:desc]}"
-        option :environment, :required => true
+        unless crypto_commands.to_s.match(/shared_.+/)
+          option :environment, :required => true
+        end
         define_method crypto_commands[:commands][1] do
           file_path = send(crypto_commands[:file_path_method])
           encrypt_file(file_path)
@@ -148,6 +171,25 @@ module Hashicorptools
         ""
     end
 
+    def execute(state_file_path, var_file_path=nil)
+      decrypt_file(state_file_path)
+      if var_file_path
+        decrypt_file(var_file_path)
+      end
+
+      begin
+        yield
+      rescue StandardError => e
+        puts e.message
+        puts e.backtrace
+      ensure
+        encrypt_file(state_file_path)
+        if var_file_path
+          delete_decrypted_var_file
+        end
+      end
+    end
+
     def delete_decrypted_var_file
       return unless File.exist?(var_file_path)
 

data/lib/hashicorptools/variables.rb

@@ -6,7 +6,7 @@ module Hashicorptools
     end
 
     def variables(settings_overrides = {})
-      aws_credentials_settings(settings_overrides).collect{|key,value| "-var '#{key}=#{value}'" }.join(' ')
+      aws_credentials_settings(settings_overrides).collect{|key,value| "-var '#{key}=\"#{value}\"'" }.join(' ')
     end
   end
 end

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: hashicorptools
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: dynect_rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Wrappers for terraform and packer
@@ -231,12 +231,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []