Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Merge main and fix conflicts

Browse source
This commit is contained in:
Martin Angers 2024-07-10 09:08:08 -04:00
parent 0913f77bdd
commit 0945ef9889
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/mock/datastore_mock.go
View file

@ -3045,11 +3045,11 @@ func (s *DataStore) GenerateHostStatusStatistics(ctx context.Context, filter fle
return s.GenerateHostStatusStatisticsFunc(ctx, filter, now, platform, lowDiskSpace)
}
func (s *DataStore) HostIDsByIdentifier(ctx context.Context, filter fleet.TeamFilter, hostIdentifiers []string) ([]uint, error) {
func (s *DataStore) HostIDsByIdentifier(ctx context.Context, filter fleet.TeamFilter, hostnames []string) ([]uint, error) {
s.mu.Lock()
s.HostIDsByIdentifierFuncInvoked = true
s.mu.Unlock()
return s.HostIDsByIdentifierFunc(ctx, filter, hostIdentifiers)
return s.HostIDsByIdentifierFunc(ctx, filter, hostnames)
}
func (s *DataStore) HostIDsByOSID(ctx context.Context, osID uint, offset int, limit int) ([]uint, error) {