From 4bd7ea27a78cbac8c647540cdd1e82ca589a27cc Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 31 Oct 2018 15:20:26 +0100
Subject: [PATCH] Rely more on puppetlabs-apt

This refactors the code to rely more on puppetlabs-apt features. It
passes in the key and lets apt::source define apt::key for us.

Puppetlabs-apt also knows better when apt-transport-https is actually
needed. On the most recent Debian/Ubuntu releases it doesn't even exist
anymore since apt handles it out of the box.

It also removes the absolute resource notation which is no longer
needed.
---
 manifests/repo/debian.pp | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
index f267201f..a9bfc8dd 100644
--- a/manifests/repo/debian.pp
+++ b/manifests/repo/debian.pp
@@ -38,14 +38,9 @@
 
   assert_private()
 
-  include '::apt'
+  include 'apt'
 
-  create_resources(::apt::key, { 'php::repo::debian' => {
-    id     => $key['id'],
-    source => $key['source'],
-  }})
-
-  ::apt::source { "source_php_${release}":
+  apt::source { "source_php_${release}":
     location => $location,
     release  => $release,
     repos    => $repos,
@@ -53,14 +48,14 @@
       'src' => $include_src,
       'deb' => true,
     },
-    require  => Apt::Key['php::repo::debian'],
+    key      => $key,
   }
 
   if ($dotdeb) {
     # both repositories are required to work correctly
     # See: http://www.dotdeb.org/instructions/
     if $release == 'wheezy-php56' {
-      ::apt::source { 'dotdeb-wheezy':
+      apt::source { 'dotdeb-wheezy':
         location => $location,
         release  => 'wheezy',
         repos    => $repos,
@@ -73,27 +68,17 @@
   }
 
   if ($sury and $php::globals::php_version == '7.1') {
-    # Required packages for PHP 7.1 repository
-    ensure_packages(['lsb-release', 'ca-certificates'], {'ensure' => 'present'})
-
-    # Add PHP 7.1 key + repository
-    apt::key { 'php::repo::debian-php71':
-      id     => 'DF3D585DB8F0EB658690A554AC0E47584A7A714D',
-      source => 'https://packages.sury.org/php/apt.gpg',
-    }
-
-    ::apt::source { 'source_php_71':
+    apt::source { 'source_php_71':
       location => 'https://packages.sury.org/php/',
-      release  => $facts['os']['distro']['codename'],
       repos    => 'main',
       include  => {
         'src' => $include_src,
         'deb' => true,
       },
-      require  => [
-        Apt::Key['php::repo::debian-php71'],
-        Package['apt-transport-https', 'lsb-release', 'ca-certificates']
-      ],
+      key      => {
+        id     => 'DF3D585DB8F0EB658690A554AC0E47584A7A714D',
+        source => 'https://packages.sury.org/php/apt.gpg',
+      },
     }
   }
 }