switch to NanoLIB log

cmd/nanocmd/api.go

@@ -1,13 +1,14 @@
 package main
 
 import (
- "github.com/alexedwards/flow"
  enginehttp "github.com/micromdm/nanocmd/engine/http"
- "github.com/micromdm/nanocmd/log"
  cmdplanhttp "github.com/micromdm/nanocmd/subsystem/cmdplan/http"
  fvenablehttp "github.com/micromdm/nanocmd/subsystem/filevault/http"
  invhttp "github.com/micromdm/nanocmd/subsystem/inventory/http"
  profhttp "github.com/micromdm/nanocmd/subsystem/profile/http"
+
+ "github.com/alexedwards/flow"
+ "github.com/micromdm/nanolib/log"
 )
 
 type engineLike interface {

cmd/nanocmd/main.go

@@ -13,11 +13,11 @@ import (
 
  "github.com/micromdm/nanocmd/engine"
  httpcwe "github.com/micromdm/nanocmd/http"
- "github.com/micromdm/nanocmd/log/logkeys"
- "github.com/micromdm/nanocmd/log/stdlogfmt"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/mdm/foss"
 
  "github.com/alexedwards/flow"
+ "github.com/micromdm/nanolib/log/stdlogfmt"
 )
 
 // overridden by -ldflags -X

cmd/nanocmd/workflows.go

@@ -3,14 +3,15 @@ package main
 import (
  "fmt"
 
- "github.com/micromdm/nanocmd/log"
  "github.com/micromdm/nanocmd/workflow"
  "github.com/micromdm/nanocmd/workflow/cmdplan"
  "github.com/micromdm/nanocmd/workflow/fvenable"
  "github.com/micromdm/nanocmd/workflow/fvrotate"
  "github.com/micromdm/nanocmd/workflow/inventory"
  "github.com/micromdm/nanocmd/workflow/lock"
  "github.com/micromdm/nanocmd/workflow/profile"
+
+ "github.com/micromdm/nanolib/log"
 )
 
 type registerer interface {

engine/engine.go

@@ -10,12 +10,13 @@ import (
  "time"
 
  "github.com/micromdm/nanocmd/engine/storage"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/mdm"
  "github.com/micromdm/nanocmd/utils/uuid"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 var (

engine/http/engine.go

@@ -7,12 +7,13 @@ import (
  "errors"
  "net/http"
 
- "github.com/alexedwards/flow"
  "github.com/micromdm/nanocmd/http/api"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/alexedwards/flow"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 var (

engine/http/event.go

@@ -5,12 +5,13 @@ import (
  "errors"
  "net/http"
 
- "github.com/alexedwards/flow"
  "github.com/micromdm/nanocmd/engine/storage"
  "github.com/micromdm/nanocmd/http/api"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
+
+ "github.com/alexedwards/flow"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 var (

engine/worker.go

@@ -6,9 +6,10 @@ import (
  "time"
 
  "github.com/micromdm/nanocmd/engine/storage"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/micromdm/nanolib/log"
 )
 
 const DefaultDuration = time.Minute * 5

go.mod

@@ -8,6 +8,7 @@ require (
  github.com/google/uuid v1.6.0
  github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5
  github.com/jessepeterson/mdmcommands v0.0.0-20230517161100-c5ca4128e1e3
+ github.com/micromdm/nanolib v0.1.1
  github.com/peterbourgon/diskv/v3 v3.0.1
  github.com/smallstep/pkcs7 v0.0.0-20231107075624-be1870d87d13
 )

go.sum

@@ -13,6 +13,8 @@ github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5 h1:saaSiB25B1wgaxrshQh
 github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5/go.mod h1:itkABA+w2cw7x5nYUS/pLRef6ludkZKOigbROmCTaFw=
 github.com/jessepeterson/mdmcommands v0.0.0-20230517161100-c5ca4128e1e3 h1:J825aym3sjbzht2K6m4Bd8HPkvV0lbyM/G2ZjGHuDaU=
 github.com/jessepeterson/mdmcommands v0.0.0-20230517161100-c5ca4128e1e3/go.mod h1:EHxwKfMUtf7wNjF19BQQ/XCOvh62vbOXTggS9guNVxY=
+github.com/micromdm/nanolib v0.1.1 h1:nNwY2xLBTHSpwEJsW5xGjkW9MdskAbeo/e6+ZYwr2mE=
+github.com/micromdm/nanolib v0.1.1/go.mod h1:FwBKCvvphgYvbdUZ+qw5kay7NHJcg6zPi8W7kXNajmE=
 github.com/peterbourgon/diskv/v3 v3.0.1 h1:x06SQA46+PKIUftmEujdwSEpIx8kR+M9eLYsUxeYveU=
 github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o=
 github.com/smallstep/pkcs7 v0.0.0-20231107075624-be1870d87d13 h1:qRxEt9ESQhAg1kjmgJ8oyyzlc9zkAjOooe7bcKjKORQ=

http/http.go

@@ -9,8 +9,8 @@ import (
  "net"
  "net/http"
 
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 // ReadAllAndReplaceBody reads all of r.Body and replaces it with a new byte buffer.

mdm/foss/foss.go

@@ -10,9 +10,10 @@ import (
  "net/url"
  "strings"
 
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
+
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 var ErrNoIDsInIDChunk = errors.New("no ids in id chunk")

mdm/foss/webhook.go

@@ -5,9 +5,10 @@ import (
  "net/http"
  "time"
 
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
+
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 type Event struct {

mdm/foss/webhook_test.go

@@ -8,9 +8,10 @@ import (
  "testing"
  "time"
 
- "github.com/micromdm/nanocmd/log"
  "github.com/micromdm/nanocmd/mdm"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/micromdm/nanolib/log"
 )
 
 type event struct {

subsystem/cmdplan/http/http.go

@@ -6,12 +6,13 @@ import (
  "errors"
  "net/http"
 
- "github.com/alexedwards/flow"
  "github.com/micromdm/nanocmd/http/api"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/subsystem/cmdplan/storage"
+
+ "github.com/alexedwards/flow"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 var (

subsystem/inventory/http/http.go

@@ -7,10 +7,11 @@ import (
  "net/http"
 
  "github.com/micromdm/nanocmd/http/api"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/subsystem/inventory/storage"
+
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 var (

subsystem/profile/http/http.go

@@ -7,13 +7,14 @@ import (
  "io"
  "net/http"
 
- "github.com/alexedwards/flow"
  "github.com/micromdm/nanocmd/http/api"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/subsystem/profile/storage"
  "github.com/micromdm/nanocmd/utils/mobileconfig"
+
+ "github.com/alexedwards/flow"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 // GetProfilesHandler returns an HTTP handler that returns profile metadata for all profile names.

workflow/cmdplan/workflow.go

@@ -8,15 +8,16 @@ import (
  "os"
  "strings"
 
- "github.com/jessepeterson/mdmcommands"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/mdm"
  "github.com/micromdm/nanocmd/subsystem/cmdplan/storage"
  profstorage "github.com/micromdm/nanocmd/subsystem/profile/storage"
  "github.com/micromdm/nanocmd/utils/uuid"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/jessepeterson/mdmcommands"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 const WorkflowName = "io.micromdm.wf.cmdplan.v1"

workflow/fvenable/workflow.go

@@ -9,14 +9,15 @@ import (
  "fmt"
  "time"
 
- "github.com/jessepeterson/mdmcommands"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  fvstorage "github.com/micromdm/nanocmd/subsystem/filevault/storage"
  profstorage "github.com/micromdm/nanocmd/subsystem/profile/storage"
  "github.com/micromdm/nanocmd/utils/uuid"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/jessepeterson/mdmcommands"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 const WorkflowName = "io.micromdm.wf.fvenable.v1"

workflow/fvrotate/workflow.go

@@ -6,13 +6,14 @@ import (
  "errors"
  "fmt"
 
- "github.com/jessepeterson/mdmcommands"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/subsystem/filevault/storage"
  "github.com/micromdm/nanocmd/utils/uuid"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/jessepeterson/mdmcommands"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 const WorkflowName = "io.micromdm.wf.fvrotate.v1"

workflow/lock/workflow.go

@@ -7,13 +7,14 @@ import (
  "math/rand"
  "time"
 
- "github.com/jessepeterson/mdmcommands"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/subsystem/inventory/storage"
  "github.com/micromdm/nanocmd/utils/uuid"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/jessepeterson/mdmcommands"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 const WorkflowName = "io.micromdm.wf.lock.v1"

workflow/profile/workflow.go

@@ -7,13 +7,14 @@ import (
  "fmt"
  "strings"
 
- "github.com/jessepeterson/mdmcommands"
- "github.com/micromdm/nanocmd/log"
- "github.com/micromdm/nanocmd/log/ctxlog"
- "github.com/micromdm/nanocmd/log/logkeys"
+ "github.com/micromdm/nanocmd/logkeys"
  "github.com/micromdm/nanocmd/subsystem/profile/storage"
  "github.com/micromdm/nanocmd/utils/uuid"
  "github.com/micromdm/nanocmd/workflow"
+
+ "github.com/jessepeterson/mdmcommands"
+ "github.com/micromdm/nanolib/log"
+ "github.com/micromdm/nanolib/log/ctxlog"
 )
 
 const WorkflowName = "io.micromdm.wf.profile.v1"