stream_info: add setResponseCode and update local_reply to take a nor…

…mal StreamInfo (#14402) Signed-off-by: John Esmet <john.esmet@gmail.com>
envoyproxy · Dec 16, 2020 · ffbf952 · ffbf952
1 parent 93ee668
commit ffbf952
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 7 deletions.
diff --git a/include/envoy/stream_info/stream_info.h b/include/envoy/stream_info/stream_info.h
@@ -236,6 +236,11 @@ class StreamInfo {
    */
   virtual void setResponseFlag(ResponseFlag response_flag) PURE;
 
+  /**
+   * @param code the HTTP response code to set for this request.
+   */
+  virtual void setResponseCode(uint32_t code) PURE;
+
   /**
    * @param rc_details the response code details string to set for this request.
    * See ResponseCodeDetailValues above for well-known constants.

diff --git a/source/common/local_reply/local_reply.cc b/source/common/local_reply/local_reply.cc
@@ -77,7 +77,7 @@ class ResponseMapper {
   bool matchAndRewrite(const Http::RequestHeaderMap& request_headers,
                        Http::ResponseHeaderMap& response_headers,
                        const Http::ResponseTrailerMap& response_trailers,
-                       StreamInfo::StreamInfoImpl& stream_info, Http::Code& code, std::string& body,
+                       StreamInfo::StreamInfo& stream_info, Http::Code& code, std::string& body,
                        BodyFormatter*& final_formatter) const {
     // If not matched, just bail out.
     if (!filter_->evaluate(stream_info, request_headers, response_headers, response_trailers)) {
@@ -93,7 +93,7 @@ class ResponseMapper {
     if (status_code_.has_value() && code != status_code_.value()) {
       code = status_code_.value();
       response_headers.setStatus(std::to_string(enumToInt(code)));
-      stream_info.response_code_ = static_cast<uint32_t>(code);
+      stream_info.setResponseCode(static_cast<uint32_t>(code));
     }
 
     if (body_formatter_) {
@@ -129,14 +129,14 @@ class LocalReplyImpl : public LocalReply {
   }
 
   void rewrite(const Http::RequestHeaderMap* request_headers,
-               Http::ResponseHeaderMap& response_headers, StreamInfo::StreamInfoImpl& stream_info,
+               Http::ResponseHeaderMap& response_headers, StreamInfo::StreamInfo& stream_info,
                Http::Code& code, std::string& body,
                absl::string_view& content_type) const override {
     // Set response code to stream_info and response_headers due to:
     // 1) StatusCode filter is using response_code from stream_info,
     // 2) %RESP(:status)% is from Status() in response_headers.
     response_headers.setStatus(std::to_string(enumToInt(code)));
-    stream_info.response_code_ = static_cast<uint32_t>(code);
+    stream_info.setResponseCode(static_cast<uint32_t>(code));
 
     if (request_headers == nullptr) {
       request_headers = Http::StaticEmptyHeaders::get().request_headers.get();

diff --git a/source/common/local_reply/local_reply.h b/source/common/local_reply/local_reply.h
@@ -24,7 +24,7 @@ class LocalReply {
    */
   virtual void rewrite(const Http::RequestHeaderMap* request_headers,
                        Http::ResponseHeaderMap& response_headers,
-                       StreamInfo::StreamInfoImpl& stream_info, Http::Code& code, std::string& body,
+                       StreamInfo::StreamInfo& stream_info, Http::Code& code, std::string& body,
                        absl::string_view& content_type) const PURE;
 };
 

diff --git a/source/common/stream_info/stream_info_impl.h b/source/common/stream_info/stream_info_impl.h
@@ -131,6 +131,8 @@ struct StreamInfoImpl : public StreamInfo {
     return response_code_details_;
   }
 
+  void setResponseCode(uint32_t code) override { response_code_ = code; }
+
   void setResponseCodeDetails(absl::string_view rc_details) override {
     response_code_details_.emplace(absl::StrReplaceAll(rc_details, emptySpaceReplacement()));
   }

diff --git a/test/common/stream_info/test_util.h b/test/common/stream_info/test_util.h
@@ -38,6 +38,7 @@ class TestStreamInfo : public StreamInfo::StreamInfo {
   const absl::optional<std::string>& responseCodeDetails() const override {
     return response_code_details_;
   }
+  void setResponseCode(uint32_t code) override { response_code_ = code; }
   void setResponseCodeDetails(absl::string_view rc_details) override {
     response_code_details_.emplace(rc_details);
   }

diff --git a/test/mocks/local_reply/mocks.h b/test/mocks/local_reply/mocks.h
@@ -11,9 +11,9 @@ class MockLocalReply : public LocalReply {
 
   MOCK_METHOD(void, rewrite,
               (const Http::RequestHeaderMap* request_headers,
-               Http::ResponseHeaderMap& response_headers, StreamInfo::StreamInfoImpl& stream_info,
+               Http::ResponseHeaderMap& response_headers, StreamInfo::StreamInfo& stream_info,
                Http::Code& code, std::string& body, absl::string_view& content_type),
               (const));
 };
 } // namespace LocalReply
-} // namespace Envoy
+} // namespace Envoy
diff --git a/test/mocks/stream_info/mocks.cc b/test/mocks/stream_info/mocks.cc
@@ -24,6 +24,9 @@ MockStreamInfo::MockStreamInfo()
   ON_CALL(*this, setResponseFlag(_)).WillByDefault(Invoke([this](ResponseFlag response_flag) {
     response_flags_ |= response_flag;
   }));
+  ON_CALL(*this, setResponseCode(_)).WillByDefault(Invoke([this](uint32_t code) {
+    response_code_ = code;
+  }));
   ON_CALL(*this, setResponseCodeDetails(_)).WillByDefault(Invoke([this](absl::string_view details) {
     response_code_details_ = std::string(details);
   }));

diff --git a/test/mocks/stream_info/mocks.h b/test/mocks/stream_info/mocks.h
@@ -21,6 +21,7 @@ class MockStreamInfo : public StreamInfo {
 
   // StreamInfo::StreamInfo
   MOCK_METHOD(void, setResponseFlag, (ResponseFlag response_flag));
+  MOCK_METHOD(void, setResponseCode, (uint32_t));
   MOCK_METHOD(void, setResponseCodeDetails, (absl::string_view));
   MOCK_METHOD(void, setConnectionTerminationDetails, (absl::string_view));
   MOCK_METHOD(bool, intersectResponseFlags, (uint64_t), (const));