Skip to content

Fix package cache lookup to allow substring match for canonical URIs #2167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

Fix package cache lookup to allow substring match for canonical URIs #2167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...hir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ public String findCanonicalInLocalCache(String canonicalUrl) {
for (String pf : listPackages()) {
if (ManagedFileAccess.file(Utilities.path(cacheFolder, pf, "package", "package.json")).exists()) {
JsonObject npm = JsonParser.parseObjectFromFile(Utilities.path(cacheFolder, pf, "package", "package.json"));
if (canonicalUrl.equals(npm.asString("canonical"))) {
if (canonicalUrl.contains(npm.asString("canonical"))) {
return npm.asString("name");
}
}
Expand Down
14 changes: 14 additions & 0 deletions ...hir.utilities/src/test/java/org/hl7/fhir/utilities/npm/FilesystemPackageManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,20 @@ public void testReadFromCacheOnlyWaitsForLockDelete() throws IOException, Interr
lockThread.join();
}

@Test
public void testCacheHitWithCanonicalSubstringMatch() throws IOException {
File cacheDirectory = ManagedFileAccess.fromPath(Files.createTempDirectory("fpcm-canonicalSubstringTest"));
FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager.Builder().withCacheFolder(cacheDirectory.getAbsolutePath()).build();

pcm.addPackageToCache("example.fhir.uv.myig", "1.2.3", this.getClass().getResourceAsStream("/npm/dummy-package.tgz"), "https://packages.fhir.org/example.fhir.uv.myig/1.2.3");

String dependsOnUri = "http://somewhere.org/fhir/uv/myig/ImplementationGuide/hl7.fhir.uv.extensions";

String npmPackageName = pcm.findCanonicalInLocalCache(dependsOnUri);
assertThat(npmPackageName).isNotNull();
assertThat(npmPackageName).isEqualTo("example.fhir.uv.myig");
}

/**
We repeat the same tests multiple times here, in order to catch very rare edge cases.
*/
Expand Down
Loading