miam 0.2.3 → 0.2.4.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb232253b3506a0387caa0817c099a76b0d5ec5f
-  data.tar.gz: e10d873066aef538049bb703bf2977064c1ab586
+  metadata.gz: d8f1bb0af1a2fc50488600724625331227f2d140
+  data.tar.gz: d3d47fde2bcaa09e111128288ae7df5b503d0672
 SHA512:
-  metadata.gz: d07415f6abcf2efa6d0572bf61302ee6d5334cc76f2a7739dbde62cf8b3b0cc0ceece4cf9613bbcc66776e0ad3758bfb5cf75196a286cfe47d95de467f02fa33
-  data.tar.gz: eb2ecd520a5d43173249082dfdb29dd0b31fa36acc254cb356a57b04d9dd2befc4caaae70f4a7376189ffda32395b425195f7f014c0f223501dc1ac96d324f9b
+  metadata.gz: 94f5a8bbe72365205d570058894105b69a21be1f9bff0037ce026ca89d140eb2de6f40fa6f7a02cd4fd71cf3d54341fcdb052646335dbcf087f12b5c6dd35f97
+  data.tar.gz: 9c2a71d660f36313d38cae51b048e828aa20bd1c2d666b77ff67a6f1b8a7537164df49196eb6fba1c3801d97dfa87695cac087d1ea5116f6623dbc86ec7ac097

data/.travis.yml

@@ -10,3 +10,4 @@ env:
   - secure: "Ec8bwSfp06anSzLJpGhkKjPz9EocMwl7H8t2LKoI3bKV/cz9JU0GhhUdUUmg3mCFH9+8/YGLzcbFKcxZIqnDK7ukdgTGsnGDevnctis0QwM7/nKHdkaK8JWhCx41TUXOqoiCKkNEnm1EbDtrILt4rJwb0BGXGnPjv6nLAyvdE2Y="
   - secure: "Ky5Dpxc7SIqbQ4Y10m/jik/rVdeGMeh1439m3KB+tiV/Bz1hhWv4+If150ajLjbmWCZBPMLhxrTL0EePoyqYXpOGHvINvYM+/XCPcpP4iYkaTzr1MVIOMpa8A8aAOOgQWoGOwfyWoxfrYzv/TRvtMietnm+dZwVcbbkQ4ut7oa4="
   - AWS_REGION=ap-northeast-1
+  - DEBUG=1

data/lib/miam/client.rb

@@ -452,7 +452,7 @@ class Miam::Client
           log(:warn, "ManagedPolicy `#{policy_name}`: 'path' cannot be updated", :color => :yellow)
         end
 
-        updated = walk_managed_policy(policy_name, expected_attrs[:document], actual_attrs[:document]) || updated
+        updated = walk_managed_policy(policy_name, actual_attrs[:path], expected_attrs[:document], actual_attrs[:document]) || updated
       else
         @driver.create_managed_policy(policy_name, expected_attrs)
         updated = true
@@ -462,13 +462,13 @@ class Miam::Client
     updated
   end
 
-  def walk_managed_policy(policy_name, expected_document, actual_document)
+  def walk_managed_policy(policy_name, policy_path, expected_document, actual_document)
     updated = false
     expected_document.sort_array!
     actual_document.sort_array!
 
     if expected_document != actual_document
-      @driver.update_managed_policy(policy_name, expected_document, actual_document)
+      @driver.update_managed_policy(policy_name, policy_path, expected_document, actual_document)
       updated = true
     end
 
@@ -479,7 +479,7 @@ class Miam::Client
     updated = false
 
     actual.each do |policy_name, actual_attrs|
-      @driver.delete_managed_policy(policy_name)
+      @driver.delete_managed_policy(policy_name, actual_attrs[:path])
       updated = true
     end
 

data/lib/miam/driver.rb

@@ -377,12 +377,12 @@ class Miam::Driver
     end
   end
 
