Support TinyGo SDK for extension toolkit

Makefile

@@ -15,7 +15,7 @@
 ENVOY = standard:1.11.1
 HUB ?= docker.io/getenvoy
 GETENVOY_TAG ?= dev
-BUILDERS_LANGS := rust
+BUILDERS_LANGS := rust tinygo
 BUILDERS_TAG ?= latest
 EXTRA_TAG ?=
 
@@ -139,7 +139,7 @@ builder/$(1):
 	$(if $(USE_DOCKER_BUILDKIT_CACHE),--build-arg BUILDKIT_INLINE_CACHE=1,)                                                         \
 	$(if $(USE_DOCKER_BUILDKIT_CACHE),--cache-from $(call EXTENSION_BUILDER_IMAGE,$(1),$(EXTENSION_BUILDER_IMAGE_LATEST_VERSION)),) \
 	-t $(call EXTENSION_BUILDER_IMAGE,$(1),$(BUILDERS_TAG))                                                                         \
-	images/extension-builders/$(1)
+	-f images/extension-builders/$(1)/Dockerfile images/extension-builders
 endef
 $(foreach lang,$(BUILDERS_LANGS),$(eval $(call GEN_BUILD_EXTENSION_BUILDER_IMAGE_TARGET,$(lang))))
 

data/extension/init/templates/tinygo/envoy.access_loggers/default/go.mod

@@ -0,0 +1,8 @@
+module my.filters.http
+
+go 1.15
+
+require (
+	github.com/stretchr/testify v1.6.1
+	github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14
+)

data/extension/init/templates/tinygo/envoy.access_loggers/default/go.sum

@@ -0,0 +1,13 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14 h1:13uKVfbtQJGshUqrGN7ujlJZwKYCS8N46NvBwKu5VvU=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14/go.mod h1:y1ZQT4bQEBnR8Do4nSOzb3roczzPvcAp8UrF6NEYWNY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

data/extension/init/templates/tinygo/envoy.access_loggers/default/main.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
+)
+
+func main() {
+	proxywasm.SetNewRootContext(newAccessLogger)
+}
+
+type accessLogger struct {
+	// you must embed the default context
+	proxywasm.DefaultRootContext
+}
+
+func newAccessLogger(contextID uint32) proxywasm.RootContext {
+	return &accessLogger{}
+}
+
+// override
+func (ctx *accessLogger) OnLog() {
+	hdr, err := proxywasm.GetHttpRequestHeader(":path")
+	if err != nil {
+		proxywasm.LogCritical(err.Error())
+		return
+	}
+
+	proxywasm.LogInfof("OnLog: :path = %s", hdr)
+}

data/extension/init/templates/tinygo/envoy.access_loggers/default/main_test.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxytest"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
+)
+
+func TestHelloWorld_OnTick(t *testing.T) {
+	opt := proxytest.NewEmulatorOption().
+		WithNewRootContext(newAccessLogger)
+	host := proxytest.NewHostEmulator(opt)
+	defer host.Done() // release the host emulation lock so that other test cases can insert their own host emulation
+
+	path := [2]string{":path", "/this/is/path"}
+	host.CallOnLogForAccessLogger([][2]string{path}, nil) // call OnLog
+
+	logs := host.GetLogs(types.LogLevelInfo)
+	require.Greater(t, len(logs), 0)
+	msg := logs[len(logs)-1]
+
+	assert.True(t, strings.Contains(msg, "/this/is/path"))
+}

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

@@ -0,0 +1,8 @@
+module my.filters.http
+
+go 1.15
+
+require (
+	github.com/stretchr/testify v1.6.1
+	github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14
+)

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

@@ -0,0 +1,13 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14 h1:13uKVfbtQJGshUqrGN7ujlJZwKYCS8N46NvBwKu5VvU=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14/go.mod h1:y1ZQT4bQEBnR8Do4nSOzb3roczzPvcAp8UrF6NEYWNY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

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

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
+)
+
+var (
+	requestCounterName = "my_http_filter.request_counter"
+	counter            proxywasm.MetricCounter
+)
+
+func main() {
+	proxywasm.SetNewRootContext(newRootContext)
+	proxywasm.SetNewHttpContext(newHttpContext)
+}
+
+type rootContext struct {
+	// we must embed the default context
+	proxywasm.DefaultRootContext
+	contextID uint32
+}
+
+func newRootContext(rootContextID uint32) proxywasm.RootContext {
+	return &rootContext{contextID: rootContextID}
+}
+
+func (ctx *rootContext) OnVMStart(vmConfigurationSize int) bool {
+	counter = proxywasm.DefineCounterMetric(requestCounterName)
+	return true
+}
+
+type httpContext struct {
+	// you must embed the default context
+	proxywasm.DefaultHttpContext
+	rootContextID, contextID uint32
+}
+
+func newHttpContext(rootContextID, contextID uint32) proxywasm.HttpContext {
+	return &httpContext{contextID: contextID, rootContextID: rootContextID}
+}
+
+func (ctx *httpContext) OnHttpRequestHeaders(numHeaders int, endOfStream bool) types.Action {
+	hs, err := proxywasm.GetHttpRequestHeaders()
+	if err != nil {
+		proxywasm.LogCriticalf("failed to get request headers: %v", err)
+		return types.ActionPause
+	}
+
+	proxywasm.LogInfo("observing request headers")
+	for _, h := range hs {
+		proxywasm.LogInfof("%s: %s", h[0], h[1])
+	}
+
+	return types.ActionContinue
+}
+
+func (ctx *httpContext) OnHttpResponseHeaders(numHeaders int, endOfStream bool) types.Action {
+	if err := proxywasm.SetHttpResponseHeader("additional", "header"); err != nil {
+		proxywasm.LogCriticalf("failed to add header: %v", err)
+		return types.ActionPause
+	}
+	return types.ActionContinue
+}
+
+func (ctx *httpContext) OnHttpStreamDone() {
+	counter.Increment(1)
+}

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

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxytest"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
+)
+
+func TestHttpHeaders_OnHttpRequestHeaders(t *testing.T) {
+	opt := proxytest.NewEmulatorOption().
+		WithNewRootContext(newRootContext).
+		WithNewHttpContext(newHttpContext)
+	host := proxytest.NewHostEmulator(opt)
+	defer host.Done() // release the host emulation lock so that other test cases can insert their own host emulation
+
+	host.StartVM() // call OnVMStart -> the metric is initialized
+
+	contextID := host.HttpFilterInitContext() // create http stream
+
+	hs := [][2]string{
+		{"key1", "value1"},
+		{"key2", "value2"},
+	}
+
+	host.HttpFilterPutRequestHeaders(contextID, hs) // call OnHttpRequestHeaders
+
+	logs := host.GetLogs(types.LogLevelInfo)
+	require.Greater(t, 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])
+}

