opsicle 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e1ae90db98327bdf981f1d0fc69b7488d091a68
-  data.tar.gz: c591e7f2567cfc9f5eb15e4f83762b29a7b54c08
+  metadata.gz: ab993b3d50de8fe63817cfdadf477b2226e7b988
+  data.tar.gz: 627593752949a28787510fcb7808fac626fe2f22
 SHA512:
-  metadata.gz: bbebdecd44667c6f4533f3466eb2674afd75456d35f07d6c6e4cf80f134ed8866e0bcc81f8405b7ab1446a592addec81b631ad2ea0770ba634a98643e96c4049
-  data.tar.gz: f5f7997debb53669e4ee64010a763448c16ffc282ddbe69daabe0479068370e51bfc56fe401e36b16ff5075a1a0dfc626da9b5d44db5d811cb59937e22490a5b
+  metadata.gz: 27dc029b0626c90206a77eb74f8e14b8a74a3b68c30d4a9d5acdfb059690354036d6fa1e7b66ffa18081f36be65f1f1ded65ddb23b4d1255b047e5a57d45f585
+  data.tar.gz: e573205db262222309adad4b7d30f2a7a897ed302199aa09440fbb4c72b878b0353624fb6b7c5b3541751dea8495cb23a67245754650f3f41527ebfdfe476d0a

data/lib/opsicle/config.rb

@@ -5,7 +5,7 @@ module Opsicle
   class Config
     FOG_CONFIG_PATH = '~/.fog'
     OPSICLE_CONFIG_PATH = './.opsicle'
-
+    SESSION_DURATION = 3600
 
     attr_reader :environment
 
@@ -15,8 +15,16 @@ module Opsicle
 
     def aws_config
       return @aws_config if @aws_config
-      fog_config = load_config(File.expand_path(FOG_CONFIG_PATH))
-      @aws_config = { access_key_id: fog_config[:aws_access_key_id], secret_access_key: fog_config[:aws_secret_access_key] }
+      if fog_config[:mfa_serial_number]
+        @aws_config = get_session.credentials
+      else
+        @aws_config = { access_key_id: fog_config[:aws_access_key_id], secret_access_key: fog_config[:aws_secret_access_key] }
+      end
+    end
+
+    def fog_config
+      return @fog_config if @fog_config
+      @fog_config = load_config(File.expand_path(FOG_CONFIG_PATH))
     end
 
     def opsworks_config
@@ -35,6 +43,23 @@ module Opsicle
       env_config
     end
 
+    def get_mfa_token
+      Output.ask("Enter MFA token: "){ |q|  q.validate = /^\d{6}$/ }
+    end
+
+    def get_session
+      return @session if @session
+      sts = AWS::STS.new(access_key_id: fog_config[:aws_access_key_id],
+                           secret_access_key: fog_config[:aws_secret_access_key])
+      @session = sts.new_session(duration: session_duration, serial_number: fog_config[:mfa_serial_number],
+                                 token_code: get_mfa_token)
+    end
+
+    def session_duration
+      fog_config = load_config(File.expand_path(FOG_CONFIG_PATH))
+      fog_config[:session_duration] || SESSION_DURATION
+    end
+
     # We want all ouf our YAML loaded keys to be symbols
     # taken from http://devblog.avdi.org/2009/07/14/recursively-symbolize-keys/
     def symbolize_keys(hash)

data/lib/opsicle/output.rb

@@ -30,8 +30,8 @@ module Opsicle
       terminal.say "<%= color('#{msg}', 'verbose') %>" if $verbose
     end
 
-    def self.ask(*args)
-      terminal.ask(*args)
+    def self.ask(*args, &block)
+      terminal.ask(*args, &block)
     end
   end
 end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/spec/opsicle/config_spec.rb

@@ -40,6 +40,31 @@ module Opsicle
       end
     end
 
+    context "with a valid MFA config" do
+      before do
+        allow(File).to receive(:exist?).with(File.expand_path '~/.fog').and_return(true)
+        mock_fog = { 'derp' => { 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret',
+                     'mfa_serial_number' => 'tacos' }}
+        allow(YAML).to receive(:load_file).with(File.expand_path '~/.fog').and_return(mock_fog)
+
+        mock_sts = Class.new
+        mock_session = Class.new
+        mock_credentials = { access_key_id: 'key', secret_access_key: 'secret', session_token: 'cats' }
+        allow(mock_session).to receive(:credentials).and_return(mock_credentials)
+        allow(mock_sts).to receive(:new_session).and_return(mock_session)
+        allow(AWS::STS).to receive(:new).and_return(mock_sts)
+        allow(Output).to receive(:ask).and_return(123456)
+      end
+
+      context "#configure_aws!" do
+        it "should load the config into the AWS module" do
+          expect(AWS).to receive(:config).with(hash_including(access_key_id: 'key', secret_access_key: 'secret',
+                                               session_token: 'cats'))
+          subject.configure_aws!
+        end
+      end
+    end
+
     context "missing configs" do
       before do
         allow(File).to receive(:exist?).with(File.expand_path '~/.fog').and_return(false)
@@ -52,6 +77,12 @@ module Opsicle
         end
       end
 
+      context "#fog_config" do
+        it "should gracefully raise an exception if no .fog file was found" do
+          expect {subject.aws_config}.to raise_exception(Config::MissingConfig)
+        end
+      end
+
       context "#opsworks_config" do
         it "should gracefully raise an exception if no .fog file was found" do
           expect {subject.opsworks_config}.to raise_exception(Config::MissingConfig)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk