commit 95b74e269622d0c4c315433fdfc696a0918ff4e7
author Sen Jiang <senj@google.com> Fri Jun 24 13:25:06 2022 +0000
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 24 13:25:06 2022 +0000
tree 7affa2fb511071fc1cdab81544b039d43e46930c
parent 036c8d65a081a04a10c8c26c519537570c6be339

[pkg-resolver] Allow cache fallback for non fuchsia.com URLs.

cache_packages.json now includes full URLs which might not be
fuchsia.com.

Bug: 98784
Change-Id: Icc5e8de36d6e8bd1c810dc2db27c339178febce1
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/693948
Fuchsia-Auto-Submit: Sen Jiang <senj@google.com>
Reviewed-by: Ben Keller <galbanum@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>

src/sys/pkg/bin/pkg-resolver/src/resolver_service.rs

diff --git a/src/sys/pkg/bin/pkg-resolver/src/resolver_service.rs b/src/sys/pkg/bin/pkg-resolver/src/resolver_service.rs
index 4506100..adb06b1 100644
--- a/src/sys/pkg/bin/pkg-resolver/src/resolver_service.rs
+++ b/src/sys/pkg/bin/pkg-resolver/src/resolver_service.rs
@@ -596,16 +596,11 @@
 }
 
 // Attempts to lookup the hash of a package from `system_cache_list`, which is populated from the
-// cache_packages manifest of the system_image package. The cache_packages manifest only includes
-// the package path and assumes all hosts are "fuchsia.com", so this fn can only succeed on
-// `AbsolutePackageUrl`s with a host of "fuchsia.com".
+// cache_packages manifest of the system_image package.
 fn hash_from_cache_packages_manifest<'a>(
     url: &AbsolutePackageUrl,
     system_cache_list: &'a CachePackages,
 ) -> Option<BlobId> {
-    if url.host() != "fuchsia.com" {
-        return None;
-    }
     // We are in the process of removing the concept of package variant
     // (generalizing fuchsia-pkg URL paths to be `(first-segment)(/more-segments)*`
     // instead of requiring that paths are `(name)/(variant)`. Towards this goal,
@@ -890,12 +885,20 @@
     fn test_hash_from_cache_packages_manifest() {
         let hash =
             "0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap();
-        let cache_packages = CachePackages::from_entries(vec![PinnedAbsolutePackageUrl::new(
-            "fuchsia-pkg://fuchsia.com".parse().unwrap(),
-            "potato".parse().unwrap(),
-            None,
-            hash,
-        )]);
+        let cache_packages = CachePackages::from_entries(vec![
+            PinnedAbsolutePackageUrl::new_with_path(
+                "fuchsia-pkg://fuchsia.com".parse().unwrap(),
+                "/potato",
+                hash,
+            )
+            .unwrap(),
+            PinnedAbsolutePackageUrl::new_with_path(
+                "fuchsia-pkg://other.com".parse().unwrap(),
+                "/potato",
+                hash,
+            )
+            .unwrap(),
+        ]);
         let empty_cache_packages = CachePackages::from_entries(vec![]);
 
         let fuchsia_url = AbsolutePackageUrl::parse("fuchsia-pkg://fuchsia.com/potato").unwrap();
@@ -903,7 +906,7 @@
             AbsolutePackageUrl::parse("fuchsia-pkg://fuchsia.com/potato/1").unwrap();
         let variant_zero_fuchsia_url =
             AbsolutePackageUrl::parse("fuchsia-pkg://fuchsia.com/potato/0").unwrap();
-        let other_repo_url = AbsolutePackageUrl::parse("fuchsia-pkg://nope.com/potato").unwrap();
+        let other_repo_url = AbsolutePackageUrl::parse("fuchsia-pkg://other.com/potato").unwrap();
         assert_eq!(
             hash_from_cache_packages_manifest(&fuchsia_url, &cache_packages),
             Some(hash.into())
@@ -916,7 +919,10 @@
             hash_from_cache_packages_manifest(&variant_nonzero_fuchsia_url, &cache_packages),
             None
         );
-        assert_eq!(hash_from_cache_packages_manifest(&other_repo_url, &cache_packages), None);
+        assert_eq!(
+            hash_from_cache_packages_manifest(&other_repo_url, &cache_packages),
+            Some(hash.into())
+        );
         assert_eq!(hash_from_cache_packages_manifest(&fuchsia_url, &empty_cache_packages), None);
     }