fix: should catch label name

alibaba · Nov 29, 2021 · 18020c1 · 18020c1
1 parent 877ae0e
commit 18020c1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 39 deletions.
diff --git a/pkg/kt/cmd/mesh.go b/pkg/kt/cmd/mesh.go
@@ -140,7 +140,7 @@ func (o *MeshOptions) transport() *options.DaemonOptions {
 	daemonOptions := o.transportGlobalOptions()
 	daemonOptions.MeshOptions = &options.MeshOptions{
 		Expose:  o.Expose,
-		Version: o.Version,
+		VersionMark: o.Version,
 	}
 	return daemonOptions
 }
diff --git a/pkg/kt/command/mesh.go b/pkg/kt/command/mesh.go
@@ -149,7 +149,7 @@ func autoMesh(ctx context.Context, k cluster.KubernetesInterface, deploymentName
 		common.KtRole: common.RoleShadow,
 		common.KtName: shadowPodName,
 	}
-	if err = createShadowService(ctx, k, shadowSvcName, ports, shadowLabels, opts); err != nil {
+	if err = createShadowService(ctx, k, shadowSvcName, ports, util.CopyMap(shadowLabels), opts); err != nil {
 		return err
 	}
 
@@ -159,7 +159,7 @@ func autoMesh(ctx context.Context, k cluster.KubernetesInterface, deploymentName
 		common.KtRole: common.RoleRouter,
 		common.KtName: routerPodName,
 	}
-	if err = createRouter(ctx, k, routerPodName, svc.Name, ports, routerLabels, versionMark, opts); err != nil {
+	if err = createRouter(ctx, k, routerPodName, svc.Name, ports, util.CopyMap(routerLabels), versionMark, opts); err != nil {
 		return err
 	}
 
@@ -414,6 +414,6 @@ func getVersion(versionMark string) (string, string) {
 }
 
 func isValidKey(key string) bool {
-	ok, err := regexp.MatchString("^[a-z][a-z0-9_-]*", key)
+	ok, err := regexp.MatchString("^[a-z][a-z0-9_-]*$", key)
 	return err == nil && ok
 }
diff --git a/pkg/kt/command/mesh_test.go b/pkg/kt/command/mesh_test.go
@@ -3,6 +3,7 @@ package command
 import (
 	"errors"
 	"flag"
+	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"testing"
 
@@ -46,60 +47,42 @@ func Test_meshCommand(t *testing.T) {
 		err := command.Run(context)
 
 		if c.expectedErr != nil {
-			if err.Error() != c.expectedErr.Error() {
-				t.Errorf("expected %v but is %v", c.expectedErr, err)
-			}
-		} else if err != c.expectedErr {
-			t.Errorf("expected %v but is %v", c.expectedErr, err)
+			require.Equal(t, err.Error(), c.expectedErr.Error(), "expected %v but is %v", c.expectedErr, err)
+		} else {
+			require.Equal(t, err, c.expectedErr, "expected %v but is %v", c.expectedErr, err)
 		}
-
 	}
-
 }
 
 func Test_toPortMapParameter(t *testing.T) {
-	if toPortMapParameter(map[int]int{ }) != "" {
-		t.Errorf("port map parameter incorrect")
-	}
-	if toPortMapParameter(map[int]int{ 80:8080 }) != "80:8080" {
-		t.Errorf("port map parameter incorrect")
-	}
-	if toPortMapParameter(map[int]int{ 80:8080, 70:7000 }) != "80:8080,70:7000" {
-		t.Errorf("port map parameter incorrect")
-	}
+	require.Equal(t, toPortMapParameter(map[int]int{ }), "", "port map parameter incorrect")
+	require.Equal(t, toPortMapParameter(map[int]int{ 80:8080 }), "80:8080", "port map parameter incorrect")
+	require.Equal(t, toPortMapParameter(map[int]int{ 80:8080, 70:7000 }), "80:8080,70:7000","port map parameter incorrect")
 }
 
 func Test_isValidKey(t *testing.T) {
 	validCases := []string{"kt", "k123", "kt-version_1123"}
 	for _, c := range validCases {
-		if !isValidKey(c) {
-			t.Errorf("\"%s\" should be valid", c)
-		}
+		require.True(t, isValidKey(c), "\"%s\" should be valid", c)
 	}
-	invalidCases := []string{"-version_1123", "123", ""}
+	invalidCases := []string{"-version_1123", "123", "", "kt.ver"}
 	for _, c := range invalidCases {
-		if isValidKey(c) {
-			t.Errorf("\"%s\" should be invalid", c)
-		}
+		require.True(t, !isValidKey(c), "\"%s\" should be invalid", c)
 	}
 }
 
 func Test_getVersion(t *testing.T) {
 	var k, v string
 	k, v = getVersion("")
-	if k != "kt-version" || len(v) != 5 {
-		t.Errorf("parse empty version mark, got %s:%s", k, v)
-	}
+	require.Equal(t, k, "kt-version")
+	require.Equal(t, len(v), 5)
 	k, v = getVersion("test")
-	if k != "kt-version" || v != "test" {
-		t.Errorf("parse key-only version mark, got %s:%s", k, v)
-	}
+	require.Equal(t, k, "kt-version")
+	require.Equal(t, v, "test")
 	k, v = getVersion("mark:")
-	if k != "mark" || len(v) != 5 {
-		t.Errorf("parse value-only version mark, got %s:%s", k, v)
-	}
+	require.Equal(t, k, "mark")
+	require.Equal(t, len(v), 5)
 	k, v = getVersion("mark:test")
-	if k != "mark" || v != "test" {
-		t.Errorf("parse key-value version mark, got %s:%s", k, v)
-	}
+	require.Equal(t, k, "mark")
+	require.Equal(t, v, "test")
 }