From: Simon Deziel <simon@sdeziel.info>
Date: Fri, 19 Oct 2018 20:11:08 +0000 (-0400)
Subject: (MODULES-8081): mention hkps:// protocol in key.pp and s/and/&&/ in apt_key_provider_... 
X-Git-Tag: 6.2.0~4^2~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=350370363ec2d12207142324d582345ae02c20f1;p=puppet-modules%2Fpuppetlabs-apt.git

(MODULES-8081): mention hkps:// protocol in key.pp and s/and/&&/ in apt_key_provider_spec.rb
---

diff --git a/manifests/key.pp b/manifests/key.pp
index 474ca39..13b4770 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -26,8 +26,8 @@
 #   an absolute path.
 #
 # @param server
-#   Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or 
-#   hkp://).
+#   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://). The hkps:// protocol is currently only supported on Ubuntu 18.04.
 #
 # @param options
 #   Passes additional options to `apt-key adv --keyserver-options`.
diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index b43dc15..219983c 100644
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -478,7 +478,7 @@ hkp_pool_pp = <<-MANIFEST
         }
   MANIFEST
 
-if fact('operatingsystem') =~ %r{Ubuntu} and fact('operatingsystemrelease') =~ %r{^18\.04}
+if fact('operatingsystem') =~ %r{Ubuntu} && fact('operatingsystemrelease') =~ %r{^18\.04}
   hkps_protocol_supported = true
 else
   hkps_protocol_supported = false