sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-21 21:09:07 +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-08 14:50:26 +02:00
parent f98fe1e9ec
commit 3bb44e72db
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/internal/profilemanager/id.go
+3 -2
View File
@@ -106,10 +106,11 @@ func (id ID) ShortID() string {
if id == DefaultProfileName { if id == DefaultProfileName {
return DefaultProfileName return DefaultProfileName
} }
if len(id) <= shortIDLen { runes := []rune(id)
if len(runes) <= shortIDLen {
return id.String() return id.String()
} }
return id.String()[:shortIDLen] return string(runes[:shortIDLen])
} }
func (id ID) String() string { func (id ID) String() string {
client/internal/profilemanager/profilemanager_test.go
+2 -2
View File
@@ -50,14 +50,14 @@ func TestServiceManager_CreateAndGetDefaultProfile(t *testing.T) {
state, err := sm.GetActiveProfileState() state, err := sm.GetActiveProfileState()
assert.NoError(t, err) 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() err = sm.SetActiveProfileStateToDefault()
assert.NoError(t, err) assert.NoError(t, err)
active, err := sm.GetActiveProfileState() active, err := sm.GetActiveProfileState()
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "default", active.ID) assert.Equal(t, "default", active.ID.String())
}) })
}) })
} }
client/internal/profilemanager/service_test.go
+2 -2
View File
@@ -110,7 +110,7 @@ func TestServiceProfile_DefaultByExactID(t *testing.T) {
withTestSM(t, func(sm *ServiceManager, username string) { withTestSM(t, func(sm *ServiceManager, username string) {
got, err := sm.ResolveProfile(defaultProfileName, username) got, err := sm.ResolveProfile(defaultProfileName, username)
require.NoError(t, err) 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) got, err := sm.ResolveProfile("legacy", username)
require.NoError(t, err) 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. // Name falls back to the filename stem when JSON omits it.
assert.Equal(t, "legacy", got.Name) assert.Equal(t, "legacy", got.Name)
}) })