refactor(app/outbound): Connect fields are not pub (#3895)

this structure exposes its fields, but those fields are never accessed
elsewhere, aside from test code.

this commit removes the `pub` directives from the address and tls
fields. in their stead, test interfaces are added to allow the
`tagged_transport` test suite to function.

Signed-off-by: katelyn martin <kate@buoyant.io>

Author: cratelyn

linkerd/app/outbound/src/tcp/connect.rs

@@ -8,8 +8,8 @@ use std::task::{Context, Poll};
 
 #[derive(Clone, Debug)]
 pub struct Connect {
-    pub addr: Remote<ServerAddr>,
-    pub tls: tls::ConditionalClientTls,
+    addr: Remote<ServerAddr>,
+    tls: tls::ConditionalClientTls,
 }
 
 /// Prevents outbound connections on the loopback interface, unless the
@@ -77,6 +77,12 @@ where
 
 // === impl Connect ===
 
+impl Connect {
+    pub fn new(addr: Remote<ServerAddr>, tls: tls::ConditionalClientTls) -> Self {
+        Self { addr, tls }
+    }
+}
+
 impl svc::Param<Remote<ServerAddr>> for Connect {
     fn param(&self) -> Remote<ServerAddr> {
         self.addr
@@ -88,3 +94,14 @@ impl svc::Param<tls::ConditionalClientTls> for Connect {
         self.tls.clone()
     }
 }
+
+#[cfg(test)]
+impl Connect {
+    pub fn addr(&self) -> &Remote<ServerAddr> {
+        &self.addr
+    }
+
+    pub fn tls(&self) -> &tls::ConditionalClientTls {
+        &self.tls
+    }
+}

linkerd/app/outbound/src/tcp/tagged_transport.rs

@@ -67,10 +67,7 @@ where
         let tls: tls::ConditionalClientTls = ep.param();
         if let tls::ConditionalClientTls::None(reason) = tls {
             trace!(%reason, "Not attempting opaque transport");
-            let target = Connect {
-                addr: ep.param(),
-                tls,
-            };
+            let target = Connect::new(ep.param(), tls);
             return Box::pin(self.inner.connect(target).err_into::<Error>());
         }
 
@@ -109,10 +106,10 @@ where
 
         let protocol: Option<SessionProtocol> = ep.param();
 
-        let connect = self.inner.connect(Connect {
-            addr: Remote(ServerAddr((addr.ip(), connect_port).into())),
+        let connect = self.inner.connect(Connect::new(
+            Remote(ServerAddr((addr.ip(), connect_port).into())),
             tls,
-        });
+        ));
         Box::pin(async move {
             let (mut io, meta) = connect.await.map_err(Into::into)?;
 
@@ -203,9 +200,9 @@ mod test {
     ) -> impl Fn(Connect) -> futures::future::Ready<Result<(tokio_test::io::Mock, ConnectMeta), io::Error>>
     {
         move |ep| {
-            let Remote(ServerAddr(sa)) = ep.addr;
+            let Remote(ServerAddr(sa)) = ep.addr();
             assert_eq!(sa.port(), 4143);
-            assert!(ep.tls.is_some());
+            assert!(ep.tls().is_some());
             let buf = header.encode_prefaced_buf().expect("Must encode");
             let io = tokio_test::io::Builder::new()
                 .write(&buf[..])
@@ -225,9 +222,9 @@ mod test {
 
         let svc = TaggedTransport {
             inner: service_fn(|ep: Connect| {
-                let Remote(ServerAddr(sa)) = ep.addr;
+                let Remote(ServerAddr(sa)) = ep.addr();
                 assert_eq!(sa.port(), 4321);
-                assert!(ep.tls.is_none());
+                assert!(ep.tls().is_none());
                 let io = tokio_test::io::Builder::new().write(b"hello").build();
                 let meta = tls::ConnectMeta {
                     socket: Local(ClientAddr(([0, 0, 0, 0], 0).into())),