-  def delete_managed_policy(policy_name)
+  def delete_managed_policy(policy_name, policy_path)
     log(:info, "Delete ManagedPolicy `#{policy_name}`", :color => :red)
 
     unless_dry_run do
       policy_versions = @iam.list_policy_versions(
-        :policy_arn => policy_arn(policy_name),
+        :policy_arn => policy_arn(policy_name, policy_path),
         :max_items => MAX_POLICY_VERSIONS
       )
 
@@ -390,24 +390,24 @@ class Miam::Driver
         pv.is_default_version
       }.each {|pv|
         @iam.delete_policy_version(
-          :policy_arn => policy_arn(policy_name),
+          :policy_arn => policy_arn(policy_name, policy_path),
           :version_id => pv.version_id
         )
       }
 
       @iam.delete_policy(
-        :policy_arn => policy_arn(policy_name)
+        :policy_arn => policy_arn(policy_name, policy_path)
       )
     end
   end
 
-  def update_managed_policy(policy_name, policy_document, old_policy_document)
+  def update_managed_policy(policy_name, policy_path, policy_document, old_policy_document)
     log(:info, "Update ManagedPolicy `#{policy_name}`", :color => :green)
     log(:info, Miam::Utils.diff(old_policy_document, policy_document, :color => @options[:color]), :color => false)
 
     unless_dry_run do
       policy_versions = @iam.list_policy_versions(
-        :policy_arn => policy_arn(policy_name),
+        :policy_arn => policy_arn(policy_name, policy_path),
         :max_items => MAX_POLICY_VERSIONS
       )
 
@@ -417,13 +417,13 @@ class Miam::Driver
         }.sort_by {|pv| pv.version_id[1..-1].to_i }.first
 
         @iam.delete_policy_version(
-          :policy_arn => policy_arn(policy_name),
+          :policy_arn => policy_arn(policy_name, policy_path),
           :version_id => delete_policy_version.version_id
         )
       end
 
       @iam.create_policy_version(
-        :policy_arn => policy_arn(policy_name),
+        :policy_arn => policy_arn(policy_name, policy_path),
         :policy_document => encode_document(policy_document),
         set_as_default: true
       )
@@ -455,11 +455,12 @@ class Miam::Driver
     yield unless @options[:dry_run]
   end
 
-  def user_id
-    @user_id ||= @iam.get_user.user.user_id
+  def account_id
+    # https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html
+    @account_id ||= @iam.get_user.user.arn.split(':').fetch(4)
   end
 
-  def policy_arn(policy_name)
-    "arn:aws:iam::#{user_id}:policy/#{policy_name}"
+  def policy_arn(policy_name, policy_path)
+    File.join("arn:aws:iam::#{account_id}:policy", policy_path, policy_name)
   end
 end

data/lib/miam/exporter.rb

@@ -255,12 +255,19 @@ class Miam::Exporter
       :policies,
     ]
 
-    keys.each do |key|
+    key_by_filter = {
+      'User' => :user_detail_list,
+      'Role' => :role_detail_list,
+      'Group' => :group_detail_list,
+      'LocalManagedPolicy' => :policies
+    }
+
+    key_by_filter.values.each do |key|
       account_authorization_details[key] = []
     end
 
-    @iam.get_account_authorization_details.each do |resp|
-      keys.each do |key|
+    Parallel.each(key_by_filter, :in_threads => @concurrency) do |filter, key|
+      @iam.get_account_authorization_details(:filter => [filter]).each do |resp|
         account_authorization_details[key].concat(resp[key])
 
         unless @options[:no_progress]

data/lib/miam/version.rb

@@ -1,3 +1,3 @@
 module Miam
-  VERSION = '0.2.3'
+  VERSION = '0.2.4.beta5'
 end

data/miam.gemspec

@@ -8,8 +8,6 @@ Gem::Specification.new do |spec|
   spec.version       = Miam::VERSION
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sgwr_dts@yahoo.co.jp']
-  spec.summary       = %q{TODO: Write a short summary. Required.}
-  spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.summary       = %q{Miam is a tool to manage IAM.}
   spec.description   = %q{Miam is a tool to manage IAM. It defines the state of IAM using DSL, and updates IAM according to DSL.}
   spec.homepage      = 'http://miam.codenize.tools/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4.beta5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -224,9 +224,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.4.5.1