Merge pull request #131 from DeterminateSystems/colemickens/improve-message

improve unauthenticated error message

Author: cole-h

Cargo.lock

@@ -58,6 +58,7 @@ http-body-util = "0.1"
 hyper = { version = "1.0.0", features = ["full"] }
 hyper-util = { version = "0.1", features = ["tokio", "server-auto", "http1"] }
 xdg = { version = "2.5.2" }
+color-eyre = { version = "0.6.3" }
 
 [dependencies.tokio]
 version = "1.44.2"

flake.lock

@@ -0,0 +1,52 @@
+use serde::{Deserialize, Serialize};
+
+const GITHUB_ACTOR_TYPE_USER: &str = "User";
+const GITHUB_ACTOR_TYPE_ORGANIZATION: &str = "Organization";
+
+#[derive(Serialize, Deserialize)]
+pub struct WorkflowData {
+    event: WorkflowDataEvent,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct WorkflowDataEvent {
+    repository: WorkflowDataEventRepo,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct WorkflowDataEventRepo {
+    owner: WorkflowDataEventRepoOwner,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct WorkflowDataEventRepoOwner {
+    login: String,
+    #[serde(rename = "type")]
+    kind: String,
+}
+
+pub(crate) fn get_actions_event_data() -> color_eyre::Result<WorkflowData> {
+    let github_context = std::env::var("GITHUB_CONTEXT")?;
+    let workflow_data: WorkflowData = serde_json::from_str::<WorkflowData>(&github_context)?;
+
+    Ok(workflow_data)
+}
+
+pub(crate) fn print_unauthenticated_error() {
+    let mut msg = "::error title=FlakeHub registration required.::Unable to authenticate to FlakeHub. Individuals must register at FlakeHub.com; Organizations must create an organization at FlakeHub.com.".to_string();
+    if let Ok(workflow_data) = get_actions_event_data() {
+        let owner = workflow_data.event.repository.owner;
+        if owner.kind == GITHUB_ACTOR_TYPE_USER {
+            msg = format!(
+                "::error title=FlakeHub registration required.::Please create an account for {} on FlakeHub.com to publish flakes.",
+                &owner.login
+            );
+        } else if owner.kind == GITHUB_ACTOR_TYPE_ORGANIZATION {
+            msg = format!(
+                "::error title=FlakeHub registration required.::Please create an organization for {} on FlakeHub.com to publish flakes.",
+                &owner.login
+            );
+        }
+    };
+    println!("{}", msg);
+}

magic-nix-cache/Cargo.toml

@@ -18,6 +18,7 @@ mod env;
 mod error;
 mod flakehub;
 mod gha;
+mod github;
 mod pbh;
 mod telemetry;
 mod util;
@@ -366,8 +367,11 @@ async fn main_cli() -> Result<()> {
                 Some(state)
             }
             Err(err) => {
-                tracing::error!("FlakeHub cache initialization failed: {}. Unable to authenticate to FlakeHub. Individuals must register at FlakeHub.com; Organizations must create an organization at FlakeHub.com.", err);
-                println!("::error title={{FlakeHub: Unauthenticated}}::{{Unable to authenticate to FlakeHub. Individuals must register at FlakeHub.com; Organizations must create an organization at FlakeHub.com.}}");
+                tracing::error!(
+                    "FlakeHub: cache initialized failed: Unauthenticated: {}",
+                    err
+                );
+                github::print_unauthenticated_error();
                 None
             }
         }