Merge pull request #1142 from evgeni/cleanup-debian-9

Cleanup Debian 9 and Ubuntu pre-18.04 specialcases

Author: bastelfreak

manifests/init.pp

@@ -391,14 +391,10 @@
 
   case $facts['os']['name'] {
     'Debian': {
-      if versioncmp($facts['os']['release']['major'], '9') >= 0 {
-        stdlib::ensure_packages(['gnupg'])
-      }
+      stdlib::ensure_packages(['gnupg'])
     }
     'Ubuntu': {
-      if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
-        stdlib::ensure_packages(['gnupg'])
-      }
+      stdlib::ensure_packages(['gnupg'])
     }
     default: {
       # Nothing in here

manifests/key.pp

@@ -64,16 +64,12 @@
 
         case $facts['os']['name'] {
           'Debian': {
-            if versioncmp($facts['os']['release']['major'], '9') >= 0 {
-              stdlib::ensure_packages(['gnupg'])
-              Apt::Key<| title == $title |>
-            }
+            stdlib::ensure_packages(['gnupg'])
+            Apt::Key<| title == $title |>
           }
           'Ubuntu': {
-            if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
-              stdlib::ensure_packages(['gnupg'])
-              Apt::Key<| title == $title |>
-            }
+            stdlib::ensure_packages(['gnupg'])
+            Apt::Key<| title == $title |>
           }
           default: {
             # Nothing in here

manifests/ppa.pp

@@ -44,14 +44,9 @@
     fail("Invalid PPA name: ${name}")
   }
 
-  if versioncmp($facts['os']['release']['full'], '14.10') >= 0 {
-    $distid = downcase($dist)
-    $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
-    $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
-  } else {
-    $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2")
-    $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_\\2")
-  }
+  $distid = downcase($dist)
+  $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
+  $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
 
   $dash_filename_no_slashes      = regsubst($dash_filename, '/', '-', 'G')
   $dash_filename_no_specialchars = regsubst($dash_filename_no_slashes, '[\.\+]', '_', 'G')
@@ -60,8 +55,7 @@
 
   $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.list"
 
-  if versioncmp($facts['os']['release']['full'], '15.10') >= 0 and
-  versioncmp($facts['os']['release']['full'], '21.04') < 0 {
+  if versioncmp($facts['os']['release']['full'], '21.04') < 0 {
     $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
   } else {
     $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"

manifests/source.pp

@@ -125,12 +125,6 @@
     else {
       $_location = $location
     }
-    # Newer oses, do not need the package for HTTPS transport.
-    $_transport_https_releases = ['9']
-    if (fact('os.release.major') in $_transport_https_releases) and $_location =~ /(?i:^https:\/\/)/ {
-      stdlib::ensure_packages('apt-transport-https')
-      Package['apt-transport-https'] -> Class['apt::update']
-    }
   } else {
     $_location = undef
   }

spec/defines/source_spec.rb

@@ -35,7 +35,6 @@
 
       it {
         expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{# my_source\ndeb-src hello.there wheezy main\n})
-        expect(subject).not_to contain_package('apt-transport-https')
       }
     end
   end
@@ -223,79 +222,6 @@
     }
   end
 
-  context 'with a https location, install apt-transport-https' do
-    let :params do
-      {
-        location: 'HTTPS://foo.bar',
-        allow_unsigned: false
-      }
-    end
-
-    it {
-      expect(subject).to contain_package('apt-transport-https')
-    }
-  end
-
-  context 'with a https location and custom release, install apt-transport-https' do
-    let :facts do
-      {
-        os: {
-          family: 'Debian',
-          name: 'Debian',
-          release: {
-            major: '9',
-            full: '9.0'
-          },
-          distro: {
-            codename: 'stretch',
-            id: 'Debian'
-          }
-        },
-        puppetversion: Puppet.version
-      }
-    end
-    let :params do
-      {
-        location: 'HTTPS://foo.bar',
-        allow_unsigned: false,
-        release: 'customrelease'
-      }
-    end
-
-    it {
-      expect(subject).to contain_package('apt-transport-https')
-    }
-  end
-
-  context 'with a https location, do not install apt-transport-https on oses not in list eg buster' do
-    let :facts do
-      {
-        os: {
-          family: 'Debian',
-          name: 'Debian',
-          release: {
-            major: '10',
-            full: '10.0'
-          },
-          distro: {
-            codename: 'buster',
-            id: 'Debian'
-          }
-        }
-      }
-    end
-    let :params do
-      {
-        location: 'https://foo.bar',
-        allow_unsigned: false
-      }
-    end
-
-    it {
-      expect(subject).not_to contain_package('apt-transport-https')
-    }
-  end
-
   context 'with architecture equals x86_64' do
     let :facts do
       {