Support per-request transport for Check. (istio#87)

Author: qiwzhang

mixerclient/include/client.h

@@ -85,7 +85,8 @@ class MixerClient {
   // The response data from mixer will be consumed by mixer client.
 
   // A check call.
-  virtual void Check(const Attributes& attributes, DoneFunc on_done) = 0;
+  virtual void Check(const Attributes& attributes, TransportCheckFunc transport,
+                     DoneFunc on_done) = 0;
 
   // A report call.
   virtual void Report(const Attributes& attributes) = 0;

mixerclient/src/client_impl.cc

@@ -58,7 +58,8 @@ MixerClientImpl::MixerClientImpl(const MixerClientOptions &options)
 
 MixerClientImpl::~MixerClientImpl() {}
 
-void MixerClientImpl::Check(const Attributes &attributes, DoneFunc on_done) {
+void MixerClientImpl::Check(const Attributes &attributes,
+                            TransportCheckFunc transport, DoneFunc on_done) {
   std::unique_ptr<CheckCache::CheckResult> check_result(
       new CheckCache::CheckResult);
   check_cache_->Check(attributes, check_result.get());
@@ -94,22 +95,24 @@ void MixerClientImpl::Check(const Attributes &attributes, DoneFunc on_done) {
   // Lambda capture could not pass unique_ptr, use raw pointer.
   CheckCache::CheckResult *raw_check_result = check_result.release();
   QuotaCache::CheckResult *raw_quota_result = quota_result.release();
-  options_.check_transport(request, response,
-                           [response, raw_check_result, raw_quota_result,
-                            on_done](const Status &status) {
-                             raw_check_result->SetResponse(status, *response);
-                             raw_quota_result->SetResponse(status, *response);
-                             if (on_done) {
-                               if (!raw_check_result->status().ok()) {
-                                 on_done(raw_check_result->status());
-                               } else {
-                                 on_done(raw_quota_result->status());
-                               }
-                             }
-                             delete raw_check_result;
-                             delete raw_quota_result;
-                             delete response;
-                           });
+  if (!transport) {
+    transport = options_.check_transport;
+  }
+  transport(request, response, [response, raw_check_result, raw_quota_result,
+                                on_done](const Status &status) {
+    raw_check_result->SetResponse(status, *response);
+    raw_quota_result->SetResponse(status, *response);
+    if (on_done) {
+      if (!raw_check_result->status().ok()) {
+        on_done(raw_check_result->status());
+      } else {
+        on_done(raw_quota_result->status());
+      }
+    }
+    delete raw_check_result;
+    delete raw_quota_result;
+    delete response;
+  });
 }
 
 void MixerClientImpl::Report(const Attributes &attributes) {

mixerclient/src/client_impl.h

@@ -35,7 +35,8 @@ class MixerClientImpl : public MixerClient {
   // Destructor
   virtual ~MixerClientImpl();
 
-  virtual void Check(const Attributes& attributes, DoneFunc on_done);
+  virtual void Check(const Attributes& attributes, TransportCheckFunc transport,
+                     DoneFunc on_done);
   virtual void Report(const Attributes& attributes);
 
  private:

mixerclient/src/client_impl_test.cc

@@ -68,6 +68,7 @@ class MixerClientImplTest : public ::testing::Test {
   Attributes request_;
   std::unique_ptr<MixerClient> client_;
   MockCheckTransport mock_check_transport_;
+  TransportCheckFunc empty_transport_;
 };
 
 TEST_F(MixerClientImplTest, TestSuccessCheck) {
@@ -81,14 +82,43 @@ TEST_F(MixerClientImplTest, TestSuccessCheck) {
   // Remove quota, not to test quota
   request_.attributes.erase(Attributes::kQuotaName);
   Status done_status = Status::UNKNOWN;
-  client_->Check(request_,
+  client_->Check(request_, empty_transport_,
                  [&done_status](Status status) { done_status = status; });
   EXPECT_TRUE(done_status.ok());
 
   for (int i = 0; i < 10; i++) {
     // Other calls should ba cached.
     Status done_status1 = Status::UNKNOWN;
-    client_->Check(request_,
+    client_->Check(request_, empty_transport_,
+                   [&done_status1](Status status) { done_status1 = status; });
+    EXPECT_TRUE(done_status1.ok());
+  }
+}
+
+TEST_F(MixerClientImplTest, TestPerRequestTransport) {
+  // Global transport should not be called.
+  EXPECT_CALL(mock_check_transport_, Check(_, _, _)).Times(0);
+
+  // For local pre-request transport.
+  MockCheckTransport local_check_transport;
+  EXPECT_CALL(local_check_transport, Check(_, _, _))
+      .WillOnce(Invoke([](const CheckRequest& request, CheckResponse* response,
+                          DoneFunc on_done) {
+        response->mutable_precondition()->set_valid_use_count(1000);
+        on_done(Status::OK);
+      }));
+
+  // Remove quota, not to test quota
+  request_.attributes.erase(Attributes::kQuotaName);
+  Status done_status = Status::UNKNOWN;
+  client_->Check(request_, local_check_transport.GetFunc(),
+                 [&done_status](Status status) { done_status = status; });
+  EXPECT_TRUE(done_status.ok());
+
+  for (int i = 0; i < 10; i++) {
+    // Other calls should ba cached.
+    Status done_status1 = Status::UNKNOWN;
+    client_->Check(request_, local_check_transport.GetFunc(),
                    [&done_status1](Status status) { done_status1 = status; });
     EXPECT_TRUE(done_status1.ok());
   }
@@ -111,14 +141,14 @@ TEST_F(MixerClientImplTest, TestNoCheckCache) {
       }));
 
   Status done_status = Status::UNKNOWN;
-  client_->Check(request_,
+  client_->Check(request_, empty_transport_,
                  [&done_status](Status status) { done_status = status; });
   EXPECT_TRUE(done_status.ok());
 
   for (int i = 0; i < 10; i++) {
     // Other calls should ba cached.
     Status done_status1 = Status::UNKNOWN;
-    client_->Check(request_,
+    client_->Check(request_, empty_transport_,
                    [&done_status1](Status status) { done_status1 = status; });
     EXPECT_TRUE(done_status1.ok());
   }
@@ -143,14 +173,14 @@ TEST_F(MixerClientImplTest, TestNoQuotaCache) {
       }));
 
   Status done_status = Status::UNKNOWN;
-  client_->Check(request_,
+  client_->Check(request_, empty_transport_,
                  [&done_status](Status status) { done_status = status; });
   EXPECT_TRUE(done_status.ok());
 
   for (int i = 0; i < 10; i++) {
     // Other calls should ba cached.
     Status done_status1 = Status::UNKNOWN;
-    client_->Check(request_,
+    client_->Check(request_, empty_transport_,
                    [&done_status1](Status status) { done_status1 = status; });
     EXPECT_TRUE(done_status1.ok());
   }
@@ -173,14 +203,14 @@ TEST_F(MixerClientImplTest, TestSuccessCheckAndQuota) {
       }));
 
   Status done_status = Status::UNKNOWN;
-  client_->Check(request_,
+  client_->Check(request_, empty_transport_,
                  [&done_status](Status status) { done_status = status; });
   EXPECT_TRUE(done_status.ok());
 
   for (int i = 0; i < 10; i++) {
     // Other calls should ba cached.
     Status done_status1 = Status::UNKNOWN;
-    client_->Check(request_,
+    client_->Check(request_, empty_transport_,
                    [&done_status1](Status status) { done_status1 = status; });
     EXPECT_TRUE(done_status1.ok());
   }
@@ -203,14 +233,14 @@ TEST_F(MixerClientImplTest, TestFailedCheckAndQuota) {
       }));
 
   Status done_status = Status::UNKNOWN;
-  client_->Check(request_,
+  client_->Check(request_, empty_transport_,
                  [&done_status](Status status) { done_status = status; });
   EXPECT_ERROR_CODE(Code::FAILED_PRECONDITION, done_status);
 
   for (int i = 0; i < 10; i++) {
     // Other calls should ba cached.
     Status done_status1 = Status::UNKNOWN;
-    client_->Check(request_,
+    client_->Check(request_, empty_transport_,
                    [&done_status1](Status status) { done_status1 = status; });
     EXPECT_ERROR_CODE(Code::FAILED_PRECONDITION, done_status1);
   }