Skip to content

Commit d8e1deb

Browse files
authored
refactor: move chunking utilities to pkg/common/envoy/request (kubernetes-sigs#2549)
Signed-off-by: noalimoy <nlimoy@redhat.com>
1 parent 9a03451 commit d8e1deb

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

pkg/bbr/handlers/request.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727

2828
"sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/framework"
2929
"sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/metrics"
30-
"sigs.k8s.io/gateway-api-inference-extension/pkg/common"
3130
reqenvoy "sigs.k8s.io/gateway-api-inference-extension/pkg/common/envoy/request"
3231
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/common/observability/logging"
3332
)
@@ -121,7 +120,7 @@ func (s *Server) runRequestPlugins(ctx context.Context, request *framework.Infer
121120
}
122121

123122
func addStreamedBodyResponse(responses []*eppb.ProcessingResponse, requestBodyBytes []byte) []*eppb.ProcessingResponse {
124-
commonResponses := common.BuildChunkedBodyResponses(requestBodyBytes, true)
123+
commonResponses := reqenvoy.BuildChunkedBodyResponses(requestBodyBytes, true)
125124
for _, commonResp := range commonResponses {
126125
responses = append(responses, &eppb.ProcessingResponse{
127126
Response: &eppb.ProcessingResponse_RequestBody{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package common
17+
package request
1818

1919
import (
2020
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package common
17+
package request
1818

1919
import (
2020
"crypto/rand"

pkg/epp/handlers/request.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"go.opentelemetry.io/otel/propagation"
2929
"google.golang.org/protobuf/types/known/structpb"
3030

31-
"sigs.k8s.io/gateway-api-inference-extension/pkg/common"
3231
reqenvoy "sigs.k8s.io/gateway-api-inference-extension/pkg/common/envoy/request"
3332
errcommon "sigs.k8s.io/gateway-api-inference-extension/pkg/common/error"
3433
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metadata"
@@ -74,7 +73,7 @@ func (s *StreamingServer) HandleRequestHeaders(ctx context.Context, reqCtx *Requ
7473
}
7574

7675
func (s *StreamingServer) generateRequestBodyResponses(requestBodyBytes []byte) []*extProcPb.ProcessingResponse {
77-
commonResponses := common.BuildChunkedBodyResponses(requestBodyBytes, true)
76+
commonResponses := reqenvoy.BuildChunkedBodyResponses(requestBodyBytes, true)
7877
responses := make([]*extProcPb.ProcessingResponse, 0, len(commonResponses))
7978
for _, commonResp := range commonResponses {
8079
resp := &extProcPb.ProcessingResponse{

pkg/epp/handlers/response.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
2424
"sigs.k8s.io/controller-runtime/pkg/log"
2525

26-
"sigs.k8s.io/gateway-api-inference-extension/pkg/common"
2726
reqenvoy "sigs.k8s.io/gateway-api-inference-extension/pkg/common/envoy/request"
2827
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/common/observability/logging"
2928
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
@@ -90,7 +89,7 @@ func (s *StreamingServer) generateResponseHeaderResponse(reqCtx *RequestContext)
9089
}
9190

9291
func generateResponseBodyResponses(responseBodyBytes []byte, setEoS bool) []*extProcPb.ProcessingResponse {
93-
commonResponses := common.BuildChunkedBodyResponses(responseBodyBytes, setEoS)
92+
commonResponses := reqenvoy.BuildChunkedBodyResponses(responseBodyBytes, setEoS)
9493
responses := make([]*extProcPb.ProcessingResponse, 0, len(commonResponses))
9594
for _, commonResp := range commonResponses {
9695
resp := &extProcPb.ProcessingResponse{

0 commit comments

Comments
 (0)