Merge pull request #2451 from itowlson/bikeshed-private-endpoints

Bikeshed private endpoint UI

Author: itowlson

crates/http/src/config.rs

@@ -18,7 +18,15 @@ pub struct HttpTriggerConfig {
 #[serde(untagged)]
 pub enum HttpTriggerRouteConfig {
     Route(String),
-    IsRoutable(bool),
+    Private(HttpPrivateEndpoint),
+}
+
+/// Indicates that a trigger is a private endpoint (not routable).
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct HttpPrivateEndpoint {
+    /// Whether the private endpoint is private. This must be true.
+    pub private: bool,
 }
 
 impl Default for HttpTriggerRouteConfig {

crates/http/src/routes.rs

@@ -43,8 +43,11 @@ impl Router {
                     HttpTriggerRouteConfig::Route(r) => {
                         Some(Ok((RoutePattern::from(base, r), component_id.to_string())))
                     }
-                    HttpTriggerRouteConfig::IsRoutable(false) => None,
-                    HttpTriggerRouteConfig::IsRoutable(true) => Some(Err(anyhow!("route must be a string pattern or 'false': component '{component_id}' has route = 'true'"))),
+                    HttpTriggerRouteConfig::Private(endpoint) => if endpoint.private {
+                        None
+                    } else {
+                        Some(Err(anyhow!("route must be a string pattern or '{{ private = true }}': component '{component_id}' has {{ private = false }}")))
+                    }
                 }
             })
             .collect::<Result<Vec<_>>>()?;
@@ -217,6 +220,8 @@ impl fmt::Display for RoutePattern {
 mod route_tests {
     use spin_testing::init_tracing;
 
+    use crate::config::HttpPrivateEndpoint;
+
     use super::*;
 
     #[test]
@@ -502,7 +507,10 @@ mod route_tests {
             vec![
                 ("/", &"/".into()),
                 ("/foo", &"/foo".into()),
-                ("private", &HttpTriggerRouteConfig::IsRoutable(false)),
+                (
+                    "private",
+                    &HttpTriggerRouteConfig::Private(HttpPrivateEndpoint { private: true }),
+                ),
                 ("/whee/...", &"/whee/...".into()),
             ],
         )
@@ -519,7 +527,10 @@ mod route_tests {
             vec![
                 ("/", &"/".into()),
                 ("/foo", &"/foo".into()),
-                ("bad component", &HttpTriggerRouteConfig::IsRoutable(true)),
+                (
+                    "bad component",
+                    &HttpTriggerRouteConfig::Private(HttpPrivateEndpoint { private: false }),
+                ),
                 ("/whee/...", &"/whee/...".into()),
             ],
         )

crates/trigger-http/src/lib.rs

@@ -272,7 +272,7 @@ impl HttpTrigger {
 
                 let raw_route = match &trigger.route {
                     HttpTriggerRouteConfig::Route(r) => r.as_str(),
-                    HttpTriggerRouteConfig::IsRoutable(_) => "/...",
+                    HttpTriggerRouteConfig::Private(_) => "/...",
                 };
 
                 let res = match executor {

tests/runtime-tests/tests/internal-http/spin.toml

@@ -14,7 +14,7 @@ source = "%{source=internal-http-front}"
 allowed_outbound_hosts = ["http://middle.spin.internal"]
 
 [[trigger.http]]
-route = false
+route = { private = true }
 component = "middle"
 
 [component.middle]