Support fallback URLs for netkan validate-ckan #3060
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
HebaruSan
added
Enhancement
Pull request
In progress
DasSkelett
reviewed
May 24, 2020
| } | ||
| else | ||
| { | ||
| return DownloadPackage(fallback, metadata.Identifier, metadata.RemoteTimestamp, metadata.Download); |
There was a problem hiding this comment.
A log statement would probably be handy here, so that you can see that the fallback is used.
I would go for a Log.Info at least.
There was a problem hiding this comment.
Good idea, borrowed the one from Core.
DasSkelett
approved these changes
May 24, 2020
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.
Problem
If you submit a CKAN-meta pull request for a module that currently relies on its archive.org fallback URL for download, the pull request validation will fail, even though the module can be installed by the client.
Cause
Netkan uses a downloading service separate from the client's, which does not know about fallback URLs.
Changes
Metadataprovides aFallbackDownloadproperty that returns an archive.orgUriif we have enough info to do so andnullotherwise.CachingHttpServicetakesMetadataas input when downloading instead of aUri, identifier, and timestamp separately.CachingHttpServiceattempts to getFallbackDownloadif it is set, and propagates the exception otherwise.This will allow
netkan.exe --validate-ckanto access fallback URLs and pass validation for modules relying on them.NOTE: I just realized I forgot to check for redistributable licenses. I'll start that and remove the "In Progress" label when done.
NOTE: Also, the cache entries should be stored according to the original URL, not the fallback. Consider this pending as well.
Fixes #2938.