diff --git a/api/kubernetes/customresourcedefinitions.gen.yaml b/api/kubernetes/customresourcedefinitions.gen.yaml index 023ed35f9a..8b9c5f2c66 100644 --- a/api/kubernetes/customresourcedefinitions.gen.yaml +++ b/api/kubernetes/customresourcedefinitions.gen.yaml @@ -154,6 +154,11 @@ spec: type: array httpPath: type: string + paramFromEntireBody: + properties: + paramType: + type: string + type: object params: items: properties: diff --git a/api/networking/v1/http_2_rpc.pb.go b/api/networking/v1/http_2_rpc.pb.go index 55a0112441..6d2843800f 100644 --- a/api/networking/v1/http_2_rpc.pb.go +++ b/api/networking/v1/http_2_rpc.pb.go @@ -200,14 +200,15 @@ func (m *DubboService) GetMethods() []*Method { } type Method struct { - ServiceMethod string `protobuf:"bytes,1,opt,name=service_method,json=serviceMethod,proto3" json:"service_method,omitempty"` - HeadersAttach string `protobuf:"bytes,2,opt,name=headers_attach,json=headersAttach,proto3" json:"headers_attach,omitempty"` - HttpPath string `protobuf:"bytes,3,opt,name=http_path,json=httpPath,proto3" json:"http_path,omitempty"` - HttpMethods []string `protobuf:"bytes,4,rep,name=http_methods,json=httpMethods,proto3" json:"http_methods,omitempty"` - Params []*Param `protobuf:"bytes,5,rep,name=params,proto3" json:"params,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServiceMethod string `protobuf:"bytes,1,opt,name=service_method,json=serviceMethod,proto3" json:"service_method,omitempty"` + HeadersAttach string `protobuf:"bytes,2,opt,name=headers_attach,json=headersAttach,proto3" json:"headers_attach,omitempty"` + HttpPath string `protobuf:"bytes,3,opt,name=http_path,json=httpPath,proto3" json:"http_path,omitempty"` + HttpMethods []string `protobuf:"bytes,4,rep,name=http_methods,json=httpMethods,proto3" json:"http_methods,omitempty"` + Params []*Param `protobuf:"bytes,5,rep,name=params,proto3" json:"params,omitempty"` + ParamFromEntireBody *ParamFromEntireBody `protobuf:"bytes,6,opt,name=paramFromEntireBody,proto3" json:"paramFromEntireBody,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Method) Reset() { *m = Method{} } @@ -278,6 +279,13 @@ func (m *Method) GetParams() []*Param { return nil } +func (m *Method) GetParamFromEntireBody() *ParamFromEntireBody { + if m != nil { + return m.ParamFromEntireBody + } + return nil +} + type Param struct { ParamSource string `protobuf:"bytes,1,opt,name=param_source,json=paramSource,proto3" json:"param_source,omitempty"` ParamKey string `protobuf:"bytes,2,opt,name=param_key,json=paramKey,proto3" json:"param_key,omitempty"` @@ -341,6 +349,53 @@ func (m *Param) GetParamType() string { return "" } +type ParamFromEntireBody struct { + ParamType string `protobuf:"bytes,1,opt,name=param_type,json=paramType,proto3" json:"param_type,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ParamFromEntireBody) Reset() { *m = ParamFromEntireBody{} } +func (m *ParamFromEntireBody) String() string { return proto.CompactTextString(m) } +func (*ParamFromEntireBody) ProtoMessage() {} +func (*ParamFromEntireBody) Descriptor() ([]byte, []int) { + return fileDescriptor_dc706c3b890c1c84, []int{4} +} +func (m *ParamFromEntireBody) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ParamFromEntireBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ParamFromEntireBody.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ParamFromEntireBody) XXX_Merge(src proto.Message) { + xxx_messageInfo_ParamFromEntireBody.Merge(m, src) +} +func (m *ParamFromEntireBody) XXX_Size() int { + return m.Size() +} +func (m *ParamFromEntireBody) XXX_DiscardUnknown() { + xxx_messageInfo_ParamFromEntireBody.DiscardUnknown(m) +} + +var xxx_messageInfo_ParamFromEntireBody proto.InternalMessageInfo + +func (m *ParamFromEntireBody) GetParamType() string { + if m != nil { + return m.ParamType + } + return "" +} + type GrpcService struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -351,7 +406,7 @@ func (m *GrpcService) Reset() { *m = GrpcService{} } func (m *GrpcService) String() string { return proto.CompactTextString(m) } func (*GrpcService) ProtoMessage() {} func (*GrpcService) Descriptor() ([]byte, []int) { - return fileDescriptor_dc706c3b890c1c84, []int{4} + return fileDescriptor_dc706c3b890c1c84, []int{5} } func (m *GrpcService) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -385,42 +440,46 @@ func init() { proto.RegisterType((*DubboService)(nil), "higress.networking.v1.DubboService") proto.RegisterType((*Method)(nil), "higress.networking.v1.Method") proto.RegisterType((*Param)(nil), "higress.networking.v1.Param") + proto.RegisterType((*ParamFromEntireBody)(nil), "higress.networking.v1.ParamFromEntireBody") proto.RegisterType((*GrpcService)(nil), "higress.networking.v1.GrpcService") } func init() { proto.RegisterFile("networking/v1/http_2_rpc.proto", fileDescriptor_dc706c3b890c1c84) } var fileDescriptor_dc706c3b890c1c84 = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xcf, 0x8a, 0xd3, 0x40, - 0x18, 0x77, 0xba, 0x6d, 0xb7, 0xfb, 0x65, 0xeb, 0x61, 0x40, 0x08, 0x8b, 0xc6, 0x35, 0x7b, 0x70, - 0x41, 0x49, 0xd8, 0xea, 0x41, 0x14, 0x0f, 0x5b, 0x04, 0x17, 0x44, 0x58, 0xb2, 0x9e, 0xbc, 0x84, - 0x49, 0x32, 0x66, 0x86, 0x6d, 0x33, 0xc3, 0xcc, 0x34, 0xda, 0xb7, 0xf0, 0x35, 0x7c, 0x13, 0x8f, - 0x3e, 0x82, 0x14, 0x1f, 0x44, 0x32, 0x93, 0x6e, 0x13, 0xb1, 0xb7, 0xf0, 0xfb, 0x33, 0xdf, 0xef, - 0xc7, 0xf7, 0x05, 0x82, 0x8a, 0x9a, 0xaf, 0x42, 0xdd, 0xf2, 0xaa, 0x8c, 0xeb, 0x8b, 0x98, 0x19, - 0x23, 0xd3, 0x59, 0xaa, 0x64, 0x1e, 0x49, 0x25, 0x8c, 0xc0, 0x0f, 0x18, 0x2f, 0x15, 0xd5, 0x3a, - 0xda, 0xe9, 0xa2, 0xfa, 0xe2, 0xe4, 0x71, 0x29, 0x44, 0xb9, 0xa0, 0x31, 0x91, 0x3c, 0xfe, 0xc2, - 0xe9, 0xa2, 0x48, 0x33, 0xca, 0x48, 0xcd, 0x85, 0x72, 0xbe, 0xf0, 0x3b, 0x82, 0xc9, 0x95, 0x31, - 0x72, 0x96, 0xc8, 0x1c, 0xbf, 0x81, 0x51, 0xb1, 0xca, 0x32, 0xe1, 0xa3, 0x53, 0x74, 0xee, 0xcd, - 0xce, 0xa2, 0xff, 0x3e, 0x1a, 0xbd, 0x6b, 0x34, 0x37, 0x54, 0xd5, 0x3c, 0xa7, 0x57, 0xf7, 0x12, - 0xe7, 0xc1, 0xaf, 0x60, 0x58, 0x2a, 0x99, 0xfb, 0x03, 0xeb, 0x0d, 0xf7, 0x78, 0xdf, 0x2b, 0x99, - 0xef, 0xac, 0xd6, 0x31, 0x9f, 0x82, 0x57, 0x50, 0x6d, 0x78, 0x45, 0x0c, 0x17, 0x55, 0xf8, 0x03, - 0xc1, 0x71, 0x77, 0x04, 0x0e, 0xe0, 0x50, 0xbb, 0x4f, 0x1b, 0xec, 0x68, 0x3e, 0xdc, 0x5c, 0xa2, - 0x41, 0xb2, 0x05, 0x1b, 0xbe, 0xa6, 0x4a, 0x73, 0x51, 0xd9, 0xe1, 0x77, 0x7c, 0x0b, 0xe2, 0x13, - 0x18, 0x95, 0x4a, 0xac, 0xa4, 0x7f, 0x70, 0xc7, 0xa2, 0xc4, 0x41, 0xf8, 0x2d, 0x1c, 0x2e, 0xa9, - 0x61, 0xa2, 0xd0, 0xfe, 0xf0, 0xf4, 0xe0, 0xdc, 0x9b, 0x3d, 0xda, 0x13, 0xfc, 0xa3, 0x55, 0x6d, - 0x9f, 0x6e, 0x3d, 0xe1, 0x1f, 0x04, 0x63, 0xc7, 0xe0, 0x67, 0x70, 0xbf, 0x0d, 0x94, 0x3a, 0xb6, - 0x17, 0x76, 0xda, 0x72, 0x3b, 0x31, 0xa3, 0xa4, 0xa0, 0x4a, 0xa7, 0xc4, 0x18, 0x92, 0xb3, 0x4e, - 0x72, 0x94, 0x4c, 0x5b, 0xee, 0xd2, 0x52, 0xf8, 0x09, 0x1c, 0xd9, 0x7d, 0x4b, 0x62, 0x58, 0xa7, - 0xc3, 0x20, 0x99, 0x34, 0xf0, 0x35, 0x31, 0x0c, 0x3f, 0x85, 0x63, 0x2b, 0xe9, 0x76, 0xd9, 0xaa, - 0xbc, 0x86, 0x71, 0x73, 0x35, 0x7e, 0x09, 0x63, 0x49, 0x14, 0x59, 0x6a, 0x7f, 0x64, 0xeb, 0x3e, - 0xdc, 0x53, 0xf7, 0xba, 0x11, 0x25, 0xad, 0x36, 0xfc, 0x06, 0x23, 0x0b, 0x34, 0x73, 0x2c, 0x94, - 0x6a, 0xb1, 0x52, 0xff, 0xec, 0xc3, 0xb3, 0xcc, 0x8d, 0x25, 0x9a, 0xcc, 0x4e, 0x78, 0x4b, 0xd7, - 0xbd, 0xad, 0x4c, 0x2c, 0xfc, 0x81, 0xae, 0xf1, 0x19, 0x80, 0x93, 0x98, 0xb5, 0xa4, 0xbd, 0x5e, - 0xce, 0xfa, 0x69, 0x2d, 0x69, 0x38, 0x05, 0xaf, 0x73, 0x32, 0xf3, 0xd7, 0x3f, 0x37, 0x01, 0xfa, - 0xb5, 0x09, 0xd0, 0xef, 0x4d, 0x80, 0x3e, 0x3f, 0x2f, 0xb9, 0x61, 0xab, 0x2c, 0xca, 0xc5, 0x32, - 0x26, 0x0b, 0x9e, 0x91, 0x8c, 0xc4, 0x6d, 0x1d, 0x7b, 0xf1, 0xbd, 0x7f, 0x26, 0x1b, 0xdb, 0x8b, - 0x7f, 0xf1, 0x37, 0x00, 0x00, 0xff, 0xff, 0x75, 0x5c, 0x9e, 0x28, 0x4b, 0x03, 0x00, 0x00, + // 506 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xdf, 0x6e, 0xd3, 0x30, + 0x14, 0xc6, 0x71, 0xd7, 0x76, 0xdd, 0xc9, 0xca, 0x85, 0x27, 0xa4, 0x68, 0x82, 0x32, 0xb2, 0x0b, + 0x26, 0x40, 0x89, 0x56, 0xb8, 0x40, 0x43, 0x5c, 0xac, 0xe2, 0xcf, 0x24, 0x84, 0x34, 0x65, 0x5c, + 0x71, 0x13, 0x39, 0x89, 0x49, 0xac, 0xb5, 0xb1, 0x65, 0xbb, 0x85, 0xbc, 0x05, 0xaf, 0xc1, 0x9b, + 0xec, 0x92, 0x47, 0x40, 0x7d, 0x12, 0x14, 0x3b, 0x5d, 0x93, 0xa9, 0xdd, 0x5d, 0x74, 0xbe, 0xef, + 0x77, 0x7c, 0x3e, 0x9f, 0x18, 0x46, 0x05, 0xd5, 0x3f, 0xb9, 0xbc, 0x66, 0x45, 0x16, 0x2c, 0x4e, + 0x83, 0x5c, 0x6b, 0x11, 0x8d, 0x23, 0x29, 0x12, 0x5f, 0x48, 0xae, 0x39, 0x7e, 0x94, 0xb3, 0x4c, + 0x52, 0xa5, 0xfc, 0xb5, 0xcf, 0x5f, 0x9c, 0x1e, 0x3e, 0xcd, 0x38, 0xcf, 0xa6, 0x34, 0x20, 0x82, + 0x05, 0x3f, 0x18, 0x9d, 0xa6, 0x51, 0x4c, 0x73, 0xb2, 0x60, 0x5c, 0x5a, 0xce, 0xfb, 0x8d, 0x60, + 0x70, 0xa1, 0xb5, 0x18, 0x87, 0x22, 0xc1, 0xef, 0xa0, 0x97, 0xce, 0xe3, 0x98, 0xbb, 0xe8, 0x08, + 0x9d, 0x38, 0xe3, 0x63, 0x7f, 0x63, 0x53, 0xff, 0x43, 0xe5, 0xb9, 0xa2, 0x72, 0xc1, 0x12, 0x7a, + 0xf1, 0x20, 0xb4, 0x0c, 0x7e, 0x0b, 0xdd, 0x4c, 0x8a, 0xc4, 0xed, 0x18, 0xd6, 0xdb, 0xc2, 0x7e, + 0x96, 0x22, 0x59, 0xa3, 0x86, 0x98, 0x0c, 0xc1, 0x49, 0xa9, 0xd2, 0xac, 0x20, 0x9a, 0xf1, 0xc2, + 0xfb, 0x83, 0x60, 0xbf, 0x79, 0x04, 0x1e, 0xc1, 0xae, 0xb2, 0x9f, 0x66, 0xb0, 0xbd, 0x49, 0x77, + 0x79, 0x8e, 0x3a, 0xe1, 0xaa, 0x58, 0xe9, 0x0b, 0x2a, 0x15, 0xe3, 0x85, 0x39, 0xfc, 0x56, 0xaf, + 0x8b, 0xf8, 0x10, 0x7a, 0x99, 0xe4, 0x73, 0xe1, 0xee, 0xdc, 0xaa, 0x28, 0xb4, 0x25, 0xfc, 0x1e, + 0x76, 0x67, 0x54, 0xe7, 0x3c, 0x55, 0x6e, 0xf7, 0x68, 0xe7, 0xc4, 0x19, 0x3f, 0xd9, 0x32, 0xf8, + 0x57, 0xe3, 0x5a, 0xb5, 0xae, 0x19, 0xef, 0xa6, 0x03, 0x7d, 0xab, 0xe0, 0x97, 0xf0, 0xb0, 0x1e, + 0x28, 0xb2, 0x6a, 0x6b, 0xd8, 0x61, 0xad, 0xad, 0xcd, 0x39, 0x25, 0x29, 0x95, 0x2a, 0x22, 0x5a, + 0x93, 0x24, 0x6f, 0x4c, 0x8e, 0xc2, 0x61, 0xad, 0x9d, 0x1b, 0x09, 0x3f, 0x83, 0x3d, 0xb3, 0x6f, + 0x41, 0x74, 0xde, 0xc8, 0xd0, 0x09, 0x07, 0x55, 0xf9, 0x92, 0xe8, 0x1c, 0x3f, 0x87, 0x7d, 0x63, + 0x69, 0x66, 0x59, 0xb9, 0x9c, 0x4a, 0xb1, 0xe7, 0x2a, 0xfc, 0x06, 0xfa, 0x82, 0x48, 0x32, 0x53, + 0x6e, 0xcf, 0xc4, 0x7d, 0xbc, 0x25, 0xee, 0x65, 0x65, 0x0a, 0x6b, 0x2f, 0x8e, 0xe1, 0xc0, 0x7c, + 0x7d, 0x92, 0x7c, 0xf6, 0xb1, 0xd0, 0x4c, 0xd2, 0x09, 0x4f, 0x4b, 0xb7, 0x6f, 0x56, 0xfd, 0xe2, + 0xbe, 0x16, 0x6d, 0xa2, 0xce, 0xb7, 0xa9, 0x99, 0xf7, 0x0b, 0x7a, 0x86, 0xa8, 0xb2, 0x18, 0x3d, + 0x52, 0x7c, 0x2e, 0xef, 0xec, 0xdc, 0x31, 0xca, 0x95, 0x11, 0xaa, 0x7b, 0xb1, 0xc6, 0x6b, 0x5a, + 0xb6, 0x36, 0x3f, 0x30, 0xe5, 0x2f, 0xb4, 0xc4, 0xc7, 0x00, 0xd6, 0xa2, 0x4b, 0x41, 0x5b, 0x77, + 0x67, 0xd1, 0x6f, 0xa5, 0xa0, 0xde, 0x19, 0x1c, 0x6c, 0x98, 0xf5, 0x0e, 0x8b, 0x36, 0xb3, 0x43, + 0x70, 0x1a, 0xbf, 0xf4, 0xe4, 0xec, 0x66, 0x39, 0x42, 0x7f, 0x97, 0x23, 0xf4, 0x6f, 0x39, 0x42, + 0xdf, 0x5f, 0x65, 0x4c, 0xe7, 0xf3, 0xd8, 0x4f, 0xf8, 0x2c, 0x20, 0x53, 0x16, 0x93, 0x98, 0x04, + 0xf5, 0x5d, 0x99, 0x17, 0xd9, 0x7a, 0xd3, 0x71, 0xdf, 0xbc, 0xc8, 0xd7, 0xff, 0x03, 0x00, 0x00, + 0xff, 0xff, 0x30, 0xef, 0x3d, 0xa9, 0xeb, 0x03, 0x00, 0x00, } func (m *Http2Rpc) Marshal() (dAtA []byte, err error) { @@ -587,6 +646,18 @@ func (m *Method) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.ParamFromEntireBody != nil { + { + size, err := m.ParamFromEntireBody.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintHttp_2Rpc(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } if len(m.Params) > 0 { for iNdEx := len(m.Params) - 1; iNdEx >= 0; iNdEx-- { { @@ -682,6 +753,40 @@ func (m *Param) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ParamFromEntireBody) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ParamFromEntireBody) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ParamFromEntireBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.ParamType) > 0 { + i -= len(m.ParamType) + copy(dAtA[i:], m.ParamType) + i = encodeVarintHttp_2Rpc(dAtA, i, uint64(len(m.ParamType))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *GrpcService) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -819,6 +924,10 @@ func (m *Method) Size() (n int) { n += 1 + l + sovHttp_2Rpc(uint64(l)) } } + if m.ParamFromEntireBody != nil { + l = m.ParamFromEntireBody.Size() + n += 1 + l + sovHttp_2Rpc(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -849,6 +958,22 @@ func (m *Param) Size() (n int) { return n } +func (m *ParamFromEntireBody) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ParamType) + if l > 0 { + n += 1 + l + sovHttp_2Rpc(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *GrpcService) Size() (n int) { if m == nil { return 0 @@ -1360,6 +1485,42 @@ func (m *Method) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ParamFromEntireBody", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowHttp_2Rpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthHttp_2Rpc + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthHttp_2Rpc + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ParamFromEntireBody == nil { + m.ParamFromEntireBody = &ParamFromEntireBody{} + } + if err := m.ParamFromEntireBody.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipHttp_2Rpc(dAtA[iNdEx:]) @@ -1529,6 +1690,89 @@ func (m *Param) Unmarshal(dAtA []byte) error { } return nil } +func (m *ParamFromEntireBody) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowHttp_2Rpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ParamFromEntireBody: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ParamFromEntireBody: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ParamType", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowHttp_2Rpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthHttp_2Rpc + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthHttp_2Rpc + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ParamType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipHttp_2Rpc(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthHttp_2Rpc + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *GrpcService) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/api/networking/v1/http_2_rpc.proto b/api/networking/v1/http_2_rpc.proto index a32164452f..ac60041294 100644 --- a/api/networking/v1/http_2_rpc.proto +++ b/api/networking/v1/http_2_rpc.proto @@ -62,6 +62,7 @@ message Method { string http_path = 3 [(google.api.field_behavior) = REQUIRED]; repeated string http_methods = 4 [(google.api.field_behavior) = REQUIRED]; repeated Param params = 5; + ParamFromEntireBody paramFromEntireBody = 6 [(google.api.field_behavior) = OPTIONAL]; } message Param { @@ -70,5 +71,9 @@ message Param { string param_type = 3 [(google.api.field_behavior) = REQUIRED]; } +message ParamFromEntireBody { + string param_type = 1 [(google.api.field_behavior) = REQUIRED]; +} + message GrpcService { } diff --git a/api/networking/v1/http_2_rpc_deepcopy.gen.go b/api/networking/v1/http_2_rpc_deepcopy.gen.go index 4b9de6da0a..dc717a327b 100644 --- a/api/networking/v1/http_2_rpc_deepcopy.gen.go +++ b/api/networking/v1/http_2_rpc_deepcopy.gen.go @@ -99,6 +99,27 @@ func (in *Param) DeepCopyInterface() interface{} { return in.DeepCopy() } +// DeepCopyInto supports using ParamFromEntireBody within kubernetes types, where deepcopy-gen is used. +func (in *ParamFromEntireBody) DeepCopyInto(out *ParamFromEntireBody) { + p := proto.Clone(in).(*ParamFromEntireBody) + *out = *p +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParamFromEntireBody. Required by controller-gen. +func (in *ParamFromEntireBody) DeepCopy() *ParamFromEntireBody { + if in == nil { + return nil + } + out := new(ParamFromEntireBody) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ParamFromEntireBody. Required by controller-gen. +func (in *ParamFromEntireBody) DeepCopyInterface() interface{} { + return in.DeepCopy() +} + // DeepCopyInto supports using GrpcService within kubernetes types, where deepcopy-gen is used. func (in *GrpcService) DeepCopyInto(out *GrpcService) { p := proto.Clone(in).(*GrpcService) diff --git a/api/networking/v1/http_2_rpc_json.gen.go b/api/networking/v1/http_2_rpc_json.gen.go index 72afa59dea..d48e556e0b 100644 --- a/api/networking/v1/http_2_rpc_json.gen.go +++ b/api/networking/v1/http_2_rpc_json.gen.go @@ -61,6 +61,17 @@ func (this *Param) UnmarshalJSON(b []byte) error { return Http_2RpcUnmarshaler.Unmarshal(bytes.NewReader(b), this) } +// MarshalJSON is a custom marshaler for ParamFromEntireBody +func (this *ParamFromEntireBody) MarshalJSON() ([]byte, error) { + str, err := Http_2RpcMarshaler.MarshalToString(this) + return []byte(str), err +} + +// UnmarshalJSON is a custom unmarshaler for ParamFromEntireBody +func (this *ParamFromEntireBody) UnmarshalJSON(b []byte) error { + return Http_2RpcUnmarshaler.Unmarshal(bytes.NewReader(b), this) +} + // MarshalJSON is a custom marshaler for GrpcService func (this *GrpcService) MarshalJSON() ([]byte, error) { str, err := Http_2RpcMarshaler.MarshalToString(this) diff --git a/pkg/ingress/config/ingress_config.go b/pkg/ingress/config/ingress_config.go index f104e25650..ad55182ca0 100644 --- a/pkg/ingress/config/ingress_config.go +++ b/pkg/ingress/config/ingress_config.go @@ -1265,12 +1265,21 @@ func (m *IngressConfig) constructHttp2RpcMethods(dubbo *higressv1.DubboService) var method = make(map[string]interface{}) method["name"] = serviceMethod.GetServiceMethod() var params []interface{} - for _, methodParam := range serviceMethod.GetParams() { + // paramFromEntireBody is for methods with single parameter. So when paramFromEntireBody exists, we just ignore parmas. + var paramFromEntireBody = serviceMethod.GetParamFromEntireBody() + if paramFromEntireBody != nil { var param = make(map[string]interface{}) - param["extract_key"] = methodParam.GetParamKey() - param["extract_key_spec"] = Http2RpcParamSourceMap()[methodParam.GetParamSource()] - param["mapping_type"] = methodParam.GetParamType() + param["extract_key_spec"] = Http2RpcParamSourceMap()["BODY"] + param["mapping_type"] = paramFromEntireBody.GetParamType() params = append(params, param) + } else { + for _, methodParam := range serviceMethod.GetParams() { + var param = make(map[string]interface{}) + param["extract_key"] = methodParam.GetParamKey() + param["extract_key_spec"] = Http2RpcParamSourceMap()[methodParam.GetParamSource()] + param["mapping_type"] = methodParam.GetParamType() + params = append(params, param) + } } method["parameter_mapping"] = params var path_matcher = make(map[string]interface{})