support 'extension build/test/clean' command for TinyGo

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

Author: mathetake

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 ?=
 
@@ -133,7 +133,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.filters.http/default/go.mod

@@ -1,6 +1,6 @@
 module envoy.filters.http
 
-go 1.14
+go 1.15
 
 require (
 	github.com/stretchr/testify v1.6.1

images/extension-builders/rust/entrypoint.sh renamed to images/extension-builders/entrypoint.sh

@@ -24,6 +24,6 @@ RUN rustup target add wasm32-unknown-unknown
 ENV CARGO_HOME=
 
 COPY ./entrypoint.sh /usr/local/getenvoy/extension/builder/entrypoint.sh
-COPY ./commands.sh /usr/local/getenvoy/extension/builder/commands.sh
+COPY ./rust/commands.sh /usr/local/getenvoy/extension/builder/commands.sh
 ENTRYPOINT ["/usr/local/getenvoy/extension/builder/entrypoint.sh"]
 CMD ["--help"]

images/extension-builders/rust/Dockerfile

@@ -0,0 +1,40 @@
+# Copyright 2020 Tetrate
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Builder image for Envoy Wasm extensions written in Go.
+#
+
+FROM golang:1.15
+
+ENV TINYGO_VERSION=0.15.0
+
+RUN wget https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo_${TINYGO_VERSION}_amd64.deb
+RUN dpkg -i tinygo_${TINYGO_VERSION}_amd64.deb && rm tinygo_${TINYGO_VERSION}_amd64.deb
+
+ENV GOCACHE=/source/.gocache
+ENV GOMODCACHE=/source/.gomodcache
+ENV XDG_CACHE_HOME=/source/.cache
+
+ENV TINYGO_SDK_NAME=github.com/tetratelabs/proxy-wasm-go-sdk
+ENV TINYGO_SDK_VERSION=v0.0.1
+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"]
+CMD ["--help"]

images/extension-builders/tinygo/Dockerfile

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Copyright 2020 Tetrate
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#########################################################################
+# Build Wasm extension and copy *.wasm file to a given location.
+# Globals:
+#   CARGO_TARGET_DIR
+#   GETENVOY_WORKSPACE_DIR
+# Arguments:
+#   Path relative to the workspace root to copy *.wasm file to.
+#########################################################################
+extension_build()  {
+	tinygo build -o "$1" -wasm-abi=generic -target wasm main.go
+}
+
+extension_test()  {
+	go test -tags=proxytest -v ./...
+}
+
+extension_clean()  {
+	rm main.wasm || true
+	rm -rf "${GOCACHE}" "${XDG_CACHE_HOME}" "${GOMODCACHE}" || true
+}

images/extension-builders/tinygo/commands.sh

@@ -82,6 +82,7 @@ Run unit tests on Envoy extension.`,
 			err = toolchain.Test(types.TestContext{
 				IO: cmdutil.StreamsOf(cmd),
 			})
+
 			if err != nil {
 				return errors.Wrapf(err, "failed to unit test Envoy extension using %q toolchain", opts.Toolchain.Name)
 			}

pkg/cmd/extension/test/cmd.go

@@ -47,8 +47,9 @@ func (l Language) String() string {
 }
 
 const (
-	// LanguageRust represens a Rust programming language.
-	LanguageRust   Language = "rust"
+	// LanguageRust represents a Rust programming language.
+	LanguageRust Language = "rust"
+	// LanguageTinyGo represents a TinyGo programming language.
 	LanguageTinyGo Language = "tinygo"
 )
 

pkg/extension/workspace/config/extension/types.go

@@ -36,7 +36,8 @@ var (
 		return version.Build.Version
 	}()
 	// defaultRustBuildImage represents a full name of the default Rust builder image in a Docker registry.
-	defaultRustBuildImage = dockerutil.ImageName{Org: defaultBuildImageOrg, Name: "extension-rust-builder", Tag: defaultBuildImageTag}.String()
+	defaultRustBuildImage   = dockerutil.ImageName{Org: defaultBuildImageOrg, Name: "extension-rust-builder", Tag: defaultBuildImageTag}.String()
+	defaultTinyGoBuildImage = dockerutil.ImageName{Org: defaultBuildImageOrg, Name: "extension-tinygo-builder", Tag: defaultBuildImageTag}.String()
 )
 
 // defaultConfigFor returns a default toolchain config for a given extension.
@@ -57,6 +58,8 @@ func defaultBuildImageFor(language extensionconfig.Language) string {
 	switch language {
 	case extensionconfig.LanguageRust:
 		return defaultRustBuildImage
+	case extensionconfig.LanguageTinyGo:
+		return defaultTinyGoBuildImage
 	default:
 		// must be caught by unit tests
 		panic(errors.Errorf("failed to determine default build image for unsupported programming language %q", language))
@@ -69,6 +72,8 @@ func defaultOutputPathFor(language extensionconfig.Language) string {
 	case extensionconfig.LanguageRust:
 		// keep *.wasm file inside Cargo build dir (to be cleaned up automatically)
 		return "target/getenvoy/extension.wasm"
+	case extensionconfig.LanguageTinyGo:
+		return "main.wasm"
 	default:
 		// must be caught by unit tests
 		panic(errors.Errorf("failed to determine default output path for unsupported programming language %q", language))

pkg/extension/workspace/toolchain/builtin/default_config.go

@@ -21,12 +21,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-
-	. "github.com/tetratelabs/getenvoy/pkg/extension/workspace/toolchain/builtin"
-
 	"github.com/pkg/errors"
 
 	"github.com/tetratelabs/getenvoy/pkg/extension/workspace/config/extension"
+	. "github.com/tetratelabs/getenvoy/pkg/extension/workspace/toolchain/builtin"
 )
 
 var _ = Describe("ExampleConfig()", func() {