From 5bfcbcab3486e69770a8205f3d23dab2aa24407e Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Mon, 25 Sep 2017 10:17:11 +0100 Subject: [PATCH] Undo the id/name duplication; fixed in Resource API --- lib/puppet/type/apt_key2.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/puppet/type/apt_key2.rb b/lib/puppet/type/apt_key2.rb index ccc69a7..57ad7f1 100644 --- a/lib/puppet/type/apt_key2.rb +++ b/lib/puppet/type/apt_key2.rb @@ -21,7 +21,7 @@ Puppet::ResourceApi.register_type( desc: 'Whether this apt key should be present or absent on the target system.', default: 'present', }, - name: { + id: { type: 'Variant[Pattern[/\A(0x)?[0-9a-fA-F]{8}\Z/], Pattern[/\A(0x)?[0-9a-fA-F]{16}\Z/], Pattern[/\A(0x)?[0-9a-fA-F]{40}\Z/]]', desc: 'The fingerprint of the key you want to manage.', behaviour: :namevar, @@ -45,11 +45,6 @@ Puppet::ResourceApi.register_type( type: 'Optional[String]', desc: 'Additional options to pass to apt-key\'s --keyserver-options.', }, - id: { - type: 'Pattern[/[a-f]{40}/]', - desc: 'The 40-digit hexadecimal fingerprint of the specified GPG key.', - behaviour: :read_only, - }, fingerprint: { type: 'Pattern[/[a-f]{40}/]', desc: 'The 40-digit hexadecimal fingerprint of the specified GPG key.', -- 2.45.2