refine tinygo/httpfilter example

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

Author: mathetake

data/extension/init/templates/tinygo/envoy.filters.http/default/main.go

@@ -5,25 +5,51 @@ import (
 	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
 )
 
+var (
+	requestCounterName = "proxy_wasm_go.request_counter"
+	counter            proxywasm.MetricCounter
+)
+
 func main() {
-	proxywasm.SetNewHttpContext(newContext)
+	proxywasm.SetNewRootContext(func(uint32) proxywasm.RootContext { return &context{} })
+	proxywasm.SetNewHttpContext(func(uint32) proxywasm.HttpContext { return &context{} })
 }
 
-type httpFilterContext struct {
-	id uint32
-	proxywasm.DefaultContext
-}
+type context struct{ proxywasm.DefaultContext }
 
-func newContext(contextID uint32) proxywasm.HttpContext {
-	return &httpFilterContext{id: contextID}
+func (ctx *context) OnVMStart(int) bool {
+	var err error
+	counter, err = proxywasm.DefineCounterMetric(requestCounterName)
+	if err != nil {
+		proxywasm.LogCritical("failed to initialize request counter: ", err.Error())
+	}
+	return true
 }
 
-func (ctx *httpFilterContext) OnHttpRequestHeaders(int, bool) types.Action {
-	// TODO:
+func (ctx *context) OnHttpRequestHeaders(int, bool) types.Action {
+	hs, err := proxywasm.HostCallGetHttpRequestHeaders()
+	if err != nil {
+		proxywasm.LogCritical("failed to get request headers: ", err.Error())
+	}
+
+	proxywasm.LogInfo("observing request headers")
+	for _, h := range hs {
+		proxywasm.LogInfo(h[0], ": ", h[1])
+	}
+
 	return types.ActionContinue
 }
 
-func (ctx *httpFilterContext) OnHttpResponseHeaders(int, bool) types.Action {
-	// TODO:
+func (ctx *context) OnHttpResponseHeaders(int, bool) types.Action {
+	if err := proxywasm.HostCallSetHttpResponseHeader("additional", "header"); err != nil {
+		proxywasm.LogCritical(err.Error())
+	}
 	return types.ActionContinue
 }
+
+func (ctx *context) OnDone() bool {
+	if err := counter.Increment(1); err != nil {
+		proxywasm.LogCritical("failed to increment request counter: ", err.Error())
+	}
+	return true
+}

data/extension/init/templates/tinygo/envoy.filters.http/default/main_test.go

@@ -7,11 +7,14 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/tetratelabs/proxy-wasm-go-sdk/proxytest"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
 	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
 )
 
 func TestHttpHeaders_OnHttpRequestHeaders(t *testing.T) {
-	host, done := proxytest.NewHttpFilterHost(newContext)
+	host, done := proxytest.NewHttpFilterHost(func(contextID uint32) proxywasm.HttpContext {
+		return &context{}
+	})
 	defer done()
 	id := host.InitContext()
 
@@ -22,26 +25,9 @@ func TestHttpHeaders_OnHttpRequestHeaders(t *testing.T) {
 	host.PutRequestHeaders(id, hs) // call OnHttpRequestHeaders
 
 	logs := host.GetLogs(types.LogLevelInfo)
-	require.Greater(t, len(logs), 1)
+	require.Greater(t, len(logs), 2)
 
-	assert.Equal(t, "request header: key2: value2", logs[len(logs)-1])
-	assert.Equal(t, "request header: key1: value1", logs[len(logs)-2])
-}
-
-func TestHttpHeaders_OnHttpResponseHeaders(t *testing.T) {
-	host, done := proxytest.NewHttpFilterHost(newContext)
-	defer done()
-	id := host.InitContext()
-
-	hs := [][2]string{
-		{"key1", "value1"},
-		{"key2", "value2"},
-	}
-	host.PutResponseHeaders(id, hs) // call OnHttpResponseHeaders
-
-	logs := host.GetLogs(types.LogLevelInfo)
-	require.Greater(t, len(logs), 1)
-
-	assert.Equal(t, "response header: key2: value2", logs[len(logs)-1])
-	assert.Equal(t, "response header: key1: value1", logs[len(logs)-2])
+	assert.Equal(t, "key2: value2", logs[len(logs)-1])
+	assert.Equal(t, "key1: value1", logs[len(logs)-2])
+	assert.Equal(t, "observing request headers", logs[len(logs)-3])
 }

images/extension-builders/tinygo/Dockerfile

@@ -33,7 +33,6 @@ ENV TINYGO_SDK_PATH=${GOMODCACHE}/${TINYGO_SDK_NAME}@${TINYGO_SDK_VERSION}
 
 RUN mkdir -p ${TINYGO_SDK_PATH} && git clone https://${TINYGO_SDK_NAME} -b ${TINYGO_SDK_VERSION} ${TINYGO_SDK_PATH}
 
-
 COPY ./entrypoint.sh /usr/local/getenvoy/extension/builder/entrypoint.sh
 COPY ./tinygo/commands.sh /usr/local/getenvoy/extension/builder/commands.sh
 ENTRYPOINT ["/usr/local/getenvoy/extension/builder/entrypoint.sh"]

images/extension-builders/tinygo/commands.sh

@@ -23,14 +23,15 @@
 #   Path relative to the workspace root to copy *.wasm file to.
 #########################################################################
 extension_build()  {
-	tinygo build -o "$1" -wasm-abi=generic -target wasm main.go
+	exec tinygo build -o "$1" -wasm-abi=generic -target wasm main.go
 }
 
 extension_test()  {
-	go test -tags=proxytest -v ./...
+	exec go test -tags=proxytest -v ./...
 }
 
 extension_clean()  {
-	rm main.wasm || true
-	rm -rf "${GOCACHE}" "${XDG_CACHE_HOME}" "${GOMODCACHE}" || true
+	rm /source/main.wasm || true
+	go clean -modcache
+	rm -rf "${GOCACHE}" "${XDG_CACHE_HOME}" || true
 }