Merge pull request #200 from kpcyrd/misc-fixes

Fix minor bugs and clippy warnings

Author: kpcyrd

contrib/systemd/[email protected]

@@ -4,6 +4,7 @@ Description=rebuilderd-worker: rebuild packages
 [Service]
 Restart=always
 RestartSec=0
+Environment="REBUILDERD_WORKER_CONFIG=/etc/rebuilderd-worker.conf"
 ExecStart=/usr/bin/rebuilderd-worker -n %i connect
 CPUSchedulingPolicy=idle
 IOSchedulingClass=3

daemon/src/config.rs

@@ -91,6 +91,7 @@ pub fn setup_auth_cookie() -> Result<String> {
         .mode(0o640)
         .write(true)
         .create(true)
+        .truncate(true)
         .open(cookie_path)
         .context("Failed to open auth cookie file")?;
     file.write_all(format!("{}\n", cookie).as_bytes())?;

tools/src/args.rs

@@ -1,7 +1,7 @@
 use clap::{ArgAction, CommandFactory, Parser};
 use clap_complete::Shell;
 use glob::Pattern;
-use rebuilderd_common::api::v1::BuildStatus;
+use rebuilderd_common::api::v1::ArtifactStatus;
 use rebuilderd_common::errors::*;
 use std::io;
 use std::path::PathBuf;
@@ -67,10 +67,7 @@ pub struct PkgsSyncProfile {
 }
 
 #[derive(Debug, Parser)]
-pub struct PkgsSyncStdin {
-    pub distro: String,
-    pub suite: String,
-}
+pub struct PkgsSyncStdin {}
 
 #[derive(Debug, Parser)]
 pub struct PkgsSync {
@@ -110,7 +107,7 @@ pub struct PkgsFilter {
     pub name: Option<String>,
     /// Filter packages matching this status
     #[arg(long)]
-    pub status: Option<BuildStatus>,
+    pub status: Option<ArtifactStatus>,
     /// Filter packages matching this distro
     #[arg(long)]
     pub distro: Option<String>,

tools/src/main.rs

@@ -67,7 +67,7 @@ pub async fn sync(client: &Client, sync: PkgsSync) -> Result<()> {
         print_json(&reports)?;
     } else {
         for report in reports {
-            submit_package_report(&client, &report).await?;
+            submit_package_report(client, &report).await?;
         }
     }
 
@@ -201,7 +201,7 @@ async fn main() -> Result<()> {
             )
             .await?;
         }
-        SubCommand::Pkgs(Pkgs::SyncStdin(sync)) => {
+        SubCommand::Pkgs(Pkgs::SyncStdin(_sync)) => {
             let mut stdin = tokio::io::stdin();
             let mut buf = Vec::new();
             stdin.read_to_end(&mut buf).await?;
@@ -233,7 +233,7 @@ async fn main() -> Result<()> {
             };
 
             loop {
-                let results = client
+                let mut results = client
                     .get_binary_packages(Some(&page), Some(&origin_filter), Some(&identity_filter))
                     .await?;
 
@@ -243,6 +243,15 @@ async fn main() -> Result<()> {
                     break;
                 }
 
+                // Filter the list by status so it's applied to the json output as well
+                if let Some(status) = &ls.filter.status {
+                    results.records.retain(|pkg| {
+                        // If our filter is "UNKWN", match packages with status == null
+                        pkg.status == ls.filter.status
+                            || (*status == ArtifactStatus::Unknown && pkg.status.is_none())
+                    });
+                }
+
                 if ls.json {
                     print_json(&results.records)?;
                 } else {

tools/src/schedule/debian.rs

@@ -298,19 +298,23 @@ impl SyncState {
     fn get_mut_group(
         &mut self,
         src: &DebianSourcePkg,
-        release: &String,
-        component: &String,
-        architecture: &String,
+        release: &str,
+        component: &str,
+        architecture: &str,
     ) -> &mut SourcePackageReport {
-        let key = (release.clone(), component.clone(), architecture.clone());
+        let key = (
+            release.to_string(),
+            component.to_string(),
+            architecture.to_string(),
+        );
         let report = self
             .reports
             .entry(key.clone())
             .or_insert_with(|| PackageReport {
                 distribution: "debian".to_string(),
-                release: Some(release.clone()),
-                component: Some(component.clone()),
-                architecture: architecture.clone(),
+                release: Some(release.to_string()),
+                component: Some(component.to_string()),
+                architecture: architecture.to_string(),
                 packages: Vec::new(),
             });
 
@@ -339,8 +343,8 @@ impl SyncState {
         src: &DebianSourcePkg,
         bin: DebianBinPkg,
         source: &str,
-        release: &String,
-        component: &String,
+        release: &str,
+        component: &str,
     ) {
         let group = self.get_mut_group(src, release, component, &bin.architecture);
         let url = format!("{}/{}", source, bin.filename);
@@ -360,8 +364,8 @@ impl SyncState {
         &mut self,
         pkg: DebianBinPkg,
         sources: &SourcePkgBucket,
-        release: &String,
-        component: &String,
+        release: &str,
+        component: &str,
         sync: &PkgsSync,
     ) -> Result<()> {
         // Debian combines arch:all and arch:any packages.
@@ -392,8 +396,8 @@ impl SyncState {
         &mut self,
         bytes: &[u8],
         sources: &SourcePkgBucket,
-        release: &String,
-        component: &String,
+        release: &str,
+        component: &str,
         sync: &PkgsSync,
     ) -> Result<()> {
         for pkg in extract_pkgs_compressed::<DebianBinPkg>(bytes)? {
@@ -406,8 +410,8 @@ impl SyncState {
         &mut self,
         bytes: &[u8],
         sources: &SourcePkgBucket,
-        release: &String,
-        component: &String,
+        release: &str,
+        component: &str,
         sync: &PkgsSync,
     ) -> Result<()> {
         for pkg in extract_pkgs_uncompressed::<DebianBinPkg, _>(bytes)? {
@@ -689,13 +693,7 @@ Section: misc
             uploaders: vec![],
         };
         let mut state = SyncState::new();
-        state.push(
-            &src,
-            bin,
-            "https://deb.debian.org/debian",
-            &"sid".to_string(),
-            &"main".to_string(),
-        );
+        state.push(&src, bin, "https://deb.debian.org/debian", "sid", "main");
 
         let mut reports = HashMap::new();
         reports.insert(("sid".to_string(), "main".to_string(), "all".to_string()), PackageReport {
@@ -804,8 +802,8 @@ Section: misc
                 &src_pkgs[0],
                 bin,
                 "https://deb.debian.org/debian",
-                &"sid".to_string(),
-                &"main".to_string(),
+                "sid",
+                "main",
             );
         }
 
@@ -1136,13 +1134,7 @@ Section: mail
         let mut state = SyncState::new();
         for bin in bin_pkgs {
             let src = sources.get(&bin).unwrap();
-            state.push(
-                &src,
-                bin,
-                "https://deb.debian.org/debian",
-                &"sid".to_string(),
-                &"main".to_string(),
-            );
+            state.push(&src, bin, "https://deb.debian.org/debian", "sid", "main");
         }
 
         let mut reports = HashMap::new();
@@ -1495,22 +1487,10 @@ SHA256: cc2081a6b2f6dcb82039b5097405b5836017a7bfc54a78eba36b656549e17c92
 
         // add the package list twice, to simulate importing sid and testing
         state
-            .import_uncompressed_binary_package_file(
-                &bytes[..],
-                &sources,
-                &"sid".to_string(),
-                &"main".to_string(),
-                &sync,
-            )
+            .import_uncompressed_binary_package_file(&bytes[..], &sources, "sid", "main", &sync)
             .unwrap();
         state
-            .import_uncompressed_binary_package_file(
-                &bytes[..],
-                &sources,
-                &"testing".to_string(),
-                &"main".to_string(),
-                &sync,
-            )
+            .import_uncompressed_binary_package_file(&bytes[..], &sources, "testing", "main", &sync)
             .unwrap();
 
         let mut reports = HashMap::new();
@@ -1578,9 +1558,9 @@ SHA256: cc2081a6b2f6dcb82039b5097405b5836017a7bfc54a78eba36b656549e17c92
             sync_method: None,
         };
 
-        for (source, binary) in [
-            // sid
-            (&b"Package: novnc
+        // sid
+        let (source, binary) = (
+&b"Package: novnc
 Binary: novnc, python3-novnc
 Version: 1:1.6.0-1
 Maintainer: Debian OpenStack <[email protected]>
@@ -1670,15 +1650,18 @@ Size: 12664
 MD5sum: e088e49616de39f4cfa162959335340e
 SHA256: 89c378d37058ea2a6c5d4bb2c1d47c4810f7504bde9e4d8142ac9781ce9df002
 
-"[..]), ] {
-            let mut sources = SourcePkgBucket::new();
-            sources.import_uncompressed_source_package_file(&source[..]).unwrap();
-            state.import_uncompressed_binary_package_file(&binary[..], &sources, &"sid".to_string(), &"main".to_string(), &sync).unwrap();
-        }
+"[..]);
+        let mut sources = SourcePkgBucket::new();
+        sources
+            .import_uncompressed_source_package_file(source)
+            .unwrap();
+        state
+            .import_uncompressed_binary_package_file(binary, &sources, "sid", "main", &sync)
+            .unwrap();
 
-        for (source, binary) in [
-            // testing
-            (b"Package: novnc
+        // testing
+        let (source, binary) = (
+b"Package: novnc
 Binary: novnc, python3-novnc
 Version: 1:1.6.0-1
 Maintainer: Debian OpenStack <[email protected]>
@@ -1741,12 +1724,14 @@ Size: 12664
 MD5sum: e088e49616de39f4cfa162959335340e
 SHA256: 89c378d37058ea2a6c5d4bb2c1d47c4810f7504bde9e4d8142ac9781ce9df002
 
-")
-        ] {
-            let mut sources = SourcePkgBucket::new();
-            sources.import_uncompressed_source_package_file(&source[..]).unwrap();
-            state.import_uncompressed_binary_package_file(binary, &sources, &"testing".to_string(), &"main".to_string(), &sync).unwrap();
-        }
+");
+        let mut sources = SourcePkgBucket::new();
+        sources
+            .import_uncompressed_source_package_file(&source[..])
+            .unwrap();
+        state
+            .import_uncompressed_binary_package_file(binary, &sources, "testing", "main", &sync)
+            .unwrap();
 
         let mut reports = HashMap::new();
 

tools/src/schedule/tails.rs

@@ -18,7 +18,7 @@ pub async fn sync(http: &http::Client, sync: &PkgsSync) -> Result<Vec<PackageRep
             url.path_segments_mut()
                 .map_err(|_| anyhow!("cannot be base"))?
                 .pop_if_empty()
-                .push(&release);
+                .push(release);
 
             info!("Downloading directory list from {}", url);
             let directory_list = http
@@ -40,7 +40,7 @@ pub async fn sync(http: &http::Client, sync: &PkgsSync) -> Result<Vec<PackageRep
             info!("Detecting tails versions");
 
             let prefix = format!("tails-{architecture}");
-            let re = Regex::new(&*(prefix + r"-([0-9a-z~\.]+)/")).unwrap();
+            let re = Regex::new(&(prefix + r"-([0-9a-z~\.]+)/")).unwrap();
             let cap = re
                 .captures_iter(&directory_list)
                 .next()

worker/src/main.rs

@@ -202,7 +202,7 @@ async fn main() -> Result<()> {
     }
 
     if let Some(name) = &args.name {
-        setup::run(&name).context("Failed to setup worker")?;
+        setup::run(name).context("Failed to setup worker")?;
     }
     let profile = auth::load()?;
 
@@ -226,13 +226,12 @@ async fn main() -> Result<()> {
                 cookie,
             )?;
 
-            if config.signup_secret.is_some() {
-                client
-                    .register_worker(RegisterWorkerRequest {
-                        name: args.name.unwrap_or("worker".to_string()),
-                    })
-                    .await?;
-            }
+            client
+                .register_worker(RegisterWorkerRequest {
+                    name: args.name.unwrap_or("worker".to_string()),
+                })
+                .await
+                .context("Failed to register worker with rebuilderd daemon")?;
 
             run_worker_loop(&client, &profile.privkey, &config).await?;
         }
@@ -283,7 +282,7 @@ async fn main() -> Result<()> {
                 } else {
                     error!("Package failed to verify");
                     if let Some(diffoscope) = res.diffoscope {
-                        io::stdout().write_all(&*diffoscope).ok();
+                        io::stdout().write_all(&diffoscope).ok();
                     }
                 }
             }