Allow `hkp://` style URLs for `repo_keyserver` URL

[hp197]

Fixes voxpupuli/puppet-gitlab_ci_runner#101

Pull Request (PR) description

This Pull Request (PR) fixes the following issues

[hp197]

Added test case, will need to test it offline though, travis isn't playing nice.

[hp197]

👍

test case made and passes:

with manage_repo => true and repo_keyserver => hkp://keys.gnupg.net:80 is expected to compile into a catalogue without dependency cycles is expected to contain Class[gitlab_ci_runner::repo] is expected to contain Apt::Source[apt_gitlabci] with key => {"id"=>"F6403F6544A38863DAA0B6E03F01618A51312F3F", "server"=>"hkp://keys.gnupg.net:80"}

Please also note the apt::key regex: https://github.com/puppetlabs/puppetlabs-apt/blob/main/manifests/key.pp#L43

Maybe it should be converted to something like that?

[kenyon]

Please also note the apt::key regex: https://github.com/puppetlabs/puppetlabs-apt/blob/main/manifests/key.pp#L43

Maybe it should be converted to something like that?

Sure, I think that would be an improvement, so if you want to do that, go ahead. :smiley:

[kenyon]

We need to get #93 done to get the tests to pass.

[hp197]

with manage_repo => true and repo_keyserver => keys.gnupg.net
  is expected to compile into a catalogue without dependency cycles
  is expected to contain Class[gitlab_ci_runner::repo]
  is expected to contain Apt::Source[apt_gitlabci] with key => {"id"=>"F6403F6544A38863DAA0B6E03F01618A51312F3F", "server"=>"keys.gnupg.net"}
with manage_repo => true and repo_keyserver => hkp://keys.gnupg.net:80
  is expected to compile into a catalogue without dependency cycles
  is expected to contain Class[gitlab_ci_runner::repo]
  is expected to contain Apt::Source[apt_gitlabci] with key => {"id"=>"F6403F6544A38863DAA0B6E03F01618A51312F3F", "server"=>"hkp://keys.gnupg.net:80"}
with manage_repo => true and repo_keyserver => https://keys.gnupg.net:88
  is expected to compile into a catalogue without dependency cycles
  is expected to contain Class[gitlab_ci_runner::repo]
  is expected to contain Apt::Source[apt_gitlabci] with key => {"id"=>"F6403F6544A38863DAA0B6E03F01618A51312F3F", "server"=>"https://keys.gnupg.net:88"}

Added custom keyserver type with the regex. This is in my opinion cleaner then add the whole regex to init.pp. Existing functionality still works as before.

[hp197]

ready to merge ❤️

[alexjfisher]

@hp197 Sorry for the delay. Would you be able to rebase, so that we could get this change in?

[hp197]

Sure, though I'm on vacation for the next 2 weeks. If you can wait on that I'll do it after I'm back.

On Mon, Aug 9, 2021, 17:53 Alexander Fisher @.***> wrote:

@hp197 https://github.com/hp197 Sorry for the delay. Would you be able to rebase, so that we could get this change in?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/voxpupuli/puppet-gitlab_ci_runner/pull/102#issuecomment-895338063, or unsubscribe https://github.com/notifications/unsubscribe-auth/ACKRKZFF4KU326UBETAWUZDT372W3ANCNFSM42B2SPXA . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email .

[hp197]

rebased, squashed and ready to merge (if tests pass) ❤️

[hp197]

@alexjfisher ready and tests passed

[alexjfisher]

@hp197 Thanks!