Merge pull request #805 from 25th-floor/PR/apt_source_parameters

Fix deprecated apt::source parameters

Author: eputnam

.fixtures.yml

@@ -1,8 +1,8 @@
 fixtures:
   repositories:
-    apt: 
+    apt:
       repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
-      branch: "1.8.x"
+      branch: "2.0.0"
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
     concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

manifests/repo/apt_postgresql_org.pp

@@ -15,12 +15,16 @@
     priority   => 500,
   }->
   apt::source { 'apt.postgresql.org':
-    location    => $_baseurl,
-    release     => "${::lsbdistcodename}-pgdg",
-    repos       => "main ${postgresql::repo::version}",
-    key         => 'B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8',
-    key_source  => 'https://www.postgresql.org/media/keys/ACCC4CF8.asc',
-    include_src => false,
+    location => $_baseurl,
+    release  => "${::lsbdistcodename}-pgdg",
+    repos    => "main ${postgresql::repo::version}",
+    key      => {
+      id     => 'B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8',
+      source => 'https://www.postgresql.org/media/keys/ACCC4CF8.asc',
+    },
+    include  => {
+      src => false,
+    },
   }
 
   Apt::Source['apt.postgresql.org']->Package<|tag == 'postgresql'|>

metadata.json

@@ -9,7 +9,7 @@
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":"4.x"},
-    {"name":"puppetlabs/apt","version_requirement":">=1.8.0 <3.0.0"},
+    {"name":"puppetlabs/apt","version_requirement":">=2.0.0 <3.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <3.0.0"}
   ],
   "data_provider": null,