(maint) Handle an invalid mirror gracefully #813
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
nmburgan
force-pushed
the
fix_mirror_errors
branch
from
fa96d7d
to
2b47423
Compare
e-gris
approved these changes
Aug 28, 2023
joshcooper
reviewed
Aug 28, 2023
lib/vanagon/component.rb
Outdated
| @@ -260,14 +260,28 @@ def fetch_mirrors(options) | |||
| VanagonLogger.info %(Attempting to fetch from mirror URL "#{mirror}") | |||
| @source = Vanagon::Component::Source.source(mirror, **options) | |||
| return true if source.fetch | |||
| rescue Vanagon::Error => e | |||
| if e.message =~ /Unknown file type/ | |||
There was a problem hiding this comment.
I think I'd prefer raising an subclass of Vanagon::Error specifically for the unknown source case and rescue the most specific exceptions first like:
rescue Vanagon::UnknownSourceError
VanagonLogger.error %(Unable to access mirror URL "#{mirror}")
rescue Vanagon::Error
raise
rescue SocketError
...
rescue StandardError
...There was a problem hiding this comment.
Yeah, that's fair. I was being lazy :)
nmburgan
force-pushed
the
fix_mirror_errors
branch
from
2b47423
to
b25ebff
Compare
nmburgan
force-pushed
the
fix_mirror_errors
branch
from
b25ebff
to
60037c5
Compare
nmburgan
changed the title
nmburgan
force-pushed
the
fix_mirror_errors
branch
from
60037c5
to
8d4a9ee
Compare
Because the HTTP source's valid_url? check was always returning truthy before, a mirror URL to a file would always seem to be valid, even if it wasn't. Now that puppetlabs@9995d5e fixed it, a Vanagon::Error would get thrown saying it was an unknown file type. This means that fetch_url would never get called since this exception in fetch_mirrors would be unhandled. This handles that particular error, and continues to throw other Vanagon::Error types, as they usually indicate a problem with the definition of the component or some other type of fatal error. Additionally, this changes the catching of RuntimeError to StandardError, so that we can handle issues talking to the particular URL, such as OpenSSL errors.
nmburgan
force-pushed
the
fix_mirror_errors
branch
from
8d4a9ee
to
dbd2721
Compare
joshcooper
approved these changes
Aug 29, 2023
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.
Because the HTTP source's valid_url? check was always returning truthy before, a mirror URL to a file would always seem to be valid, even if it wasn't. Now that 9995d5e fixed it, a Vanagon::Error would get thrown saying it was an unknown file type. This means that fetch_url would never get called since this exception in fetch_mirrors would be unhandled.
This handles that particular error, and continues to throw other Vanagon::Error types, as they usually indicate a problem with the definition of the component or some other type of fatal error. Additionally, this changes the catching of RuntimeError to StandardError, so that we can handle issues talking to the particular URL, such as OpenSSL errors.
Please add all notable changes to the "Unreleased" section of the CHANGELOG.