wip

Signed-off-by: mathetake <[email protected]>

Author: mathetake

proxytest/base.go

@@ -41,12 +41,12 @@ type baseHost struct {
 	metricIDToType  map[uint32]types.MetricType
 	metricNameToID  map[string]uint32
 
-	calloutCallbackCaller func(contextID uint32, numHeaders, bodySize, numTrailers int)
-	calloutResponse       map[uint32]struct {
+	httpCalloutCallbackCaller func(contextID uint32, numHeaders, bodySize, numTrailers int)
+	httpCalloutResponse       map[uint32]struct {
 		headers, trailers [][2]string
 		body              []byte
 	}
-	callouts map[uint32]struct{}
+	httpCallouts map[uint32]struct{}
 }
 
 type sharedData struct {
@@ -56,27 +56,25 @@ type sharedData struct {
 
 func newBaseHost(f func(contextID uint32, numHeaders, bodySize, numTrailers int)) *baseHost {
 	return &baseHost{
-		queues:                map[uint32][][]byte{},
-		queueNameID:           map[string]uint32{},
-		sharedDataKVS:         map[string]*sharedData{},
-		metricIDToValue:       map[uint32]uint64{},
-		metricIDToType:        map[uint32]types.MetricType{},
-		metricNameToID:        map[string]uint32{},
-		calloutCallbackCaller: f,
-		calloutResponse: map[uint32]struct {
+		queues:                    map[uint32][][]byte{},
+		queueNameID:               map[string]uint32{},
+		sharedDataKVS:             map[string]*sharedData{},
+		metricIDToValue:           map[uint32]uint64{},
+		metricIDToType:            map[uint32]types.MetricType{},
+		metricNameToID:            map[string]uint32{},
+		httpCalloutCallbackCaller: f,
+		httpCalloutResponse: map[uint32]struct {
 			headers, trailers [][2]string
 			body              []byte
 		}{},
-		callouts: map[uint32]struct{}{},
+		httpCallouts: map[uint32]struct{}{},
 	}
 }
 
 func (b *baseHost) ProxyLog(logLevel types.LogLevel, messageData *byte, messageSize int) types.Status {
 	str := proxywasm.RawBytePtrToString(messageData, messageSize)
 
 	log.Printf("proxy_log: %s", str)
-	// TODO: exit if loglevel == fatal?
-
 	b.logs[logLevel] = append(b.logs[logLevel], str)
 	return types.StatusOK
 }

proxytest/base_test.go

@@ -153,6 +153,14 @@ func (h *HttpFilterHost) PutResponseBody(contextID uint32, body []byte) {
 	cs.action = cs.context.OnHttpResponseBody(len(body), false) // TODO: allow for specifying end_of_stream
 }
 
+func (h *HttpFilterHost) CompleteHttpStream(contextID uint32) {
+	cs, ok := h.contexts[contextID]
+	if !ok {
+		log.Fatalf("invalid context id: %d", contextID)
+	}
+	cs.context.OnHttpStreamDone()
+}
+
 func (h *HttpFilterHost) ProxyGetBufferBytes(bt types.BufferType, start int, maxSize int,
 	returnBufferData **byte, returnBufferSize *int) types.Status {
 	ctx := h.contexts[h.currentContextID]

proxytest/http.go

@@ -117,7 +117,7 @@ func (n *NetworkFilterHost) CloseDownstreamConnection(contextID uint32) {
 }
 
 func (n *NetworkFilterHost) CompleteConnection(contextID uint32) {
-	n.streams[contextID].context.OnDone()
+	n.streams[contextID].context.OnStreamDone()
 	delete(n.streams, contextID)
 }
 

proxytest/http_test.go

@@ -49,7 +49,7 @@ func NewRootContextHostEmulator(ctx proxywasm.RootContext, pluginConfiguration,
 	}
 }
 
-func (n *RootContextHostEmulator) ConfigurePlugin() {
+func (n *RootContextHostEmulator) StartPlugin() {
 	size := len(n.pluginConfiguration)
 	n.context.OnPluginStart(size)
 }

proxytest/network.go

@@ -14,9 +14,10 @@ func Test_proxyOnContextCreate(t *testing.T) {
 
 	var cnt int
 	currentState = &state{
-		rootContexts: map[uint32]*rootContextState{},
-		httpStreams:  map[uint32]HttpContext{},
-		streams:      map[uint32]StreamContext{},
+		rootContexts:     map[uint32]*rootContextState{},
+		httpStreams:      map[uint32]HttpContext{},
+		streams:          map[uint32]StreamContext{},
+		contextIDToRooID: map[uint32]uint32{},
 	}
 
 	SetNewRootContext(func(contextID uint32) RootContext {

proxytest/network_test.go

@@ -87,6 +87,7 @@ func TestState_createStreamContext(t *testing.T) {
 		rootContexts:     map[uint32]*rootContextState{rid: nil},
 		streams:          map[uint32]StreamContext{},
 		newStreamContext: func(contextID uint32) StreamContext { return &sc{} },
+		contextIDToRooID: map[uint32]uint32{},
 	}
 
 	s.createStreamContext(cid, rid)
@@ -104,9 +105,10 @@ func TestState_createHttpContext(t *testing.T) {
 		rid uint32 = 10
 	)
 	s := &state{
-		rootContexts:   map[uint32]*rootContextState{rid: nil},
-		httpStreams:    map[uint32]HttpContext{},
-		newHttpContext: func(contextID uint32) HttpContext { return &hc{} },
+		rootContexts:     map[uint32]*rootContextState{rid: nil},
+		httpStreams:      map[uint32]HttpContext{},
+		newHttpContext:   func(contextID uint32) HttpContext { return &hc{} },
+		contextIDToRooID: map[uint32]uint32{},
 	}
 
 	s.createHttpContext(cid, rid)