miam 0.2.2.beta2 → 0.2.2.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02694ddfe3ad49f32f2105b74f6367f52cdf0eaa
-  data.tar.gz: 950a3109de9a191931aaadf6313b9628da4f943c
+  metadata.gz: d496d9a9aa4ed9b87d1204a9258cd38d91a7f6fb
+  data.tar.gz: 33fbbdd4f482125637ffb7f8b89d066b0eb2a49e
 SHA512:
-  metadata.gz: 332e80bae95488ee96f9b269d120cb80d896ba7eec058419e5498f784c45cc40a5018f9a14c5c59d2995a2c326ac100d8c607690d23798e7a3114ca9ac62ddcf
-  data.tar.gz: c7f97f201ab25b1765e8dc8fa445110354c41546f8ad6c9a376a85b3e3fffc0e72b067967151eed40fab6fc9896266a3012cd1b8a0ff4af5beddcbdfb3d4aa02
+  metadata.gz: 8b9ebdd9f3d954e859d5661e676c75546d92a1e33126d56cf0d3fa5f31cd0f43f00af87a3ed5416aa8faa67f1e4a021e87afcdf347cb39ffdeba6bfc83c62a81
+  data.tar.gz: 5bc040e86752fb87b19e25f56f834e39e97d848397358545ff629948db0a0730f99fb7b78f6e5ce80719a5851b5d6a2b23a7bd5f28fef06ba7cb9140078fa006

data/README.md

@@ -18,6 +18,8 @@ It defines the state of IAM using DSL, and updates IAM according to DSL.
 * `>= 0.2.2`
   * Improve update (show diff)
   * Support Template
+  * Add `--ignore-login-profile` option
+  * Sort policy array
 
 ## Installation
 
@@ -67,6 +69,7 @@ Usage: miam [options]
         --format=FORMAT
         --export-concurrency N
         --target REGEXP
+        --ignore-login-profile
         --no-color
         --no-progress
         --debug

data/bin/miam

@@ -36,25 +36,26 @@ ARGV.options do |opt|
     credentials_path = nil
     format_passed = false
 
-    opt.on('-p', '--profile PROFILE_NAME')          {|v| profile_name                 = v                                     }
-    opt.on(''  , '--credentials-path PATH')         {|v| credentials_path             = v                                     }
-    opt.on('-k', '--access-key ACCESS_KEY')         {|v| access_key                   = v                                     }
-    opt.on('-s', '--secret-key SECRET_KEY')         {|v| secret_key                   = v                                     }
-    opt.on('-r', '--region REGION')                 {|v| region                       = v                                     }
-    opt.on('-a', '--apply')                         {    mode                         = :apply                                }
-    opt.on('-f', '--file FILE')                     {|v| file                         = v                                     }
-    opt.on(''  , '--dry-run')                       {    options[:dry_run]            = true                                  }
-    opt.on(''  , '--account-output FILE')           {|v| options[:password_manager]   = Miam::PasswordManager.new(v, options) }
-    opt.on('-e', '--export')                        {    mode                         = :export                               }
-    opt.on('-o', '--output FILE')                   {|v| output_file                  = v                                     }
-    opt.on(''  , '--split')                         {    split                        = true                                  }
-    opt.on(''  , '--split-more')                    {    split                        = :more                                 }
-    opt.on('',   '--format=FORMAT', [:ruby, :json]) {|v| format_passed = true; options[:format] = v                           }
-    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.on('-p', '--profile PROFILE_NAME')          {|v| profile_name                   = v                                     }
+    opt.on(''  , '--credentials-path PATH')         {|v| credentials_path               = v                                     }
+    opt.on('-k', '--access-key ACCESS_KEY')         {|v| access_key                     = v                                     }
+    opt.on('-s', '--secret-key SECRET_KEY')         {|v| secret_key                     = v                                     }
+    opt.on('-r', '--region REGION')                 {|v| region                         = v                                     }
+    opt.on('-a', '--apply')                         {    mode                           = :apply                                }
+    opt.on('-f', '--file FILE')                     {|v| file                           = v                                     }
+    opt.on(''  , '--dry-run')                       {    options[:dry_run]              = true                                  }
+    opt.on(''  , '--account-output FILE')           {|v| options[:password_manager]     = Miam::PasswordManager.new(v, options) }
+    opt.on('-e', '--export')                        {    mode                           = :export                               }
+    opt.on('-o', '--output FILE')                   {|v| output_file                    = v                                     }
+    opt.on(''  , '--split')                         {    split                          = true                                  }
+    opt.on(''  , '--split-more')                    {    split                          = :more                                 }
+    opt.on('',   '--format=FORMAT', [:ruby, :json]) {|v| format_passed = true; options[:format] = v                             }
+    opt.on(''  , '--export-concurrency N', Integer) {|v| options[:export_concurrency]   = v                                     }
+    opt.on(''  , '--target REGEXP')                 {|v| options[:target]               = Regexp.new(v)                         }
+    opt.on(''  , '--ignore-login-profile')          {    options[:ignore_login_profile] = true                                  }
+    opt.on(''  , '--no-color')                      {    options[:color]                = false                                 }
+    opt.on(''  , '--no-progress')                   {    options[:no_progress]          = true                                  }
+    opt.on(''  , '--debug')                         {    options[:debug]                = true                                  }
     opt.parse!
 
     aws_opts = {}

