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
3 changes: 3 additions & 0 deletions api/types/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,9 @@ const (

// OktaGroupDescriptionLabel is the individual group description label.
OktaGroupDescriptionLabel = TeleportInternalLabelPrefix + "okta-group-description"

// OktaRoleNameLabel is the human readable name for a role sourced from Okta.
OktaRoleNameLabel = TeleportInternalLabelPrefix + "okta-role-name"
)

const (
Expand Down
2 changes: 2 additions & 0 deletions api/types/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,8 @@ func FriendlyName(resource ResourceWithLabels) string {
return appName
} else if groupName, ok := resource.GetLabel(OktaGroupNameLabel); ok {
return groupName
} else if roleName, ok := resource.GetLabel(OktaRoleNameLabel); ok {
return roleName
}
return resource.GetMetadata().Description
}
Expand Down
17 changes: 17 additions & 0 deletions api/types/resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,15 @@ func TestFriendlyName(t *testing.T) {
return group
}

newRole := func(t *testing.T, name string, labels map[string]string) Role {
role, err := NewRole(name, RoleSpecV6{})
require.NoError(t, err)
metadata := role.GetMetadata()
metadata.Labels = labels
role.SetMetadata(metadata)
return role
}

node, err := NewServer("node", KindNode, ServerSpecV2{
Hostname: "friendly hostname",
})
Expand Down Expand Up @@ -573,6 +582,14 @@ func TestFriendlyName(t *testing.T) {
}),
expected: "label friendly name",
},
{
name: "friendly role name (uses label)",
resource: newRole(t, "friendly", map[string]string{
OriginLabel: OriginOkta,
OktaRoleNameLabel: "label friendly name",
}),
expected: "label friendly name",
},
{
name: "friendly node name",
resource: node,
Expand Down