change route name (#51)

pkg/ingress/kube/common/controller.go

@@ -73,7 +73,7 @@ type WrapperHTTPRoute struct {
 }
 
 func (w *WrapperHTTPRoute) Meta() string {
-	return strings.Join([]string{w.WrapperConfig.Config.Namespace, w.WrapperConfig.Config.Name}, "-")
+	return strings.Join([]string{w.WrapperConfig.Config.Namespace, w.WrapperConfig.Config.Name}, "/")
 }
 
 func (w *WrapperHTTPRoute) BasePathFormat() string {

pkg/ingress/kube/common/tool.go

@@ -267,31 +267,11 @@ func partMd5(raw string) string {
 }
 
 func GenerateUniqueRouteName(route *WrapperHTTPRoute) string {
-	raw := constructRouteName(route)
-
-	// meta-part-clusterId
-	// meta: ingressNamespace-ingressName
-	meta := route.Meta()
-	// host-pathType-path-header-queryParam, md5, then before 4 char and end 4 char
-	part := partMd5(raw)
-	routeName := CreateConvertedName(meta, part, route.ClusterId)
-
-	if route.WrapperConfig.AnnotationsConfig.IsCanary() {
-		return routeName + "-canary"
-	}
-
-	return routeName
+	return route.Meta()
 }
 
 func GenerateUniqueRouteNameWithSuffix(route *WrapperHTTPRoute, suffix string) string {
-	raw := constructRouteName(route)
-
-	// meta-part-clusterId
-	// meta: ingressNamespace-ingressName
-	meta := route.Meta()
-	// host-pathType-path-header-queryParam, md5, then before 4 char and end 4 char
-	part := partMd5(raw)
-	return CreateConvertedName(meta, part, route.ClusterId, suffix)
+	return CreateConvertedName(route.Meta(), suffix)
 }
 
 func SplitServiceFQDN(fqdn string) (string, string, bool) {

pkg/ingress/kube/common/tool_test.go

@@ -23,6 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/alibaba/higress/pkg/ingress/kube/annotations"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestConstructRouteName(t *testing.T) {
@@ -151,7 +152,7 @@ func TestConstructRouteName(t *testing.T) {
 }
 
 func TestGenerateUniqueRouteName(t *testing.T) {
-	inputWithoutCanary := &WrapperHTTPRoute{
+	input := &WrapperHTTPRoute{
 		WrapperConfig: &WrapperConfig{
 			Config: &config.Config{
 				Meta: config.Meta{
@@ -197,65 +198,8 @@ func TestGenerateUniqueRouteName(t *testing.T) {
 		},
 	}
 
-	withoutCanary := GenerateUniqueRouteName(inputWithoutCanary)
-	t.Log(withoutCanary)
+	assert.Equal(t, "bar/foo", GenerateUniqueRouteName(input))
 
-	inputWithCanary := &WrapperHTTPRoute{
-		WrapperConfig: &WrapperConfig{
-			Config: &config.Config{
-				Meta: config.Meta{
-					Name:      "foo",
-					Namespace: "bar",
-				},
-			},
-			AnnotationsConfig: &annotations.Ingress{
-				Canary: &annotations.CanaryConfig{
-					Enabled: true,
-				},
-			},
-		},
-		Host:           "test.com",
-		OriginPathType: Prefix,
-		OriginPath:     "/test",
-		ClusterId:      "cluster1",
-		HTTPRoute: &networking.HTTPRoute{
-			Match: []*networking.HTTPMatchRequest{
-				{
-					Headers: map[string]*networking.StringMatch{
-						"f": {
-							MatchType: &networking.StringMatch_Regex{
-								Regex: "abc?",
-							},
-						},
-						"e": {
-							MatchType: &networking.StringMatch_Exact{
-								Exact: "bye",
-							},
-						},
-					},
-					QueryParams: map[string]*networking.StringMatch{
-						"b": {
-							MatchType: &networking.StringMatch_Regex{
-								Regex: "a?c.*",
-							},
-						},
-						"a": {
-							MatchType: &networking.StringMatch_Exact{
-								Exact: "hello",
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	withCanary := GenerateUniqueRouteName(inputWithCanary)
-	t.Log(withCanary)
-
-	if withCanary != withoutCanary+"-canary" {
-		t.Fatalf("Expect %s, but actual is %s", withCanary, withoutCanary+"-canary")
-	}
 }
 
 func TestGetLbStatusList(t *testing.T) {