miam 0.1.4 → 0.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f7fbc6d8f30d94ddf30434144c507f90a08a92
-  data.tar.gz: f4bec97bf208b21f044bb4089f29453e8236ee15
+  metadata.gz: 93e592c9821a09f0eb8dee36c98f1ab14cbd9185
+  data.tar.gz: 06c463a3aa71249eaf5371fadcf5df506afe1c67
 SHA512:
-  metadata.gz: 79ab922dc36aaa76e8ed5cec329daad942ea06deda43fa80cc657547d056d341320871a97e9ffc7103a61f180b7d357f7265e64963f13b0c05869a809c219ed2
-  data.tar.gz: b98f1198e7c93184c5eedcebf1bb20dc45543e8d5800e58169eabffd065545db6a3c587447c93ec0e781ca1dad3afa8c1b6a29448baa5ae3da62d57f5ed3ebc2
+  metadata.gz: ebbb9ef86252c3240575445f3afe68690b53fe6c6a9bd7de7de95368d6a1b87bde63b2d22eb37942c7f83eea5f5215defc21b766ab67af42c9bfbf01df722cb8
+  data.tar.gz: ffabc21c6da3fa8ffa0c23308b90c2c2f7aec0bc0fecf90c29b6363014fd80974eed9a25018b4b80fff448c09f1987301d7f597d6c550aa5976a34b1d9b8c37a

data/README.md

