update proxy_abi_version to support istio/proxyv2

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

Author: mathetake

.github/workflows/workflow.yaml

@@ -14,10 +14,10 @@ jobs:
         with:
           args: make lint
 
-      - name: set up go 1.14
+      - name: set up go 1.15
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.15
 
       - name: run tests
         run: make test.sdk
@@ -26,15 +26,15 @@ jobs:
     name: build examples
     runs-on: ubuntu-latest
     container:
-      image: tinygo/tinygo:0.14.0
+      image: tinygo/tinygo:0.15.0
     steps:
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: set up go 1.14
+      - name: set up go 1.15
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.15
 
       - name: build examples
         run: find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -target=wasm -wasm-abi=generic p
@@ -49,11 +49,8 @@ jobs:
     name: e2e tests on examples
     needs: build-examples
     runs-on: ubuntu-latest
-    services:
-      httpbin:
-        image: kennethreitz/httpbin
-        ports:
-          - 8000:80
+    container:
+      image: mathetake/proxy-wasm-go-ci:istio-1.7.2
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -64,16 +61,5 @@ jobs:
           name: wasm-binaries
           path: examples
 
-      - name: set up go 1.14
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.14
-
-      - name: download getenvoy
-        run: curl -L https://getenvoy.io/cli | sudo bash -s -- -b /usr/local/bin
-
-      - name: download envoy
-        run: getenvoy fetch wasm:1.15
-
       - name: run e2e test
         run: go test ./e2e/... -v

Makefile

@@ -17,8 +17,10 @@ test:
 	go test -tags=proxytest $(go list ./... | grep -v e2e | sed 's/github.com\/tetratelabs\/proxy-wasm-go-sdk/./g')
 
 test.e2e:
-	docker-compose -f ./examples/docker-compose.yaml -d
-	go test ./e2e
+	docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go mathetake/proxy-wasm-go-ci:istio-1.7.2 go test ./e2e
 
 run:
-	getenvoy run wasm:1.15 -- -c ./examples/${name}/envoy.yaml --concurrency 2
+	docker run --entrypoint='/usr/local/bin/envoy' \
+		-p 18000:18000 -p 8099:8099 \
+		-w /tmp/envoy -v $(shell pwd):/tmp/envoy istio/proxyv2:1.7.2 \
+		-c /tmp/envoy/examples/${name}/envoy.yaml --concurrency 2

README.md

@@ -36,20 +36,18 @@ func (ctx *context) OnHttpRequestHeaders(int, bool) types.Action {
 ```
 
 
-## requirements
+### requirements
 
-- TinyGo(0.14.0+): https://tinygo.org/
-- GetEnvoy: https://www.getenvoy.io/install/ (for running examples)
+- TinyGo(0.15.0+): https://tinygo.org
+
+### compatible Envoy builds
+
+| proxy-wasm-go-sdk| proxy-wasm ABI version | envoyproxy/envoy-wasm| istio/proxyv2|
+|:-------------:|:-------------:|:-------------:|:-------------:|
+| master |  0.2.0|  N/A  |   v1.17.2 |
+| v0.0.2 | 0.1.0|release/v1.15 | N/A |
 
-To download compatible envoyproxy, run
-```bash
-getenvoy fetch wasm:1.15
-```
 
-The target Envoy version is `release/v1.15`
- branch on [envoyproxy/envoy-wasm](https://github.com/envoyproxy/envoy-wasm/tree/release/v1.15).
- 
- 
 ## setup
 
 - __git clone__ this repository to `${GOPATH}/github.com/tetratelabs/proxy-wasm-go-sdk`

e2e/Dockerfile

@@ -0,0 +1,5 @@
+FROM istio/proxyv2:1.7.2
+
+FROM golang:1.15
+
+COPY --from=0 /usr/local/bin/envoy /usr/local/bin/

e2e/e2e_test.go

@@ -38,16 +38,12 @@ func TestMain(m *testing.M) {
 }
 
 const (
-	envoyVersion       = "wasm:1.15"
 	envoyEndpoint      = "http://localhost:18000"
 	envoyAdminEndpoint = "http://localhost:8001"
 )
 
 func startExample(t *testing.T, name string) (*exec.Cmd, *bytes.Buffer) {
-	cmd := exec.Command("getenvoy",
-		"run",
-		envoyVersion,
-		"--",
+	cmd := exec.Command("envoy",
 		"--concurrency", "2",
 		"-c", fmt.Sprintf("./examples/%s/envoy.yaml", name))
 

examples/docker-compose.yml

@@ -3,7 +3,7 @@ static_resources:
     - name: main
       address:
         socket_address:
-          address: 127.0.0.1
+          address: 0.0.0.0
           port_value: 18000
       filter_chains:
         - filters:

examples/helloworld/envoy.yaml

@@ -3,7 +3,7 @@ static_resources:
     - name: main
       address:
         socket_address:
-          address: 127.0.0.1
+          address: 0.0.0.0
           port_value: 18000
       filter_chains:
         - filters:
@@ -50,8 +50,8 @@ static_resources:
               - endpoint:
                   address:
                     socket_address:
-                      address: localhost
-                      port_value: 8000
+                      address: httpbin.org
+                      port_value: 80
 
 admin:
   access_log_path: "/dev/null"

examples/http_auth_random/envoy.yaml

@@ -3,7 +3,7 @@ static_resources:
     - name: main
       address:
         socket_address:
-          address: 127.0.0.1
+          address: 0.0.0.0
           port_value: 18000
       filter_chains:
         - filters:

examples/http_headers/envoy.yaml

@@ -3,7 +3,7 @@ static_resources:
     - name: main
       address:
         socket_address:
-          address: 127.0.0.1
+          address: 0.0.0.0
           port_value: 18000
       filter_chains:
         - filters: