fix e2e

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

Author: mathetake

examples/http_auth_random/main.go

@@ -48,13 +48,13 @@ func (ctx *httpAuthRandom) OnHttpRequestHeaders(int, bool) types.Action {
 		proxywasm.LogInfof("request header: %s: %s", h[0], h[1])
 	}
 
-	if _, err := proxywasm.DispatchHttpCall(clusterName, hs, "", [][2]string{},
+	if err := proxywasm.DispatchHttpCall(clusterName, hs, "", [][2]string{},
 		50000, httpCallResponseCallback); err != nil {
 		proxywasm.LogCriticalf("dipatch httpcall failed: %v", err)
+		return types.ActionContinue
 	}
 
 	proxywasm.LogInfof("http call dispatched to %s", clusterName)
-
 	return types.ActionPause
 }
 

proxywasm/hostcall.go

@@ -52,7 +52,7 @@ func GetCurrentTime() int64 {
 
 func DispatchHttpCall(upstream string,
 	headers [][2]string, body string, trailers [][2]string,
-	timeoutMillisecond uint32, callBack HttpCalloutCallBack) (uint32, error) {
+	timeoutMillisecond uint32, callBack HttpCalloutCallBack) error {
 	shs := SerializeMap(headers)
 	hp := &shs[0]
 	hl := len(shs)
@@ -68,9 +68,9 @@ func DispatchHttpCall(upstream string,
 		hp, hl, stringBytePtr(body), len(body), tp, tl, timeoutMillisecond, &calloutID); st {
 	case types.StatusOK:
 		currentState.registerHttpCallOut(calloutID, callBack)
-		return calloutID, nil
+		return nil
 	default:
-		return 0, types.StatusToError(st)
+		return types.StatusToError(st)
 	}
 }
 

proxywasm/vmstate.go

@@ -35,13 +35,14 @@ type state struct {
 	httpStreams      map[uint32]HttpContext
 
 	contextIDToRooID map[uint32]uint32
-	activeContextID  uint32 // TODO: set anywhere
+	activeContextID  uint32
 }
 
 var currentState = &state{
-	rootContexts: make(map[uint32]*rootContextState),
-	httpStreams:  make(map[uint32]HttpContext),
-	streams:      make(map[uint32]StreamContext),
+	rootContexts:     make(map[uint32]*rootContextState),
+	httpStreams:      make(map[uint32]HttpContext),
+	streams:          make(map[uint32]StreamContext),
+	contextIDToRooID: make(map[uint32]uint32),
 }
 
 func SetNewRootContext(f func(contextID uint32) RootContext) {
@@ -65,13 +66,12 @@ func (s *state) createRootContext(contextID uint32) {
 		ctx = s.newRootContext(contextID)
 	}
 
-	LogInfof("createRootContext for contextID: %d", contextID)
 	s.rootContexts[contextID] = &rootContextState{
 		context: ctx,
-		httpCallbacks: make(map[uint32]*struct {
+		httpCallbacks: map[uint32]*struct {
 			f         HttpCalloutCallBack
 			contextID uint32
-		}),
+		}{},
 	}
 }
 
@@ -85,6 +85,7 @@ func (s *state) createStreamContext(contextID uint32, rootContextID uint32) {
 	}
 
 	ctx := s.newStreamContext(contextID)
+	s.contextIDToRooID[contextID] = rootContextID
 	s.streams[contextID] = ctx
 }
 
@@ -98,6 +99,7 @@ func (s *state) createHttpContext(contextID uint32, rootContextID uint32) {
 	}
 
 	ctx := s.newHttpContext(contextID)
+	s.contextIDToRooID[contextID] = rootContextID
 	s.httpStreams[contextID] = ctx
 }