misc cleanup

Author: hawkw

linkerd/app/admin/src/stack.rs

@@ -69,11 +69,15 @@ struct Rescue;
 // === impl Config ===
 
 impl Config {
+    /// Builds the admin endpoint server.
+    ///
+    /// This method is asynchronous, as it must discover a `ServerPolicy` for
+    /// the admin port.
     #[allow(clippy::too_many_arguments)]
-    pub fn build<B, R, P>(
+    pub async fn build<B, R, P>(
         self,
         bind: B,
-        policy: P,
+        policy: &P,
         identity: identity::Server,
         report: R,
         metrics: inbound::Metrics,
@@ -91,16 +95,11 @@ impl Config {
         let (listen_addr, listen) = bind.bind(&self.server)?;
 
         let (ready, latch) = crate::server::Readiness::new();
-        let serve = Box::pin(async move {
-            // Get the policy for the admin server.
-            // TODO(eliza): don't expect this...
-            let policy = policy
-                .get_policy(OrigDstAddr(listen_addr.into()))
-                .await
-                .expect("must be able to get policy for admin server");
-
-            let admin = crate::server::Admin::new(report, ready, shutdown, trace);
-            let admin = svc::stack(move |_| admin.clone())
+        // Get the policy for the admin server.
+        let policy = policy.get_policy(OrigDstAddr(listen_addr.into())).await?;
+
+        let admin = crate::server::Admin::new(report, ready, shutdown, trace);
+        let admin = svc::stack(move |_| admin.clone())
             .push(metrics.proxy.http_endpoint.to_layer::<classify::Response, _, Permitted>())
             .push_map_target(|(permit, http)| Permitted { permit, http })
             .push(inbound::policy::NewHttpPolicy::layer(metrics.http_authz.clone()))
@@ -164,8 +163,7 @@ impl Config {
                 identity,
             }))
             .into_inner();
-            serve::serve(listen, admin, drain.signaled()).await
-        });
+        let serve = Box::pin(serve::serve(listen, admin, drain.signaled()));
         Ok(Task {
             listen_addr,
             latch,

linkerd/app/inbound/src/policy.rs

@@ -46,13 +46,6 @@ pub trait GetPolicy {
     type Future: Future<Output = Result<AllowPolicy, Error>>;
 
     fn get_policy(&self, target: OrigDstAddr) -> Self::Future;
-
-    // fn into_service(self) -> GetPolicyService<Self>
-    // where
-    //     Self: Sized,
-    // {
-    //     GetPolicyService(self)
-    // }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]

linkerd/app/src/lib.rs

@@ -170,23 +170,24 @@ impl Config {
         let admin = {
             let identity = identity.receiver().server();
             let metrics = inbound.metrics();
-            let policy = inbound_policies.clone();
             let report = inbound
                 .metrics()
                 .and_report(outbound.metrics())
                 .and_report(report);
-            info_span!("admin").in_scope(move || {
-                admin.build(
+
+            admin
+                .build(
                     bind_admin,
-                    policy,
+                    &inbound_policies,
                     identity,
                     report,
                     metrics,
                     log_level,
                     drain_rx,
                     shutdown_tx,
                 )
-            })?
+                .instrument(info_span!("admin"))
+                .await?
         };
 
         let dst_addr = dst.addr.clone();