Address CR

gravitational · Mar 3, 2022 · c1d6a39 · c1d6a39
1 parent f3ffbcb
commit c1d6a39
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 133 deletions.
diff --git a/api/types/app_test.go b/api/types/app_test.go
@@ -141,8 +141,6 @@ func TestAppServerSorter(t *testing.T) {
 	for _, c := range cases {
 		c := c
 		t.Run(fmt.Sprintf("%s desc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName, IsDesc: true}
 			servers := AppServers(makeServers(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))
@@ -152,8 +150,6 @@ func TestAppServerSorter(t *testing.T) {
 		})
 
 		t.Run(fmt.Sprintf("%s asc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName}
 			servers := AppServers(makeServers(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))

diff --git a/api/types/appserver.go b/api/types/appserver.go
@@ -304,7 +304,14 @@ func (s AppServers) Len() int { return len(s) }
 
 // Less compares app servers by name and host ID.
 func (s AppServers) Less(i, j int) bool {
-	return s[i].GetName() < s[j].GetName() && s[i].GetHostID() < s[j].GetHostID()
+	switch {
+	case s[i].GetName() < s[j].GetName():
+		return true
+	case s[i].GetName() > s[j].GetName():
+		return false
+	default:
+		return s[i].GetHostID() < s[j].GetHostID()
+	}
 }
 
 // Swap swaps two app servers.

diff --git a/api/types/databaseserver.go b/api/types/databaseserver.go
@@ -291,7 +291,14 @@ func (s DatabaseServers) Len() int { return len(s) }
 
 // Less compares database servers by name and host ID.
 func (s DatabaseServers) Less(i, j int) bool {
-	return s[i].GetName() < s[j].GetName() && s[i].GetHostID() < s[j].GetHostID()
+	switch {
+	case s[i].GetName() < s[j].GetName():
+		return true
+	case s[i].GetName() > s[j].GetName():
+		return false
+	default:
+		return s[i].GetHostID() < s[j].GetHostID()
+	}
 }
 
 // Swap swaps two database servers.

diff --git a/api/types/databaseserver_test.go b/api/types/databaseserver_test.go
@@ -154,8 +154,6 @@ func TestDatabaseServerSorter(t *testing.T) {
 	for _, c := range cases {
 		c := c
 		t.Run(fmt.Sprintf("%s desc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName, IsDesc: true}
 			servers := DatabaseServers(makeServers(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))
@@ -165,8 +163,6 @@ func TestDatabaseServerSorter(t *testing.T) {
 		})
 
 		t.Run(fmt.Sprintf("%s asc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName}
 			servers := DatabaseServers(makeServers(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))

diff --git a/api/types/desktop.go b/api/types/desktop.go
@@ -229,7 +229,14 @@ func (s WindowsDesktops) Len() int { return len(s) }
 
 // Less compares desktops by name and host ID.
 func (s WindowsDesktops) Less(i, j int) bool {
-	return s[i].GetName() < s[j].GetName() && s[i].GetHostID() < s[j].GetHostID()
+	switch {
+	case s[i].GetName() < s[j].GetName():
+		return true
+	case s[i].GetName() > s[j].GetName():
+		return false
+	default:
+		return s[i].GetHostID() < s[j].GetHostID()
+	}
 }
 
 // Swap swaps two windows desktops.

diff --git a/api/types/desktop_test.go b/api/types/desktop_test.go
@@ -63,8 +63,6 @@ func TestWindowsDesktopsSorter(t *testing.T) {
 	for _, c := range cases {
 		c := c
 		t.Run(fmt.Sprintf("%s desc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName, IsDesc: true}
 			servers := WindowsDesktops(makeDesktops(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))
@@ -74,8 +72,6 @@ func TestWindowsDesktopsSorter(t *testing.T) {
 		})
 
 		t.Run(fmt.Sprintf("%s asc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName}
 			servers := WindowsDesktops(makeDesktops(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))
@@ -85,10 +81,8 @@ func TestWindowsDesktopsSorter(t *testing.T) {
 		})
 	}
 
-	t.Run("error", func(t *testing.T) {
-		t.Parallel()
-		sortBy := SortBy{Field: "unsupported"}
-		desktops := makeDesktops(testValsUnordered, "does-not-matter")
-		require.True(t, trace.IsNotImplemented(WindowsDesktops(desktops).SortByCustom(sortBy)))
-	})
+	// Test error.
+	sortBy := SortBy{Field: "unsupported"}
+	desktops := makeDesktops(testValsUnordered, "does-not-matter")
+	require.True(t, trace.IsNotImplemented(WindowsDesktops(desktops).SortByCustom(sortBy)))
 }
diff --git a/api/types/server_test.go b/api/types/server_test.go
@@ -76,8 +76,6 @@ func TestServerSorter(t *testing.T) {
 	for _, c := range cases {
 		c := c
 		t.Run(fmt.Sprintf("%s desc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName, IsDesc: true}
 			servers := Servers(makeServers(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))
@@ -87,8 +85,6 @@ func TestServerSorter(t *testing.T) {
 		})
 
 		t.Run(fmt.Sprintf("%s asc", c.name), func(t *testing.T) {
-			t.Parallel()
-
 			sortBy := SortBy{Field: c.fieldName}
 			servers := Servers(makeServers(testValsUnordered, c.fieldName))
 			require.NoError(t, servers.SortByCustom(sortBy))

diff --git a/lib/auth/api.go b/lib/auth/api.go
@@ -809,7 +809,7 @@ type Cache interface {
 
 	// ListResources returns a paginated list of resources.
 	ListResources(ctx context.Context, req proto.ListResourcesRequest) (*types.ListResourcesResponse, error)
-	// ListWindowsDesktops returns a paginated list of windows desktops..
+	// ListWindowsDesktops returns a paginated list of windows desktops.
 	ListWindowsDesktops(ctx context.Context, req types.ListWindowsDesktopsRequest) (*types.ListWindowsDesktopsResponse, error)
 }