Merge pull request #226 from kpcyrd/nullable-release

Fix some api routes for distros with release=null (e.g. Arch Linux)

Author: kpcyrd

daemon/src/api/v1/meta.rs

@@ -10,6 +10,12 @@ use rebuilderd_common::errors::Error;
 use serde_json::json;
 use std::sync::Arc;
 
+const NO_RELEASE: &str = "-";
+
+fn derive_release(release: &str) -> Option<&str> {
+    Some(release).filter(|r| *r != NO_RELEASE)
+}
+
 #[get("/distributions")]
 pub async fn get_distributions(
     pool: web::Data<Pool>,
@@ -92,11 +98,12 @@ pub async fn get_distribution_release_architectures(
     freshness_filter: web::Query<FreshnessFilter>,
 ) -> web::Result<impl Responder> {
     let mut connection = pool.get().map_err(Error::from)?;
+    let release = derive_release(&path.1);
 
     let distribution_release_architectures = source_packages::table
         .inner_join(build_inputs::table)
         .filter(source_packages::distribution.is(&path.0))
-        .filter(source_packages::release.is(&path.1))
+        .filter(source_packages::release.is(release))
         .filter(freshness_filter.into_inner().into_filter())
         .select(build_inputs::architecture)
         .distinct()
@@ -113,10 +120,11 @@ pub async fn get_distribution_release_components(
     freshness_filter: web::Query<FreshnessFilter>,
 ) -> web::Result<impl Responder> {
     let mut connection = pool.get().map_err(Error::from)?;
+    let release = derive_release(&path.1);
 
     let distribution_release_components = source_packages::table
         .filter(source_packages::distribution.is(&path.0))
-        .filter(source_packages::release.is(&path.1))
+        .filter(source_packages::release.is(release))
         .filter(freshness_filter.into_inner().into_filter())
         .select(source_packages::component)
         .distinct()
@@ -133,11 +141,12 @@ pub async fn get_distribution_release_component_architectures(
     freshness_filter: web::Query<FreshnessFilter>,
 ) -> web::Result<impl Responder> {
     let mut connection = pool.get().map_err(Error::from)?;
+    let release = derive_release(&path.1);
 
     let distribution_release_component_architectures = source_packages::table
         .inner_join(build_inputs::table)
         .filter(source_packages::distribution.is(&path.0))
-        .filter(source_packages::release.is(&path.1))
+        .filter(source_packages::release.is(release))
         .filter(source_packages::component.is(&path.2))
         .filter(freshness_filter.into_inner().into_filter())
         .select(build_inputs::architecture)

tests/src/actions/mod.rs

@@ -44,6 +44,13 @@ pub async fn import_multiple_packages(client: &Client) {
         .unwrap();
 }
 
+pub async fn import_single_package_with_null_release(client: &Client) {
+    client
+        .submit_package_report(&single_package_report_with_null_release())
+        .await
+        .unwrap();
+}
+
 pub async fn pick_up_job(client: &Client) -> QueuedJobWithArtifacts {
     match client
         .request_work(PopQueuedJobRequest {

tests/src/api/v1/build/get_build.rs

@@ -1,6 +1,6 @@
 use crate::fixtures::server::IsolatedServer;
 use crate::fixtures::*;
-use crate::setup::*;
+use crate::setup;
 use rebuilderd_common::api::v1::BuildRestApi;
 use rstest::rstest;
 
@@ -17,7 +17,7 @@ pub async fn returns_no_results_for_empty_database(mut isolated_server: Isolated
 #[rstest]
 #[tokio::test]
 pub async fn returns_result_for_existing_id(mut isolated_server: IsolatedServer) {
-    setup_single_good_rebuild(&isolated_server.client).await;
+    setup::single_good_rebuild(&isolated_server.client).await;
 
     let results = isolated_server.client.get_build(1).await;
 
@@ -29,7 +29,7 @@ pub async fn returns_result_for_existing_id(mut isolated_server: IsolatedServer)
 #[rstest]
 #[tokio::test]
 pub async fn returns_no_result_for_nonexistent_id(mut isolated_server: IsolatedServer) {
-    setup_single_good_rebuild(&isolated_server.client).await;
+    setup::single_good_rebuild(&isolated_server.client).await;
 
     let results = isolated_server.client.get_build(99999).await;
 
@@ -43,7 +43,7 @@ pub async fn returns_no_result_for_nonexistent_id(mut isolated_server: IsolatedS
 pub async fn does_not_need_authentication(mut isolated_server: IsolatedServer) {
     let client = &mut isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     // zero out keys
     client.auth_cookie("");

tests/src/api/v1/build/get_build_artifact.rs

@@ -1,6 +1,6 @@
 use crate::fixtures::server::IsolatedServer;
 use crate::fixtures::*;
-use crate::setup::*;
+use crate::setup;
 use rebuilderd_common::api::v1::BuildRestApi;
 use rstest::rstest;
 
@@ -21,7 +21,7 @@ pub async fn returns_no_results_for_empty_database(mut isolated_server: Isolated
 pub async fn returns_result_for_existing_id(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     let results = client.get_build_artifact(1, 1).await;
 
@@ -35,7 +35,7 @@ pub async fn returns_result_for_existing_id(mut isolated_server: IsolatedServer)
 pub async fn returns_no_result_for_nonexistent_build_id(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     let results = client.get_build_artifact(99999, 1).await;
 
@@ -49,7 +49,7 @@ pub async fn returns_no_result_for_nonexistent_build_id(mut isolated_server: Iso
 pub async fn returns_no_result_for_nonexistent_artifact_id(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     let results = client.get_build_artifact(1, 99999).await;
 
@@ -63,7 +63,7 @@ pub async fn returns_no_result_for_nonexistent_artifact_id(mut isolated_server:
 pub async fn does_not_need_authentication(mut isolated_server: IsolatedServer) {
     let client = &mut isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     // zero out keys
     client.auth_cookie("");

tests/src/api/v1/build/get_build_artifact_attestation.rs

@@ -1,7 +1,7 @@
 use crate::actions::*;
 use crate::fixtures::server::IsolatedServer;
 use crate::fixtures::*;
-use crate::setup::*;
+use crate::setup;
 use rebuilderd::attestation;
 use rebuilderd::attestation::Attestation;
 use rebuilderd_common::api::v1::{BuildRestApi, MetaRestApi, PackageRestApi};
@@ -24,7 +24,7 @@ pub async fn returns_no_result_for_empty_database(mut isolated_server: IsolatedS
 pub async fn returns_no_result_for_failed_build(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_failed_rebuild(client).await;
+    setup::single_failed_rebuild(client).await;
 
     let results = client.get_build_artifact_attestation(1, 1).await;
 

tests/src/api/v1/build/get_build_artifact_diffoscope.rs

@@ -1,7 +1,7 @@
 use crate::data::*;
 use crate::fixtures::server::IsolatedServer;
 use crate::fixtures::*;
-use crate::setup::*;
+use crate::setup;
 use rebuilderd_common::api::v1::BuildRestApi;
 use rstest::rstest;
 
@@ -22,7 +22,7 @@ pub async fn returns_no_result_for_empty_database(mut isolated_server: IsolatedS
 pub async fn returns_no_result_for_failed_build(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_failed_rebuild(client).await;
+    setup::single_failed_rebuild(client).await;
 
     let result = client.get_build_artifact_diffoscope(1, 1).await;
 
@@ -36,7 +36,7 @@ pub async fn returns_no_result_for_failed_build(mut isolated_server: IsolatedSer
 pub async fn returns_result_for_bad_build(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_bad_rebuild(client).await;
+    setup::single_bad_rebuild(client).await;
 
     let result = client.get_build_artifact_diffoscope(1, 1).await.unwrap();
 
@@ -50,7 +50,7 @@ pub async fn returns_result_for_bad_build(mut isolated_server: IsolatedServer) {
 pub async fn does_not_need_authentication(mut isolated_server: IsolatedServer) {
     let client = &mut isolated_server.client;
 
-    setup_single_bad_rebuild(client).await;
+    setup::single_bad_rebuild(client).await;
 
     // zero out keys
     client.auth_cookie("");

tests/src/api/v1/build/get_build_artifacts.rs

@@ -2,7 +2,7 @@ use crate::actions::*;
 use crate::data::*;
 use crate::fixtures::server::IsolatedServer;
 use crate::fixtures::*;
-use crate::setup::*;
+use crate::setup;
 use rebuilderd_common::api::v1::BuildRestApi;
 use rstest::rstest;
 
@@ -23,7 +23,7 @@ pub async fn returns_no_results_for_empty_database(mut isolated_server: Isolated
 pub async fn returns_no_results_for_failed_build(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_failed_rebuild(client).await;
+    setup::single_failed_rebuild(client).await;
 
     let results = client.get_build_artifacts(1).await.unwrap();
 
@@ -79,7 +79,7 @@ pub async fn returns_correct_results_for_good_build_with_multiple_artifacts(
 pub async fn does_not_need_authentication(mut isolated_server: IsolatedServer) {
     let client = &mut isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     // zero out keys
     client.auth_cookie("");

tests/src/api/v1/build/get_build_log.rs

@@ -1,7 +1,7 @@
 use crate::data::*;
 use crate::fixtures::server::IsolatedServer;
 use crate::fixtures::*;
-use crate::setup::*;
+use crate::setup;
 use rebuilderd_common::api::v1::BuildRestApi;
 use rstest::rstest;
 
@@ -22,7 +22,7 @@ pub async fn returns_no_result_for_empty_database(mut isolated_server: IsolatedS
 pub async fn returns_result_for_failed_build(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_failed_rebuild(client).await;
+    setup::single_failed_rebuild(client).await;
 
     let result = client.get_build_log(1).await.unwrap();
 
@@ -36,7 +36,7 @@ pub async fn returns_result_for_failed_build(mut isolated_server: IsolatedServer
 pub async fn returns_result_for_bad_build(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_bad_rebuild(client).await;
+    setup::single_bad_rebuild(client).await;
 
     let result = client.get_build_log(1).await.unwrap();
 
@@ -50,7 +50,7 @@ pub async fn returns_result_for_bad_build(mut isolated_server: IsolatedServer) {
 pub async fn does_not_need_authentication(mut isolated_server: IsolatedServer) {
     let client = &mut isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     // zero out keys
     client.auth_cookie("");

tests/src/api/v1/build/get_builds.rs

@@ -2,7 +2,7 @@ use crate::actions::*;
 use crate::data::*;
 use crate::fixtures::server::IsolatedServer;
 use crate::fixtures::*;
-use crate::setup::*;
+use crate::setup;
 use rebuilderd_common::api::v1::{
     BuildRestApi, OriginFilter, PackageReport, PackageRestApi, Page, SourceIdentityFilter,
 };
@@ -31,7 +31,7 @@ pub async fn returns_single_result_for_database_with_single_build(
 ) {
     let client = &isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     let results = client
         .get_builds(None, None, None)
@@ -51,7 +51,7 @@ pub async fn returns_multiple_results_for_database_with_multiple_builds(
 ) {
     let client = &isolated_server.client;
 
-    setup_single_bad_rebuild(client).await;
+    setup::single_bad_rebuild(client).await;
     request_rebuild_of_all_bad_packages(client).await;
     report_good_rebuild(client).await;
 
@@ -71,7 +71,7 @@ pub async fn returns_multiple_results_for_database_with_multiple_builds(
 pub async fn does_not_need_authentication(mut isolated_server: IsolatedServer) {
     let client = &mut isolated_server.client;
 
-    setup_single_good_rebuild(client).await;
+    setup::single_good_rebuild(client).await;
 
     // zero out keys
     client.auth_cookie("");
@@ -90,7 +90,7 @@ pub async fn does_not_need_authentication(mut isolated_server: IsolatedServer) {
 pub async fn can_paginate(mut isolated_server: IsolatedServer) {
     let client = &isolated_server.client;
 
-    setup_single_bad_rebuild(client).await;
+    setup::single_bad_rebuild(client).await;
     request_rebuild_of_all_bad_packages(client).await;
     report_good_rebuild(client).await;
 
@@ -190,7 +190,7 @@ pub async fn returns_result_for_matching_origin_filter(
     #[case] expected_count: usize,
 ) {
     let client = &isolated_server.client;
-    setup_single_imported_package(client).await;
+    setup::single_imported_package(client).await;
 
     register_worker(client).await;
     report_good_rebuild(client).await;
@@ -265,7 +265,7 @@ pub async fn returns_result_for_matching_identity_filter(
 ) {
     let client = &isolated_server.client;
 
-    setup_multiple_imported_packages(client).await;
+    setup::multiple_imported_packages(client).await;
 
     register_worker(client).await;