@@ -8,6 +8,12 @@ It defines the state of IAM using DSL, and updates IAM according to DSL.
 [![Build Status](https://travis-ci.org/winebarrel/miam.svg?branch=master)](https://travis-ci.org/winebarrel/miam)
 [![Coverage Status](https://coveralls.io/repos/winebarrel/miam/badge.png?branch=master)](https://coveralls.io/r/winebarrel/miam?branch=master)
 
+** Notice **
+
+* `>= 0.2.0`
+  * Use [get_account_authorization_details](http://docs.aws.amazon.com/sdkforruby/api/Aws/IAM/Client.html#get_account_authorization_details-instance_method).
+  * Remove progress bar.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -56,7 +62,6 @@ Usage: miam [options]
         --export-concurrency N
         --target REGEXP
         --no-color
-        --no-progress
         --debug
 ```
 

data/bin/miam

@@ -46,7 +46,6 @@ ARGV.options do |opt|
     opt.on(''  , '--export-concurrency N', Integer) {|v| options[:export_concurrency] = v                                     }
     opt.on(''  , '--target REGEXP')                 {|v| options[:target]             = Regexp.new(v)                         }
     opt.on(''  , '--no-color')                      {    options[:color]              = false                                 }
-    opt.on(''  , '--no-progress')                   {    options[:no_progress]        = true                                  }
     opt.on(''  , '--debug')                         {    options[:debug]              = true                                  }
     opt.parse!
 

data/lib/miam.rb

@@ -6,7 +6,6 @@ require 'singleton'
 require 'thread'
 
 require 'aws-sdk-core'
-require 'ruby-progressbar'
 require 'parallel'
 require 'term/ansicolor'
 

data/lib/miam/exporter.rb

@@ -11,18 +11,15 @@ class Miam::Exporter
   end
 
   def export
-    users = list_users
-    groups = list_groups
-    roles = list_roles
+    account_authorization_details = get_account_authorization_details
+
+    users = account_authorization_details[:user_detail_list]
+    groups = account_authorization_details[:group_detail_list]
+    roles = account_authorization_details[:role_detail_list]
     instance_profiles = list_instance_profiles
     group_users = {}
     instance_profile_roles = {}
 
-    unless @options[:no_progress]
-      progress_total = users.length + groups.length + roles.length + instance_profiles.length
-      @progressbar = ProgressBar.create(:title => "Loading", :total => progress_total, :output => $stderr)
-    end
-
     expected = {
       :users => export_users(users, group_users),
       :groups => export_groups(groups),
@@ -40,8 +37,8 @@ class Miam::Exporter
 
     Parallel.each(users, :in_threads => @concurrency) do |user|
       user_name = user.user_name
-      groups = export_user_groups(user_name)
-      policies = export_user_policies(user_name)
+      groups = user.group_list
+      policies = export_user_policies(user)
       login_profile = export_login_profile(user_name)
 
       @mutex.synchronize do
@@ -59,31 +56,18 @@ class Miam::Exporter
         if login_profile
           result[user_name][:login_profile] = login_profile
         end
-
-        progress
       end
     end
 
     result
   end
 
-  def export_user_groups(user_name)
-    @iam.list_groups_for_user(:user_name => user_name).map {|resp|
-      resp.groups.map do |group|
-        group.group_name
-      end
-    }.flatten
-  end
-
-  def export_user_policies(user_name)
+  def export_user_policies(user)
     result = {}
 
-    @iam.list_user_policies(:user_name => user_name).each do |resp|
-      resp.policy_names.map do |policy_name|
-        policy = @iam.get_user_policy(:user_name => user_name, :policy_name => policy_name)
-        document = CGI.unescape(policy.policy_document)
-        result[policy_name] = JSON.parse(document)
-      end
+    user.user_policy_list.each do |policy|
+      document = CGI.unescape(policy.policy_document)
+      result[policy.policy_name] = JSON.parse(document)
     end
 
     result
@@ -103,30 +87,25 @@ class Miam::Exporter
 
     Parallel.each(groups, :in_threads => @concurrency) do |group|
       group_name = group.group_name
-      policies = export_group_policies(group_name)
+      policies = export_group_policies(group)
 
       @mutex.synchronize do
         result[group_name] = {
           :path => group.path,
           :policies => policies,
         }
-
-        progress
       end
     end
 
     result
   end
 
-  def export_group_policies(group_name)
+  def export_group_policies(group)
     result = {}
 
-    @iam.list_group_policies(:group_name => group_name).each do |resp|
-      resp.policy_names.map do |policy_name|
-        policy = @iam.get_group_policy(:group_name => group_name, :policy_name => policy_name)
-        document = CGI.unescape(policy.policy_document)
-        result[policy_name] = JSON.parse(document)
-      end
+    group.group_policy_list.each do |policy|
+      document = CGI.unescape(policy.policy_document)
+      result[policy.policy_name] = JSON.parse(document)
     end
 
     result
@@ -137,8 +116,8 @@ class Miam::Exporter
 
     Parallel.each(roles, :in_threads => @concurrency) do |role|
       role_name = role.role_name
-      instance_profiles = export_role_instance_profiles(role_name)
-      policies = export_role_policies(role_name)
+      instance_profiles = role.instance_profile_list.map {|i| i.instance_profile_name }
+      policies = export_role_policies(role)
 
       @mutex.synchronize do
         instance_profiles.each do |instance_profile_name|
@@ -154,31 +133,18 @@ class Miam::Exporter
           :instance_profiles => instance_profiles,
           :policies => policies,
         }
-
-        progress
       end
     end
 
     result
   end
 
-  def export_role_instance_profiles(role_name)
-    @iam.list_instance_profiles_for_role(:role_name => role_name).map {|resp|
-      resp.instance_profiles.map do |instance_profile|
-        instance_profile.instance_profile_name
-      end
-    }.flatten
-  end
-
-  def export_role_policies(role_name)
+  def export_role_policies(role)
     result = {}
 
-    @iam.list_role_policies(:role_name => role_name).each do |resp|
-      resp.policy_names.map do |policy_name|
-        policy = @iam.get_role_policy(:role_name => role_name, :policy_name => policy_name)
-        document = CGI.unescape(policy.policy_document)
-        result[policy_name] = JSON.parse(document)
-      end
+    role.role_policy_list.each do |policy|
+      document = CGI.unescape(policy.policy_document)
+      result[policy.policy_name] = JSON.parse(document)
     end
 
     result
@@ -194,47 +160,37 @@ class Miam::Exporter
         result[instance_profile_name] = {
           :path => instance_profile.path,
         }
-
-        progress
       end
     end
 
     result
   end
 
-  def export_role_instance_profiles(role_name)
-    @iam.list_instance_profiles_for_role(:role_name => role_name).map {|resp|
-      resp.instance_profiles.map do |instance_profile|
-        instance_profile.instance_profile_name
-      end
+  def list_instance_profiles
+    @iam.list_instance_profiles.map {|resp|
+      resp.instance_profiles.to_a
     }.flatten
   end
 
-  def list_users
-    @iam.list_users.map {|resp|
-      resp.users.to_a
-    }.flatten
-  end
+  def get_account_authorization_details
+    account_authorization_details = {}
 
-  def list_groups
-    @iam.list_groups.map {|resp|
-      resp.groups.to_a
-    }.flatten
-  end
+    keys = [
+      :user_detail_list,
+      :group_detail_list,
+      :role_detail_list,
+    ]
 
-  def list_roles
-    @iam.list_roles.map {|resp|
-      resp.roles.to_a
-    }.flatten
-  end
+    keys.each do |key|
+      account_authorization_details[key] = []
+    end
 
-  def list_instance_profiles
-    @iam.list_instance_profiles.map {|resp|
-      resp.instance_profiles.to_a
-    }.flatten
-  end
+    @iam.get_account_authorization_details.each do |resp|
+      keys.each do |key|
+        account_authorization_details[key].concat(resp[key])
+      end
+    end
 
-  def progress
-    @progressbar.increment if @progressbar
+    account_authorization_details
   end
 end

data/lib/miam/version.rb

@@ -1,3 +1,3 @@
 module Miam
-  VERSION = '0.1.4'
+  VERSION = '0.2.0.beta'
 end

data/miam.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk-core', '~> 2.0.3'
-  spec.add_dependency 'ruby-progressbar'
   spec.add_dependency 'parallel'
   spec.add_dependency 'term-ansicolor'
   spec.add_development_dependency 'bundler', '~> 1.7'

data/spec/spec_helper.rb

@@ -29,7 +29,6 @@ end
 def client(user_options = {})
   options = {
     logger: Logger.new('/dev/null'),
-    no_progress: true
   }
 
   options[:password_manager] = Miam::PasswordManager.new('/dev/null', options)
@@ -76,7 +75,7 @@ def apply(cli = client)
 end
 
 def export(options = {})
-  options = {no_progress: true}.merge(options)
+  options = {}.merge(options)
   cli = options.delete(:client) || Aws::IAM::Client.new
   Miam::Exporter.export(cli, options)[0]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  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: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -189,9 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14