mydrive-aws-mfa 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07621ca0fa5c31dd33e4f4fb34d1712e00912a44
-  data.tar.gz: eb7ee3da6efd28847f03215a0b36152138102a08
+SHA256:
+  metadata.gz: 5776f52ef1b781f9aeea4996019358182f49502f27ed0ad943e0a1a55ce8e2d6
+  data.tar.gz: b1e19ee73a61ace3c884f984e0967a539ae2302efb7503dff7aeb31f810a75fd
 SHA512:
-  metadata.gz: 3cee3d86acda2ef27e9ad2dc1eb1a2b6c617372d34fc7edbc2eb2696ccfc5afe560471de798b75e0457d86e10a8280b49c0e4b8dc3b64104c042c38d70d8b244
-  data.tar.gz: 4a64ec6e80f54da21973ef65c4d3053f29ed5e9707e78572735c474ba24bcbcc239a2aff790ae5b7d8815739cb99c2fae8ed3f4972b60a9283c5dd8a9a2940b9
+  metadata.gz: dcb52467e7e567861ba18101affbcad5c508dba8f9e0acbe7db1bd921b26fc65b94fe95a250e3979ffacd811492e0c1040626cadaeb4966f69c892b79dc89ae8
+  data.tar.gz: b01e529138a2ff94dbeca9abd6dc3111af935819c8fe781562733bdf2559eca0795e060f8648e58c4196a1c7a0367cceec635c2ab67978cbe5d1b7dc5b41cc68

data/lib/aws_mfa.rb

@@ -1,6 +1,6 @@
-require 'aws-sdk-core/ini_parser'
 require 'fileutils'
 require 'json'
+require_relative 'aws_mfa/config_loader'
 require_relative 'aws_mfa/credentials_output_executor'
 require_relative 'aws_mfa/credentials_loader'
 require_relative 'aws_mfa/errors'
@@ -8,17 +8,16 @@ require_relative 'aws_mfa/profile_config'
 require_relative 'aws_mfa/shell_command'
 
 class AwsMfa
-  ARN_CONFIG_FILE_PATH = ".aws/config"
   MYDRIVE_CREDENTIALS_FILE_PATH = '.mydrive-aws'
 
   def initialize
     verify_aws_installed
-    @aws_config_file = find_aws_config_file
+    verify_config_file
     @mydrive_credentials_cache_dir = set_mydrive_credentials_cache_dir
   end
 
   def execute(execution_output = :set_env, profile = nil)
-    aws_profile = profile || ENV['AWS_PROFILE'] || 'default'
+    aws_profile = profile || ENV['AWS_PROFILE'] || "default"
     profile_config = load_profile_config(aws_profile)
     credentials = load_credentials(profile_config)
     execute_output(execution_output, credentials)
@@ -26,7 +25,7 @@ class AwsMfa
 
   private
 
-  attr_reader :aws_config_file, :mydrive_credentials_cache_dir
+  attr_reader :mydrive_credentials_cache_dir
 
   def verify_aws_installed
     unless AwsMfa::ShellCommand.new("which aws").call.success?
@@ -34,13 +33,8 @@ class AwsMfa
     end
   end
 
-  def find_aws_config_file
-    aws_config_file = File.join(ENV['HOME'], ARN_CONFIG_FILE_PATH)
-    unless File.readable?(aws_config_file)
-      raise Errors::ConfigurationNotFound, 'Aws configuration not found. You must run `aws configure`'
-    end
-
-    aws_config_file
+  def verify_config_file
+    aws_config
   end
 
   def set_mydrive_credentials_cache_dir
@@ -50,7 +44,6 @@ class AwsMfa
   end
 
   def load_profile_config(profile)
-    aws_config = Aws::IniParser.ini_parse(File.read(aws_config_file))
     if profile_config = aws_config[profile]
       AwsMfa::ProfileConfig.new(profile_config, profile)
     else
@@ -72,4 +65,8 @@ class AwsMfa
   def expiration_buffer_minutes
     ENV.fetch("MYDRIVE_MFA_TOKEN_EXPIRATION_BUFFER", 0).to_i
   end
+
+  def aws_config
+    @aws_config ||= ConfigLoader.build.load
+  end
 end

data/lib/aws_mfa/config_loader.rb

@@ -0,0 +1,32 @@
+require "inifile"
+require_relative "errors"
+
+class ConfigLoader
+  ARN_CONFIG_FILE_PATH = ".aws/config".freeze
+
+  def self.build
+    config_file = File.join(ENV["HOME"], ARN_CONFIG_FILE_PATH)
+
+    raise AwsMfa::Errors::ConfigurationNotFound, "Configuration not found." unless File.readable?(config_file)
+
+    new(config_file)
+  end
+
+  def initialize(config_file)
+    @config_file = config_file
+  end
+
+  def load
+    config = IniFile.load(@config_file).to_h
+    config.each_with_object({}) do |(key, value), acc|
+      key =
+        if key.start_with?("profile ")
+          key.gsub("profile ", "")
+        else
+          key
+        end
+
+      acc[key] = value
+    end
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mydrive-aws-mfa
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - MyDrive Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.44'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.44'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - README.md
 - bin/mydrive-aws-mfa
 - lib/aws_mfa.rb
+- lib/aws_mfa/config_loader.rb
 - lib/aws_mfa/credentials_loader.rb
 - lib/aws_mfa/credentials_output_executor.rb
 - lib/aws_mfa/errors.rb
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - aws-cli
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Run AWS commands with MFA (MyDrive fork)