Migrate crate reporting to the orchestrator

Goodbye, sandbox.

Author: shepmaster

compiler/base/orchestrator/Cargo.lock

@@ -12,6 +12,7 @@ bincode = { version = "1.3", default-features = false }
 futures = { version = "0.3.28", default-features = false, features = ["executor"] }
 modify-cargo-toml = { path = "../modify-cargo-toml", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
+serde_json = { version = "1.0.108", default-features = false, features = ["std"] }
 snafu = { version = "0.7.4", default-features = false, features = ["futures", "std"] }
 tokio = { version = "1.28", default-features = false, features = ["fs", "io-std", "io-util", "macros", "process", "rt", "time", "sync"] }
 tokio-stream = { version = "0.1.14", default-features = false }

compiler/base/orchestrator/Cargo.toml

@@ -2,6 +2,7 @@ use futures::{
     future::{BoxFuture, OptionFuture},
     Future, FutureExt,
 };
+use serde::Deserialize;
 use snafu::prelude::*;
 use std::{
     collections::HashMap,
@@ -163,6 +164,48 @@ pub enum VersionError {
     TaskPanic { source: tokio::task::JoinError },
 }
 
+#[derive(Debug, Clone)]
+pub struct Crate {
+    pub name: String,
+    pub version: String,
+    pub id: String,
+}
+
+#[derive(Deserialize)]
+struct InternalCrate {
+    name: String,
+    version: String,
+    id: String,
+}
+
+impl From<InternalCrate> for Crate {
+    fn from(other: InternalCrate) -> Self {
+        let InternalCrate { name, version, id } = other;
+        Self { name, version, id }
+    }
+}
+
+#[derive(Debug, Snafu)]
+pub enum CratesError {
+    #[snafu(display("Could not start the container"))]
+    #[snafu(context(false))]
+    Start { source: Error },
+
+    #[snafu(context(false))] // transparent
+    Container { source: ContainerCratesError },
+}
+
+#[derive(Debug, Snafu)]
+pub enum ContainerCratesError {
+    #[snafu(display("Could not read the crate information file"))]
+    #[snafu(context(false))]
+    Read { source: CommanderError },
+
+    #[snafu(display("Could not parse the crate information file"))]
+    #[snafu(context(false))]
+    Deserialization { source: serde_json::Error },
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum AssemblyFlavor {
     Att,
@@ -789,6 +832,14 @@ where
         })
     }
 
+    pub async fn crates(&self) -> Result<Vec<Crate>, CratesError> {
+        self.select_channel(Channel::Stable)
+            .await?
+            .crates()
+            .await
+            .map_err(Into::into)
+    }
+
     pub async fn execute(
         &self,
         request: ExecuteRequest,
@@ -1120,6 +1171,15 @@ impl Container {
         Ok(if o.success { Some(o.stdout) } else { None })
     }
 
+    async fn crates(&self) -> Result<Vec<Crate>, ContainerCratesError> {
+        let read = ReadFileRequest {
+            path: "crate-information.json".into(),
+        };
+        let read = self.commander.one(read).await?;
+        let crates = serde_json::from_slice::<Vec<InternalCrate>>(&read.0)?;
+        Ok(crates.into_iter().map(Into::into).collect())
+    }
+
     async fn execute(
         &self,
         request: ExecuteRequest,

compiler/base/orchestrator/src/coordinator.rs

@@ -162,10 +162,6 @@ impl MetricsToken {
 
 #[derive(Debug, Snafu)]
 enum Error {
-    #[snafu(display("Sandbox creation failed: {}", source))]
-    SandboxCreation { source: sandbox::Error },
-    #[snafu(display("Caching operation failed: {}", source))]
-    Caching { source: sandbox::Error },
     #[snafu(display("Gist creation failed: {}", source))]
     GistCreation { source: octocrab::Error },
     #[snafu(display("Gist loading failed: {}", source))]
@@ -219,6 +215,11 @@ enum Error {
     #[snafu(display("The WebSocket worker panicked: {}", text))]
     WebSocketTaskPanic { text: String },
 
+    #[snafu(display("Unable to find the available crates"))]
+    Crates {
+        source: orchestrator::coordinator::CratesError,
+    },
+
     #[snafu(display("Unable to find the available versions"))]
     Versions {
         source: orchestrator::coordinator::VersionsError,
@@ -464,21 +465,6 @@ struct EvaluateResponse {
     error: Option<String>,
 }
 
-impl From<Vec<sandbox::CrateInformation>> for MetaCratesResponse {
-    fn from(me: Vec<sandbox::CrateInformation>) -> Self {
-        let crates = me
-            .into_iter()
-            .map(|cv| CrateInformation {
-                name: cv.name,
-                version: cv.version,
-                id: cv.id,
-            })
-            .collect();
-
-        MetaCratesResponse { crates }
-    }
-}
-
 impl From<gist::Gist> for MetaGistResponse {
     fn from(me: gist::Gist) -> Self {
         MetaGistResponse {

ui/Cargo.lock

@@ -10,8 +10,6 @@ use std::{
     time::{Duration, Instant},
 };
 
-use crate::sandbox;
-
 lazy_static! {
     pub(crate) static ref REQUESTS: HistogramVec = register_histogram_vec!(
         "playground_request_duration_seconds",
@@ -204,29 +202,6 @@ impl Labels {
     }
 }
 
-pub(crate) trait GenerateLabels {
-    fn generate_labels(&self, outcome: Outcome) -> Labels;
-}
-
-impl<T> GenerateLabels for &'_ T
-where
-    T: GenerateLabels,
-{
-    fn generate_labels(&self, outcome: Outcome) -> Labels {
-        T::generate_labels(self, outcome)
-    }
-}
-
-pub(crate) trait SuccessDetails: Sized {
-    fn success_details(&self) -> Outcome;
-}
-
-impl SuccessDetails for Vec<sandbox::CrateInformation> {
-    fn success_details(&self) -> Outcome {
-        Outcome::Success
-    }
-}
-
 pub(crate) async fn track_metric_no_request_async<B, Fut, Resp>(
     endpoint: Endpoint,
     body: B,