Skip to content

Commit

Permalink
Correct acl creation
Browse files Browse the repository at this point in the history
Otherwise the diplomat gem raise an exception

also updates the rubocop rule name
  • Loading branch information
kamaradclimber committed Feb 5, 2016
1 parent 257a086 commit 5c787b0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Metrics/AbcSize:
Enabled: false
PerceivedComplexity:
Enabled: false
Style/SingleSpaceBeforeFirstArg:
Style/SpaceBeforeFirstArg:
Enabled: false
Style/ClassAndModuleChildren:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion libraries/consul_acl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ 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).first
return false if old_acl.nil?
old_acl.select! { |k, _v| %w(ID Type Name Rules).include?(k) }
old_acl == new_resource.to_acl
Expand Down

0 comments on commit 5c787b0

Please sign in to comment.