Merge branch 'master' into speed-up-windows-ci

yittg · Sep 3, 2020 · 9346ba4 · 9346ba4
2 parents 2a5793e + ce6562c
commit 9346ba4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/messaging/direct_messaging.go b/pkg/messaging/direct_messaging.go
@@ -90,7 +90,7 @@ func (d *directMessaging) requestNamespace(targetAppID string) (string, error) {
 	if len(items) == 1 {
 		return d.namespace, nil
 	} else if len(items) == 2 {
-		return items[0], nil
+		return items[1], nil
 	} else {
 		return "", fmt.Errorf("invalid app id %s", targetAppID)
 	}

diff --git a/pkg/messaging/direct_messaging_test.go b/pkg/messaging/direct_messaging_test.go
@@ -65,7 +65,7 @@ func TestKubernetesNamespace(t *testing.T) {
 	})
 
 	t.Run("with namespace", func(t *testing.T) {
-		appID := "ns1.app1"
+		appID := "app1.ns1"
 
 		dm := newDirectMessaging()
 		ns, err := dm.requestNamespace(appID)
@@ -75,7 +75,7 @@ func TestKubernetesNamespace(t *testing.T) {
 	})
 
 	t.Run("invalid namespace", func(t *testing.T) {
-		appID := "ns1.ns2.app1"
+		appID := "app1.ns1.ns2"
 
 		dm := newDirectMessaging()
 		_, err := dm.requestNamespace(appID)