From 3b20693a3484337ddd580e614085de4c1376f5c9 Mon Sep 17 00:00:00 2001
From: Kyle Williams <36274986+kyle-williams-1@users.noreply.github.com>
Date: Mon, 26 Feb 2018 15:46:33 -0700
Subject: [PATCH 1/4] Use new puppetlabs apt modules version

---
 manifests/repos.pp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 3436ec733..28f59bd2e 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -17,14 +17,19 @@
           $key_source = $docker::package_key_source
           $package_key = $docker::package_key
         }
+        ensure_packages(['debian-keyring', 'debian-archive-keyring'])
         apt::source { 'docker':
           location          => $location,
           release           => $docker::package_release,
           repos             => $docker::package_repos,
-          key               => $package_key,
-          key_source        => $key_source,
-          required_packages => 'debian-keyring debian-archive-keyring',
-          include_src       => false,
+          key               => {
+            id              => $package_key,
+            source          => $key_source 
+          },
+          require           => [ Package['debian-keyring'], Package['debian-archive-keyring'] ],
+          include           => {
+            src             => false
+          },
         }
         $url_split = split($location, '/')
         $repo_host = $url_split[2]

From f7bdde17b7e111f317d13fa54506ce334bad6775 Mon Sep 17 00:00:00 2001
From: Kyle Williams <36274986+kyle-williams-1@users.noreply.github.com>
Date: Mon, 26 Feb 2018 15:47:27 -0700
Subject: [PATCH 2/4] Update version of apt used

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index bd858fec4..c17c7e86f 100755
--- a/metadata.json
+++ b/metadata.json
@@ -9,7 +9,7 @@
   "issues_url": "https://github.com/garethr/garethr-docker/issues",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0"},
-    {"name":"puppetlabs/apt","version_requirement":">= 1.8.0 <= 3.0.0"},
+    {"name":"puppetlabs/apt","version_requirement":">= 1.8.0"},
     {"name":"stahnma/epel","version_requirement":">= 0.0.6"}
   ],
   "data_provider": null,

From 73159f4afe59e6320e26e012da0c63cf6bae11ed Mon Sep 17 00:00:00 2001
From: Kyle Williams <36274986+kyle-williams-1@users.noreply.github.com>
Date: Mon, 30 Apr 2018 20:55:11 -0600
Subject: [PATCH 3/4] Update metadata.json

Correct version for apt::source key hash feature
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index c17c7e86f..eba9f63ca 100755
--- a/metadata.json
+++ b/metadata.json
@@ -9,7 +9,7 @@
   "issues_url": "https://github.com/garethr/garethr-docker/issues",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0"},
-    {"name":"puppetlabs/apt","version_requirement":">= 1.8.0"},
+    {"name":"puppetlabs/apt","version_requirement":">= 2.0.0"},
     {"name":"stahnma/epel","version_requirement":">= 0.0.6"}
   ],
   "data_provider": null,

From 761f7a424eddcbd4463e2dca3aa9cb1941b94f38 Mon Sep 17 00:00:00 2001
From: Kyle Williams <kyle.williams@netapp.com>
Date: Fri, 18 May 2018 10:42:58 -0600
Subject: [PATCH 4/4] Whitespace cleanup

---
 manifests/repos.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 28f59bd2e..15a988aea 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -19,16 +19,16 @@
         }
         ensure_packages(['debian-keyring', 'debian-archive-keyring'])
         apt::source { 'docker':
-          location          => $location,
-          release           => $docker::package_release,
-          repos             => $docker::package_repos,
-          key               => {
-            id              => $package_key,
-            source          => $key_source 
+          location => $location,
+          release  => $docker::package_release,
+          repos    => $docker::package_repos,
+          key      => {
+            id     => $package_key,
+            source => $key_source,
           },
-          require           => [ Package['debian-keyring'], Package['debian-archive-keyring'] ],
-          include           => {
-            src             => false
+          require  => [ Package['debian-keyring'], Package['debian-archive-keyring'] ],
+          include  => {
+            src => false,
           },
         }
         $url_split = split($location, '/')