Skip to content

Commit

Permalink
Merge pull request #272 from criteo-forks/acl
Browse files Browse the repository at this point in the history
Correct acl creation
  • Loading branch information
johnbellone committed Feb 8, 2016
2 parents d21fc16 + ad8fa9b commit c390fcc
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions libraries/consul_acl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ def configure_diplomat
end

def up_to_date?
old_acl = Diplomat::Acl.info(new_resource.to_acl['ID']).first
old_acl = Diplomat::Acl.info(new_resource.to_acl['ID'], nil, :return)
return false if old_acl.nil?
old_acl.select! { |k, _v| %w(ID Type Name Rules).include?(k) }
old_acl == new_resource.to_acl
old_acl.first.select! { |k, _v| %w(ID Type Name Rules).include?(k) }
old_acl.first == new_resource.to_acl
end
end
end
Expand Down

0 comments on commit c390fcc

Please sign in to comment.