data/lib/miam.rb

@@ -13,6 +13,8 @@ require 'diffy'
 require 'hashie'
 
 module Miam; end
+require 'miam/ext/string_ext'
+require 'miam/ext/hash_ext'
 require 'miam/logger'
 require 'miam/template_helper'
 require 'miam/client'
@@ -24,7 +26,6 @@ require 'miam/dsl/context/role'
 require 'miam/dsl/context/user'
 require 'miam/dsl/converter'
 require 'miam/exporter'
-require 'miam/ext/string_ext'
 require 'miam/password_manager'
 require 'miam/utils'
 require 'miam/version'

data/lib/miam/client.rb

@@ -133,8 +133,12 @@ class Miam::Client
       @driver.delete_login_profile(user_name)
       updated = true
     elsif expected_login_profile != actual_login_profile
-      @driver.update_login_profile(user_name, expected_login_profile, actual_login_profile)
-      updated = true
+      if @options[:ignore_login_profile]
+        log(:warn, "User `#{user_name}`: difference of loging profile has been ignored: expected=#{expected_login_profile.inspect}, actual=#{actual_login_profile.inspect}", :color => :yellow)
+      else
+        @driver.update_login_profile(user_name, expected_login_profile, actual_login_profile)
+        updated = true
+      end
     end
 
     updated
@@ -398,6 +402,8 @@ class Miam::Client
 
   def walk_policy(type, user_or_group_name, policy_name, expected_document, actual_document)
     updated = false
+    expected_document.sort_array!
+    actual_document.sort_array!
 
     if expected_document != actual_document
       @driver.update_policy(type, user_or_group_name, policy_name, expected_document, actual_document)

data/lib/miam/ext/hash_ext.rb

@@ -0,0 +1,29 @@
+class Hash
+  def sort_array!
+    keys.each do |key|
+      value = self[key]
+      self[key] = sort_array0(value)
+    end
+
+    self
+  end
+
+  private
+
+  def sort_array0(value)
+    case value
+    when Hash
+      new_value = {}
+
+      value.each do |k, v|
+        new_value[k] = sort_array0(v)
+      end
+
+      new_value
+    when Array
+      value.map {|v| sort_array0(v) }.sort_by(&:to_s)
+    else
+      value
+    end
+  end
+end

data/lib/miam/version.rb

@@ -1,3 +1,3 @@
 module Miam
-  VERSION = '0.2.2.beta2'
+  VERSION = '0.2.2.beta3'
 end

data/spec/miam/hash_ext_spec.rb

@@ -0,0 +1,39 @@
+describe 'Hash#sort_array!' do
+  let(:hash) do
+    {:users=>
+      {"bob"=>
+        {:path=>"/devloper/",
+         :groups=>[],
+         :policies=>
+          {"S3"=>
+            {"Statement"=>
+              [{"Action"=>["s3:Put*", "s3:List*", "s3:Get*"],
+                "Effect"=>"Allow",
+                "Resource"=>"*"}]}},
+         :attached_managed_policies=>[
+          "arn:aws:iam::aws:policy/AmazonElastiCacheReadOnlyAccess",
+          "arn:aws:iam::aws:policy/AmazonEC2ReadOnlyAccess"],
+         :login_profile=>{:password_reset_required=>true}}}}
+  end
+
+  let(:expected_hash) do
+    {:users=>
+      {"bob"=>
+        {:path=>"/devloper/",
+         :groups=>[],
+         :policies=>
+          {"S3"=>
+            {"Statement"=>
+              [{"Action"=>["s3:Get*", "s3:List*", "s3:Put*"],
+                "Effect"=>"Allow",
+                "Resource"=>"*"}]}},
+         :attached_managed_policies=>[
+          "arn:aws:iam::aws:policy/AmazonEC2ReadOnlyAccess",
+          "arn:aws:iam::aws:policy/AmazonElastiCacheReadOnlyAccess"],
+         :login_profile=>{:password_reset_required=>true}}}}
+  end
+
+  subject { hash.sort_array! }
+
+  it { is_expected.to eq expected_hash }
+end

