tfrb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcf070c3b3ae2566c53df75d4a38a6fdcae411cd0eadaa620062ea0d8c690a91
-  data.tar.gz: 468e9dbf7423807d1fbe9ccca5ea835394013176848f671451eec28a5d439548
+  metadata.gz: 7007bbfc991d6e9b8ee14d9e0a7dc673338b589c1da0afd61c78859c6da2f1ff
+  data.tar.gz: ed13eab16dfdbfa573d9c9785a46c9a1d14b90ac3c6b0cc222777397ad40e240
 SHA512:
-  metadata.gz: f93320b30f22b5b6101083e3e4d544de336f56abb85d74dbfe1db12e1340b2eb3b48f947b4130fb2156038d57655399895afb73d8dd98c71616b1ef1d7ec85a8
-  data.tar.gz: 30e8349752c48e7a16cdc11070a752f0f79560aa1d3a8417f5946b2335d4a42db1968f44c49f212ab12cd25202129c99032e6d553a3d54cfbf17d48f68aaeae8
+  metadata.gz: 2ff08dde3f046f973a452a8b1752f5fcb9606bf06e2273dc4635def287bce7af92a8451d8d1714245c188a0c28b14e3675eee2fc16df1161c85b3e39340d1073
+  data.tar.gz: 6e9112522fe46f57fc4c27f6c4e7ee44aa228695a69dc628bded44b301a88869561b3ffe4a372200083048f997806e5853ff40c3e846c76cc5951bfab63397c3

data/README.md

@@ -22,6 +22,34 @@ Or install it yourself as:
 
     $ tfrm --help
 
+## Configuration
+
+tfrb is configured using a `tfrb.rb` file in the current working directory where you run `tfrb` similar to:
+
+    ::Tfrb::Config[:environment_name] = 'dev'
+    ::Tfrb::Config[:path] = ::File.join(::File.dirname(::Chef::Config.environment_path), 'infrastructure')
+    ::Tfrb::Config[:temp_path] = ::File.join(::File.dirname(::Chef::Config.environment_path), '.infrastructure')
+    ::Tfrb::Config[:files] = ::Chef::Config[:knife][:infrastructure_environments]
+
+    ::Tfrb::Config[:extra_modules] = [
+      Atlas::Aws,
+      Atlas::Chef
+    ]
+
+    ::Tfrb::Config[:overrides] = {
+      'provider' => {
+        'aws' => {
+          'access_key' => ::Chef::Config[:knife][:aws_access_key_id],
+          'secret_key' => ::Chef::Config[:knife][:aws_secret_access_key],
+          'token' => ::Chef::Config[:knife][:aws_session_token]
+        }
+      },
+      'resource' => {}
+    }
+
+    # Require everything in lib/tfrb/resource/
+    ::Dir[::File.join(::File.dirname(__FILE__), 'lib', 'tfrb', '*', '*.rb')].each { |file| require file }
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/tfrb/base.rb

@@ -7,7 +7,6 @@ require 'mixlib/shellout'
 class Tfrb::Base
   attr_accessor :block
   attr_accessor :path
-  attr_accessor :temp_path
   attr_accessor :local_state_path
   attr_accessor :environments
   attr_accessor :state
@@ -21,7 +20,7 @@ class Tfrb::Base
     @path = Tfrb::Config[:path]
     @temp_path = File.join(Tfrb::Config[:temp_path], block)
     Dir.mkdir(@temp_path) unless Dir.exist?(@temp_path)
-    @local_state_path = File.join(@temp_path, '.terraform', 'local.tfstate')
+    @local_state_path = temp_path('.terraform', 'local.tfstate')
     @environments = environments.each_with_object({}) do |environment, hash|
       hash[environment] = Tfrb::Block.load(environment)
     end
@@ -30,9 +29,7 @@ class Tfrb::Base
 
   def write!
     @environments.each do |environment_name, environment|
