Merge pull request #815 from simondeziel/modules-8081

(MODULES-8081): add support for hkps:// protocol in apt::key

diff --combined lib/puppet/type/apt_key.rb
index 72f56fa1c3708a6afc927693a4a05d66f9bf65ef,19c044ec984f35c6a6b53b358071ec43bffbdb1c..467f568af4a74ff475fb2ed77da0e2c31298dc16
--- 1/lib/puppet/type/apt_key.rb
--- 2/lib/puppet/type/apt_key.rb
+++ b/lib/puppet/type/apt_key.rb
@@@ -68,7 -68,7 +68,7 @@@ Puppet::Type.newtype(:apt_key) d
      desc 'The key server to fetch the key from based on the ID. It can either be a domain name or url.'
      defaultto :'keyserver.ubuntu.com'
  
-     newvalues(%r{\A((hkp|http|https)://)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$})
+     newvalues(%r{\A((hkp|hkps|http|https)://)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$})
    end
  
    newparam(:options) do
@@@ -77,7 -77,6 +77,7 @@@
  
    newparam(:refresh, boolean: true, parent: Puppet::Parameter::Boolean) do
      desc 'When true, recreate an existing expired key'
 +    defaultto false
    end
  
    newproperty(:fingerprint) do