piculet 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzVmZDAxYzEwOTBhZjM0MzMzZWExNGJlMzYwY2Y2NTQyZjNiYzFiZQ==
-  data.tar.gz: !binary |-
-    NWQ3M2U2M2M3ZDE1OWY4MGM1MWYxOTAwODRiYzJjMjEwNGRjMmQxOA==
+SHA1:
+  metadata.gz: 7b46576137a90e84ea196dc54427fe9b2435c5e5
+  data.tar.gz: db4cf94939ab82f13888954c257594973f93a401
 SHA512:
-  metadata.gz: !binary |-
-    MDA0MTI3YjQ5YmVhYzNhN2VlOWRlZjYyM2U3NmI5YmIxNTQ0M2VkM2FlODU3
-    OWZhZGRhZGIyMzZlNDY1OTNjNTRlZDU0MmQ1ZjA4YjZhMThmMDBmZGIzODQ1
-    YjExMGE4ZGMwNmRhYmUyOTFkOGZiNjQ0NTM5NjQ4ZjU2MDE5M2E=
-  data.tar.gz: !binary |-
-    N2M1ODliNTU0NzFlZWI4MzA5YWFiNDc4YmQ2OGEyMDAzOWZlNTQxYWIxNmE1
-    M2M5YzkwMzRkMmU4OGY4ZWY0OGQ4OGVjZDE5MWQzNTI3OGE5YjBjYTkyZjRj
-    YmNjODM5MWUwYmE4NmY2M2IwNDM3Yjg1MTkzYTdjYWFjNzRkOTg=
+  metadata.gz: 876f93b3987fdf4e703856fd81be34c8af6498dcc6d4437ee4fceae2b9c201e01d855c6cd773826e873d52ab87e109572794c80b88214e83241bb31f6f841aa7
+  data.tar.gz: 922c087ec74874e94a7da7932d37b3ed250b9a8a99bcfd4b45c7fe612fdb5eab073536a6d7069a935c29a70fb577cb831dc6a15b2c2f65d9be238b775eff8743

data/README.md

@@ -27,6 +27,8 @@ export AWS_ACCESS_KEY_ID='...'
 export AWS_SECRET_ACCESS_KEY='...'
 export AWS_REGION='ap-northeast-1'
 #export AWS_OWNER_ID='123456789012'
+# Note: If you do not set the OWNER_ID,
+#       Piculet get the OWNER_ID from GetUser(IAM) or CreateSecurityGroup(EC2)
 piculet -e -o Groupfile  # export EC2 SecurityGroup
 vi Groupfile
 piculet -a --dry-run

data/lib/piculet/ext/ec2-owner-id-ext.rb

@@ -8,13 +8,9 @@ module AWS
 
     def owner_id
       return ENV['AWS_OWNER_ID'] if ENV['AWS_OWNER_ID']
+      return @owner_id if @owner_id
 
-      unless @owner_id
-        security_group = create_random_security_group
-        return nil unless security_group
-        @owner_id = random_security_group_owner_id(security_group)
-        delete_random_security_group(security_group)
-      end
+      @owner_id = get_owner_id_from_iam || get_owner_id_from_security_group
 
       return @owner_id
     end
@@ -24,6 +20,23 @@ module AWS
     end
 
     private
+    def get_owner_id_from_iam
+      credentials = self.config.credential_provider.credentials
+      iam = AWS::IAM.new(credentials)
+      user = iam.client.get_user rescue nil
+      return nil unless user
+      arn = user[:user][:arn]
+      arn.split(':')[4]
+    end
+
+    def get_owner_id_from_security_group
+      security_group = create_random_security_group
+      return nil unless security_group
+      owner_id = random_security_group_owner_id(security_group)
+      delete_random_security_group(security_group)
+      return owner_id
+    end
+
     def create_random_security_group
       security_group = nil
 

data/lib/piculet/version.rb

@@ -1,5 +1,5 @@
 module Piculet
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 
 Version = Piculet::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - winebarrel
@@ -14,28 +14,28 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Piculet is a tool to manage EC2 Security Group.