ec2-host 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3a13e6935752a27033d440cdc5b0b5ae5af4a3b684ddf87bf82c109cfbe25ab7
-  data.tar.gz: 10b9818eb1428ace6ada0f80b4cc29f1c460ebea6452a9a8fcb662ec255e9dd2
+SHA1:
+  metadata.gz: 8f749471944700121c781943703aa72e8b8a07d9
+  data.tar.gz: 9db09c8155b61efb38851d579740fb809ce30aab
 SHA512:
-  metadata.gz: ddc6f7f6e62dbd638ad061fda97843ecc858b956b45f76042020bc181560567504600f682470d041ad155759b941061a6a1d03f0a9e40133dc3453cb16962084
-  data.tar.gz: 5688701717d96b582ea90b190e851fdadf2dd1c1ec596abab34f65376ef3fa9a70577248e24ad6fc3b67c1aa597dc3ffa326e3f6ac1de40d7f78c15b7d4b4106
+  metadata.gz: 7b1098d2a578af8b30dab95e87ebe1f4b89e23bfab7f8bf51370549051413c75756ce38f210e98fcabb28f325a01f5be399e0229922f11d5683b2a8079c3d016
+  data.tar.gz: e5a6fe2fae9935252dc4af230c3726fec9a43bb1824e7e11cae1615f6d03be85499b0e397f5dc19b4bb9e603ff2d219c0b78e90e065b1f4a09bfb469b3fbdb12

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+# 1.0.1 (2019/02/05)
+
+Enhancements:
+
+* Support assume role credential and instance profile (thanks to @toyama0919)
+
 # 1.0.0 (2018/12/04)
 
-Fixes:
+Breaking changes:
 
-* upgrade aws-sdk v3. use aws-sdk-ec2.
+* Upgrade aws-sdk to v3, using aws-sdk-ec2.
 
 # 0.6.0 (2017/05/20)
 

data/ec2-host.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'aws-sdk-ec2'
   gem.add_runtime_dependency 'dotenv'
-  gem.add_runtime_dependency 'inifile'
+  gem.add_runtime_dependency 'aws_config'
 
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rdoc'

data/lib/ec2/host/config.rb

@@ -1,5 +1,5 @@
-require 'inifile'
 require 'dotenv'
+require 'aws_config'
 Dotenv.load
 
 class EC2
@@ -65,13 +65,10 @@ class EC2
 
       def self.aws_config
         return @aws_config if @aws_config
-        if File.readable?(aws_config_file)
-          ini = IniFile.load(aws_config_file).to_h
-          if aws_profile == 'default'
-            @aws_config = ini['default']
-          else
-            @aws_config = ini["profile #{aws_profile}"]
-          end
+        if File.readable?(aws_config_file) && File.readable?(aws_credential_file)
+          AWSConfig.config_file = aws_config_file
+          AWSConfig.credentials_file = aws_credential_file
+          @aws_config = AWSConfig[aws_profile]
         end
         @aws_config ||= {}
       end

data/lib/ec2/host/ec2_client.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'aws-sdk-ec2'
+require 'aws-sdk-sts'
 
 class EC2
   class Host
@@ -38,7 +39,21 @@ class EC2
         if Config.aws_access_key_id and Config.aws_secret_access_key
           Aws::Credentials.new(Config.aws_access_key_id, Config.aws_secret_access_key)
         else
-          Aws::SharedCredentials.new(profile_name: Config.aws_profile, path: Config.aws_credential_file)
+          aws_config = Config.aws_config
+          if aws_config[:role_arn]
+            Aws::AssumeRoleCredentials.new(
+              client: Aws::STS::Client.new(aws_config.config_hash),
+              role_arn: aws_config[:role_arn],
+              role_session_name: "ec2-host-session-#{Time.now.to_i}"
+            )
+          elsif aws_config[:credential_source] == "Ec2InstanceMetadata"
+            Aws::InstanceProfileCredentials.new
+          else
+            Aws::SharedCredentials.new(
+              profile_name: Config.aws_profile,
+              path: Config.aws_credential_file
+            )
+          end
         end
       end
 

data/lib/ec2/host/version.rb

@@ -1,5 +1,5 @@
 class EC2
   class Host
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: aws_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Search hosts on AWS EC2