data/extension/init/templates/tinygo/envoy.filters.network/default/go.mod

@@ -0,0 +1,8 @@
+module my.filters.http
+
+go 1.15
+
+require (
+	github.com/stretchr/testify v1.6.1
+	github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14
+)

data/extension/init/templates/tinygo/envoy.filters.network/default/go.sum

@@ -0,0 +1,13 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14 h1:13uKVfbtQJGshUqrGN7ujlJZwKYCS8N46NvBwKu5VvU=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.14/go.mod h1:y1ZQT4bQEBnR8Do4nSOzb3roczzPvcAp8UrF6NEYWNY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

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

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
+)
+
+var (
+	connectionCounterName = "my_network_filter.connection_counter"
+	counter               proxywasm.MetricCounter
+)
+
+func main() {
+	proxywasm.SetNewRootContext(newRootContext)
+	proxywasm.SetNewStreamContext(newStreamContext)
+}
+
+type rootContext struct {
+	// we must embed the default context
+	proxywasm.DefaultRootContext
+	contextID uint32
+}
+
+func newRootContext(rootContextID uint32) proxywasm.RootContext {
+	return &rootContext{contextID: rootContextID}
+}
+
+func (ctx *rootContext) OnVMStart(vmConfigurationSize int) bool {
+	counter = proxywasm.DefineCounterMetric(connectionCounterName)
+	return true
+}
+
+type streamContext struct {
+	// we must embed the default context
+	proxywasm.DefaultStreamContext
+	rootContextID, contextID uint32
+}
+
+func newStreamContext(rootContextID, contextID uint32) proxywasm.StreamContext {
+	return &streamContext{contextID: contextID, rootContextID: rootContextID}
+}
+
+func (ctx *streamContext) OnNewConnection() types.Action {
+	proxywasm.LogInfo("new connection!")
+	return types.ActionContinue
+}
+
+func (ctx *streamContext) OnStreamDone() {
+	counter.Increment(1)
+	proxywasm.LogInfo("connection complete!")
+}

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

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxytest"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
+)
+
+func TestNetwork_OnNewConnection(t *testing.T) {
+	opt := proxytest.NewEmulatorOption().
+		WithNewRootContext(newRootContext).
+		WithNewStreamContext(newStreamContext)
+	host := proxytest.NewHostEmulator(opt)
+	defer host.Done() // release the host emulation lock so that other test cases can insert their own host emulation
+
+	host.NetworkFilterInitConnection() // OnNewConnection is called
+
+	logs := host.GetLogs(types.LogLevelInfo) // retrieve logs emitted to Envoy
+	assert.Equal(t, logs[0], "new connection!")
+}
+
+func TestNetwork_counter(t *testing.T) {
+	opt := proxytest.NewEmulatorOption().
+		WithNewRootContext(newRootContext).
+		WithNewStreamContext(newStreamContext)
+	host := proxytest.NewHostEmulator(opt)
+	defer host.Done() // release the host emulation lock so that other test cases can insert their own host emulation
+
+	host.StartVM() // init metric
+
+	contextID := host.NetworkFilterInitConnection()
+	host.NetworkFilterCompleteConnection(contextID) // call OnDone on contextID -> increment the connection counter
+
+	logs := host.GetLogs(types.LogLevelInfo)
+	require.Greater(t, len(logs), 0)
+
+	assert.Equal(t, "connection complete!", logs[len(logs)-1])
+	actual := counter.Get()
+	assert.Equal(t, uint64(1), actual)
+}

go.mod

@@ -23,7 +23,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/onsi/ginkgo v1.12.1
 	github.com/onsi/gomega v1.10.0
-	github.com/opencontainers/go-digest v1.0.0-rc1
 	github.com/opencontainers/image-spec v1.0.1
 	github.com/opencontainers/selinux v1.8.0 // indirect
 	github.com/otiai10/copy v1.2.0