backport of commit e46378b67f

internal/clientcache/internal/cache/search_test.go

@@ -234,11 +234,11 @@ func TestSearch(t *testing.T) {
 
 	t.Run("List aliases", func(t *testing.T) {
 		got, err := ss.Search(ctx, SearchParams{
-			Resource:    "aliases",
+			Resource:    "resolvable-aliases",
 			AuthTokenId: at.Id,
 		})
 		assert.NoError(t, err)
-		assert.EqualValues(t, &SearchResult{Aliases: []*aliases.Alias{
+		assert.EqualValues(t, &SearchResult{ResolvableAliases: []*aliases.Alias{
 			{Id: "alt_1", Value: "one", Type: "target"},
 			{Id: "alt_2", Value: "two", Type: "target"},
 		}}, got)
@@ -246,24 +246,24 @@ func TestSearch(t *testing.T) {
 
 	t.Run("query aliases", func(t *testing.T) {
 		got, err := ss.Search(ctx, SearchParams{
-			Resource:    "aliases",
+			Resource:    "resolvable-aliases",
 			AuthTokenId: at.Id,
 			Query:       `value="one"`,
 		})
 		assert.NoError(t, err)
-		assert.EqualValues(t, &SearchResult{Aliases: []*aliases.Alias{
+		assert.EqualValues(t, &SearchResult{ResolvableAliases: []*aliases.Alias{
 			{Id: "alt_1", Value: "one", Type: "target"},
 		}}, got)
 	})
 
 	t.Run("query aliases on type", func(t *testing.T) {
 		got, err := ss.Search(ctx, SearchParams{
-			Resource:    "aliases",
+			Resource:    "resolvable-aliases",
 			AuthTokenId: at.Id,
 			Query:       `type="target"`,
 		})
 		assert.NoError(t, err)
-		assert.EqualValues(t, &SearchResult{Aliases: []*aliases.Alias{
+		assert.EqualValues(t, &SearchResult{ResolvableAliases: []*aliases.Alias{
 			{Id: "alt_1", Value: "one", Type: "target"},
 			{Id: "alt_2", Value: "two", Type: "target"},
 		}}, got)
@@ -271,7 +271,7 @@ func TestSearch(t *testing.T) {
 
 	t.Run("query aliases bad column", func(t *testing.T) {
 		got, err := ss.Search(ctx, SearchParams{
-			Resource:    "aliases",
+			Resource:    "resolvable-aliases",
 			AuthTokenId: at.Id,
 			Query:       `item % "one"`,
 		})
@@ -282,7 +282,7 @@ func TestSearch(t *testing.T) {
 
 	t.Run("query aliases bad column owner user id", func(t *testing.T) {
 		got, err := ss.Search(ctx, SearchParams{
-			Resource:    "aliases",
+			Resource:    "resolvable-aliases",
 			AuthTokenId: at.Id,
 			Query:       `fk_user_id % "u"`,
 		})
@@ -293,12 +293,12 @@ func TestSearch(t *testing.T) {
 
 	t.Run("Filter aliases", func(t *testing.T) {
 		got, err := ss.Search(ctx, SearchParams{
-			Resource:    "aliases",
+			Resource:    "resolvable-aliases",
 			AuthTokenId: at.Id,
 			Filter:      `"/item/value" matches "one"`,
 		})
 		assert.NoError(t, err)
-		assert.EqualValues(t, &SearchResult{Aliases: []*aliases.Alias{
+		assert.EqualValues(t, &SearchResult{ResolvableAliases: []*aliases.Alias{
 			{Id: "alt_1", Value: "one", Type: "target"},
 		}}, got)
 	})