Allow passing all keyring params in apt::source
#1147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We don't need apt::keyring::keyring_thing, it should just be apt::keyring::thing.
Being able to provide the dir, filename, and full file path makes the logic too complicated for users of this defined type. We should only allow providing the filename and dir, and then compute the full path from those. Otherwise, someone could pass all three parameters, in which case the filename and dir would be ignored, which could be confusing.
This uses the same logic as apt::keyring itself, and what I think would be the least surprising logic: 1. Passing both `dir` and `filename`: you have provided the full path, so that is used in the signed-by setting. 2. Passing just the `filename` means you want to use the default dir, /etc/apt/keyrings. 3. Passing just the `dir` means you want to use the given directory, and the `name` attribute as the filename. 4. Passing only `name` means use `name` with the default dir.
bastelfreak
approved these changes
Nov 21, 2023
|
I'm intending to make use of this to modernize puppetlabs-puppet_agent in https://github.com/puppetlabs/puppetlabs-puppet_agent/blob/bd687442d8eaf9a08cb3f138f1e7a965c46f8490/manifests/osfamily/debian.pp |
|
@bastelfreak IMO these aren't backwards-incompatible changes since there hasn't been a release done with |
|
Ended up not needing this for puppetlabs/puppetlabs-puppet_agent#681, but I think these changes are good still. |
|
@kenyon oh right! |
bastelfreak
approved these changes
Nov 21, 2023
kali-brandwatch
pushed a commit
to brandwatch/puppetlabs-apt
that referenced
this pull request
May 10, 2024
Allow passing all `keyring` params in `apt::source`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
apt::keyringattributes