test: add ut for pkg/wasm

pkg/wasm/abi.go

@@ -35,7 +35,7 @@ func abiImplFactory(instance types.WasmInstance) types.ABI {
 	return abi
 }
 
-// easy for extension
+// AbiV2Impl easy for extension
 type AbiV2Impl struct {
 	v1.ABIContext
 }
@@ -45,17 +45,17 @@ var (
 	_ Exports          = &AbiV2Impl{}
 )
 
-// Get abi name
+// Name Get abi name
 func (a *AbiV2Impl) Name() string {
 	return AbiV2
 }
 
-// Get abi
+// GetABIExports Get abi
 func (a *AbiV2Impl) GetABIExports() interface{} {
 	return a
 }
 
-// Get id
+// ProxyGetID Get id
 func (a *AbiV2Impl) ProxyGetID() (string, error) {
 	// store the funcName and common.WasmFunction, then return the common.WasmFunction
 	ff, err := a.Instance.GetExportsFunc("proxy_get_id")

pkg/wasm/dispatch.go

@@ -44,11 +44,12 @@ func (route *Router) RegisterRoute(id string, plugin *WasmPlugin) {
 	}
 }
 
+// RemoveRoute remove group by id
 func (route *Router) RemoveRoute(id string) {
 	delete(route.routes, id)
 }
 
-// Get random plugin with rand id
+// GetRandomPluginByID Get random plugin with rand id
 func (route *Router) GetRandomPluginByID(id string) (*WasmPlugin, error) {
 	group, ok := route.routes[id]
 	if !ok {

pkg/wasm/dispatch_test.go

@@ -0,0 +1,218 @@
+/*
+ * Copyright 2021 Layotto Authors
+ *
+ * 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.
+ */
+
+package wasm
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+var (
+	wasmPluginName1 = "test1"
+	wasmPluginName2 = "test2"
+
+	idValid   = "wasm_test1"
+	idInvalid = "wasm_test2"
+)
+
+func mockRouters() map[string]*Group {
+	wasmPlugin := &WasmPlugin{
+		pluginName: wasmPluginName1,
+	}
+	group := &Group{
+		count:   1,
+		plugins: []*WasmPlugin{wasmPlugin},
+	}
+
+	return map[string]*Group{
+		idValid: group,
+	}
+}
+
+func TestRouter_GetRandomPluginByID(t *testing.T) {
+	type fields struct {
+		routes map[string]*Group
+	}
+	type args struct {
+		id string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    *WasmPlugin
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "normal",
+			fields: fields{
+				routes: mockRouters(),
+			},
+			args: args{
+				id: idValid,
+			},
+			want: &WasmPlugin{
+				pluginName: wasmPluginName1,
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "not found",
+			fields: fields{
+				routes: mockRouters(),
+			},
+			args: args{
+				id: idInvalid,
+			},
+			want:    nil,
+			wantErr: assert.Error,
+		},
+		{
+			name: "empty",
+			fields: fields{
+				routes: make(map[string]*Group),
+			},
+			args: args{
+				id: idInvalid,
+			},
+			want:    nil,
+			wantErr: assert.Error,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			route := &Router{
+				routes: tt.fields.routes,
+			}
+			got, err := route.GetRandomPluginByID(tt.args.id)
+			if !tt.wantErr(t, err, fmt.Sprintf("GetRandomPluginByID(%v)", tt.args.id)) {
+				return
+			}
+			assert.Equalf(t, tt.want, got, "GetRandomPluginByID(%v)", tt.args.id)
+		})
+	}
+}
+
+func TestRouter_RegisterRoute(t *testing.T) {
+	type fields struct {
+		routes map[string]*Group
+	}
+	type args struct {
+		id     string
+		plugin *WasmPlugin
+	}
+	tests := []struct {
+		name     string
+		fields   fields
+		args     args
+		groupCnt int
+	}{
+		{
+			name: "add",
+			fields: fields{
+				routes: mockRouters(),
+			},
+			args: args{
+				id: idValid,
+				plugin: &WasmPlugin{
+					pluginName: wasmPluginName2,
+				},
+			},
+			groupCnt: 2,
+		},
+		{
+			name: "replace",
+			fields: fields{
+				routes: mockRouters(),
+			},
+			args: args{
+				id: idValid,
+				plugin: &WasmPlugin{
+					pluginName: wasmPluginName1,
+				},
+			},
+			groupCnt: 1,
+		},
+		{
+			name: "empty",
+			fields: fields{
+				routes: make(map[string]*Group),
+			},
+			args: args{
+				id: idValid,
+				plugin: &WasmPlugin{
+					pluginName: wasmPluginName1,
+				},
+			},
+			groupCnt: 1,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			route := &Router{
+				routes: tt.fields.routes,
+			}
+			route.RegisterRoute(tt.args.id, tt.args.plugin)
+			_, err := route.GetRandomPluginByID(tt.args.id)
+			assert.NoError(t, err)
+			assert.Equal(t, tt.groupCnt, route.routes[tt.args.id].count)
+		})
+	}
+}
+
+func TestRouter_RemoveRoute(t *testing.T) {
+	type fields struct {
+		routes map[string]*Group
+	}
+	type args struct {
+		id string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		{
+			name: "normal",
+			fields: fields{
+				routes: mockRouters(),
+			},
+			args: args{
+				id: idValid,
+			},
+		},
+		{
+			name: "not exist",
+			fields: fields{
+				routes: mockRouters(),
+			},
+			args: args{
+				id: idInvalid,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			route := &Router{
+				routes: tt.fields.routes,
+			}
+			route.RemoveRoute(tt.args.id)
+		})
+	}
+}

pkg/wasm/factory.go

