opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #408 from cyberious/MODULES-1661

Browse source 
MODULES-1661 Fix issue with apt_key destroy, also added mutliple deletes
This commit is contained in:
Colleen Murphy 2015-01-13 17:41:49 -08:00
commit 251bd23b5b
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/puppet/provider/apt_key/apt_key.rb
View file

@ -50,7 +50,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
new(
:name => line_hash[:key_fingerprint],
:id => line_hash[:key_fingerprint],
:id => line_hash[:key_long],
:fingerprint => line_hash[:key_fingerprint],
:short => line_hash[:key_short],
:long => line_hash[:key_long],
@ -166,8 +166,10 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
end
def destroy
#Currently del only removes the first key, we need to recursively list and ensure all with id are absent.
apt_key('del', resource[:id])
begin
apt_key('del', resource.provider.long)
r = execute(["#{command(:apt_key)} list | grep #{resource.provider.long}"], :failonfail => false)
end while r.exitstatus == 0
@property_hash.clear
end

8
spec/acceptance/apt_key_provider_spec.rb
View file

@ -11,6 +11,8 @@ CENTOS_GPG_KEY_FINGERPRINT = 'C1DAC52D1664E8A4386DBA430946FCA2C105B9DE'
CENTOS_REPO_URL = 'ftp.cvut.cz/centos'
CENTOS_GPG_KEY_FILE = 'RPM-GPG-KEY-CentOS-6'
SHOULD_NEVER_EXIST_ID = '4BD6EC30'
KEY_CHECK_COMMAND = "apt-key adv --list-keys --with-colons --fingerprint | grep "
PUPPETLABS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{PUPPETLABS_GPG_KEY_FINGERPRINT}"
CENTOS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{CENTOS_GPG_KEY_FINGERPRINT}"
@ -351,7 +353,7 @@ ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
it 'fails with a 550' do
pp = <<-EOS
apt_key { 'CentOS 6':
id => '#{CENTOS_GPG_KEY_LONG_ID}',
id => '#{SHOULD_NEVER_EXIST_ID}',
ensure => 'present',
source => 'ftp://#{CENTOS_REPO_URL}/herpderp.gpg',
}
@ -395,7 +397,7 @@ ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
it 'fails with a 404' do
pp = <<-EOS
apt_key { 'puppetlabs':
id => '4BD6EC30',
id => '#{SHOULD_NEVER_EXIST_ID}',
ensure => 'present',
source => 'https://#{PUPPETLABS_APT_URL}/herpderp.gpg',
}
@ -409,7 +411,7 @@ ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
it 'fails with a socket error' do
pp = <<-EOS
apt_key { 'puppetlabs':
id => '4BD6EC30',
id => '#{SHOULD_NEVER_EXIST_ID}',
ensure => 'present',
source => 'https://apt.puppetlabss.com/herpderp.gpg',
}