s/DistributedResponseFragment/DistributedServiceResponse/

Otto van der Schaaf · Otto van der Schaaf · commit 5462844f6971 · 2021-04-20T16:06:37.000+02:00
Signed-off-by: Otto van der Schaaf &lt;ovanders@redhat.com&gt;
diff --git a/api/distributor/distributor.proto b/api/distributor/distributor.proto
@@ -18,7 +18,7 @@ message DistributedRequest {
   repeated envoy.config.core.v3.Address services = 3 [(validate.rules).repeated .min_items = 1];
 }
 
-message DistributedResponseFragment {
+message DistributedServiceResponse {
   oneof distributed_response_type {
     google.rpc.Status error = 1;
     nighthawk.client.ExecutionResponse execution_response = 2;
@@ -29,7 +29,7 @@ message DistributedResponseFragment {
 
 // Carries responses associated with a DistributedRequest.
 message DistributedResponse {
-  repeated DistributedResponseFragment fragment = 1;
+  repeated DistributedServiceResponse service_response = 1;
 }
 
 // Service which distributes messages to one or more other services for handling, and streams back
diff --git a/source/distributor/service_impl.cc b/source/distributor/service_impl.cc
@@ -66,14 +66,14 @@ NighthawkDistributorServiceImpl::handleRequest(const nighthawk::DistributedReque
   for (const envoy::config::core::v3::Address& service : request.services()) {
     absl::StatusOr<nighthawk::client::ExecutionResponse> execution_response =
         handleExecutionRequest(service, request.execution_request());
-    nighthawk::DistributedResponseFragment* response_fragment = response.add_fragment();
-    response_fragment->mutable_service()->MergeFrom(service);
+    nighthawk::DistributedServiceResponse* service_response = response.add_service_response();
+    service_response->mutable_service()->MergeFrom(service);
     if (execution_response.ok()) {
-      *response_fragment->mutable_execution_response() = execution_response.value();
+      *service_response->mutable_execution_response() = execution_response.value();
     } else {
-      response_fragment->mutable_error()->set_code(
+      service_response->mutable_error()->set_code(
           static_cast<int>(execution_response.status().code()));
-      response_fragment->mutable_error()->set_message(
+      service_response->mutable_error()->set_message(
           std::string("Distributed Execution Request failed: ") +
           std::string(execution_response.status().message()));
       has_errors = true;
diff --git a/test/distributor/distributor_service_test.cc b/test/distributor/distributor_service_test.cc
@@ -149,10 +149,10 @@ TEST_P(DistributorServiceTest, ValidStartRequestNonExistingServiceYieldsResponse
   auto status = reader_writer->Finish();
   EXPECT_FALSE(status.ok());
   EXPECT_THAT(status.error_message(), HasSubstr("One or more execution requests failed"));
-  ASSERT_EQ(response_.fragment_size(), 1);
-  EXPECT_TRUE(response_.fragment(0).has_error());
-  EXPECT_EQ(response_.fragment(0).error().code(), grpc::StatusCode::UNAVAILABLE);
-  EXPECT_THAT(response_.fragment(0).error().message(),
+  ASSERT_EQ(response_.service_response_size(), 1);
+  EXPECT_TRUE(response_.service_response(0).has_error());
+  EXPECT_EQ(response_.service_response(0).error().code(), grpc::StatusCode::UNAVAILABLE);
+  EXPECT_THAT(response_.service_response(0).error().message(),
               HasSubstr("Distributed Execution Request failed: Failed to write request to the "
                         "Nighthawk Service gRPC channel"));
 }
@@ -173,7 +173,7 @@ TEST_P(DistributorServiceWithMockServiceClientTest, DistributeToTwoServicesYield
   ASSERT_TRUE(reader_writer->Read(&response_));
   auto status = reader_writer->Finish();
   EXPECT_TRUE(status.ok());
-  EXPECT_EQ(response_.fragment_size(), 2);
+  EXPECT_EQ(response_.service_response_size(), 2);
 }
 
 TEST_P(DistributorServiceWithMockServiceClientTest,
@@ -192,8 +192,8 @@ TEST_P(DistributorServiceWithMockServiceClientTest,
   auto status = reader_writer->Finish();
   EXPECT_FALSE(status.ok());
   EXPECT_THAT(status.error_message(), HasSubstr("One or more execution requests failed"));
-  ASSERT_EQ(response_.fragment_size(), 1);
-  EXPECT_THAT(response_.fragment(0).error().message(),
+  ASSERT_EQ(response_.service_response_size(), 1);
+  EXPECT_THAT(response_.service_response(0).error().message(),
               HasSubstr("artificial nighthawk service error"));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ message DistributedRequest {`
`18`	`18`	`repeated envoy.config.core.v3.Address services = 3 [(validate.rules).repeated .min_items = 1];`
`19`	`19`	`}`
`20`	`20`
`21`		`-message DistributedResponseFragment {`
	`21`	`+message DistributedServiceResponse {`
`22`	`22`	`oneof distributed_response_type {`
`23`	`23`	`google.rpc.Status error = 1;`
`24`	`24`	`nighthawk.client.ExecutionResponse execution_response = 2;`
`@@ -29,7 +29,7 @@ message DistributedResponseFragment {`
`29`	`29`
`30`	`30`	`// Carries responses associated with a DistributedRequest.`
`31`	`31`	`message DistributedResponse {`
`32`		`- repeated DistributedResponseFragment fragment = 1;`
	`32`	`+ repeated DistributedServiceResponse service_response = 1;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// Service which distributes messages to one or more other services for handling, and streams back`