mirror of
https://github.com/fleetdm/fleet
synced 2026-05-24 09:28:54 +00:00
62186cb6bd
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #40540 go-kit/log is no longer a direct dependency; moved kitlog adapter required for some 3rd party libraries into its own package # Checklist for submitter - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. - Present in previous PR ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Modernized logging across the codebase: switched from legacy logging wrappers to Go's standard slog, updated adapters, tests, tools, and server components. * Threaded the new slog logger through test utilities and tooling; adjusted a small number of logging-related function/constructor signatures to accept the new logger type (minor compatibility updates). <!-- end of auto-generated comment: release notes by coderabbit.ai -->
66 lines
1.8 KiB
Go
66 lines
1.8 KiB
Go
package condaccess
|
|
|
|
import (
|
|
"log/slog"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/fleetdm/fleet/v4/server/config"
|
|
"github.com/fleetdm/fleet/v4/server/datastore/redis/redistest"
|
|
"github.com/fleetdm/fleet/v4/server/fleet"
|
|
"github.com/fleetdm/fleet/v4/server/service"
|
|
"github.com/fleetdm/fleet/v4/server/service/integrationtest"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type Suite struct {
|
|
integrationtest.BaseSuite
|
|
}
|
|
|
|
func SetUpSuite(t *testing.T, uniqueTestName string) *Suite {
|
|
return SetUpSuiteWithConfig(t, uniqueTestName, nil)
|
|
}
|
|
|
|
func SetUpSuiteWithConfig(t *testing.T, uniqueTestName string, configModifier func(cfg *config.FleetConfig)) *Suite {
|
|
// Note: t.Parallel() is called when MySQL datastore options are processed
|
|
license := &fleet.LicenseInfo{
|
|
Tier: fleet.TierPremium,
|
|
}
|
|
ds, fleetCfg, fleetSvc, ctx := integrationtest.SetUpMySQLAndService(t, uniqueTestName, &service.TestServerOpts{
|
|
License: license,
|
|
Pool: redistest.SetupRedis(t, t.Name(), false, false, false),
|
|
})
|
|
|
|
// Apply config modifications
|
|
if configModifier != nil {
|
|
configModifier(&fleetCfg)
|
|
}
|
|
|
|
slogLogger := slog.New(slog.NewTextHandler(os.Stdout, nil))
|
|
condAccessSCEPDepot, err := ds.NewConditionalAccessSCEPDepot(slogLogger.With("component", "conditional-access-scep-depot"), &fleetCfg)
|
|
require.NoError(t, err)
|
|
|
|
users, server := service.RunServerForTestsWithServiceWithDS(t, ctx, ds, fleetSvc, &service.TestServerOpts{
|
|
License: license,
|
|
FleetConfig: &fleetCfg,
|
|
Logger: slogLogger,
|
|
ConditionalAccess: &service.ConditionalAccess{
|
|
SCEPStorage: condAccessSCEPDepot,
|
|
},
|
|
})
|
|
|
|
s := &Suite{
|
|
BaseSuite: integrationtest.BaseSuite{
|
|
Logger: slogLogger,
|
|
DS: ds,
|
|
FleetCfg: fleetCfg,
|
|
Users: users,
|
|
Server: server,
|
|
},
|
|
}
|
|
|
|
integrationtest.SetUpServerURL(t, ds, server)
|
|
|
|
s.BaseSuite.Token = s.BaseSuite.GetTestAdminToken(t)
|
|
return s
|
|
}
|