Fix discovery of draft releases during artifact upload

Author: zanieb

Cargo.lock

@@ -85,7 +85,7 @@ release-create tag:
       exit 1
       ;;
     "release not found")
-      gh release create {{tag}} --draft --notes TBD --verify-tag
+      gh release create {{tag}} --draft --title {{tag}} --notes TBD --verify-tag
       ;;
     *)
       echo "error: unexpected gh cli output: $draft_exists"

Justfile

@@ -7,7 +7,7 @@ use {
         RELEASE_TRIPLES, bootstrap_llvm, build_wanted_filenames, produce_install_only,
         produce_install_only_stripped,
     },
-    anyhow::{Result, anyhow},
+    anyhow::{Context, Result, anyhow},
     bytes::Bytes,
     clap::ArgMatches,
     futures::StreamExt,
@@ -170,6 +170,43 @@ fn new_github_client(args: &ArgMatches) -> Result<(Octocrab, String)> {
     Ok((builder.build()?, token))
 }
 
+async fn get_draft_release_by_tag(
+    client: &Octocrab,
+    organization: &str,
+    repo: &str,
+    tag: &str,
+) -> Result<Release> {
+    let mut page = client
+        .repos(organization, repo)
+        .releases()
+        .list()
+        .send()
+        .await?;
+
+    let release = loop {
+        if let Some(release) = page
+            .take_items()
+            .into_iter()
+            .find(|release| release.tag_name == tag)
+        {
+            break Some(release);
+        }
+
+        page = match client.get_page::<Release>(&page.next).await? {
+            Some(page) => page,
+            None => break None,
+        };
+    };
+
+    let release = release.ok_or_else(|| anyhow!("release {tag} does not exist"))?;
+
+    if !release.draft {
+        return Err(anyhow!("release {tag} exists but is not a draft"));
+    }
+
+    Ok(release)
+}
+
 pub async fn command_fetch_release_distributions(args: &ArgMatches) -> Result<()> {
     let dest_dir = args
         .get_one::<PathBuf>("dest")
@@ -486,12 +523,7 @@ pub async fn command_upload_release_distributions(args: &ArgMatches) -> Result<(
     }
 
     let (client, token) = new_github_client(args)?;
-    let repo_handler = client.repos(organization, repo);
-    let releases = repo_handler.releases();
-    let release = releases
-        .get_by_tag(tag)
-        .await
-        .map_err(|_| anyhow!("release {tag} does not exist; create it via GitHub web UI"))?;
+    let release = get_draft_release_by_tag(&client, organization, repo, tag).await?;
 
     let retry_policy = ExponentialBackoff::builder().build_with_max_retries(5);
     let raw_client = Client::new();
@@ -538,10 +570,9 @@ pub async fn command_upload_release_distributions(args: &ArgMatches) -> Result<(
 
     // Check that content wasn't munged as part of uploading. This once happened
     // and created a busted release. Never again.
-    let release = releases
-        .get_by_tag(tag)
+    let release = get_draft_release_by_tag(&client, organization, repo, tag)
         .await
-        .map_err(|_| anyhow!("could not find release; this should not happen!"))?;
+        .with_context(|| format!("could not find draft release {tag}; this should not happen"))?;
     let shasums_asset = release
         .assets
         .into_iter()

src/github.rs

@@ -138,6 +138,8 @@ class Release:
     release_id: int
     tag_name: str
     assets: list = dataclasses.field(default_factory=list)
+    draft: bool = True
+    prerelease: bool = False
     # fault0 and fault1 are called before and after receiving the first
     # chunk of a PUT request, respectively. Each is called once per
     # release - the first upload that hits it will disarm it.
@@ -157,14 +159,15 @@ def render(self) -> dict:
             "node_id": "fakenode",
             "tag_name": self.tag_name,
             "target_commitish": "main",
-            "draft": False,
-            "prerelease": True,
+            "draft": self.draft,
+            "prerelease": self.prerelease,
             "assets": [i.render() for i in self.assets],
         }
 
 
 releases = [
     Release(1, "basic"),
+    Release(2, "draft"),
     Release(11, "early-drop", fault0=drop_connection),
     Release(12, "late-drop", fault1=drop_connection),
     Release(4011, "early-401", fault0=lambda: quart.abort(401)),
@@ -195,7 +198,17 @@ def get_release(*, tag=None, release=None) -> Release:
 
 @app.route("/repos/<org>/<repo>/releases/tags/<tag>")
 async def get_release_by_tag(org, repo, tag):
-    return get_release(tag=tag).render()
+    release = get_release(tag=tag)
+    if release.draft:
+        quart.abort(
+            404, response=quart.jsonify({"message": "Not Found", "status": "404"})
+        )
+    return release.render()
+
+
+@app.route("/repos/<org>/<repo>/releases")
+async def list_releases(org, repo):
+    return quart.jsonify([release.render() for release in releases])
 
 
 @app.route("/repos/<org>/<repo>/releases/<int:release>")
@@ -311,7 +324,7 @@ async def upload_release_distributions(*args):
 
 
 # TODO: test all of [r.tag_name for r in releases]
-TAGS_TO_TEST = ["basic", "early-drop", "late-drop", "early-403", "late-403"]
+TAGS_TO_TEST = ["basic", "draft", "early-drop", "late-drop", "early-403", "late-403"]
 
 
 @pytest.mark.parametrize("tag", TAGS_TO_TEST)

src/github_api_tester.py

@@ -4,7 +4,7 @@
 
 use {
     crate::validation::ValidationContext,
-    anyhow::{anyhow, Context, Result},
+    anyhow::{Context, Result, anyhow},
     apple_sdk::{AppleSdk, SdkSearch, SdkSearchLocation, SdkSorting, SdkVersion, SimpleSdk},
     semver::Version,
     std::{