oneaws 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af998829b0bd0674ee923e173025684f16c92be665ebccbad6064627ba8d90d7
-  data.tar.gz: c6710c75bf309c0d9dc1d4208815eebff4c01e5f3e057cee07a41ecf08626fac
+  metadata.gz: 5f54d58039f558feb418d69d9252d073333ac9a0fc6278f14d2e2589110908f2
+  data.tar.gz: 8185852f34183388ee1038aceade221dac8308cf0253d6ef37a8b4e911728a79
 SHA512:
-  metadata.gz: 9053ce65d3d2f182e7c0a9c704fcf605cae97785779733c2820d1b171681c847d542a87ddd8c736e8c967faa33f0e8177525f65603c167a2e6a53c5c3071eb2a
-  data.tar.gz: e1030899f630dd449337bca924dbb878f8a64950539c9cb94b2f5152779c9e6a29b4b58c482ace512e406155a9ed3651389dc5abec0e7f7d85dc06f1fb90afd1
+  metadata.gz: 44c212bffa35b64a4150a008b4755a08b3a817ccb91de8a9e8a41dcb93e9fe07187b2c0eeec961adb39e2a4b11a6a2d6a81b10ac94884871b86eb32302edb9a9
+  data.tar.gz: b46a0acaf73c53fb6bfec0dcf5e778bde1a58332233b6b476e2cfc53f232f6f2b9b70a5dab0b8341e9856e8f9b93f6259c105ce8f1c84db21f881ee1e3bac75d

data/README.md

@@ -37,3 +37,17 @@ oneaws
 ```
 
 `-u` オプションをつけていると `~/.aws/credentials` に追記されます(default: true)。
+
+### ONEAWS_MFA_DEVICE
+
+MFA デバイスを複数登録している場合、以下のようにデバイスの選択を求められます。
+
+```
+Available MFA devices:
+1. OneLogin Protect (ID: ***)
+2. OneLogin Auth (ID: ***)
+
+Select MFA device (1-2):
+```
+
+デバイスの選択が面倒な場合は、環境変数 `ONEAWS_MFA_DEVICE` を指定することで、指定した番号のデバイスを自動で選択できます。上記を例にすると、`1. OneLogin Protect` を選ぶ場合は `ONEAWS_MFA_DEVICE=1` と指定します。

data/lib/oneaws/client.rb

@@ -15,7 +15,7 @@ module Oneaws
       })
 
       @aws = Aws::STS::Client.new(
-        credentials: Aws::AssumeRoleCredentials,
+        credentials: nil,
         region: ENV['AWS_REGION'] || 'ap-northeast-1',
       )
     end
@@ -31,25 +31,8 @@ module Oneaws
       end
 
       mfa = response.mfa
+      mfa_device = select_mfa_device(mfa)
       
-      if mfa.devices.length == 1
-        mfa_device = mfa.devices.first
-      else
-        puts "\nAvailable MFA devices:"
-        mfa.devices.each_with_index do |device, index|
-          puts "#{index + 1}. #{device.type} (ID: #{device.id})"
-        end
-
-        print "\nSelect MFA device (1-#{mfa.devices.length}): "
-        selection = STDIN.gets.chomp.to_i
-
-        if selection < 1 || selection > mfa.devices.length
-          raise MfaDeviceNotFoundError.new("Invalid device selection.")
-        end
-
-        mfa_device = mfa.devices[selection - 1]
-      end
-
       device_types_that_do_not_require_token = [
         "OneLogin Protect"
       ]
@@ -83,5 +66,36 @@ module Oneaws
       }
       @aws.assume_role_with_saml(params)[:credentials]
     end
+
+    private
+
+    def select_mfa_device(mfa)
+      if mfa.devices.length == 1
+        return mfa.devices.first
+      end
+
+      if selection = ENV["ONEAWS_MFA_DEVICE"] &.to_i
+        if selection <= 0
+          warn "ONEAWS_MFA_DEVICE must be >= 1"
+          exit 1
+        end
+
+        return mfa.devices[selection - 1]
+      end
+
+      puts "\nAvailable MFA devices:"
+      mfa.devices.each_with_index do |device, index|
+        puts "#{index + 1}. #{device.type} (ID: #{device.id})"
+      end
+
+      print "\nSelect MFA device (1-#{mfa.devices.length}): "
+      selection = STDIN.gets.chomp.to_i
+
+      if selection < 1 || selection > mfa.devices.length
+        raise MfaDeviceNotFoundError.new("Invalid device selection.")
+      end
+
+      mfa.devices[selection - 1]
+    end
   end
 end

data/lib/oneaws/version.rb

@@ -1,3 +1,3 @@
 module Oneaws
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/oneaws.gemspec

@@ -24,8 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk-core', '~> 3.206.0'
+  spec.add_dependency 'aws-sdk-core'
   spec.add_dependency 'inifile'
   spec.add_dependency 'onelogin', '~> 1.6'
   spec.add_dependency 'thor'
+  spec.add_dependency 'base64'
+  spec.add_dependency 'logger'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oneaws
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yuki Koya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.206.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.206.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  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: logger
+  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'
 description: Issue temporary credentials using OneLogin and AWS STS.
 email:
 - ykky@pepabo.com
@@ -108,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Issue temporary credentials using OneLogin and AWS STS.