diff --git a/cmd/nanocmd/api.go b/cmd/nanocmd/api.go index a8006b5..3b2c8b3 100644 --- a/cmd/nanocmd/api.go +++ b/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 { diff --git a/cmd/nanocmd/main.go b/cmd/nanocmd/main.go index 6c8af49..eeaa03d 100644 --- a/cmd/nanocmd/main.go +++ b/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 diff --git a/cmd/nanocmd/workflows.go b/cmd/nanocmd/workflows.go index 9a40869..8485e4f 100644 --- a/cmd/nanocmd/workflows.go +++ b/cmd/nanocmd/workflows.go @@ -3,7 +3,6 @@ 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" @@ -11,6 +10,8 @@ import ( "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 { diff --git a/engine/engine.go b/engine/engine.go index c6fb8a7..50142bc 100644 --- a/engine/engine.go +++ b/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 ( diff --git a/engine/http/engine.go b/engine/http/engine.go index b237850..531e853 100644 --- a/engine/http/engine.go +++ b/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 ( diff --git a/engine/http/event.go b/engine/http/event.go index e9eda6e..ed6e7bc 100644 --- a/engine/http/event.go +++ b/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 ( diff --git a/engine/worker.go b/engine/worker.go index 6116eb8..39438d9 100644 --- a/engine/worker.go +++ b/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 diff --git a/go.mod b/go.mod index 5ee65c7..37e2f31 100644 --- a/go.mod +++ b/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 ) diff --git a/go.sum b/go.sum index 67fe262..c7945e7 100644 --- a/go.sum +++ b/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= diff --git a/http/http.go b/http/http.go index 1416fc2..0e69931 100644 --- a/http/http.go +++ b/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. diff --git a/log/logkeys/logkeys.go b/logkeys/logkeys.go similarity index 100% rename from log/logkeys/logkeys.go rename to logkeys/logkeys.go diff --git a/mdm/foss/foss.go b/mdm/foss/foss.go index a0c65c0..de3bf50 100644 --- a/mdm/foss/foss.go +++ b/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") diff --git a/mdm/foss/webhook.go b/mdm/foss/webhook.go index 3a469ca..3389dbe 100644 --- a/mdm/foss/webhook.go +++ b/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 { diff --git a/mdm/foss/webhook_test.go b/mdm/foss/webhook_test.go index 5315bb5..54248a7 100644 --- a/mdm/foss/webhook_test.go +++ b/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 { diff --git a/subsystem/cmdplan/http/http.go b/subsystem/cmdplan/http/http.go index 7b35e68..da6d0af 100644 --- a/subsystem/cmdplan/http/http.go +++ b/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 ( diff --git a/subsystem/inventory/http/http.go b/subsystem/inventory/http/http.go index e3c042b..79d3387 100644 --- a/subsystem/inventory/http/http.go +++ b/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 ( diff --git a/subsystem/profile/http/http.go b/subsystem/profile/http/http.go index 125a316..bba1472 100644 --- a/subsystem/profile/http/http.go +++ b/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. diff --git a/workflow/cmdplan/workflow.go b/workflow/cmdplan/workflow.go index 407492d..4ee6eff 100644 --- a/workflow/cmdplan/workflow.go +++ b/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" diff --git a/workflow/fvenable/workflow.go b/workflow/fvenable/workflow.go index 7739c71..726a86b 100644 --- a/workflow/fvenable/workflow.go +++ b/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" diff --git a/workflow/fvrotate/workflow.go b/workflow/fvrotate/workflow.go index 63ceacc..1be4739 100644 --- a/workflow/fvrotate/workflow.go +++ b/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" diff --git a/workflow/lock/workflow.go b/workflow/lock/workflow.go index c8ef68a..5349133 100644 --- a/workflow/lock/workflow.go +++ b/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" diff --git a/workflow/profile/workflow.go b/workflow/profile/workflow.go index 6a5939b..d6e5b69 100644 --- a/workflow/profile/workflow.go +++ b/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"