Ensure request body is correctly propagated in Nighthawk Request Source.

include/nighthawk/common/request.h

@@ -20,6 +20,7 @@ class Request {
    * @return HeaderMapPtr shared pointer to a request header specification.
    */
   virtual HeaderMapPtr header() const PURE;
+  virtual const std::string& body() const PURE;
   // TODO(oschaaf): expectations
 };
 

source/common/request_impl.h

@@ -1,18 +1,23 @@
 #pragma once
 
+#include <string>
+#include <utility>
 #include "envoy/http/header_map.h"
-
 #include "nighthawk/common/request.h"
 
 namespace Nighthawk {
 
 class RequestImpl : public Request {
 public:
-  RequestImpl(HeaderMapPtr header) : header_(std::move(header)) {}
+  RequestImpl(HeaderMapPtr header, std::string json_body = "")
+      : header_(std::move(header)), json_body_(std::move(json_body)) {}
+
   HeaderMapPtr header() const override { return header_; }
+  const std::string& body() const override { return json_body_; }
 
 private:
   HeaderMapPtr header_;
+  std::string json_body_;
 };
 
 } // namespace Nighthawk

source/common/request_source_impl.cc

@@ -1,11 +1,13 @@
 #include "source/common/request_source_impl.h"
 
 #include <chrono>
+#include <memory>
 
 #include "envoy/common/exception.h"
 
 #include "external/envoy/source/common/common/assert.h"
 
+#include "source/common/request.h"
 #include "source/common/request_impl.h"
 
 namespace Nighthawk {
@@ -80,7 +82,17 @@ void RemoteRequestSourceImpl::destroyOnThread() {
 }
 
 RequestGenerator RemoteRequestSourceImpl::get() {
-  return [this]() -> RequestPtr { return grpc_client_->maybeDequeue(); };
+  return [this]() -> RequestPtr {
+    // Retrieve the request from grpc_client_
+    std::unique_ptr<Nighthawk::Request> request = grpc_client_->maybeDequeue();
+
+    // Ensure request is valid before processing
+    if (request) {
+      return std::make_unique<RequestImpl>(request->header(), request->body());
+    }
+
+    return nullptr;
+  };
 }
 
 } // namespace Nighthawk

test/request_source/request_source_plugin_test.cc

@@ -1,12 +1,27 @@
+#include <cstdint>
+#include <string>
+#include <utility>
+
 #include "envoy/common/exception.h"
 
+
 #include "external/envoy/source/common/config/utility.h"
 #include "external/envoy/test/mocks/api/mocks.h"
 #include "external/envoy/test/mocks/stats/mocks.h"
 #include "external/envoy/test/test_common/file_system_for_test.h"
 #include "external/envoy/test/test_common/utility.h"
+#include "external/envoy/src/envoy/api/api.h"
+#include "external/envoy/http/header_map.h"
+#include "external/envoy/src/source/common/http/header_map_impl.h"
+#include "external/envoy/src/source/common/protobuf/message_validator_impl.h"
+#include "external/envoy/src/source/common/protobuf/protobuf.h"
+#include "external/envoy/src/source/common/protobuf/utility.h"
 
 #include "source/request_source/request_options_list_plugin_impl.h"
+#include "source/common/exception.h"
+#include "source/common/request.h"
+#include "source/common/request_source.h"
+#include "request_source/request_source_plugin_config_factory.h"
 
 #include "test/request_source/stub_plugin_impl.h"
 #include "test/test_common/environment.h"
@@ -150,7 +165,7 @@ TEST_F(FileBasedRequestSourcePluginTest,
   nighthawk::request_source::FileBasedOptionsListRequestSourceConfig config =
       MakeFileBasedPluginConfigWithTestYaml(Nighthawk::TestEnvironment::runfilesPath(
           "test/request_source/test_data/test-config-ab.yaml"));
-  config.set_num_requests(2);
+  config.set_num_requests(3)
   Envoy::ProtobufWkt::Any config_any;
   config_any.PackFrom(config);
   auto& config_factory =
@@ -164,14 +179,18 @@ TEST_F(FileBasedRequestSourcePluginTest,
   Nighthawk::RequestPtr request1 = generator();
   Nighthawk::RequestPtr request2 = generator();
   Nighthawk::RequestPtr request3 = generator();
+  Nighthawk::RequestPtr request4 = generator();
   ASSERT_NE(request1, nullptr);
   ASSERT_NE(request2, nullptr);
+  ASSERT_NE(request3, nullptr);
 
   Nighthawk::HeaderMapPtr header1 = request1->header();
   Nighthawk::HeaderMapPtr header2 = request2->header();
   EXPECT_EQ(header1->getPathValue(), "/a");
   EXPECT_EQ(header2->getPathValue(), "/b");
   EXPECT_EQ(request3, nullptr);
+  EXPECT_EQ(request3->body(), R"({"message": "hello"})");
+  EXPECT_EQ(request4, nullptr);
 }
 
 TEST_F(FileBasedRequestSourcePluginTest, CreateRequestSourcePluginWithTooLargeAFileThrowsAnError) {

test/request_source/test_data/test-config-ab.yaml

@@ -1,11 +1,13 @@
 options:
   - request_method: 1
     request_body_size: 10
+    json_body: '{"message": "hello"}'
     request_headers:
       - { header: { key: ":path", value: "/a" } }  
       - { header: { key: "x-nighthawk-test-server-config", value: "{response_body_size:13}" } }
   - request_method: 1
     request_body_size: 10
+    json_body: '{"message": "hello"}'
     request_headers:
       - { header: { key: ":path", value: "/b" } }  
       - { header: { key: "x-nighthawk-test-server-config", value: "{response_body_size:17}" } }