@@ -70,7 +70,8 @@ func createProxyWasmFilterFactory(confs map[string]interface{}) (api.StreamFilte
 			log.DefaultLogger.Errorf("[proxywasm][factory] createProxyWasmFilterFactory config not a map, configID: %s", configID)
 			return nil, errors.New("config not a map")
 		}
-		err := factory.Install(conf)
+		manager := wasm.GetWasmManager()
+		err := factory.Install(conf, manager)
 		if err != nil {
 			log.DefaultLogger.Errorf("[proxywasm][factory] createProxyWasmFilterFactory install error: %v", err)
 			return nil, err
@@ -98,7 +99,7 @@ func (f *FilterConfigFactory) IsRegister(id string) bool {
 	return err == nil && plugin != nil
 }
 
-func (f *FilterConfigFactory) Install(conf map[string]interface{}) error {
+func (f *FilterConfigFactory) Install(conf map[string]interface{}, manager types.WasmManager) error {
 	config, err := parseFilterConfigItem(conf)
 	if err != nil {
 		return err
@@ -111,7 +112,7 @@ func (f *FilterConfigFactory) Install(conf map[string]interface{}) error {
 			VmConfig:    config.VmConfig,
 			InstanceNum: config.InstanceNum,
 		}
-		err = wasm.GetWasmManager().AddOrUpdateWasm(v2Config)
+		err = manager.AddOrUpdateWasm(v2Config)
 		if err != nil {
 			config.PluginName = pluginName
 			addWatchFile(config, f)
@@ -122,7 +123,7 @@ func (f *FilterConfigFactory) Install(conf map[string]interface{}) error {
 		pluginName = config.FromWasmPlugin
 	}
 	config.PluginName = pluginName
-	pw := wasm.GetWasmManager().GetWasmPluginWrapperByName(pluginName)
+	pw := manager.GetWasmPluginWrapperByName(pluginName)
 	if pw == nil {
 		return errors.New("plugin not found")
 	}
@@ -141,7 +142,7 @@ func (f *FilterConfigFactory) Install(conf map[string]interface{}) error {
 	return nil
 }
 
-func (f *FilterConfigFactory) UpdateInstanceNum(id string, instanceNum int) error {
+func (f *FilterConfigFactory) UpdateInstanceNum(id string, instanceNum int, manager types.WasmManager) error {
 	wasmPlugin, _ := f.router.GetRandomPluginByID(id)
 	if wasmPlugin == nil {
 		log.DefaultLogger.Errorf("[proxywasm][factory] GetRandomPluginByID id not registered, id: %s", id)
@@ -169,11 +170,11 @@ func (f *FilterConfigFactory) UpdateInstanceNum(id string, instanceNum int) erro
 		VmConfig:    config.VmConfig,
 		InstanceNum: config.InstanceNum,
 	}
-	err := wasm.GetWasmManager().AddOrUpdateWasm(v2Config)
+	err := manager.AddOrUpdateWasm(v2Config)
 	if err != nil {
 		return err
 	}
-	pw := wasm.GetWasmManager().GetWasmPluginWrapperByName(config.PluginName)
+	pw := manager.GetWasmPluginWrapperByName(config.PluginName)
 	if pw == nil {
 		return errors.New("plugin not found")
 	}
@@ -187,13 +188,13 @@ func (f *FilterConfigFactory) UpdateInstanceNum(id string, instanceNum int) erro
 	return nil
 }
 
-func (f *FilterConfigFactory) UnInstall(id string) error {
+func (f *FilterConfigFactory) UnInstall(id string, manager types.WasmManager) error {
 	wasmPlugin, _ := f.router.GetRandomPluginByID(id)
 	if wasmPlugin == nil {
 		log.DefaultLogger.Errorf("[proxywasm][factory] GetRandomPluginByID id not registered, id: %s", id)
 		return errors.New(id + " is not registered")
 	}
-	err := wasm.GetWasmManager().UninstallWasmPluginByName(wasmPlugin.pluginName)
+	err := manager.UninstallWasmPluginByName(wasmPlugin.pluginName)
 	if err != nil {
 		return err
 	}
@@ -214,7 +215,7 @@ func (f *FilterConfigFactory) UnInstall(id string) error {
 	return nil
 }
 
-// Get RootContext's ID
+// GetRootContextID Get RootContext's ID
 func (f *FilterConfigFactory) GetRootContextID() int32 {
 	return f.RootContextID
 }
@@ -223,7 +224,7 @@ func (f *FilterConfigFactory) GetRootContextID() int32 {
 // for `pw.RegisterPluginHandler(factory)`
 var _ types.WasmPluginHandler = &FilterConfigFactory{}
 
-// update config of FilterConfigFactory
+// OnConfigUpdate Update config of FilterConfigFactory
 func (f *FilterConfigFactory) OnConfigUpdate(config v2.WasmPluginConfig) {
 	for _, plugin := range f.config {
 		if plugin.PluginName == config.PluginName {
@@ -233,7 +234,7 @@ func (f *FilterConfigFactory) OnConfigUpdate(config v2.WasmPluginConfig) {
 	}
 }
 
-// Execute the plugin of FilterConfigFactory
+// OnPluginStart Execute the plugin of FilterConfigFactory
 func (f *FilterConfigFactory) OnPluginStart(plugin types.WasmPlugin) {
 	plugin.Exec(func(instance types.WasmInstance) bool {
 		wasmPlugin, ok := f.plugins[plugin.PluginName()]
@@ -292,5 +293,5 @@ func (f *FilterConfigFactory) OnPluginStart(plugin types.WasmPlugin) {
 	})
 }
 
-// Destroy the plugin of FilterConfigFactory
+// OnPluginDestroy Destroy the plugin of FilterConfigFactory
 func (f *FilterConfigFactory) OnPluginDestroy(types.WasmPlugin) {}