Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch to micromdm/plist #162

Merged
merged 1 commit into from
Jan 16, 2025
Merged

switch to micromdm/plist #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ go 1.17
require (
github.com/RobotsAndPencils/buford v0.14.0
github.com/go-sql-driver/mysql v1.8.1
github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5
github.com/lib/pq v1.10.9
github.com/micromdm/nanolib v0.2.0
github.com/smallstep/pkcs7 v0.1.1
golang.org/x/net v0.33.0
github.com/micromdm/plist v0.2.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5 h1:saaSiB25B1wgaxrshQhurfPKUGJ4It3OxNJUy0rdOjU=
github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5/go.mod h1:itkABA+w2cw7x5nYUS/pLRef6ludkZKOigbROmCTaFw=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/micromdm/nanolib v0.2.0 h1:g5GHQuUpS82WIAB15LyenjF/0/WSUNJMe5XZfCJSXq4=
github.com/micromdm/nanolib v0.2.0/go.mod h1:FwBKCvvphgYvbdUZ+qw5kay7NHJcg6zPi8W7kXNajmE=
github.com/micromdm/plist v0.2.0 h1:W/AuDP/0EB1xNhWvoP5qpE14oYeQSE+IaJqoeAU5SJ0=
github.com/micromdm/plist v0.2.0/go.mod h1:flkfm0od6GzyXBqI28h5sgEyi3iPO28W2t1Zm9LpwWs=
github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o=
github.com/smallstep/pkcs7 v0.1.1 h1:x+rPdt2W088V9Vkjho4KtoggyktZJlMduZAtRHm68LU=
github.com/smallstep/pkcs7 v0.1.1/go.mod h1:dL6j5AIz9GHjVEBTXtW+QliALcgM19RtXaTeyxI+AfA=
Expand Down
2 changes: 1 addition & 1 deletion mdm/checkin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"

"github.com/groob/plist"
"github.com/micromdm/plist"
)

var ErrUnrecognizedMessageType = errors.New("unrecognized MessageType")
Expand Down
2 changes: 1 addition & 1 deletion mdm/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mdm
import (
"errors"

"github.com/groob/plist"
"github.com/micromdm/plist"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion service/nanomdm/token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"context"
"testing"

"github.com/groob/plist"
"github.com/micromdm/nanomdm/mdm"
"github.com/micromdm/nanomdm/service"
"github.com/micromdm/plist"
)

func newTokenMDMReq() *mdm.Request {
Expand Down
2 changes: 1 addition & 1 deletion service/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/micromdm/nanomdm/mdm"

"github.com/groob/plist"
"github.com/micromdm/plist"
)

type HTTPStatusError struct {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/certauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"errors"
"testing"

"github.com/groob/plist"
"github.com/micromdm/nanomdm/mdm"
"github.com/micromdm/nanomdm/service/certauth"
"github.com/micromdm/nanomdm/storage"
"github.com/micromdm/nanomdm/test"
"github.com/micromdm/nanomdm/test/enrollment"
"github.com/micromdm/plist"
)

func certAuth(t *testing.T, ctx context.Context, store storage.CertAuthStore) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"io"

"github.com/groob/plist"
"github.com/micromdm/nanomdm/mdm"
"github.com/micromdm/nanomdm/test"
"github.com/micromdm/nanomdm/test/enrollment"
"github.com/micromdm/plist"
)

// device is a wrapper around our enrollment for ease of use.
Expand Down
2 changes: 1 addition & 1 deletion test/enrollment/enrollment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/micromdm/nanomdm/test"
"github.com/micromdm/nanomdm/test/protocol"

"github.com/groob/plist"
"github.com/micromdm/plist"
)

var ErrAlreadyEnrolled = errors.New("already enrolled")
Expand Down
2 changes: 1 addition & 1 deletion test/plist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"io"

"github.com/groob/plist"
"github.com/micromdm/plist"
)

// PlistReader encodes v to XML Plist.
Expand Down
Loading