Merge pull request #93 from theseus-rs/add-zonky-binary-support

feat: add support for installing binaries from the zonky project

Author: brianheineman

Cargo.lock

@@ -33,6 +33,7 @@ http = "1.1.0"
 human_bytes = { version = "0.4.3", default-features = false }
 lazy_static = "1.5.0"
 num-format = "0.4.4"
+quick-xml = "0.35.0"
 rand = "0.8.5"
 regex = "1.10.5"
 reqwest = { version = "0.12.5", default-features = false }
@@ -52,6 +53,8 @@ thiserror = "1.0.61"
 tokio = "1.38.0"
 tracing = "0.1.40"
 url = "2.5.2"
+xz2 = "0.1.7"
+zip = "2.1.3"
 
 [workspace.metadata.release]
 shared-version = true

Cargo.toml

@@ -18,11 +18,11 @@ allow = [
     "Apache-2.0",
     "BSD-2-Clause",
     "BSD-3-Clause",
+    "BSL-1.0",
     "ISC",
     "MIT",
     "OpenSSL",
     "PostgreSQL",
-    "Unicode-3.0",
     "Unicode-DFS-2016",
 ]
 

deny.toml

@@ -1,13 +1,12 @@
 #![forbid(unsafe_code)]
 #![deny(clippy::pedantic)]
 
-use postgresql_archive::{
-    extract, get_archive, Result, VersionReq, THESEUS_POSTGRESQL_BINARIES_URL,
-};
+use postgresql_archive::configuration::theseus;
+use postgresql_archive::{extract, get_archive, Result, VersionReq};
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let url = THESEUS_POSTGRESQL_BINARIES_URL;
+    let url = theseus::URL;
     let version_req = VersionReq::STAR;
     let (archive_version, archive) = get_archive(url, &version_req).await?;
     let out_dir = tempfile::tempdir()?.into_path();

examples/archive_async/src/main.rs

@@ -2,10 +2,11 @@
 #![deny(clippy::pedantic)]
 
 use postgresql_archive::blocking::{extract, get_archive};
-use postgresql_archive::{Result, VersionReq, THESEUS_POSTGRESQL_BINARIES_URL};
+use postgresql_archive::configuration::theseus;
+use postgresql_archive::{Result, VersionReq};
 
 fn main() -> Result<()> {
-    let url = THESEUS_POSTGRESQL_BINARIES_URL;
+    let url = theseus::URL;
     let version_req = VersionReq::STAR;
     let (archive_version, archive) = get_archive(url, &version_req)?;
     let out_dir = tempfile::tempdir()?.into_path();

examples/archive_sync/src/main.rs

@@ -19,6 +19,7 @@ http = { workspace = true }
 human_bytes = { workspace = true, default-features = false }
 lazy_static = { workspace = true }
 num-format = { workspace = true }
+quick-xml = { workspace = true, features = ["serialize"] }
 regex = { workspace = true }
 reqwest = { workspace = true, default-features = false, features = ["json"] }
 reqwest-middleware = { workspace = true }
@@ -36,6 +37,8 @@ thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"], optional = true }
 tracing = { workspace = true, features = ["log"] }
 url = { workspace = true }
+xz2 = { workspace = true }
+zip = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true }

postgresql_archive/Cargo.toml

@@ -1,6 +1,7 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use postgresql_archive::blocking::{extract, get_archive};
-use postgresql_archive::{Result, VersionReq, THESEUS_POSTGRESQL_BINARIES_URL};
+use postgresql_archive::configuration::theseus;
+use postgresql_archive::{Result, VersionReq};
 use std::fs::{create_dir_all, remove_dir_all};
 use std::time::Duration;
 
@@ -10,7 +11,7 @@ fn benchmarks(criterion: &mut Criterion) {
 
 fn bench_extract(criterion: &mut Criterion) -> Result<()> {
     let version_req = VersionReq::STAR;
-    let (_archive_version, archive) = get_archive(THESEUS_POSTGRESQL_BINARIES_URL, &version_req)?;
+    let (_archive_version, archive) = get_archive(theseus::URL, &version_req)?;
 
     criterion.bench_function("extract", |bencher| {
         bencher.iter(|| {
@@ -24,7 +25,7 @@ fn bench_extract(criterion: &mut Criterion) -> Result<()> {
 fn extract_archive(archive: &Vec<u8>) -> Result<()> {
     let out_dir = tempfile::tempdir()?.path().to_path_buf();
     create_dir_all(&out_dir)?;
-    extract(THESEUS_POSTGRESQL_BINARIES_URL, archive, &out_dir)?;
+    extract(theseus::URL, archive, &out_dir)?;
     remove_dir_all(&out_dir)?;
     Ok(())
 }

postgresql_archive/benches/archive.rs

@@ -7,9 +7,6 @@ use semver::{Version, VersionReq};
 use std::path::Path;
 use tracing::instrument;
 
-pub const THESEUS_POSTGRESQL_BINARIES_URL: &str =
-    "https://github.com/theseus-rs/postgresql-binaries";
-
 /// Gets the version for the specified [version requirement](VersionReq). If a version for the
 /// [version requirement](VersionReq) is not found, then an error is returned.
 ///
@@ -52,19 +49,20 @@ pub async fn extract(url: &str, bytes: &Vec<u8>, out_dir: &Path) -> Result<()> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::configuration::theseus::URL;
 
     #[tokio::test]
     async fn test_get_version() -> Result<()> {
         let version_req = VersionReq::parse("=16.3.0")?;
-        let version = get_version(THESEUS_POSTGRESQL_BINARIES_URL, &version_req).await?;
+        let version = get_version(URL, &version_req).await?;
         assert_eq!(Version::new(16, 3, 0), version);
         Ok(())
     }
 
     #[tokio::test]
     async fn test_get_archive() -> Result<()> {
         let version_req = VersionReq::parse("=16.3.0")?;
-        let (version, bytes) = get_archive(THESEUS_POSTGRESQL_BINARIES_URL, &version_req).await?;
+        let (version, bytes) = get_archive(URL, &version_req).await?;
         assert_eq!(Version::new(16, 3, 0), version);
         assert!(!bytes.is_empty());
         Ok(())

postgresql_archive/src/archive.rs

@@ -0,0 +1,2 @@
+pub mod theseus;
+pub mod zonky;