From e5d0b828d1b6e43ace7b282e9dc8a52603a7b74f Mon Sep 17 00:00:00 2001
From: Spencer Lewis <slewis@squareup.com>
Date: Thu, 23 Apr 2020 14:20:42 -0400
Subject: [PATCH] other pr feedback

Signed-off-by: Spencer Lewis <slewis@squareup.com>
---
 source/common/upstream/health_checker_base_impl.cc | 10 +++++-----
 source/common/upstream/upstream_impl.cc            |  7 +++----
 source/common/upstream/upstream_impl.h             |  2 +-
 test/mocks/upstream/host.h                         |  7 +++----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/source/common/upstream/health_checker_base_impl.cc b/source/common/upstream/health_checker_base_impl.cc
index 3e506f1e53fa..a5040f16757e 100644
--- a/source/common/upstream/health_checker_base_impl.cc
+++ b/source/common/upstream/health_checker_base_impl.cc
@@ -59,12 +59,12 @@ HealthCheckerImplBase::initTransportSocketOptions(
 MetadataConstSharedPtr HealthCheckerImplBase::initTransportSocketMatchMetadata(
     const envoy::config::core::v3::HealthCheck& config) {
   if (config.has_transport_socket_match_criteria()) {
-    std::unique_ptr<envoy::config::core::v3::Metadata> metadata =
-        std::make_unique<envoy::config::core::v3::Metadata>();
-    metadata->mutable_filter_metadata()->operator[](
-        Envoy::Config::MetadataFilters::get().ENVOY_TRANSPORT_SOCKET_MATCH) =
+    std::shared_ptr<envoy::config::core::v3::Metadata> metadata =
+        std::make_shared<envoy::config::core::v3::Metadata>();
+    (*metadata->mutable_filter_metadata())[Envoy::Config::MetadataFilters::get()
+                                               .ENVOY_TRANSPORT_SOCKET_MATCH] =
         config.transport_socket_match_criteria();
-    return MetadataConstSharedPtr(std::move(metadata));
+    return metadata;
   }
 
   return MetadataConstSharedPtr();
diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc
index 43fa2f0d736a..7a65b81ba82e 100644
--- a/source/common/upstream/upstream_impl.cc
+++ b/source/common/upstream/upstream_impl.cc
@@ -241,7 +241,7 @@ HostVector filterHosts(const std::unordered_set<HostSharedPtr>& hosts,
 
 HostDescriptionImpl::HostDescriptionImpl(
     ClusterInfoConstSharedPtr cluster, const std::string& hostname,
-    Network::Address::InstanceConstSharedPtr dest_address, const MetadataConstSharedPtr& metadata,
+    Network::Address::InstanceConstSharedPtr dest_address, MetadataConstSharedPtr metadata,
     const envoy::config::core::v3::Locality& locality,
     const envoy::config::endpoint::v3::Endpoint::HealthCheckConfig& health_check_config,
     uint32_t priority)
@@ -310,9 +310,8 @@ Host::CreateConnectionData HostImpl::createHealthCheckConnection(
     MetadataConstSharedPtr metadata) const {
 
   Network::TransportSocketFactory& factory =
-      (metadata)
-          ? resolveTransportSocketFactory(healthCheckAddress(), metadata.get())
-          : socket_factory_;
+      (metadata) ? resolveTransportSocketFactory(healthCheckAddress(), metadata.get())
+                 : socket_factory_;
   return {createConnection(dispatcher, *cluster_, healthCheckAddress(), factory, nullptr,
                            transport_socket_options),
           shared_from_this()};
diff --git a/source/common/upstream/upstream_impl.h b/source/common/upstream/upstream_impl.h
index 3a582e5b9dd0..11065f4bd3fc 100644
--- a/source/common/upstream/upstream_impl.h
+++ b/source/common/upstream/upstream_impl.h
@@ -73,7 +73,7 @@ class HostDescriptionImpl : virtual public HostDescription,
 public:
   HostDescriptionImpl(
       ClusterInfoConstSharedPtr cluster, const std::string& hostname,
-      Network::Address::InstanceConstSharedPtr dest_address, const MetadataConstSharedPtr& metadata,
+      Network::Address::InstanceConstSharedPtr dest_address, MetadataConstSharedPtr metadata,
       const envoy::config::core::v3::Locality& locality,
       const envoy::config::endpoint::v3::Endpoint::HealthCheckConfig& health_check_config,
       uint32_t priority);
diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h
index 9a4e630285b6..281a21f600c1 100644
--- a/test/mocks/upstream/host.h
+++ b/test/mocks/upstream/host.h
@@ -133,10 +133,9 @@ class MockHost : public Host {
     return {Network::ClientConnectionPtr{data.connection_}, data.host_description_};
   }
 
-  CreateConnectionData
-  createHealthCheckConnection(Event::Dispatcher& dispatcher,
-                              Network::TransportSocketOptionsSharedPtr,
-                              MetadataConstSharedPtr) const override {
+  CreateConnectionData createHealthCheckConnection(Event::Dispatcher& dispatcher,
+                                                   Network::TransportSocketOptionsSharedPtr,
+                                                   MetadataConstSharedPtr) const override {
     MockCreateConnectionData data = createConnection_(dispatcher, nullptr);
     return {Network::ClientConnectionPtr{data.connection_}, data.host_description_};
   }