-      File.open(File.join(temp_path, "#{environment_name}.tf.json"), 'w') do |file|
-        file.write(JSON.pretty_generate(environment, indent: '  '))
-      end
+      File.write(temp_path("#{environment_name}.tf.json"), JSON.pretty_generate(environment, indent: '  '))
     end
   end
 
@@ -144,16 +141,17 @@ class Tfrb::Base
     tf_apply = Mixlib::ShellOut.new('terraform', 'apply', '-auto-approve', 'plan.cache', shell_opts)
     tf_apply.run_command
     tf_apply.error!
-    plan_cache = File.join(temp_path, 'plan.cache')
+    plan_cache = temp_path('plan.cache')
     File.delete(plan_cache) if File.exist?(plan_cache)
   end
 
   def clean!
     %w(*.tf.json).each do |glob|
-      Dir.glob(File.join(temp_path, glob)).each do |file|
+      Dir.glob(temp_path(glob)).each do |file|
         File.delete(file) if File.exist?(file)
       end
     end
+    File.delete(local_state_path) if File.exist?(local_state_path)
   end
 
   def s3_state?
@@ -169,6 +167,10 @@ class Tfrb::Base
     }
   end
 
+  def temp_path(*args)
+    File.join(@temp_path, *args)
+  end
+
   class << self
     def load(block, environments, skip_import = false, dry_run = false)
       Tfrb::Resource.load_helpers!
@@ -192,7 +194,7 @@ class Tfrb::Base
       tfrb.write!
 
       # Run terraform init if necessary
-      tfrb.init! unless Dir.exist?(File.join(tfrb.temp_path, '.terraform'))
+      tfrb.init! unless Dir.exist?(tfrb.temp_path('.terraform'))
 
       # Load state
       tfrb.load_state!

data/lib/tfrb/provider/aws.rb

@@ -1,9 +1,10 @@
 module Tfrb::Provider::Aws
   def self.load(base, environment)
     if environment.has_key?('provider') && environment['provider'].has_key?('aws')
-      unless environment['provider']['aws'].has_key?('access_key') || environment['provider']['aws'].has_key?('secret_key')
+      unless environment['provider']['aws'].has_key?('access_key') || environment['provider']['aws'].has_key?('secret_key') || environment['provider']['aws'].has_key?('token')
         environment['provider']['aws']['access_key'] = ENV['AWS_ACCESS_KEY_ID']
         environment['provider']['aws']['secret_key'] = ENV['AWS_SECRET_ACCESS_KEY']
+        environment['provider']['aws']['token'] = ENV['AWS_SESSION_TOKEN']
       end
     end
   end

data/lib/tfrb/resource.rb

@@ -37,7 +37,7 @@ module Tfrb::Resource
             unless tfrb.s3_state?
               tfrb.state[resource_type] = {} unless tfrb.state.has_key?(resource_type)
               resources.each do |resource_name, resource|
-                if ::File.exist?(::File.join(tfrb.temp_path, 'terraform.tfstate')) && !tfrb.state[resource_type].has_key?(resource_name)
+                if ::File.exist?(tfrb.temp_path('terraform.tfstate')) && !tfrb.state[resource_type].has_key?(resource_name)
                   printf "\033[1m%s.%s: Loading state...\033[0m\n", resource_type, resource_name
                   state = get_state(tfrb, resource_type, resource_name)
                   tfrb.state[resource_type][resource_name] = state if state && state.keys.size > 0
@@ -113,7 +113,8 @@ module Tfrb::Resource
       {
         region: aws_provider['region'],
         access_key_id: aws_provider['access_key'],
-        secret_access_key: aws_provider['secret_key']
+        secret_access_key: aws_provider['secret_key'],
+        session_token: aws_provider['token']
       }
     end
   end

data/lib/tfrb/version.rb

@@ -1,3 +1,3 @@
 module Tfrb
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tfrb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - 'Matt Kasa
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler