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

diff --git a/manifests/key.pp b/manifests/key.pp
index 474ca395e22fb2951c77da329cb4c382c89b8fb5..13b477060d679786677697db0fab9a1b60dc61d5 100644 (file)
--- 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 b43dc15f6d59d9d0ed6386f09e801ecee000fed3..219983cbd875993a13758e1b6d88cec1acd6131f 100644 (file)
--- 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