data/spec/miam/ignore_login_profile_spec.rb

@@ -0,0 +1,68 @@
+describe 'ignore login profile' do
+  let(:dsl) do
+    <<-RUBY
+      user "bob", :path=>"/devloper/" do
+        login_profile :password_reset_required=>true
+
+        policy "S3" do
+          {"Statement"=>
+            [{"Action"=>
+               ["s3:Get*",
+                "s3:List*"],
+              "Effect"=>"Allow",
+              "Resource"=>"*"}]}
+        end
+      end
+    RUBY
+  end
+
+  let(:update_dsl) do
+    <<-RUBY
+      user "bob", :path=>"/devloper/" do
+        login_profile :password_reset_required=>false
+
+        policy "S3" do
+          {"Statement"=>
+            [{"Action"=>
+               ["s3:Get*",
+                "s3:List*",
+                "s3:Put*"],
+              "Effect"=>"Allow",
+              "Resource"=>"*"}]}
+        end
+      end
+    RUBY
+  end
+
+  let(:expected) do
+    {:users=>
+      {"bob"=>
+        {:path=>"/devloper/",
+         :groups=>[],
+         :policies=>
+          {"S3"=>
+            {"Statement"=>
+              [{"Action"=>["s3:Get*", "s3:List*", "s3:Put*"],
+                "Effect"=>"Allow",
+                "Resource"=>"*"}]}},
+         :attached_managed_policies=>[],
+         :login_profile=>{:password_reset_required=>true}}},
+     :groups=>{},
+     :roles=>{},
+     :instance_profiles=>{}}
+  end
+
+  before(:each) do
+    apply { dsl }
+  end
+
+  context 'when no change' do
+    subject { client(ignore_login_profile: true) }
+
+    it do
+      updated = apply(subject) { update_dsl }
+      expect(updated).to be_truthy
+      expect(export).to eq expected
+    end
+  end
+end

data/spec/miam/update_spec.rb

@@ -225,9 +225,9 @@ describe 'update' do
     it do
       updated = apply(subject) { update_policy_dsl }
       expect(updated).to be_truthy
-      expected[:users]["mary"][:policies]["S3"]["Statement"][0]["Action"] = ["s3:Get*", "s3:Put*", "s3:List*"]
+      expected[:users]["mary"][:policies]["S3"]["Statement"][0]["Action"] = ["s3:Get*", "s3:List*", "s3:Put*"]
       expected[:groups]["SES"][:policies]["ses-policy"]["Statement"][0]["Action"] = "*"
-      expected[:roles]["my-role"][:policies]["role-policy"]["Statement"][0]["Action"] = ["s3:Get*", "s3:Put*", "s3:List*"]
+      expected[:roles]["my-role"][:policies]["role-policy"]["Statement"][0]["Action"] = ["s3:Get*", "s3:List*", "s3:Put*"]
       expect(export).to eq expected
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.2.2.beta2
+  version: 0.2.2.beta3
 platform: ruby
 authors:
 - Genki Sugawara
@@ -191,6 +191,7 @@ files:
 - lib/miam/dsl/context/user.rb
 - lib/miam/dsl/converter.rb
 - lib/miam/exporter.rb
+- lib/miam/ext/hash_ext.rb
 - lib/miam/ext/string_ext.rb
 - lib/miam/logger.rb
 - lib/miam/password_manager.rb
@@ -201,6 +202,8 @@ files:
 - spec/miam/attach_detach_policy_spec.rb
 - spec/miam/create_spec.rb
 - spec/miam/delete_spec.rb
+- spec/miam/hash_ext_spec.rb
+- spec/miam/ignore_login_profile_spec.rb
 - spec/miam/rename_spec.rb
 - spec/miam/update_spec.rb
 - spec/spec_helper.rb
@@ -232,6 +235,8 @@ test_files:
 - spec/miam/attach_detach_policy_spec.rb
 - spec/miam/create_spec.rb
 - spec/miam/delete_spec.rb
+- spec/miam/hash_ext_spec.rb
+- spec/miam/ignore_login_profile_spec.rb
 - spec/miam/rename_spec.rb
 - spec/miam/update_spec.rb
 - spec/spec_helper.rb