Merge pull request #69 from tetratelabs/fix-sdk-test-flow

fix: SDK test CI

Author: mathetake

.github/workflows/workflow.yaml

@@ -20,7 +20,7 @@ jobs:
           go-version: 1.15
 
       - name: run tests
-        run: make test.sdk
+        run: make test
 
   build-examples:
     name: build examples

Makefile

@@ -16,7 +16,7 @@ lint:
 	golangci-lint run --build-tags proxytest
 
 test:
-	go test -tags=proxytest $(go list ./... | grep -v e2e | sed 's/github.com\/tetratelabs\/proxy-wasm-go-sdk/./g')
+	go test -tags=proxytest $(shell go list ./... | grep -v e2e | sed 's/github.com\/tetratelabs\/proxy-wasm-go-sdk/./g')
 
 test.e2e:
 	docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go getenvoy/proxy-wasm-go-sdk-ci:istio-${ISTIO_VERSION} go test -v ./e2e

examples/http_auth_random/main.go

@@ -27,25 +27,25 @@ func main() {
 	proxywasm.SetNewHttpContext(newContext)
 }
 
-type httpHeaders struct {
+type httpAuthRandom struct {
 	// you must embed the default context so that you need not to reimplement all the methods by yourself
 	proxywasm.DefaultContext
 	contextID uint32
 }
 
 func newContext(contextID uint32) proxywasm.HttpContext {
-	return &httpHeaders{contextID: contextID}
+	return &httpAuthRandom{contextID: contextID}
 }
 
 // override default
-func (ctx *httpHeaders) OnHttpRequestHeaders(int, bool) types.Action {
+func (ctx *httpAuthRandom) OnHttpRequestHeaders(int, bool) types.Action {
 	hs, err := proxywasm.HostCallGetHttpRequestHeaders()
 	if err != nil {
 		proxywasm.LogCriticalf("failed to get request headers: %v", err)
 		return types.ActionContinue
 	}
 	for _, h := range hs {
-		proxywasm.LogInfof("request header from: %s: %s", h[0], h[1])
+		proxywasm.LogInfof("request header: %s: %s", h[0], h[1])
 	}
 
 	if _, err := proxywasm.HostCallDispatchHttpCall(
@@ -59,7 +59,7 @@ func (ctx *httpHeaders) OnHttpRequestHeaders(int, bool) types.Action {
 }
 
 // override default
-func (ctx *httpHeaders) OnHttpCallResponse(_ int, bodySize int, _ int) {
+func (ctx *httpAuthRandom) OnHttpCallResponse(_ int, bodySize int, _ int) {
 	hs, err := proxywasm.HostCallGetHttpCallResponseHeaders()
 	if err != nil {
 
@@ -99,6 +99,6 @@ func (ctx *httpHeaders) OnHttpCallResponse(_ int, bodySize int, _ int) {
 }
 
 // override default
-func (ctx *httpHeaders) OnLog() {
+func (ctx *httpAuthRandom) OnLog() {
 	proxywasm.LogInfof("%d finished", ctx.contextID)
 }

examples/http_auth_random/main_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
 )
 
-func TestHttpHeaders_OnHttpRequestHeaders(t *testing.T) {
+func TestHttpAuthRandom_OnHttpRequestHeaders(t *testing.T) {
 	host, done := proxytest.NewHttpFilterHost(newContext)
 	defer done()
 
@@ -27,7 +27,7 @@ func TestHttpHeaders_OnHttpRequestHeaders(t *testing.T) {
 	assert.Equal(t, "request header: key: value", logs[len(logs)-2])
 }
 
-func TestHttpHeaders_OnHttpCallResponse(t *testing.T) {
+func TestHttpAuthRandom_OnHttpCallResponse(t *testing.T) {
 	host, done := proxytest.NewHttpFilterHost(newContext)
 	defer done()
 

examples/network/main_test.go

@@ -62,7 +62,7 @@ func TestNetwork_OnDownstreamData(t *testing.T) {
 	host.PutDownstreamData(contextID, data) // OnDownstreamData is called
 
 	logs := host.GetLogs(types.LogLevelInfo) // retrieve logs emitted to Envoy
-	assert.Equal(t, "downstream data received: "+msg, logs[len(logs)-1])
+	assert.Equal(t, ">>>>>> downstream data received >>>>>>\n"+msg, logs[len(logs)-1])
 }
 
 func TestNetwork_OnUpstreamData(t *testing.T) {
@@ -76,7 +76,7 @@ func TestNetwork_OnUpstreamData(t *testing.T) {
 	host.PutUpstreamData(contextID, data) // OnUpstreamData is called
 
 	logs := host.GetLogs(types.LogLevelInfo) // retrieve logs emitted to Envoy
-	assert.Equal(t, "upstream data received: "+msg, logs[len(logs)-1])
+	assert.Equal(t, "<<<<<< upstream data received <<<<<<\n"+msg, logs[len(logs)-1])
 }
 
 func TestNetwork_counter(t *testing.T) {