Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 22 Packages Projects Releases Wiki Activity

Changes needed before gokit/log to slog transition. (#39527)

Browse Source 
<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #38889

PLEASE READ BELOW before looking at file changes

Before converting individual files/packages to slog, we generally need
to make these 2 changes to make the conversion easier:
- Replace uses of `kitlog.With` since they are not fully compatible with
our kitlog adapter
- Directly use the kitlog adapter logger type instead of the kitlog
interface, which will let us have direct access to the underlying slog
logger: `*logging.Logger`

Note: that I did not replace absolutely all uses of `kitlog.Logger`, but
I did remove all uses of `kitlog.With` except for these due to
complexity:
- server/logging/filesystem.go and the other log writers (webhook,
firehose, kinesis, lambda, pubsub, nats)
- server/datastore/mysql/nanomdm_storage.go (adapter pattern)
- server/vulnerabilities/nvd/* (cascades to CLI tools)
- server/service/osquery_utils/queries.go (callback type signatures
cascade broadly)
- cmd/maintained-apps/ (standalone, so can be transitioned later all at
once)

Most of the changes in this PR follow these patterns:
- `kitlog.Logger` type → `*logging.Logger`
- `kitlog.With(logger, ...)` → `logger.With(...)`
- `kitlog.NewNopLogger() → logging.NewNopLogger()`, including similar
variations such as `logging.NewLogfmtLogger(w)` and
`logging.NewJSONLogger(w)`
- removed many now-unused kitlog imports

Unique changes that the PR review should focus on:
- server/platform/logging/kitlog_adapter.go: Core adapter changes
- server/platform/logging/logging.go: New convenience functions
- server/service/integration_logger_test.go: Test changes for slog

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [x] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
  - Was added 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

* **Refactor**
* Migrated the codebase to a unified internal structured logging system
for more consistent, reliable logs and observability.
* No user-facing functionality changed; runtime behavior and APIs remain
compatible.
* **Tests**
* Updated tests to use the new logging helpers to ensure consistent test
logging and validation.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Victor Lyuboslavsky
2026-02-11 10:08:33 -06:00
committed by GitHub
parent 37e7e84f3c
commit aaac4b1dfe
78 changed files with 603 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ee/server/calendar/google_calendar.go
+3 -3
View File
@@ -15,7 +15,7 @@ import (
"github.com/cenkalti/backoff/v4"
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
"github.com/fleetdm/fleet/v4/server/fleet"
kitlog "github.com/go-kit/log"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/go-kit/log/level"
"github.com/google/uuid"
"golang.org/x/oauth2/google"
@@ -53,7 +53,7 @@ var (
type GoogleCalendarConfig struct {
Context context.Context
IntegrationConfig *fleet.GoogleCalendarIntegration
Logger kitlog.Logger
Logger *logging.Logger
ServerURL string
// Should be nil for production
API GoogleCalendarAPI
@@ -108,7 +108,7 @@ type eventDetails struct {
type GoogleCalendarLowLevelAPI struct {
service *calendar.Service
logger kitlog.Logger
logger *logging.Logger
serverURL string
}
ee/server/calendar/google_calendar_integration_test.go
+3 -3
View File
@@ -9,7 +9,7 @@ import (
"github.com/fleetdm/fleet/v4/ee/server/calendar/load_test"
"github.com/fleetdm/fleet/v4/server/fleet"
kitlog "github.com/go-kit/log"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
@@ -62,7 +62,7 @@ func (s *googleCalendarIntegrationTestSuite) TestCreateGetDeleteEvent() {
"private_key": s.server.URL,
}},
},
Logger: kitlog.NewLogfmtLogger(kitlog.NewSyncWriter(os.Stdout)),
Logger: logging.NewLogfmtLogger(os.Stdout),
}
gCal := NewGoogleCalendar(config)
err := gCal.Configure(userEmail)
@@ -129,7 +129,7 @@ func (s *googleCalendarIntegrationTestSuite) TestFillUpCalendar() {
"private_key": s.server.URL,
}},
},
Logger: kitlog.NewLogfmtLogger(kitlog.NewSyncWriter(os.Stdout)),
Logger: logging.NewLogfmtLogger(os.Stdout),
}
gCal := NewGoogleCalendar(config)
err := gCal.Configure(userEmail)
ee/server/calendar/google_calendar_load.go
+3 -3
View File
@@ -7,7 +7,7 @@ import (
"errors"
"fmt"
"github.com/fleetdm/fleet/v4/pkg/fleethttp"
kitlog "github.com/go-kit/log"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"google.golang.org/api/calendar/v3"
"google.golang.org/api/googleapi"
"io"
@@ -18,7 +18,7 @@ import (
// GoogleCalendarLoadAPI is used for load testing.
type GoogleCalendarLoadAPI struct {
Logger kitlog.Logger
Logger *logging.Logger
baseUrl string
userToImpersonate string
ctx context.Context
@@ -30,7 +30,7 @@ type GoogleCalendarLoadAPI struct {
func (lowLevelAPI *GoogleCalendarLoadAPI) Configure(ctx context.Context, _ string, privateKey string, userToImpersonate string,
serverURL string) error {
if lowLevelAPI.Logger == nil {
lowLevelAPI.Logger = kitlog.With(kitlog.NewLogfmtLogger(os.Stderr), "mock", "GoogleCalendarLoadAPI", "user", userToImpersonate)
lowLevelAPI.Logger = logging.NewLogfmtLogger(os.Stderr).With("mock", "GoogleCalendarLoadAPI", "user", userToImpersonate)
}
lowLevelAPI.baseUrl = privateKey
lowLevelAPI.userToImpersonate = userToImpersonate
ee/server/calendar/google_calendar_mock.go
+3 -3
View File
@@ -10,13 +10,13 @@ import (
"sync"
"time"
kitlog "github.com/go-kit/log"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"google.golang.org/api/calendar/v3"
"google.golang.org/api/googleapi"
)
type GoogleCalendarMockAPI struct {
logger kitlog.Logger
logger *logging.Logger
}
type channel struct {
@@ -36,7 +36,7 @@ const latency = 200 * time.Millisecond
// Configure creates a new Google Calendar service using the provided credentials.
func (lowLevelAPI *GoogleCalendarMockAPI) Configure(_ context.Context, _ string, _ string, userToImpersonate string, _ string) error {
if lowLevelAPI.logger == nil {
lowLevelAPI.logger = kitlog.With(kitlog.NewLogfmtLogger(os.Stderr), "mock", "GoogleCalendarMockAPI", "user", userToImpersonate)
lowLevelAPI.logger = logging.NewLogfmtLogger(os.Stderr).With("mock", "GoogleCalendarMockAPI", "user", userToImpersonate)
}
return nil
}
ee/server/calendar/google_calendar_test.go
+2 -2
View File
@@ -10,7 +10,7 @@ import (
"time"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/go-kit/log"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/api/calendar/v3"
@@ -26,7 +26,7 @@ const (
var (
baseCtx = context.Background()
logger = log.NewLogfmtLogger(log.NewSyncWriter(os.Stdout))
logger = logging.NewLogfmtLogger(os.Stdout)
)
type MockGoogleCalendarLowLevelAPI struct {
ee/server/integrationtest/condaccess/suite.go
+3 -4
View File
@@ -7,10 +7,9 @@ import (
"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/platform/logging"
"github.com/fleetdm/fleet/v4/server/service"
"github.com/fleetdm/fleet/v4/server/service/integrationtest"
"github.com/go-kit/kit/log"
kitlog "github.com/go-kit/log"
"github.com/stretchr/testify/require"
)
@@ -37,8 +36,8 @@ func SetUpSuiteWithConfig(t *testing.T, uniqueTestName string, configModifier fu
configModifier(&fleetCfg)
}
logger := log.NewLogfmtLogger(os.Stdout)
condAccessSCEPDepot, err := ds.NewConditionalAccessSCEPDepot(kitlog.With(logger, "component", "conditional-access-scep-depot"), &fleetCfg)
logger := logging.NewLogfmtLogger(os.Stdout)
condAccessSCEPDepot, err := ds.NewConditionalAccessSCEPDepot(logger.With("component", "conditional-access-scep-depot"), &fleetCfg)
require.NoError(t, err)
users, server := service.RunServerForTestsWithServiceWithDS(t, ctx, ds, fleetSvc, &service.TestServerOpts{
ee/server/integrationtest/hostidentity/suite.go
+3 -4
View File
@@ -11,10 +11,9 @@ import (
"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/platform/logging"
"github.com/fleetdm/fleet/v4/server/service"
"github.com/fleetdm/fleet/v4/server/service/integrationtest"
"github.com/go-kit/kit/log"
kitlog "github.com/go-kit/log"
"github.com/stretchr/testify/require"
)
@@ -57,8 +56,8 @@ func SetUpSuiteWithConfig(t *testing.T, uniqueTestName string, requireSignature
configModifier(&fleetCfg)
}
logger := log.NewLogfmtLogger(os.Stdout)
hostIdentitySCEPDepot, err := ds.NewHostIdentitySCEPDepot(kitlog.With(logger, "component", "host-id-scep-depot"), &fleetCfg)
logger := logging.NewLogfmtLogger(os.Stdout)
hostIdentitySCEPDepot, err := ds.NewHostIdentitySCEPDepot(logger.With("component", "host-id-scep-depot"), &fleetCfg)
require.NoError(t, err)
users, server := service.RunServerForTestsWithServiceWithDS(t, ctx, ds, fleetSvc, &service.TestServerOpts{
License: license,
ee/server/integrationtest/scim/suite.go
+2 -2
View File
@@ -5,9 +5,9 @@ import (
"testing"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/service"
"github.com/fleetdm/fleet/v4/server/service/integrationtest"
"github.com/go-kit/log"
)
type Suite struct {
@@ -22,7 +22,7 @@ func SetUpSuite(t *testing.T, uniqueTestName string) *Suite {
ds, fleetCfg, fleetSvc, ctx := integrationtest.SetUpMySQLAndService(t, uniqueTestName, &service.TestServerOpts{
License: license,
})
logger := log.NewLogfmtLogger(os.Stdout)
logger := logging.NewLogfmtLogger(os.Stdout)
users, server := service.RunServerForTestsWithServiceWithDS(t, ctx, ds, fleetSvc, &service.TestServerOpts{
License: license,
FleetConfig: &fleetCfg,
ee/server/scim/scim.go
+3 -2
View File
@@ -16,6 +16,7 @@ import (
"github.com/fleetdm/fleet/v4/server/authz"
"github.com/fleetdm/fleet/v4/server/config"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/service/middleware/auth"
"github.com/fleetdm/fleet/v4/server/service/middleware/log"
kitlog "github.com/go-kit/log"
@@ -31,7 +32,7 @@ func RegisterSCIM(
mux *http.ServeMux,
ds fleet.Datastore,
svc fleet.Service,
logger kitlog.Logger,
logger *logging.Logger,
fleetConfig *config.FleetConfig,
) error {
if fleetConfig == nil {
@@ -158,7 +159,7 @@ func RegisterSCIM(
},
}
scimLogger := kitlog.With(logger, "component", "SCIM")
scimLogger := logger.With("component", "SCIM")
resourceTypes := []scim.ResourceType{
{
ID: optional.NewString("User"),
ee/server/service/calendar_test.go
+2 -2
View File
@@ -9,9 +9,9 @@ import (
authz_ctx "github.com/fleetdm/fleet/v4/server/contexts/authz"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/mock"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/ptr"
"github.com/fleetdm/fleet/v4/server/service/calendar"
"github.com/go-kit/log"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -389,7 +389,7 @@ func TestCalendarWebhookErrorCases(t *testing.T) {
ds: ds,
distributedLock: lock,
authz: auth,
logger: log.NewNopLogger(),
logger: logging.NewNopLogger(),
}
// Apply test-specific mocks
ee/server/service/certificate_authorities_test.go
+3 -3
View File
@@ -18,9 +18,9 @@ import (
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/mock"
scep_mock "github.com/fleetdm/fleet/v4/server/mock/scep"
"github.com/fleetdm/fleet/v4/server/platform/logging"
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
"github.com/fleetdm/fleet/v4/server/ptr"
"github.com/go-kit/log"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -200,7 +200,7 @@ func TestCreatingCertificateAuthorities(t *testing.T) {
require.NoError(t, err)
svc := &Service{
logger: log.NewLogfmtLogger(os.Stdout),
logger: logging.NewLogfmtLogger(os.Stdout),
ds: ds,
authz: authorizer,
digiCertService: digicert.NewService(),
@@ -1195,7 +1195,7 @@ func TestUpdatingCertificateAuthorities(t *testing.T) {
require.NoError(t, err)
svc := &Service{
logger: log.NewLogfmtLogger(os.Stdout),
logger: logging.NewLogfmtLogger(os.Stdout),
ds: ds,
authz: authorizer,
digiCertService: digicert.NewService(),
ee/server/service/condaccess/idp.go
+5 -4
View File
@@ -20,6 +20,7 @@ import (
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
"github.com/fleetdm/fleet/v4/server/dev_mode"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/service/middleware/log"
"github.com/fleetdm/fleet/v4/server/service/middleware/otel"
kitlog "github.com/go-kit/log"
@@ -61,7 +62,7 @@ func (e *notFoundError) IsNotFound() bool {
// idpService implements the Okta conditional access IdP functionality.
type idpService struct {
ds fleet.Datastore
logger kitlog.Logger
logger *logging.Logger
certSerialFormat string
}
@@ -69,7 +70,7 @@ type idpService struct {
func RegisterIdP(
mux *http.ServeMux,
ds fleet.Datastore,
logger kitlog.Logger,
logger *logging.Logger,
fleetConfig *config.FleetConfig,
) error {
if fleetConfig == nil {
@@ -78,7 +79,7 @@ func RegisterIdP(
svc := &idpService{
ds: ds,
logger: kitlog.With(logger, "component", "conditional-access-idp"),
logger: logger.With("component", "conditional-access-idp"),
certSerialFormat: fleetConfig.ConditionalAccess.CertSerialFormat,
}
@@ -565,7 +566,7 @@ func (s *idpService) buildIdentityProvider(ctx context.Context, serverURL string
ssoURL = ssoURL.JoinPath(idpSSOPath)
// Create kitlog adapter for SAML library
samlLogger := &kitlogAdapter{logger: kitlog.With(s.logger, "component", "saml-idp")}
samlLogger := &kitlogAdapter{logger: s.logger.With("component", "saml-idp")}
// Build IdentityProvider
// Note: SessionProvider is set dynamically in serveSSO based on the authenticated device
ee/server/service/condaccess/idp_test.go
+5 -5
View File
@@ -15,8 +15,8 @@ import (
"github.com/fleetdm/fleet/v4/server/config"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/mock"
"github.com/fleetdm/fleet/v4/server/platform/logging"
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
kitlog "github.com/go-kit/log"
"github.com/jmoiron/sqlx"
"github.com/stretchr/testify/require"
)
@@ -76,13 +76,13 @@ b1ctZeF7HaWwFdTC8GqWI6zzRFn+YA3f/yYibhowuEypPQeSjlI=
func newTestService() (*idpService, *mock.Store) {
ds := new(mock.Store)
logger := kitlog.NewNopLogger()
logger := logging.NewNopLogger()
return &idpService{ds: ds, logger: logger, certSerialFormat: config.CertSerialFormatHex}, ds
}
func newTestServiceWithCertFormat(certFormat string) (*idpService, *mock.Store) {
ds := new(mock.Store)
logger := kitlog.NewNopLogger()
logger := logging.NewNopLogger()
return &idpService{ds: ds, logger: logger, certSerialFormat: certFormat}, ds
}
@@ -117,7 +117,7 @@ func mockCertAssetsFunc(includeCerts bool) func(context.Context, []fleet.MDMAsse
func TestRegisterIdP(t *testing.T) {
ds := new(mock.Store)
logger := kitlog.NewNopLogger()
logger := logging.NewNopLogger()
cfg := &config.FleetConfig{}
ds.AppConfigFunc = mockAppConfigFunc("https://fleet.example.com")
@@ -526,7 +526,7 @@ func TestParseCertAndKeyBytes(t *testing.T) {
}
func TestDeviceHealthSessionProvider(t *testing.T) {
logger := kitlog.NewNopLogger()
logger := logging.NewNopLogger()
now := time.Now()
tests := []struct {
ee/server/service/condaccess/log_adapter.go
+3 -3
View File
@@ -3,13 +3,13 @@ package condaccess
import (
"fmt"
kitlog "github.com/go-kit/log"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/go-kit/log/level"
)
// kitlogAdapter adapts kitlog.Logger to saml logger.Interface
// kitlogAdapter adapts to saml logger.Interface
type kitlogAdapter struct {
logger kitlog.Logger
logger *logging.Logger
}
func (k *kitlogAdapter) Printf(format string, v ...interface{}) {
ee/server/service/condaccess/scep.go
+4 -4
View File
@@ -15,9 +15,9 @@ import (
"github.com/fleetdm/fleet/v4/server/mdm/assets"
scepdepot "github.com/fleetdm/fleet/v4/server/mdm/scep/depot"
scepserver "github.com/fleetdm/fleet/v4/server/mdm/scep/server"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/service/middleware/otel"
"github.com/go-kit/kit/log"
kitlog "github.com/go-kit/log"
"github.com/smallstep/scep"
)
@@ -45,7 +45,7 @@ func RegisterSCEP(
mux *http.ServeMux,
scepStorage scepdepot.Depot,
ds fleet.Datastore,
logger kitlog.Logger,
logger *logging.Logger,
fleetConfig *config.FleetConfig,
) error {
if fleetConfig == nil {
@@ -68,10 +68,10 @@ func RegisterSCEP(
scepService := NewSCEPService(
ds,
signer,
kitlog.With(logger, "component", "conditional-access-scep"),
logger.With("component", "conditional-access-scep"),
)
scepLogger := kitlog.With(logger, "component", "http-conditional-access-scep")
scepLogger := logger.With("component", "http-conditional-access-scep")
e := scepserver.MakeServerEndpoints(scepService)
e.GetEndpoint = scepserver.EndpointLoggingMiddleware(scepLogger)(e.GetEndpoint)
e.PostEndpoint = scepserver.EndpointLoggingMiddleware(scepLogger)(e.PostEndpoint)
ee/server/service/digicert/digicert.go
+4 -4
View File
@@ -18,8 +18,8 @@ import (
"github.com/fleetdm/fleet/v4/server"
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/go-json-experiment/json"
kitlog "github.com/go-kit/log"
"github.com/go-kit/log/level"
"software.sslmate.com/src/go-pkcs12"
)
@@ -36,7 +36,7 @@ const (
)
type Service struct {
logger kitlog.Logger
logger *logging.Logger
timeout time.Duration
}
@@ -60,7 +60,7 @@ func WithTimeout(t time.Duration) Opt {
}
// WithLogger sets the logger to use for the service.
func WithLogger(logger kitlog.Logger) Opt {
func WithLogger(logger *logging.Logger) Opt {
return func(s *Service) {
s.logger = logger
}
@@ -119,7 +119,7 @@ func (s *Service) populateOpts(opts []Opt) {
s.timeout = defaultTimeout
}
if s.logger == nil {
s.logger = kitlog.NewLogfmtLogger(kitlog.NewSyncWriter(os.Stdout))
s.logger = logging.NewLogfmtLogger(os.Stderr)
}
}
ee/server/service/hostidentity/scep.go
+5 -5
View File
@@ -25,9 +25,9 @@ import (
"github.com/fleetdm/fleet/v4/server/mdm/assets"
scepdepot "github.com/fleetdm/fleet/v4/server/mdm/scep/depot"
scepserver "github.com/fleetdm/fleet/v4/server/mdm/scep/server"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/service/middleware/otel"
"github.com/go-kit/kit/log"
kitlog "github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/smallstep/scep"
)
@@ -67,7 +67,7 @@ func RegisterSCEP(
mux *http.ServeMux,
scepStorage scepdepot.Depot,
ds fleet.Datastore,
logger kitlog.Logger,
logger *logging.Logger,
fleetConfig *config.FleetConfig,
) error {
if fleetConfig == nil {
@@ -87,10 +87,10 @@ func RegisterSCEP(
scepService := NewSCEPService(
ds,
signer,
kitlog.With(logger, "component", "host-id-scep"),
logger.With("component", "host-id-scep"),
)
scepLogger := kitlog.With(logger, "component", "http-host-id-scep")
scepLogger := logger.With("component", "http-host-id-scep")
e := scepserver.MakeServerEndpoints(scepService)
e.GetEndpoint = scepserver.EndpointLoggingMiddleware(scepLogger)(e.GetEndpoint)
e.PostEndpoint = scepserver.EndpointLoggingMiddleware(scepLogger)(e.PostEndpoint)
@@ -140,7 +140,7 @@ func hasRenewalExtension(csr *x509.CertificateRequest) bool {
}
// renewalMiddleware handles certificate renewal with proof-of-possession
func renewalMiddleware(ds fleet.Datastore, logger kitlog.Logger, next scepserver.CSRSignerContext) scepserver.CSRSignerContextFunc {
func renewalMiddleware(ds fleet.Datastore, logger *logging.Logger, next scepserver.CSRSignerContext) scepserver.CSRSignerContextFunc {
return func(ctx context.Context, m *scep.CSRReqMessage) (*x509.Certificate, error) {
// Check if this is a renewal request
var renewalData types.RenewalData
ee/server/service/mdm_external_test.go
+2 -2
View File
@@ -25,11 +25,11 @@ import (
mdmtesting "github.com/fleetdm/fleet/v4/server/mdm/testing_utils"
"github.com/fleetdm/fleet/v4/server/mock"
nanodep_mock "github.com/fleetdm/fleet/v4/server/mock/nanodep"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/ptr"
"github.com/fleetdm/fleet/v4/server/service"
"github.com/fleetdm/fleet/v4/server/test"
"github.com/fleetdm/fleet/v4/server/worker"
kitlog "github.com/go-kit/log"
"github.com/google/uuid"
"github.com/jmoiron/sqlx"
"github.com/stretchr/testify/require"
@@ -40,7 +40,7 @@ func setupMockDatastorePremiumService(t testing.TB) (*mock.Store, *eeservice.Ser
lic := &fleet.LicenseInfo{Tier: fleet.TierPremium}
ctx := license.NewContext(context.Background(), lic)
logger := kitlog.NewNopLogger()
logger := logging.NewNopLogger()
fleetConfig := config.FleetConfig{
MDM: config.MDMConfig{
AppleSCEPCertBytes: eeservice.TestCert,
ee/server/service/request_certificate_test.go
+2 -2
View File
@@ -17,9 +17,9 @@ import (
"github.com/fleetdm/fleet/v4/server/contexts/viewer"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/mock"
"github.com/fleetdm/fleet/v4/server/platform/logging"
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
"github.com/fleetdm/fleet/v4/server/ptr"
"github.com/go-kit/log"
"github.com/stretchr/testify/require"
)
@@ -150,7 +150,7 @@ func TestRequestCertificate(t *testing.T) {
authorizer, err := authz.NewAuthorizer()
require.NoError(t, err)
logger := log.NewLogfmtLogger(os.Stdout)
logger := logging.NewLogfmtLogger(os.Stdout)
svc := &Service{
logger: logger,
ds: ds,
ee/server/service/service.go
+3 -3
View File
@@ -10,8 +10,8 @@ import (
"github.com/fleetdm/fleet/v4/server/mdm/android"
apple_mdm "github.com/fleetdm/fleet/v4/server/mdm/apple"
"github.com/fleetdm/fleet/v4/server/mdm/nanodep/storage"
"github.com/fleetdm/fleet/v4/server/platform/logging"
"github.com/fleetdm/fleet/v4/server/sso"
kitlog "github.com/go-kit/log"
)
// Service wraps a free Service and implements additional premium functionality on top of it.
@@ -19,7 +19,7 @@ type Service struct {
fleet.Service
ds fleet.Datastore
logger kitlog.Logger
logger *logging.Logger
config config.FleetConfig
clock clock.Clock
authz *authz.Authorizer
@@ -42,7 +42,7 @@ type Service struct {
func NewService(
svc fleet.Service,
ds fleet.Datastore,
logger kitlog.Logger,
logger *logging.Logger,
config config.FleetConfig,
mailService fleet.MailService,
c clock.Clock,
ee/server/service/software_installers.go
+1 -2
View File
@@ -30,7 +30,6 @@ import (
"github.com/fleetdm/fleet/v4/server/mdm/nanomdm/mdm"
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
"github.com/fleetdm/fleet/v4/server/ptr"
"github.com/go-kit/log"
kitlog "github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/google/uuid"
@@ -2074,7 +2073,7 @@ func (svc *Service) softwareBatchUpload(
if batchErr != nil {
status = fmt.Sprintf("%s%s", batchSetFailedPrefix, batchErr)
}
logger := log.With(svc.logger,
logger := svc.logger.With(
"request_uuid", requestUUID,
"team_id", teamID,
"payloads", len(payloads),