Skip to content

Commit

Permalink
MODULES-10956 remove redundant code in provider apt_key
Browse files Browse the repository at this point in the history
The code in function `update_expired_key` is redundant to the logic in
the function `create`. The call to function `exist` will mark the key as
absent, in case it has expired and refres is set to true.

I debugged for hours why my keys weren't updated until I realized, that
the functionality is elsewhere.
  • Loading branch information
moritz-makandra committed Feb 24, 2021
1 parent 683771d commit 49fda9c
Showing 1 changed file with 0 additions and 22 deletions.
22 changes: 0 additions & 22 deletions lib/puppet/provider/apt_key/apt_key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -177,29 +177,7 @@ def tempfile(content)
file
end

# Update a key if it is expired
def update_expired_key
# Return without doing anything if refresh or expired is false
return unless resource[:refresh] == true && resource[:expired] == true

# Execute command to update key
command = []

unless resource[:source].nil? && resource[:content].nil?
raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] })
end

# Breaking up the command like this is needed because it blows up
# if --recv-keys isn't the last argument.
command.push('adv', '--no-tty', '--keyserver', resource[:server])
unless resource[:options].nil?
command.push('--keyserver-options', resource[:options])
end
command.push('--recv-keys', resource[:id])
end

def exists?
update_expired_key
# report expired keys as non-existing when refresh => true
@property_hash[:ensure] == :present && !(resource[:refresh] && @property_hash[:expired])
end
Expand Down

0 comments on commit 49fda9c

Please sign in to comment.