From: Simon Deziel <simon@sdeziel.info>
Date: Thu, 18 Oct 2018 20:44:17 +0000 (-0400)
Subject: (MODULES-8081): hkps:// protocol is supported on Ubuntu 18.04 only
X-Git-Tag: 6.2.0~4^2~3
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=86804ab5d75e4b66b1b2564852d2929353d01877;p=puppet-modules%2Fpuppetlabs-apt.git

(MODULES-8081): hkps:// protocol is supported on Ubuntu 18.04 only
---

diff --git a/REFERENCE.md b/REFERENCE.md
index be2e981..081866d 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -66,7 +66,7 @@ Default value: $apt::params::provider
 Data type: `String`
 
 Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://,
-hkp:// or hkps://).
+hkp:// or hkps://). The hkps:// protocol is currently only supported on Ubuntu 18.04.
 
 Default value: $apt::params::keyserver
 
@@ -484,7 +484,7 @@ Default value: `undef`
 Data type: `Pattern[/\A((hkp|hkps|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/]`
 
 Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://,
-hkp:// or hkps://).
+hkp:// or hkps://). The hkps:// protocol is currently only supported on Ubuntu 18.04.
 
 Default value: $::apt::keyserver
 
diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index c17a114..b43dc15 100644
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -478,13 +478,21 @@ hkp_pool_pp = <<-MANIFEST
         }
   MANIFEST
 
-hkps_ubuntu_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-	  server => 'hkps://keyserver.ubuntu.com',
-        }
-  MANIFEST
+if fact('operatingsystem') =~ %r{Ubuntu} and fact('operatingsystemrelease') =~ %r{^18\.04}
+  hkps_protocol_supported = true
+else
+  hkps_protocol_supported = false
+end
+
+if hkps_protocol_supported
+  hkps_ubuntu_pp = <<-MANIFEST
+          apt_key { 'puppetlabs':
+            id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+            ensure => 'present',
+            server => 'hkps://keyserver.ubuntu.com',
+          }
+    MANIFEST
+end
 
 nonexistant_key_server_pp = <<-MANIFEST
         apt_key { 'puppetlabs':
@@ -794,14 +802,16 @@ describe 'apt_key' do
       end
     end
 
-    context 'with hkps://keyserver.ubuntu.com' do
-      it 'works' do
-        retry_on_error_matching do
-          apply_manifest(hkps_ubuntu_pp, catch_failures: true)
-        end
+    if hkps_protocol_supported
+      context 'with hkps://keyserver.ubuntu.com' do
+        it 'works' do
+          retry_on_error_matching do
+            apply_manifest(hkps_ubuntu_pp, catch_failures: true)
+          end
 
-        apply_manifest(hkps_ubuntu_pp, catch_changes: true)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
+          apply_manifest(hkps_ubuntu_pp, catch_changes: true)
+          shell(PUPPETLABS_KEY_CHECK_COMMAND)
+        end
       end
     end