Merge pull request coreos#107 from jbtrystram/oci_only_release

scraper: support releases without ostree commits

Author: jbtrystram

commons/src/graph.rs

@@ -56,15 +56,26 @@ impl Graph {
                         return None;
                     }
                 } else {
-                    for commit in entry.commits {
-                        if commit.architecture != scope.basearch || commit.checksum.is_empty() {
-                            continue;
+                    match entry.commits {
+                        Some(commits) if !commits.is_empty() => {
+                            for commit in commits {
+                                if commit.architecture != scope.basearch
+                                    || commit.checksum.is_empty()
+                                {
+                                    continue;
+                                }
+                                has_basearch = true;
+                                current.payload = commit.checksum;
+                                current
+                                    .metadata
+                                    .insert(metadata::SCHEME.to_string(), "checksum".to_string());
+                            }
+                        }
+                        _ => {
+                            // catch-all arm for both `None` and `Some(empty_vec)`,
+                            // both cases should result in skipping the release.
+                            return None;
                         }
-                        has_basearch = true;
-                        current.payload = commit.checksum;
-                        current
-                            .metadata
-                            .insert(metadata::SCHEME.to_string(), "checksum".to_string());
                     }
                 }
 

commons/src/metadata.rs

@@ -31,7 +31,7 @@ pub struct ReleasesJSON {
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct Release {
-    pub commits: Vec<ReleaseCommit>,
+    pub commits: Option<Vec<ReleaseCommit>>,
     #[serde(rename = "oci-images")]
     pub oci_images: Option<Vec<ReleaseOciImage>>,
     pub version: String,