From 3c9a161626c095eae561a054d859a661f94d501f Mon Sep 17 00:00:00 2001 From: Jesse Peterson Date: Sun, 6 Jun 2021 15:22:03 -0700 Subject: [PATCH] Rename module --- cmd/cli/cli.go | 10 +++++----- cmd/nano2nano/main.go | 6 +++--- cmd/nanomdm/main.go | 26 +++++++++++++------------- go.mod | 2 +- http/api.go | 10 +++++----- http/mdm.go | 6 +++--- http/mdm_cert.go | 4 ++-- log/stdlogfmt/stdlog.go | 2 +- push/buford/buford.go | 4 ++-- push/push.go | 2 +- push/service/service.go | 8 ++++---- service/certauth/certauth.go | 8 ++++---- service/certauth/service.go | 2 +- service/dump/dump.go | 4 ++-- service/microwebhook/service.go | 2 +- service/multi/multi.go | 6 +++--- service/nanomdm/service.go | 6 +++--- service/service.go | 2 +- storage/allmulti/allmulti.go | 6 +++--- storage/allmulti/certauth.go | 2 +- storage/allmulti/push.go | 2 +- storage/allmulti/queue.go | 2 +- storage/file/certauth.go | 2 +- storage/file/file.go | 4 ++-- storage/file/migrate.go | 2 +- storage/file/push.go | 2 +- storage/file/pushcert.go | 2 +- storage/file/queue.go | 2 +- storage/mysql/certauth.go | 2 +- storage/mysql/migrate.go | 2 +- storage/mysql/mysql.go | 6 +++--- storage/mysql/push.go | 2 +- storage/mysql/pushcert.go | 2 +- storage/mysql/queue.go | 2 +- storage/storage.go | 2 +- 35 files changed, 77 insertions(+), 77 deletions(-) diff --git a/cmd/cli/cli.go b/cmd/cli/cli.go index 0368d75..81cc61a 100644 --- a/cmd/cli/cli.go +++ b/cmd/cli/cli.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/storage" - "github.com/jessepeterson/nanomdm/storage/allmulti" - "github.com/jessepeterson/nanomdm/storage/file" - "github.com/jessepeterson/nanomdm/storage/mysql" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/storage" + "github.com/micromdm/nanomdm/storage/allmulti" + "github.com/micromdm/nanomdm/storage/file" + "github.com/micromdm/nanomdm/storage/mysql" ) type StringAccumulator []string diff --git a/cmd/nano2nano/main.go b/cmd/nano2nano/main.go index 161a073..8419738 100644 --- a/cmd/nano2nano/main.go +++ b/cmd/nano2nano/main.go @@ -10,9 +10,9 @@ import ( stdlog "log" "net/http" - "github.com/jessepeterson/nanomdm/cmd/cli" - "github.com/jessepeterson/nanomdm/log/stdlogfmt" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/cmd/cli" + "github.com/micromdm/nanomdm/log/stdlogfmt" + "github.com/micromdm/nanomdm/mdm" ) // overridden by -ldflags -X diff --git a/cmd/nanomdm/main.go b/cmd/nanomdm/main.go index 18f46ed..0de6547 100644 --- a/cmd/nanomdm/main.go +++ b/cmd/nanomdm/main.go @@ -11,19 +11,19 @@ import ( "net/http" "os" - "github.com/jessepeterson/nanomdm/certverify" - "github.com/jessepeterson/nanomdm/cmd/cli" - mdmhttp "github.com/jessepeterson/nanomdm/http" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/log/stdlogfmt" - "github.com/jessepeterson/nanomdm/push/buford" - pushsvc "github.com/jessepeterson/nanomdm/push/service" - "github.com/jessepeterson/nanomdm/service" - "github.com/jessepeterson/nanomdm/service/certauth" - "github.com/jessepeterson/nanomdm/service/dump" - "github.com/jessepeterson/nanomdm/service/microwebhook" - "github.com/jessepeterson/nanomdm/service/multi" - "github.com/jessepeterson/nanomdm/service/nanomdm" + "github.com/micromdm/nanomdm/certverify" + "github.com/micromdm/nanomdm/cmd/cli" + mdmhttp "github.com/micromdm/nanomdm/http" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/log/stdlogfmt" + "github.com/micromdm/nanomdm/push/buford" + pushsvc "github.com/micromdm/nanomdm/push/service" + "github.com/micromdm/nanomdm/service" + "github.com/micromdm/nanomdm/service/certauth" + "github.com/micromdm/nanomdm/service/dump" + "github.com/micromdm/nanomdm/service/microwebhook" + "github.com/micromdm/nanomdm/service/multi" + "github.com/micromdm/nanomdm/service/nanomdm" ) // overridden by -ldflags -X diff --git a/go.mod b/go.mod index 7a29891..0c2175f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jessepeterson/nanomdm +module github.com/micromdm/nanomdm go 1.15 diff --git a/http/api.go b/http/api.go index b629c1e..79e71bb 100644 --- a/http/api.go +++ b/http/api.go @@ -10,11 +10,11 @@ import ( "net/http" "strings" - "github.com/jessepeterson/nanomdm/cryptoutil" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/push" - "github.com/jessepeterson/nanomdm/storage" + "github.com/micromdm/nanomdm/cryptoutil" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/push" + "github.com/micromdm/nanomdm/storage" ) // enrolledAPIResult is a per-enrollment API result. diff --git a/http/mdm.go b/http/mdm.go index 87748be..1d8ea8f 100644 --- a/http/mdm.go +++ b/http/mdm.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/service" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/service" ) // CheckinHandlerFunc decodes an MDM check-in request and adapts it to service. diff --git a/http/mdm_cert.go b/http/mdm_cert.go index 22b7387..0297879 100644 --- a/http/mdm_cert.go +++ b/http/mdm_cert.go @@ -6,8 +6,8 @@ import ( "net/http" "net/url" - "github.com/jessepeterson/nanomdm/cryptoutil" - "github.com/jessepeterson/nanomdm/log" + "github.com/micromdm/nanomdm/cryptoutil" + "github.com/micromdm/nanomdm/log" ) type contextKeyCert struct{} diff --git a/log/stdlogfmt/stdlog.go b/log/stdlogfmt/stdlog.go index ea9d064..a24d186 100644 --- a/log/stdlogfmt/stdlog.go +++ b/log/stdlogfmt/stdlog.go @@ -4,7 +4,7 @@ import ( stdlog "log" "strings" - "github.com/jessepeterson/nanomdm/log" + "github.com/micromdm/nanomdm/log" ) // Logger wraps a standard library logger and adapts it to pkg/log. diff --git a/push/buford/buford.go b/push/buford/buford.go index 13ecc22..25c9be0 100644 --- a/push/buford/buford.go +++ b/push/buford/buford.go @@ -8,8 +8,8 @@ import ( "time" bufordpush "github.com/RobotsAndPencils/buford/push" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/push" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/push" ) // bufordFactory instantiates new buford Services to satisfy the PushProviderFactory interface. diff --git a/push/push.go b/push/push.go index 37a9751..82332d0 100644 --- a/push/push.go +++ b/push/push.go @@ -6,7 +6,7 @@ import ( "context" "crypto/tls" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) type Response struct { diff --git a/push/service/service.go b/push/service/service.go index 8589d16..282f2e3 100644 --- a/push/service/service.go +++ b/push/service/service.go @@ -8,10 +8,10 @@ import ( "fmt" "sync" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/push" - "github.com/jessepeterson/nanomdm/storage" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/push" + "github.com/micromdm/nanomdm/storage" ) type provider struct { diff --git a/service/certauth/certauth.go b/service/certauth/certauth.go index d1f7415..7aa2830 100644 --- a/service/certauth/certauth.go +++ b/service/certauth/certauth.go @@ -7,10 +7,10 @@ import ( "encoding/hex" "errors" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/service" - "github.com/jessepeterson/nanomdm/storage" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/service" + "github.com/micromdm/nanomdm/storage" ) var ( diff --git a/service/certauth/service.go b/service/certauth/service.go index d0ae374..9887325 100644 --- a/service/certauth/service.go +++ b/service/certauth/service.go @@ -3,7 +3,7 @@ package certauth import ( "fmt" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) func (s *CertAuth) Authenticate(r *mdm.Request, m *mdm.Authenticate) error { diff --git a/service/dump/dump.go b/service/dump/dump.go index b0970ec..33e2415 100644 --- a/service/dump/dump.go +++ b/service/dump/dump.go @@ -4,8 +4,8 @@ package dump import ( "os" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/service" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/service" ) // Dumper is a service middleware that dumps MDM requests and responses diff --git a/service/microwebhook/service.go b/service/microwebhook/service.go index bd01f70..9f2def5 100644 --- a/service/microwebhook/service.go +++ b/service/microwebhook/service.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) type MicroWebhook struct { diff --git a/service/multi/multi.go b/service/multi/multi.go index 393cd1d..fd133a0 100644 --- a/service/multi/multi.go +++ b/service/multi/multi.go @@ -4,9 +4,9 @@ package multi import ( "context" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/service" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/service" ) // MultiService executes multiple services for the same service calls. diff --git a/service/nanomdm/service.go b/service/nanomdm/service.go index 3496114..6dbe7d9 100644 --- a/service/nanomdm/service.go +++ b/service/nanomdm/service.go @@ -4,9 +4,9 @@ package nanomdm import ( "fmt" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/storage" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/storage" ) // Service is the main NanoMDM service which dispatches to storage. diff --git a/service/service.go b/service/service.go index 4a0de17..5078548 100644 --- a/service/service.go +++ b/service/service.go @@ -2,7 +2,7 @@ package service import ( - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) // Checkin represents the various check-in requests. diff --git a/storage/allmulti/allmulti.go b/storage/allmulti/allmulti.go index 6113818..f205316 100644 --- a/storage/allmulti/allmulti.go +++ b/storage/allmulti/allmulti.go @@ -1,9 +1,9 @@ package allmulti import ( - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" - "github.com/jessepeterson/nanomdm/storage" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" + "github.com/micromdm/nanomdm/storage" ) // MultiAllStorage dispatches to multiple AllStorage instances. diff --git a/storage/allmulti/certauth.go b/storage/allmulti/certauth.go index 71268c1..b57644f 100644 --- a/storage/allmulti/certauth.go +++ b/storage/allmulti/certauth.go @@ -1,6 +1,6 @@ package allmulti -import "github.com/jessepeterson/nanomdm/mdm" +import "github.com/micromdm/nanomdm/mdm" func (ms *MultiAllStorage) HasCertHash(r *mdm.Request, hash string) (bool, error) { hasFinal, finalErr := ms.stores[0].HasCertHash(r, hash) diff --git a/storage/allmulti/push.go b/storage/allmulti/push.go index 3fedb25..2db9c5d 100644 --- a/storage/allmulti/push.go +++ b/storage/allmulti/push.go @@ -3,7 +3,7 @@ package allmulti import ( "context" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) func (ms *MultiAllStorage) RetrievePushInfo(ctx context.Context, ids []string) (map[string]*mdm.Push, error) { diff --git a/storage/allmulti/queue.go b/storage/allmulti/queue.go index fb35e1b..b99ce8b 100644 --- a/storage/allmulti/queue.go +++ b/storage/allmulti/queue.go @@ -3,7 +3,7 @@ package allmulti import ( "context" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) func (ms *MultiAllStorage) StoreCommandReport(r *mdm.Request, report *mdm.CommandResults) error { diff --git a/storage/file/certauth.go b/storage/file/certauth.go index cf634c3..47ee0d6 100644 --- a/storage/file/certauth.go +++ b/storage/file/certauth.go @@ -7,7 +7,7 @@ import ( "path" "strings" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) func (s *FileStorage) EnrollmentHasCertHash(r *mdm.Request, _ string) (bool, error) { diff --git a/storage/file/file.go b/storage/file/file.go index bdea052..bf97fda 100644 --- a/storage/file/file.go +++ b/storage/file/file.go @@ -7,8 +7,8 @@ import ( "os" "path" - "github.com/jessepeterson/nanomdm/cryptoutil" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/cryptoutil" + "github.com/micromdm/nanomdm/mdm" ) const ( diff --git a/storage/file/migrate.go b/storage/file/migrate.go index 16e0a88..e7cf307 100644 --- a/storage/file/migrate.go +++ b/storage/file/migrate.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) func sendCheckinMessage(e *enrollment, filename string, c chan<- interface{}) { diff --git a/storage/file/push.go b/storage/file/push.go index a30b4f9..197a9b2 100644 --- a/storage/file/push.go +++ b/storage/file/push.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) // RetrievePushInfo retrieves APNs-related data for push notifications diff --git a/storage/file/pushcert.go b/storage/file/pushcert.go index 351d094..9559449 100644 --- a/storage/file/pushcert.go +++ b/storage/file/pushcert.go @@ -8,7 +8,7 @@ import ( "os" "path" - "github.com/jessepeterson/nanomdm/cryptoutil" + "github.com/micromdm/nanomdm/cryptoutil" ) // RetrievePushCert is passed through to a new PushCertFileStorage diff --git a/storage/file/queue.go b/storage/file/queue.go index 48c700a..ca4ee30 100644 --- a/storage/file/queue.go +++ b/storage/file/queue.go @@ -7,7 +7,7 @@ import ( "path" "strings" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) const ( diff --git a/storage/mysql/certauth.go b/storage/mysql/certauth.go index dfdfc5a..cc64c0e 100644 --- a/storage/mysql/certauth.go +++ b/storage/mysql/certauth.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) // Executes SQL statements that return a single COUNT(*) of rows. diff --git a/storage/mysql/migrate.go b/storage/mysql/migrate.go index 3af851d..1e19804 100644 --- a/storage/mysql/migrate.go +++ b/storage/mysql/migrate.go @@ -3,7 +3,7 @@ package mysql import ( "context" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) func (s *MySQLStorage) RetrieveMigrationCheckins(ctx context.Context, c chan<- interface{}) error { diff --git a/storage/mysql/mysql.go b/storage/mysql/mysql.go index db8d5da..a9ba16b 100644 --- a/storage/mysql/mysql.go +++ b/storage/mysql/mysql.go @@ -5,9 +5,9 @@ import ( "database/sql" "errors" - "github.com/jessepeterson/nanomdm/cryptoutil" - "github.com/jessepeterson/nanomdm/log" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/cryptoutil" + "github.com/micromdm/nanomdm/log" + "github.com/micromdm/nanomdm/mdm" _ "github.com/go-sql-driver/mysql" ) diff --git a/storage/mysql/push.go b/storage/mysql/push.go index 07a17b6..9fc106c 100644 --- a/storage/mysql/push.go +++ b/storage/mysql/push.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) // RetrievePushInfo retreives push info for identifiers ids. diff --git a/storage/mysql/pushcert.go b/storage/mysql/pushcert.go index d8412cb..aedd364 100644 --- a/storage/mysql/pushcert.go +++ b/storage/mysql/pushcert.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "strconv" - "github.com/jessepeterson/nanomdm/cryptoutil" + "github.com/micromdm/nanomdm/cryptoutil" ) func (s *MySQLStorage) RetrievePushCert(ctx context.Context, topic string) (*tls.Certificate, string, error) { diff --git a/storage/mysql/queue.go b/storage/mysql/queue.go index aced33f..6b2403b 100644 --- a/storage/mysql/queue.go +++ b/storage/mysql/queue.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) func enqueue(ctx context.Context, tx *sql.Tx, ids []string, cmd *mdm.Command) error { diff --git a/storage/storage.go b/storage/storage.go index 930bb54..6b5b3ab 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -6,7 +6,7 @@ import ( "context" "crypto/tls" - "github.com/jessepeterson/nanomdm/mdm" + "github.com/micromdm/nanomdm/mdm" ) // CheckinStore stores MDM check-in data.