From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 25 Sep 2017 09:17:11 +0000 (+0100)
Subject: Undo the id/name duplication; fixed in Resource API
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5bfcbcab3486e69770a8205f3d23dab2aa24407e;p=puppet-modules%2Fpuppetlabs-apt.git

Undo the id/name duplication; fixed in Resource API
---

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.',