Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/services/unified_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,11 @@ func makeResourceSortKey(resource types.Resource) resourceSortKey {
if app != nil {
friendlyName := types.FriendlyName(app)
if friendlyName != "" {
name = friendlyName
sanitizedFriendlyName := strings.ReplaceAll(types.FriendlyName(app), "/", "-")
// FriendlyName is not unique, and multiple apps may have the same friendly name.
// To prevent collisions in the resource cache, we append the app name to the
// friendly name, ensuring uniqueness.
name = sanitizedFriendlyName + "/" + app.GetName()
} else {
name = app.GetName()
}
Expand Down
50 changes: 50 additions & 0 deletions lib/services/unified_resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1126,3 +1126,53 @@ func newICAccountAssignment(t *testing.T, ctx context.Context, svc services.Iden
require.NoError(t, err, "creating Identity Center Account Assignment")
return assignment
}

func TestOktaAppServers(t *testing.T) {
clt := newClient(t)
ctx := context.Background()

appsServer := []*types.AppServerV3{
mustCreateOktaAppServer(t, uuid.NewString(), "App 1"),
mustCreateOktaAppServer(t, uuid.NewString(), "App 1"),
mustCreateOktaAppServer(t, uuid.NewString(), "App 1"),
}
for _, v := range appsServer {
_, err := clt.UpsertApplicationServer(ctx, v)
require.NoError(t, err)
}

w, err := services.NewUnifiedResourceCache(context.Background(), services.UnifiedResourceCacheConfig{
ResourceWatcherConfig: services.ResourceWatcherConfig{
Component: teleport.ComponentUnifiedResource,
Client: clt,
},
ResourceGetter: clt,
})
require.NoError(t, err)
res, err := w.GetUnifiedResources(ctx)
require.NoError(t, err)
require.Len(t, res, 3)

}

func mustCreateOktaAppServer(t *testing.T, name, friendlyName string) *types.AppServerV3 {
app, err := types.NewAppV3(types.Metadata{
Name: fmt.Sprintf("app-%v", name),
Labels: map[string]string{
types.OriginLabel: common.OriginOkta,
types.OktaAppNameLabel: friendlyName,
},
}, types.AppSpecV3{
URI: "localhost",
})
require.NoError(t, err)

resource, err := types.NewAppServerV3(types.Metadata{
Name: name,
}, types.AppServerSpecV3{
HostID: "localhost",
App: app,
})
require.NoError(t, err)
return resource
}