Merge pull request #182 from YageGeng/main

Fix Custom Release URL Not Working and Compilation Failure

Author: brianheineman

postgresql_archive/Cargo.toml

@@ -54,6 +54,7 @@ default = [
 blocking = ["dep:tokio"]
 github = [
     "dep:serde_json",
+    "dep:target-triple",
 ]
 indicatif = [
     "dep:tracing-indicatif"

postgresql_archive/src/configuration/custom/matcher.rs

@@ -0,0 +1,37 @@
+use semver::Version;
+
+/// Matcher for PostgreSQL binaries from custom GitHub release repositories following the same
+/// pattern as <https://github.com/theseus-rs/postgresql-binaries>
+///
+/// # Errors
+/// * If the asset matcher fails.
+pub fn matcher(_url: &str, name: &str, version: &Version) -> crate::Result<bool> {
+    let target = target_triple::TARGET;
+    // TODO: consider relaxing the version format to allow for more flexibility in where the version
+    //       and target appear in the filename.
+    let expected_name = format!("postgresql-{version}-{target}.tar.gz");
+    Ok(name == expected_name)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{Result, matcher};
+
+    const TEST_URL: &str = "https://github.com/owner/repo";
+
+    #[test]
+    fn test_register_custom_repo() -> Result<()> {
+        #[expect(clippy::unnecessary_wraps)]
+        fn supports_fn(url: &str) -> Result<bool> {
+            Ok(url == TEST_URL)
+        }
+        matcher::registry::register(supports_fn, matcher)?;
+
+        let matcher = matcher::registry::get(TEST_URL)?;
+        let version = Version::new(16, 3, 0);
+        let expected_name = format!("postgresql-{}-{}.tar.gz", version, target_triple::TARGET);
+        assert!(matcher("", &expected_name, &version)?);
+        Ok(())
+    }
+}

postgresql_archive/src/configuration/custom/mod.rs

@@ -0,0 +1,3 @@
+pub mod matcher;
+
+pub use matcher::matcher;

postgresql_archive/src/configuration/mod.rs

@@ -1,3 +1,4 @@
+pub mod custom;
 #[cfg(feature = "theseus")]
 pub mod theseus;
 #[cfg(feature = "zonky")]

postgresql_archive/src/error.rs

@@ -175,8 +175,8 @@ mod test {
     #[test]
     fn test_from_strip_prefix_error() {
         let path = PathBuf::from("test");
-        let stip_prefix_error = path.strip_prefix("foo").expect_err("strip prefix error");
-        let error = Error::from(stip_prefix_error);
+        let strip_prefix_error = path.strip_prefix("foo").expect_err("strip prefix error");
+        let error = Error::from(strip_prefix_error);
         assert_eq!(error.to_string(), "prefix not found");
     }
 

postgresql_embedded/build/bundle.rs

@@ -1,8 +1,9 @@
 #![allow(dead_code)]
 
 use anyhow::Result;
-use postgresql_archive::VersionReq;
+use postgresql_archive::configuration::{custom, theseus};
 use postgresql_archive::repository::github::repository::GitHub;
+use postgresql_archive::{VersionReq, matcher};
 use postgresql_archive::{get_archive, repository};
 use std::fs::File;
 use std::io::Write;
@@ -20,7 +21,17 @@ pub(crate) async fn stage_postgresql_archive() -> Result<()> {
     let default_releases_url = postgresql_archive::configuration::theseus::URL.to_string();
     #[cfg(not(feature = "theseus"))]
     let default_releases_url = String::new();
-    let releases_url = env::var("POSTGRESQL_RELEASES_URL").unwrap_or(default_releases_url);
+
+    let releases_url = match env::var("POSTGRESQL_RELEASES_URL") {
+        Ok(custom_url) if !default_releases_url.is_empty() => {
+            register_custom_repository()?;
+            custom_url
+        }
+        _ => {
+            register_theseus_repository()?;
+            default_releases_url
+        }
+    };
     println!("PostgreSQL releases URL: {releases_url}");
     let postgres_version_req = env::var("POSTGRESQL_VERSION").unwrap_or("*".to_string());
     let version_req = VersionReq::from_str(postgres_version_req.as_str())?;
@@ -40,7 +51,6 @@ pub(crate) async fn stage_postgresql_archive() -> Result<()> {
         return Ok(());
     }
 
-    register_github_repository()?;
     let (asset_version, archive) = get_archive(&releases_url, &version_req).await?;
 
     fs::write(archive_version_file.clone(), asset_version.to_string())?;
@@ -52,14 +62,20 @@ pub(crate) async fn stage_postgresql_archive() -> Result<()> {
     Ok(())
 }
 
-fn register_github_repository() -> Result<()> {
-    repository::registry::register(
-        |url| {
-            let parsed_url = Url::parse(url)?;
-            let host = parsed_url.host_str().unwrap_or_default();
-            Ok(host.ends_with("github.com"))
-        },
-        Box::new(GitHub::new),
-    )?;
+fn supports_github_url(url: &str) -> postgresql_archive::Result<bool> {
+    let parsed_url = Url::parse(url)?;
+    let host = parsed_url.host_str().unwrap_or_default();
+    Ok(host.ends_with("github.com"))
+}
+
+fn register_custom_repository() -> Result<()> {
+    repository::registry::register(supports_github_url, Box::new(GitHub::new))?;
+    matcher::registry::register(supports_github_url, custom::matcher)?;
+    Ok(())
+}
+
+fn register_theseus_repository() -> Result<()> {
+    repository::registry::register(supports_github_url, Box::new(GitHub::new))?;
+    matcher::registry::register(supports_github_url, theseus::matcher)?;
     Ok(())
 }