Skip to content

Commit

Permalink
Rename module
Browse files Browse the repository at this point in the history
  • Loading branch information
jessepeterson committed Jun 6, 2021
1 parent 3563f7b commit 3c9a161
Show file tree
Hide file tree
Showing 35 changed files with 77 additions and 77 deletions.
10 changes: 5 additions & 5 deletions cmd/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/nano2nano/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions cmd/nanomdm/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/jessepeterson/nanomdm
module github.com/micromdm/nanomdm

go 1.15

Expand Down
10 changes: 5 additions & 5 deletions http/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions http/mdm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions http/mdm_cert.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion log/stdlogfmt/stdlog.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions push/buford/buford.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion push/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"crypto/tls"

"github.com/jessepeterson/nanomdm/mdm"
"github.com/micromdm/nanomdm/mdm"
)

type Response struct {
Expand Down
8 changes: 4 additions & 4 deletions push/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions service/certauth/certauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion service/certauth/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions service/dump/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion service/microwebhook/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"time"

"github.com/jessepeterson/nanomdm/mdm"
"github.com/micromdm/nanomdm/mdm"
)

type MicroWebhook struct {
Expand Down
6 changes: 3 additions & 3 deletions service/multi/multi.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions service/nanomdm/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package service

import (
"github.com/jessepeterson/nanomdm/mdm"
"github.com/micromdm/nanomdm/mdm"
)

// Checkin represents the various check-in requests.
Expand Down
6 changes: 3 additions & 3 deletions storage/allmulti/allmulti.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion storage/allmulti/certauth.go
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion storage/allmulti/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion storage/allmulti/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion storage/file/certauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions storage/file/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion storage/file/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}) {
Expand Down
2 changes: 1 addition & 1 deletion storage/file/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion storage/file/pushcert.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion storage/file/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path"
"strings"

"github.com/jessepeterson/nanomdm/mdm"
"github.com/micromdm/nanomdm/mdm"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion storage/mysql/certauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion storage/mysql/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions storage/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion storage/mysql/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"strings"

"github.com/jessepeterson/nanomdm/mdm"
"github.com/micromdm/nanomdm/mdm"
)

// RetrievePushInfo retreives push info for identifiers ids.
Expand Down
2 changes: 1 addition & 1 deletion storage/mysql/pushcert.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion storage/mysql/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"crypto/tls"

"github.com/jessepeterson/nanomdm/mdm"
"github.com/micromdm/nanomdm/mdm"
)

// CheckinStore stores MDM check-in data.
Expand Down

0 comments on commit 3c9a161

Please sign in to comment.