Merge pull request #71 from tetratelabs/refactoring

mathetake · web-flow · commit 0e8ae5fadcd3 · 2020-10-03T16:52:39.000+09:00
pass rootContextID to new{http,stream}Context
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ TinyGo's official release of WASI target will come soon, and after that you coul
 | proxy-wasm-go-sdk| proxy-wasm ABI version |istio/proxyv2|
 |:-------------:|:-------------:|:-------------:|
 | main |  0.2.0|   v1.17.x |
-| v0.0.4 |  0.2.0|   v1.17.x |
+| v0.0.6 |  0.2.0|   v1.17.x |
 
 
 ## run examples
diff --git a/examples/http_auth_random/main.go b/examples/http_auth_random/main.go
@@ -33,7 +33,7 @@ type httpAuthRandom struct {
 	contextID uint32
 }
 
-func newContext(contextID uint32) proxywasm.HttpContext {
+func newContext(rootContextID, contextID uint32) proxywasm.HttpContext {
 	return &httpAuthRandom{contextID: contextID}
 }
 
diff --git a/examples/http_headers/main.go b/examples/http_headers/main.go
@@ -29,7 +29,7 @@ type httpHeaders struct {
 	contextID uint32
 }
 
-func newContext(contextID uint32) proxywasm.HttpContext {
+func newContext(rootContextID, contextID uint32) proxywasm.HttpContext {
 	return &httpHeaders{contextID: contextID}
 }
 
diff --git a/examples/metrics/main.go b/examples/metrics/main.go
@@ -48,7 +48,7 @@ type metricHttpContext struct {
 	proxywasm.DefaultHttpContext
 }
 
-func newHttpContext(uint32) proxywasm.HttpContext {
+func newHttpContext(uint32, uint32) proxywasm.HttpContext {
 	return &metricHttpContext{}
 }
 
diff --git a/examples/network/main.go b/examples/network/main.go
@@ -48,7 +48,7 @@ type networkContext struct {
 	proxywasm.DefaultStreamContext
 }
 
-func newNetworkContext(uint32) proxywasm.StreamContext {
+func newNetworkContext(uint32, uint32) proxywasm.StreamContext {
 	return &networkContext{}
 }
 
diff --git a/examples/shared_data/main.go b/examples/shared_data/main.go
@@ -40,7 +40,7 @@ func newRootContext(uint32) proxywasm.RootContext {
 	return &sharedDataRootContext{}
 }
 
-func newHttpContext(uint32) proxywasm.HttpContext {
+func newHttpContext(uint32, uint32) proxywasm.HttpContext {
 	return &sharedDataHttpContext{}
 }
 
diff --git a/examples/shared_queue/main.go b/examples/shared_queue/main.go
@@ -74,7 +74,7 @@ type queueHttpContext struct {
 	proxywasm.DefaultHttpContext
 }
 
-func newHttpContext(uint32) proxywasm.HttpContext {
+func newHttpContext(uint32, uint32) proxywasm.HttpContext {
 	return &queueHttpContext{}
 }
 
diff --git a/proxytest/option.go b/proxytest/option.go
@@ -5,8 +5,8 @@ import "github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
 type EmulatorOption struct {
 	pluginConfiguration, vmConfiguration []byte
 	newRootContext                       func(uint32) proxywasm.RootContext
-	newStreamContext                     func(uint32) proxywasm.StreamContext
-	newHttpContext                       func(uint32) proxywasm.HttpContext
+	newStreamContext                     func(uint32, uint32) proxywasm.StreamContext
+	newHttpContext                       func(uint32, uint32) proxywasm.HttpContext
 }
 
 func NewEmulatorOption() *EmulatorOption {
@@ -18,12 +18,12 @@ func (o *EmulatorOption) WithNewRootContext(f func(uint32) proxywasm.RootContext
 	return o
 }
 
-func (o *EmulatorOption) WithNewHttpContext(f func(uint32) proxywasm.HttpContext) *EmulatorOption {
+func (o *EmulatorOption) WithNewHttpContext(f func(uint32, uint32) proxywasm.HttpContext) *EmulatorOption {
 	o.newHttpContext = f
 	return o
 }
 
-func (o *EmulatorOption) WithNewStreamContext(f func(uint32) proxywasm.StreamContext) *EmulatorOption {
+func (o *EmulatorOption) WithNewStreamContext(f func(uint32, uint32) proxywasm.StreamContext) *EmulatorOption {
 	o.newStreamContext = f
 	return o
 }
diff --git a/proxywasm/abi_lifecycle_test.go b/proxywasm/abi_lifecycle_test.go
@@ -27,15 +27,15 @@ func Test_proxyOnContextCreate(t *testing.T) {
 
 	proxyOnContextCreate(100, 0)
 	require.Equal(t, 1, cnt)
-	SetNewHttpContext(func(contextID uint32) HttpContext {
+	SetNewHttpContext(func(rootContextID, contextID uint32) HttpContext {
 		cnt += 100
 		return nil
 	})
 	proxyOnContextCreate(100, 100)
 	require.Equal(t, 101, cnt)
 	currentState.newHttpContext = nil
 
-	SetNewStreamContext(func(contextID uint32) StreamContext {
+	SetNewStreamContext(func(rootContextID, contextID uint32) StreamContext {
 		cnt += 1000
 		return nil
 	})
diff --git a/proxywasm/vmstate.go b/proxywasm/vmstate.go
@@ -29,9 +29,9 @@ type (
 type state struct {
 	newRootContext   func(contextID uint32) RootContext
 	rootContexts     map[uint32]*rootContextState
-	newStreamContext func(contextID uint32) StreamContext
+	newStreamContext func(rootContextID, contextID uint32) StreamContext
 	streams          map[uint32]StreamContext
-	newHttpContext   func(contextID uint32) HttpContext
+	newHttpContext   func(rootContextID, contextID uint32) HttpContext
 	httpStreams      map[uint32]HttpContext
 
 	contextIDToRooID map[uint32]uint32
@@ -49,11 +49,11 @@ func SetNewRootContext(f func(contextID uint32) RootContext) {
 	currentState.newRootContext = f
 }
 
-func SetNewHttpContext(f func(contextID uint32) HttpContext) {
+func SetNewHttpContext(f func(rootContextID, contextID uint32) HttpContext) {
 	currentState.newHttpContext = f
 }
 
-func SetNewStreamContext(f func(contextID uint32) StreamContext) {
+func SetNewStreamContext(f func(rootContextID, contextID uint32) StreamContext) {
 	currentState.newStreamContext = f
 }
 
@@ -84,7 +84,7 @@ func (s *state) createStreamContext(contextID uint32, rootContextID uint32) {
 		panic("context id duplicated")
 	}
 
-	ctx := s.newStreamContext(contextID)
+	ctx := s.newStreamContext(rootContextID, contextID)
 	s.contextIDToRooID[contextID] = rootContextID
 	s.streams[contextID] = ctx
 }
@@ -98,7 +98,7 @@ func (s *state) createHttpContext(contextID uint32, rootContextID uint32) {
 		panic("context id duplicated")
 	}
 
-	ctx := s.newHttpContext(contextID)
+	ctx := s.newHttpContext(rootContextID, contextID)
 	s.contextIDToRooID[contextID] = rootContextID
 	s.httpStreams[contextID] = ctx
 }
diff --git a/proxywasm/vmstate_test.go b/proxywasm/vmstate_test.go
@@ -29,12 +29,12 @@ func TestSetNewHttpContext(t *testing.T) {
 	defer currentStateMux.Unlock()
 
 	var cnt int
-	f := func(uint32) HttpContext {
+	f := func(uint32, uint32) HttpContext {
 		cnt++
 		return nil
 	}
 	SetNewHttpContext(f)
-	currentState.newHttpContext(0)
+	currentState.newHttpContext(0, 0)
 	assert.Equal(t, 1, cnt)
 }
 
@@ -43,12 +43,12 @@ func TestSetNewStreamContext(t *testing.T) {
 	defer currentStateMux.Unlock()
 
 	var cnt int
-	f := func(uint32) StreamContext {
+	f := func(uint32, uint32) StreamContext {
 		cnt++
 		return nil
 	}
 	SetNewStreamContext(f)
-	currentState.newStreamContext(0)
+	currentState.newStreamContext(0, 0)
 	assert.Equal(t, 1, cnt)
 }
 
@@ -86,7 +86,7 @@ func TestState_createStreamContext(t *testing.T) {
 	s := &state{
 		rootContexts:     map[uint32]*rootContextState{rid: nil},
 		streams:          map[uint32]StreamContext{},
-		newStreamContext: func(contextID uint32) StreamContext { return &sc{} },
+		newStreamContext: func(rootContextID, contextID uint32) StreamContext { return &sc{} },
 		contextIDToRooID: map[uint32]uint32{},
 	}
 
@@ -107,7 +107,7 @@ func TestState_createHttpContext(t *testing.T) {
 	s := &state{
 		rootContexts:     map[uint32]*rootContextState{rid: nil},
 		httpStreams:      map[uint32]HttpContext{},
-		newHttpContext:   func(contextID uint32) HttpContext { return &hc{} },
+		newHttpContext:   func(rootContextID, contextID uint32) HttpContext { return &hc{} },
 		contextIDToRooID: map[uint32]uint32{},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type httpAuthRandom struct {`
`33`	`33`	`contextID uint32`
`34`	`34`	`}`
`35`	`35`
`36`		`-func newContext(contextID uint32) proxywasm.HttpContext {`
	`36`	`+func newContext(rootContextID, contextID uint32) proxywasm.HttpContext {`
`37`	`37`	`return &httpAuthRandom{contextID: contextID}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type httpHeaders struct {`
`29`	`29`	`contextID uint32`
`30`	`30`	`}`
`31`	`31`
`32`		`-func newContext(contextID uint32) proxywasm.HttpContext {`
	`32`	`+func newContext(rootContextID, contextID uint32) proxywasm.HttpContext {`
`33`	`33`	`return &httpHeaders{contextID: contextID}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ type metricHttpContext struct {`
`48`	`48`	`proxywasm.DefaultHttpContext`
`49`	`49`	`}`
`50`	`50`
`51`		`-func newHttpContext(uint32) proxywasm.HttpContext {`
	`51`	`+func newHttpContext(uint32, uint32) proxywasm.HttpContext {`
`52`	`52`	`return &metricHttpContext{}`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ type networkContext struct {`
`48`	`48`	`proxywasm.DefaultStreamContext`
`49`	`49`	`}`
`50`	`50`
`51`		`-func newNetworkContext(uint32) proxywasm.StreamContext {`
	`51`	`+func newNetworkContext(uint32, uint32) proxywasm.StreamContext {`
`52`	`52`	`return &networkContext{}`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func newRootContext(uint32) proxywasm.RootContext {`
`40`	`40`	`return &sharedDataRootContext{}`
`41`	`41`	`}`
`42`	`42`
`43`		`-func newHttpContext(uint32) proxywasm.HttpContext {`
	`43`	`+func newHttpContext(uint32, uint32) proxywasm.HttpContext {`
`44`	`44`	`return &sharedDataHttpContext{}`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ type queueHttpContext struct {`
`74`	`74`	`proxywasm.DefaultHttpContext`
`75`	`75`	`}`
`76`	`76`
`77`		`-func newHttpContext(uint32) proxywasm.HttpContext {`
	`77`	`+func newHttpContext(uint32, uint32) proxywasm.HttpContext {`
`78`	`78`	`return &queueHttpContext{}`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import "github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"`
`5`	`5`	`type EmulatorOption struct {`
`6`	`6`	`pluginConfiguration, vmConfiguration []byte`
`7`	`7`	`newRootContext func(uint32) proxywasm.RootContext`
`8`		`- newStreamContext func(uint32) proxywasm.StreamContext`
`9`		`- newHttpContext func(uint32) proxywasm.HttpContext`
	`8`	`+ newStreamContext func(uint32, uint32) proxywasm.StreamContext`
	`9`	`+ newHttpContext func(uint32, uint32) proxywasm.HttpContext`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`func NewEmulatorOption() *EmulatorOption {`
`@@ -18,12 +18,12 @@ func (o *EmulatorOption) WithNewRootContext(f func(uint32) proxywasm.RootContext`
`18`	`18`	`return o`
`19`	`19`	`}`
`20`	`20`
`21`		`-func (o EmulatorOption) WithNewHttpContext(f func(uint32) proxywasm.HttpContext) EmulatorOption {`
	`21`	`+func (o EmulatorOption) WithNewHttpContext(f func(uint32, uint32) proxywasm.HttpContext) EmulatorOption {`
`22`	`22`	`o.newHttpContext = f`
`23`	`23`	`return o`
`24`	`24`	`}`
`25`	`25`
`26`		`-func (o EmulatorOption) WithNewStreamContext(f func(uint32) proxywasm.StreamContext) EmulatorOption {`
	`26`	`+func (o EmulatorOption) WithNewStreamContext(f func(uint32, uint32) proxywasm.StreamContext) EmulatorOption {`
`27`	`27`	`o.newStreamContext = f`
`28`	`28`	`return o`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ type (`
`29`	`29`	`type state struct {`
`30`	`30`	`newRootContext func(contextID uint32) RootContext`
`31`	`31`	`rootContexts map[uint32]*rootContextState`
`32`		`- newStreamContext func(contextID uint32) StreamContext`
	`32`	`+ newStreamContext func(rootContextID, contextID uint32) StreamContext`
`33`	`33`	`streams map[uint32]StreamContext`
`34`		`- newHttpContext func(contextID uint32) HttpContext`
	`34`	`+ newHttpContext func(rootContextID, contextID uint32) HttpContext`
`35`	`35`	`httpStreams map[uint32]HttpContext`
`36`	`36`
`37`	`37`	`contextIDToRooID map[uint32]uint32`
`@@ -49,11 +49,11 @@ func SetNewRootContext(f func(contextID uint32) RootContext) {`
`49`	`49`	`currentState.newRootContext = f`
`50`	`50`	`}`
`51`	`51`
`52`		`-func SetNewHttpContext(f func(contextID uint32) HttpContext) {`
	`52`	`+func SetNewHttpContext(f func(rootContextID, contextID uint32) HttpContext) {`
`53`	`53`	`currentState.newHttpContext = f`
`54`	`54`	`}`
`55`	`55`
`56`		`-func SetNewStreamContext(f func(contextID uint32) StreamContext) {`
	`56`	`+func SetNewStreamContext(f func(rootContextID, contextID uint32) StreamContext) {`
`57`	`57`	`currentState.newStreamContext = f`
`58`	`58`	`}`
`59`	`59`
`@@ -84,7 +84,7 @@ func (s *state) createStreamContext(contextID uint32, rootContextID uint32) {`
`84`	`84`	`panic("context id duplicated")`
`85`	`85`	`}`
`86`	`86`
`87`		`- ctx := s.newStreamContext(contextID)`
	`87`	`+ ctx := s.newStreamContext(rootContextID, contextID)`
`88`	`88`	`s.contextIDToRooID[contextID] = rootContextID`
`89`	`89`	`s.streams[contextID] = ctx`
`90`	`90`	`}`
`@@ -98,7 +98,7 @@ func (s *state) createHttpContext(contextID uint32, rootContextID uint32) {`
`98`	`98`	`panic("context id duplicated")`
`99`	`99`	`}`
`100`	`100`
`101`		`- ctx := s.newHttpContext(contextID)`
	`101`	`+ ctx := s.newHttpContext(rootContextID, contextID)`
`102`	`102`	`s.contextIDToRooID[contextID] = rootContextID`
`103`	`103`	`s.httpStreams[contextID] = ctx`
`104`	`104`	`}`