Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

new IP allocator and add postgres to integration tests. #1756

Merged
merged 10 commits into from
Feb 18, 2024
Merged

new IP allocator and add postgres to integration tests. #1756

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b90c740
introduce dedicated ip allocator
kradalby Feb 17, 2024
4758469
rename ip_prefixes to prefixes.v(4|6)
kradalby Feb 17, 2024
9116cf2
require go 1.22
kradalby Feb 17, 2024
4bfdd64
use new ip allocator
kradalby Feb 17, 2024
801aeea
lint --fix
kradalby Feb 17, 2024
e64c129
sort output of api lists by ID
kradalby Feb 16, 2024
59db52c
add env option to run integration test with postgres
kradalby Feb 15, 2024
223d2cb
add postgres to gh actions generator
kradalby Feb 15, 2024
f1ff353
generate postgres gh action jobsf
kradalby Feb 15, 2024
f59db05
log database being opened
kradalby Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions hscontrol/grpcv1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package hscontrol
import (
"context"
"fmt"
"sort"
"strings"
"time"

Expand Down Expand Up @@ -98,6 +99,10 @@ func (api headscaleV1APIServer) ListUsers(
response[index] = user.Proto()
}

sort.Slice(response, func(i, j int) bool {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good lord, yes.

return response[i].Id < response[j].Id
})

log.Trace().Caller().Interface("users", response).Msg("")

return &v1.ListUsersResponse{Users: response}, nil
Expand Down Expand Up @@ -168,6 +173,10 @@ func (api headscaleV1APIServer) ListPreAuthKeys(
response[index] = key.Proto()
}

sort.Slice(response, func(i, j int) bool {
return response[i].Id < response[j].Id
})

return &v1.ListPreAuthKeysResponse{PreAuthKeys: response}, nil
}

Expand Down Expand Up @@ -427,6 +436,10 @@ func (api headscaleV1APIServer) ListNodes(
return nil, err
}

sort.Slice(nodes, func(i, j int) bool {
return nodes[i].ID < nodes[j].ID
})

response := make([]*v1.Node, len(nodes))
for index, node := range nodes {
resp := node.Proto()
Expand Down Expand Up @@ -611,6 +624,10 @@ func (api headscaleV1APIServer) ListApiKeys(
response[index] = key.Proto()
}

sort.Slice(response, func(i, j int) bool {
return response[i].Id < response[j].Id
})

return &v1.ListApiKeysResponse{ApiKeys: response}, nil
}

Expand Down