From 837b6a33e6b557aad3e3a1aa33f10699b7ba9007 Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Fri, 29 Mar 2024 11:06:26 -0700
Subject: [PATCH] fix(pd): minifront asset directory subpath

Follow-up to #4132, in which we updated the minifront assets
but mistakenly with the wrong subdir nesting. This broke serving
minifront from pd's gRPC endpoint, but our tests didn't catch that,
so we only noticed when it hit preview.

Added a test to the pd integration suite as a sanity check.
Made sure to confirm that the test fails on current main, and passes
with the asset fix included in this commit.

Squashed and committed by @conorsch.
---
 assets/minifront.zip                       |  4 ++--
 assets/node-status.zip                     |  4 ++--
 crates/bin/pd/tests/network_integration.rs | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/assets/minifront.zip b/assets/minifront.zip
index 6c77e4cc5f..c4ad381154 100644
--- a/assets/minifront.zip
+++ b/assets/minifront.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86a561124bfdfab9e421c209af183f6163acaacf338279c4a323c69814ae5943
-size 2902443
+oid sha256:4f1cc4f47b93cf1aee49f540b291ad0af3c069455197c27dd7f41c176605a1c9
+size 2901211
diff --git a/assets/node-status.zip b/assets/node-status.zip
index f0780fce86..5113e24913 100644
--- a/assets/node-status.zip
+++ b/assets/node-status.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e201c0593227760480a6ffdb5bb5cc7fc6df1f96326a51fe06fab4efffe5ce0
-size 2692222
+oid sha256:e831bf9ae8896aeac6a177979584248b9295d819255c14054e4f007fd78931a1
+size 2691710
diff --git a/crates/bin/pd/tests/network_integration.rs b/crates/bin/pd/tests/network_integration.rs
index 1739a7ad3b..17585ee39d 100644
--- a/crates/bin/pd/tests/network_integration.rs
+++ b/crates/bin/pd/tests/network_integration.rs
@@ -4,6 +4,8 @@
 //! headers in all contexts. Does NOT evaluate application logic; see the
 //! integration tests for pcli/pclientd for that.
 
+use http::StatusCode;
+
 #[ignore]
 #[tokio::test]
 /// Confirm that permissive CORS headers are returned in HTTP responses
@@ -21,3 +23,19 @@ async fn check_cors_headers() -> anyhow::Result<()> {
     );
     Ok(())
 }
+
+#[ignore]
+#[tokio::test]
+/// Confirm that the a naive GET on the gRPC route returns a 200,
+/// as a sanity check that we haven't badly broken the minifront static asset bundling.
+/// This check does *not* confirm that page works correctly, but it does confirm
+/// it's at least loading, which guards against path regressions in the asset building.
+/// See GH4139 for context.
+async fn check_minifront_http_ok() -> anyhow::Result<()> {
+    let client = reqwest::Client::new();
+    let pd_url =
+        std::env::var("PENUMBRA_NODE_PD_URL").unwrap_or("http://localhost:8080".to_string());
+    let r = client.get(pd_url).send().await?;
+    assert_eq!(r.status(), StatusCode::OK);
+    Ok(())
+}