lib/opsicle/config.rb in opsicle-1.1.1 vs lib/opsicle/config.rb in opsicle-2.0.0

@@ -1,46 +1,30 @@
 require 'yaml'
 require 'aws-sdk'
 
 module Opsicle
   class Config
-    FOG_CONFIG_PATH = '~/.fog'
     OPSICLE_CONFIG_PATH = './.opsicle'
     SESSION_DURATION = 3600
 
     attr_reader :environment
 
     def self.instance
       @instance ||= new
     end
 
     def aws_credentials
-      Aws::Credentials.new(aws_config[:access_key_id], aws_config[:secret_access_key], aws_config[:session_token])
+      authenticate_with_credentials
     end
 
-    def aws_config
-      return @aws_config if @aws_config
-      if fog_config[:mfa_serial_number]
-        creds = get_session.credentials
-        @aws_config = { access_key_id: creds.access_key_id, secret_access_key: creds.secret_access_key, session_token: creds.session_token }
-      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
       @opsworks_config ||= load_config(OPSICLE_CONFIG_PATH)
     end
 
     def configure_aws_environment!(environment)
       @environment = environment.to_sym
-      end
+    end
 
     def load_config(file)
       raise MissingConfig, "Missing configuration file: #{file}  Run 'opsicle help'" unless File.exist?(file)
       env_config = symbolize_keys(YAML.load_file(file))[environment] rescue {}
       raise MissingEnvironment, "Configuration for the \'#{environment}\' environment could not be found in #{file}" unless env_config != nil
@@ -51,25 +35,10 @@
     def get_mfa_token
       return @token if @token
       @token = Output.ask("Enter MFA token: "){ |q|  q.validate = /^\d{6}$/ }
     end
 
-    def get_session
-      return @session if @session
-      sts = Aws::STS::Client.new(access_key_id: fog_config[:aws_access_key_id],
-                                 secret_access_key: fog_config[:aws_secret_access_key],
-                                 region: 'us-east-1')
-      @session = sts.get_session_token(duration_seconds: 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)
       hash.inject({}){|result, (key, value)|
         new_key = case key
@@ -81,9 +50,47 @@
                     else value
                     end
         result[new_key] = new_value
         result
       }
+    end
+
+    def authenticate_with_credentials
+      credentials = Aws::SharedCredentials.new(profile_name: @environment.to_s)
+
+      unless credentials.set?
+        abort('Opsicle can no longer authenticate through your ~/.fog file. Please run `opsicle legacy-credential-converter` before proceeding.')
+      end
+
+      Aws.config.update({region: 'us-east-1', credentials: credentials})
+
+      iam = Aws::IAM::Client.new
+
+       # this will be an array of 0 or 1 because iam.list_mfa_devices.mfa_devices will only return 0 or 1 device per user;
+       # if user doesn't have MFA enabled, then this loop won't even execute
+      iam.list_mfa_devices.mfa_devices.each do |mfadevice|
+        mfa_serial_number = mfadevice.serial_number
+        get_mfa_token
+        session_credentials_hash = get_session(mfa_serial_number,
+                                               credentials.credentials.access_key_id,
+                                               credentials.credentials.secret_access_key).credentials
+
+        credentials = Aws::Credentials.new(session_credentials_hash.access_key_id,
+                                                   session_credentials_hash.secret_access_key,
+                                                   session_credentials_hash.session_token)
+      end
+
+      return credentials
+    end
+
+    def get_session(mfa_serial_number, access_key_id, secret_access_key)
+      return @session if @session
+      sts = Aws::STS::Client.new(access_key_id: access_key_id,
+                                 secret_access_key: secret_access_key,
+                                 region: 'us-east-1')
+      @session = sts.get_session_token(duration_seconds: SESSION_DURATION,
+                                       serial_number: mfa_serial_number,
+                                       token_code: @token)
     end
 
     MissingConfig = Class.new(StandardError)
     MissingEnvironment = Class.new(StandardError)