name parameters in examples

mathetake · mathetake · commit b03377749d79 · 2020-10-05T15:51:40.000+09:00
Signed-off-by: mathetake &lt;takeshi@tetrate.io&gt;
diff --git a/examples/helloworld/main.go b/examples/helloworld/main.go
@@ -37,7 +37,7 @@ func newHelloWorld(contextID uint32) proxywasm.RootContext {
 }
 
 // override
-func (ctx *helloWorld) OnVMStart(int) bool {
+func (ctx *helloWorld) OnVMStart(vmConfigurationSize int) bool {
 	rand.Seed(proxywasm.GetCurrentTime())
 
 	proxywasm.LogInfo("proxy_on_vm_start from Go!")
diff --git a/examples/http_auth_random/main.go b/examples/http_auth_random/main.go
@@ -38,7 +38,7 @@ func newContext(rootContextID, contextID uint32) proxywasm.HttpContext {
 }
 
 // override default
-func (ctx *httpAuthRandom) OnHttpRequestHeaders(int, bool) types.Action {
+func (ctx *httpAuthRandom) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {
 	hs, err := proxywasm.GetHttpRequestHeaders()
 	if err != nil {
 		proxywasm.LogCriticalf("failed to get request headers: %v", err)
@@ -58,7 +58,7 @@ func (ctx *httpAuthRandom) OnHttpRequestHeaders(int, bool) types.Action {
 	return types.ActionPause
 }
 
-func httpCallResponseCallback(_ int, bodySize int, _ int) {
+func httpCallResponseCallback(numHeaders, bodySize, numTrailers int) {
 	hs, err := proxywasm.GetHttpCallResponseHeaders()
 	if err != nil {
 
diff --git a/examples/http_headers/main.go b/examples/http_headers/main.go
@@ -34,7 +34,7 @@ func newContext(rootContextID, contextID uint32) proxywasm.HttpContext {
 }
 
 // override
-func (ctx *httpHeaders) OnHttpRequestHeaders(int, bool) types.Action {
+func (ctx *httpHeaders) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {
 	hs, err := proxywasm.GetHttpRequestHeaders()
 	if err != nil {
 		proxywasm.LogCriticalf("failed to get request headers: %v", err)
@@ -47,7 +47,7 @@ func (ctx *httpHeaders) OnHttpRequestHeaders(int, bool) types.Action {
 }
 
 // override
-func (ctx *httpHeaders) OnHttpResponseHeaders(int, bool) types.Action {
+func (ctx *httpHeaders) OnHttpResponseHeaders(numHeaders int, endOfStream bool) types.Action {
 	hs, err := proxywasm.GetHttpResponseHeaders()
 	if err != nil {
 		proxywasm.LogCriticalf("failed to get request headers: %v", err)
diff --git a/examples/metrics/main.go b/examples/metrics/main.go
@@ -38,7 +38,7 @@ func newRootContext(uint32) proxywasm.RootContext {
 }
 
 // override
-func (ctx *metricRootContext) OnVMStart(int) bool {
+func (ctx *metricRootContext) OnVMStart(vmConfigurationSize int) bool {
 	counter = proxywasm.DefineCounterMetric(metricsName)
 	return true
 }
@@ -53,7 +53,7 @@ func newHttpContext(uint32, uint32) proxywasm.HttpContext {
 }
 
 // override
-func (ctx *metricHttpContext) OnHttpRequestHeaders(int, bool) types.Action {
+func (ctx *metricHttpContext) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {
 	prev := counter.Get()
 	proxywasm.LogInfof("previous value of %s: %d", metricsName, prev)
 
diff --git a/examples/network/main.go b/examples/network/main.go
@@ -34,11 +34,11 @@ type rootContext struct {
 	proxywasm.DefaultRootContext
 }
 
-func newRootContext(uint32) proxywasm.RootContext {
+func newRootContext(contextID uint32) proxywasm.RootContext {
 	return &rootContext{}
 }
 
-func (ctx *rootContext) OnVMStart(int) bool {
+func (ctx *rootContext) OnVMStart(vmConfigurationSize int) bool {
 	counter = proxywasm.DefineCounterMetric(connectionCounterName)
 	return true
 }
@@ -48,7 +48,7 @@ type networkContext struct {
 	proxywasm.DefaultStreamContext
 }
 
-func newNetworkContext(uint32, uint32) proxywasm.StreamContext {
+func newNetworkContext(rootContextID, contextID uint32) proxywasm.StreamContext {
 	return &networkContext{}
 }
 
@@ -57,7 +57,7 @@ func (ctx *networkContext) OnNewConnection() types.Action {
 	return types.ActionContinue
 }
 
-func (ctx *networkContext) OnDownstreamData(dataSize int, _ bool) types.Action {
+func (ctx *networkContext) OnDownstreamData(dataSize int, endOfStream bool) types.Action {
 	if dataSize == 0 {
 		return types.ActionContinue
 	}
@@ -77,7 +77,7 @@ func (ctx *networkContext) OnDownstreamClose(types.PeerType) {
 	return
 }
 
-func (ctx *networkContext) OnUpstreamData(dataSize int, _ bool) types.Action {
+func (ctx *networkContext) OnUpstreamData(dataSize int, endOfStream bool) types.Action {
 	if dataSize == 0 {
 		return types.ActionContinue
 	}
diff --git a/examples/shared_data/main.go b/examples/shared_data/main.go
@@ -36,26 +36,26 @@ type (
 	}
 )
 
-func newRootContext(uint32) proxywasm.RootContext {
+func newRootContext(contextID uint32) proxywasm.RootContext {
 	return &sharedDataRootContext{}
 }
 
-func newHttpContext(uint32, uint32) proxywasm.HttpContext {
+func newHttpContext(rootContextID, contextID uint32) proxywasm.HttpContext {
 	return &sharedDataHttpContext{}
 }
 
 const sharedDataKey = "shared_data_key"
 
 // override
-func (ctx *sharedDataRootContext) OnVMStart(int) bool {
+func (ctx *sharedDataRootContext) OnVMStart(vmConfigurationSize int) bool {
 	if err := proxywasm.SetSharedData(sharedDataKey, []byte{0}, 0); err != nil {
 		proxywasm.LogWarnf("error setting shared data on OnVMStart: %v", err)
 	}
 	return true
 }
 
 // override
-func (ctx *sharedDataHttpContext) OnHttpRequestHeaders(int, bool) types.Action {
+func (ctx *sharedDataHttpContext) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {
 	value, cas, err := proxywasm.GetSharedData(sharedDataKey)
 	if err != nil {
 		proxywasm.LogWarnf("error getting shared data on OnHttpRequestHeaders: %v", err)
diff --git a/examples/shared_queue/main.go b/examples/shared_queue/main.go
@@ -41,7 +41,7 @@ func newRootContext(uint32) proxywasm.RootContext {
 var queueID uint32
 
 // override
-func (ctx *queueRootContext) OnVMStart(int) bool {
+func (ctx *queueRootContext) OnVMStart(vmConfigurationSize int) bool {
 	qID, err := proxywasm.RegisterSharedQueue(queueName)
 	if err != nil {
 		panic(err.Error())
@@ -74,7 +74,7 @@ type queueHttpContext struct {
 	proxywasm.DefaultHttpContext
 }
 
-func newHttpContext(uint32, uint32) proxywasm.HttpContext {
+func newHttpContext(rootContextID, contextID uint32) proxywasm.HttpContext {
 	return &queueHttpContext{}
 }
 
diff --git a/proxywasm/hostcall.go b/proxywasm/hostcall.go
@@ -21,13 +21,13 @@ import (
 
 // wrappers on the rawhostcall package
 
-func GetPluginConfiguration(dataSize int) ([]byte, error) {
-	ret, st := getBuffer(types.BufferTypePluginConfiguration, 0, dataSize)
+func GetPluginConfiguration(size int) ([]byte, error) {
+	ret, st := getBuffer(types.BufferTypePluginConfiguration, 0, size)
 	return ret, types.StatusToError(st)
 }
 
-func GetVMConfiguration(dataSize int) ([]byte, error) {
-	ret, st := getBuffer(types.BufferTypeVMConfiguration, 0, dataSize)
+func GetVMConfiguration(size int) ([]byte, error) {
+	ret, st := getBuffer(types.BufferTypeVMConfiguration, 0, size)
 	return ret, types.StatusToError(st)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func newHelloWorld(contextID uint32) proxywasm.RootContext {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// override`
`40`		`-func (ctx *helloWorld) OnVMStart(int) bool {`
	`40`	`+func (ctx *helloWorld) OnVMStart(vmConfigurationSize int) bool {`
`41`	`41`	`rand.Seed(proxywasm.GetCurrentTime())`
`42`	`42`
`43`	`43`	`proxywasm.LogInfo("proxy_on_vm_start from Go!")`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func newContext(rootContextID, contextID uint32) proxywasm.HttpContext {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// override default`
`41`		`-func (ctx *httpAuthRandom) OnHttpRequestHeaders(int, bool) types.Action {`
	`41`	`+func (ctx *httpAuthRandom) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {`
`42`	`42`	`hs, err := proxywasm.GetHttpRequestHeaders()`
`43`	`43`	`if err != nil {`
`44`	`44`	`proxywasm.LogCriticalf("failed to get request headers: %v", err)`
`@@ -58,7 +58,7 @@ func (ctx *httpAuthRandom) OnHttpRequestHeaders(int, bool) types.Action {`
`58`	`58`	`return types.ActionPause`
`59`	`59`	`}`
`60`	`60`
`61`		`-func httpCallResponseCallback(_ int, bodySize int, _ int) {`
	`61`	`+func httpCallResponseCallback(numHeaders, bodySize, numTrailers int) {`
`62`	`62`	`hs, err := proxywasm.GetHttpCallResponseHeaders()`
`63`	`63`	`if err != nil {`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func newRootContext(uint32) proxywasm.RootContext {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// override`
`41`		`-func (ctx *metricRootContext) OnVMStart(int) bool {`
	`41`	`+func (ctx *metricRootContext) OnVMStart(vmConfigurationSize int) bool {`
`42`	`42`	`counter = proxywasm.DefineCounterMetric(metricsName)`
`43`	`43`	`return true`
`44`	`44`	`}`
`@@ -53,7 +53,7 @@ func newHttpContext(uint32, uint32) proxywasm.HttpContext {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// override`
`56`		`-func (ctx *metricHttpContext) OnHttpRequestHeaders(int, bool) types.Action {`
	`56`	`+func (ctx *metricHttpContext) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {`
`57`	`57`	`prev := counter.Get()`
`58`	`58`	`proxywasm.LogInfof("previous value of %s: %d", metricsName, prev)`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ type rootContext struct {`
`34`	`34`	`proxywasm.DefaultRootContext`
`35`	`35`	`}`
`36`	`36`
`37`		`-func newRootContext(uint32) proxywasm.RootContext {`
	`37`	`+func newRootContext(contextID uint32) proxywasm.RootContext {`
`38`	`38`	`return &rootContext{}`
`39`	`39`	`}`
`40`	`40`
`41`		`-func (ctx *rootContext) OnVMStart(int) bool {`
	`41`	`+func (ctx *rootContext) OnVMStart(vmConfigurationSize int) bool {`
`42`	`42`	`counter = proxywasm.DefineCounterMetric(connectionCounterName)`
`43`	`43`	`return true`
`44`	`44`	`}`
`@@ -48,7 +48,7 @@ type networkContext struct {`
`48`	`48`	`proxywasm.DefaultStreamContext`
`49`	`49`	`}`
`50`	`50`
`51`		`-func newNetworkContext(uint32, uint32) proxywasm.StreamContext {`
	`51`	`+func newNetworkContext(rootContextID, contextID uint32) proxywasm.StreamContext {`
`52`	`52`	`return &networkContext{}`
`53`	`53`	`}`
`54`	`54`
`@@ -57,7 +57,7 @@ func (ctx *networkContext) OnNewConnection() types.Action {`
`57`	`57`	`return types.ActionContinue`
`58`	`58`	`}`
`59`	`59`
`60`		`-func (ctx *networkContext) OnDownstreamData(dataSize int, _ bool) types.Action {`
	`60`	`+func (ctx *networkContext) OnDownstreamData(dataSize int, endOfStream bool) types.Action {`
`61`	`61`	`if dataSize == 0 {`
`62`	`62`	`return types.ActionContinue`
`63`	`63`	`}`
`@@ -77,7 +77,7 @@ func (ctx *networkContext) OnDownstreamClose(types.PeerType) {`
`77`	`77`	`return`
`78`	`78`	`}`
`79`	`79`
`80`		`-func (ctx *networkContext) OnUpstreamData(dataSize int, _ bool) types.Action {`
	`80`	`+func (ctx *networkContext) OnUpstreamData(dataSize int, endOfStream bool) types.Action {`
`81`	`81`	`if dataSize == 0 {`
`82`	`82`	`return types.ActionContinue`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,26 +36,26 @@ type (`
`36`	`36`	`}`
`37`	`37`	`)`
`38`	`38`
`39`		`-func newRootContext(uint32) proxywasm.RootContext {`
	`39`	`+func newRootContext(contextID uint32) proxywasm.RootContext {`
`40`	`40`	`return &sharedDataRootContext{}`
`41`	`41`	`}`
`42`	`42`
`43`		`-func newHttpContext(uint32, uint32) proxywasm.HttpContext {`
	`43`	`+func newHttpContext(rootContextID, contextID uint32) proxywasm.HttpContext {`
`44`	`44`	`return &sharedDataHttpContext{}`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`const sharedDataKey = "shared_data_key"`
`48`	`48`
`49`	`49`	`// override`
`50`		`-func (ctx *sharedDataRootContext) OnVMStart(int) bool {`
	`50`	`+func (ctx *sharedDataRootContext) OnVMStart(vmConfigurationSize int) bool {`
`51`	`51`	`if err := proxywasm.SetSharedData(sharedDataKey, []byte{0}, 0); err != nil {`
`52`	`52`	`proxywasm.LogWarnf("error setting shared data on OnVMStart: %v", err)`
`53`	`53`	`}`
`54`	`54`	`return true`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// override`
`58`		`-func (ctx *sharedDataHttpContext) OnHttpRequestHeaders(int, bool) types.Action {`
	`58`	`+func (ctx *sharedDataHttpContext) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {`
`59`	`59`	`value, cas, err := proxywasm.GetSharedData(sharedDataKey)`
`60`	`60`	`if err != nil {`
`61`	`61`	`proxywasm.LogWarnf("error getting shared data on OnHttpRequestHeaders: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func newRootContext(uint32) proxywasm.RootContext {`
`41`	`41`	`var queueID uint32`
`42`	`42`
`43`	`43`	`// override`
`44`		`-func (ctx *queueRootContext) OnVMStart(int) bool {`
	`44`	`+func (ctx *queueRootContext) OnVMStart(vmConfigurationSize int) bool {`
`45`	`45`	`qID, err := proxywasm.RegisterSharedQueue(queueName)`
`46`	`46`	`if err != nil {`
`47`	`47`	`panic(err.Error())`
`@@ -74,7 +74,7 @@ type queueHttpContext struct {`
`74`	`74`	`proxywasm.DefaultHttpContext`
`75`	`75`	`}`
`76`	`76`
`77`		`-func newHttpContext(uint32, uint32) proxywasm.HttpContext {`
	`77`	`+func newHttpContext(rootContextID, contextID uint32) proxywasm.HttpContext {`
`78`	`78`	`return &queueHttpContext{}`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ import (`
`21`	`21`
`22`	`22`	`// wrappers on the rawhostcall package`
`23`	`23`
`24`		`-func GetPluginConfiguration(dataSize int) ([]byte, error) {`
`25`		`- ret, st := getBuffer(types.BufferTypePluginConfiguration, 0, dataSize)`
	`24`	`+func GetPluginConfiguration(size int) ([]byte, error) {`
	`25`	`+ ret, st := getBuffer(types.BufferTypePluginConfiguration, 0, size)`
`26`	`26`	`return ret, types.StatusToError(st)`
`27`	`27`	`}`
`28`	`28`
`29`		`-func GetVMConfiguration(dataSize int) ([]byte, error) {`
`30`		`- ret, st := getBuffer(types.BufferTypeVMConfiguration, 0, dataSize)`
	`29`	`+func GetVMConfiguration(size int) ([]byte, error) {`
	`30`	`+ ret, st := getBuffer(types.BufferTypeVMConfiguration, 0, size)`
`31`	`31`	`return ret, types.StatusToError(st)`
`32`	`32`	`}`
`33`	`33`