Return packages.json if packages/list.json does not exist #150
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
If you go to the drupal 7 repository https://packages.drupal.org/7/ you will find that it does not support the packages/list.json url. In that case we just return the packages.json that was returned. This was making retrieving packages.json from a nexus proxy for drupal 7 return a status 500 error.
In the process to merge the packages json, it was returning a nullpointerexception when the PROVIDERS_KEY was not found. Now it will simply to add the provider to the merged packages json.
stklcode
reviewed
Aug 18, 2024
| @@ -351,7 +351,7 @@ public Content mergePackagesJson(final Repository repository, final List<Payload | |||
| for (Payload payload : payloads) { | |||
| Map<String, Object> json = parseJson(payload); | |||
| Map<String, Object> providers = (Map<String, Object>) json.get(PROVIDERS_KEY); | |||
| names.addAll(providers.keySet()); | |||
| Optional.ofNullable(providers).ifPresent(pv -> names.addAll(pv.keySet())); | |||
There was a problem hiding this comment.
Why not using a simple old-school but cheap null check instead of creating an Optional instance and an non-static instance lambda?
Suggested change
| Optional.ofNullable(providers).ifPresent(pv -> names.addAll(pv.keySet())); | |
| if (providers != null) { | |
| names.addAll(providers.keySet()); | |
| } |
If you insist on functional style, even this would be more efficient:
Optional.ofNullable(providers).map(Map::keySet).ifPresent(names::addAll);| try { | ||
| returnedContent = generatePackagesJson(context); | ||
| } catch (NullPointerException e) { | ||
| returnedContent=content; |
There was a problem hiding this comment.
Suggested change
| returnedContent=content; | |
| returnedContent = content; |
There was a problem hiding this comment.
Service the original package.json as cached artifact might work, if the upstream repository uses the same absolute paths, e.g /p2/%package%.json.
Otherwise this pass-through of the original package.json might lead to broken repositories, e.g. proxying packages.drupal.org with a /files/packages/8/p2/%package%.json pattern. This path won't resolve on our Nexus instance.
The URLs should be rewritten in any case.
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.
If you go to the drupal 7 repository https://packages.drupal.org/7/ you will find that it does not support the packages/list.json url. In that case we just return the packages.json that was returned. This was making retrieving packages.json from a nexus proxy for drupal 7 return a status 500 error.
(brief, plain english overview of your changes here)
instead of failing a get for packages.json from a proxy which does not support the packages/list.json url, this change will instead return the original information from the target repository packages.json response.
This pull request makes the following changes:
(If there are changes to the UI, please include a screenshot so we
know what to look for!)
no change
(If there are changes to user behavior in general, please make sure to
update the docs, as well)
no change
It relates to the following issue #s:
none