sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-19 23:11:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix test and runes in ShortID()

Browse Source
This commit is contained in:
Theodor S. Midtlien
2026-06-03 12:32:52 +02:00
parent 8f03bbf27d
commit 6318994e43
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/internal/profilemanager/id.go
View File

@@ -106,10 +106,11 @@ func (id ID) ShortID() string {
if id == DefaultProfileName {
return DefaultProfileName
}
if len(id) <= shortIDLen {
runes := []rune(id)
if len(runes) <= shortIDLen {
return id.String()
}
return id.String()[:shortIDLen]
return string(runes[:shortIDLen])
}
func (id ID) String() string {

4
client/internal/profilemanager/profilemanager_test.go
View File

@@ -50,14 +50,14 @@ func TestServiceManager_CreateAndGetDefaultProfile(t *testing.T) {
state, err := sm.GetActiveProfileState()
assert.NoError(t, err)
assert.Equal(t, defaultProfileName, state.ID) // No active profile state yet
assert.Equal(t, defaultProfileName, state.ID.String()) // No active profile state yet
err = sm.SetActiveProfileStateToDefault()
assert.NoError(t, err)
active, err := sm.GetActiveProfileState()
assert.NoError(t, err)
assert.Equal(t, "default", active.ID)
assert.Equal(t, "default", active.ID.String())
})
})
}

4
client/internal/profilemanager/service_test.go
View File

@@ -110,7 +110,7 @@ func TestServiceProfile_DefaultByExactID(t *testing.T) {
withTestSM(t, func(sm *ServiceManager, username string) {
got, err := sm.ResolveProfile(defaultProfileName, username)
require.NoError(t, err)
assert.Equal(t, defaultProfileName, got.ID)
assert.Equal(t, defaultProfileName, got.ID.String())
})
}
@@ -125,7 +125,7 @@ func TestServiceProfile_LegacyFilenameCoexists(t *testing.T) {
got, err := sm.ResolveProfile("legacy", username)
require.NoError(t, err)
assert.Equal(t, "legacy", got.ID)
assert.Equal(t, "legacy", got.ID.String())
// Name falls back to the filename stem when JSON omits it.
assert.Equal(t, "legacy", got.Name)
})