fix(pdk): response.exit accept bytes (#9526)

Fix #9294
Kong · Oct 24, 2022 · cd2bcf9 · cd2bcf9
1 parent 3a3efe5
commit cd2bcf9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -127,6 +127,13 @@
   (`kong.request.getUriCaptures`)
   [#9512](https://github.com/Kong/kong/pull/9512)
 
+- Fixed parameter type of `kong.service.request.set_raw_body`
+  (`kong.service.request.setRawBody`), return type of
+  `kong.service.response.get_raw_body`(`kong.service.request.getRawBody`),
+  and body parameter type of `kong.response.exit` to bytes. Note that old
+  version of go PDK is incompatible after this change.
+  [#9526](https://github.com/Kong/kong/pull/9526)
+
 #### Plugins
 
 - **AWS Lambda**: Fix an issue that is causing inability to

diff --git a/kong/include/kong/pluginsocket.proto b/kong/include/kong/pluginsocket.proto
@@ -99,9 +99,13 @@ message String {
     string v = 1;
 }
 
+message ByteString {
+    bytes v = 1;
+}
+
 message ExitArgs {
     int32 status = 1;
-    string body = 2;
+    bytes body = 2;
     google.protobuf.Struct headers = 3;
 }
 
@@ -336,10 +340,10 @@ service Kong {
     rpc Service_Request_AddHeader(KV) returns (google.protobuf.Empty);
     rpc Service_Request_ClearHeader(String) returns (google.protobuf.Empty);
     rpc Service_Request_SetHeaders(google.protobuf.Struct) returns (google.protobuf.Empty);
-    rpc Service_Request_SetRawBody(String) returns (google.protobuf.Empty);
+    rpc Service_Request_SetRawBody(ByteString) returns (google.protobuf.Empty);
 
     rpc Service_Response_GetStatus(google.protobuf.Empty) returns (Int);
     rpc Service_Response_GetHeader(String) returns (String);
     rpc Service_Response_GetHeaders(Int) returns (google.protobuf.Struct);
-    rpc Service_Response_GetRawBody(google.protobuf.Empty) returns (String);
+    rpc Service_Response_GetRawBody(google.protobuf.Empty) returns (ByteString);
 }
diff --git a/kong/runloop/plugin_servers/pb_rpc.lua b/kong/runloop/plugin_servers/pb_rpc.lua
@@ -73,6 +73,7 @@ do
     [".kong_plugin_protocol.Number"] = unwrap_val,
     [".kong_plugin_protocol.Int"] = unwrap_val,
     [".kong_plugin_protocol.String"] = unwrap_val,
+    [".kong_plugin_protocol.ByteString"] = unwrap_val,
     [".kong_plugin_protocol.KV"] = function(d)
       return d.k, structpb_value(d.v)
     end,
@@ -151,6 +152,7 @@ do
     [".kong_plugin_protocol.Number"] = wrap_val,
     [".kong_plugin_protocol.Int"] = wrap_val,
     [".kong_plugin_protocol.String"] = wrap_val,
+    [".kong_plugin_protocol.ByteString"] = wrap_val,
     [".kong_plugin_protocol.RawBodyResult"] = function(v, err)
       if type(v) == "string" then
         return {  content = v }