From 591dbe37fc4c76241cffeab4c9f8c55df3b93a46 Mon Sep 17 00:00:00 2001 From: Victor Vrantchan Date: Thu, 23 Nov 2017 15:37:49 -0500 Subject: [PATCH] Organize MDM server packages into mdm folder (#335) Organize the packages essential to the MDM server into a mdm folder. This includes the enroll, checkin and connect services. The packages in this folder make up the APIs that a device will directly interact with. --- blueprint/listener.go | 2 +- cmd/micromdm/serve.go | 6 +++--- device/db.go | 4 ++-- {checkin => mdm/checkin}/checkin.go | 0 {checkin => mdm/checkin}/checkin_test.go | 0 {checkin => mdm/checkin}/endpoint.go | 0 {checkin => mdm/checkin}/event.go | 2 +- {checkin => mdm/checkin}/event_test.go | 2 +- {checkin => mdm/checkin}/internal/checkinproto/checkin.go | 0 .../checkin}/internal/checkinproto/checkin.pb.go | 0 .../checkin}/internal/checkinproto/checkin.proto | 0 {checkin => mdm/checkin}/service.go | 0 {checkin => mdm/checkin}/testdata/Authenticate.plist | 0 {checkin => mdm/checkin}/testdata/CheckOut.plist | 0 {checkin => mdm/checkin}/testdata/TokenUpdate.plist | 0 {checkin => mdm/checkin}/transport_http.go | 0 {connect => mdm/connect}/connect.go | 0 {connect => mdm/connect}/endpoint.go | 0 {connect => mdm/connect}/event.go | 2 +- {connect => mdm/connect}/internal/connectproto/connect.go | 0 .../connect}/internal/connectproto/connect.pb.go | 0 .../connect}/internal/connectproto/connect.proto | 0 {connect => mdm/connect}/logging.go | 0 {connect => mdm/connect}/transport_http.go | 0 {enroll => mdm/enroll}/endpoint.go | 0 {enroll => mdm/enroll}/profile.go | 0 {enroll => mdm/enroll}/profile_test.go | 0 {enroll => mdm/enroll}/service.go | 0 {enroll => mdm/enroll}/transport_http.go | 0 push/db.go | 5 +++-- user/db.go | 2 +- webhook/command.go | 2 +- 32 files changed, 14 insertions(+), 13 deletions(-) rename {checkin => mdm/checkin}/checkin.go (100%) rename {checkin => mdm/checkin}/checkin_test.go (100%) rename {checkin => mdm/checkin}/endpoint.go (100%) rename {checkin => mdm/checkin}/event.go (98%) rename {checkin => mdm/checkin}/event_test.go (96%) rename {checkin => mdm/checkin}/internal/checkinproto/checkin.go (100%) rename {checkin => mdm/checkin}/internal/checkinproto/checkin.pb.go (100%) rename {checkin => mdm/checkin}/internal/checkinproto/checkin.proto (100%) rename {checkin => mdm/checkin}/service.go (100%) rename {checkin => mdm/checkin}/testdata/Authenticate.plist (100%) rename {checkin => mdm/checkin}/testdata/CheckOut.plist (100%) rename {checkin => mdm/checkin}/testdata/TokenUpdate.plist (100%) rename {checkin => mdm/checkin}/transport_http.go (100%) rename {connect => mdm/connect}/connect.go (100%) rename {connect => mdm/connect}/endpoint.go (100%) rename {connect => mdm/connect}/event.go (95%) rename {connect => mdm/connect}/internal/connectproto/connect.go (100%) rename {connect => mdm/connect}/internal/connectproto/connect.pb.go (100%) rename {connect => mdm/connect}/internal/connectproto/connect.proto (100%) rename {connect => mdm/connect}/logging.go (100%) rename {connect => mdm/connect}/transport_http.go (100%) rename {enroll => mdm/enroll}/endpoint.go (100%) rename {enroll => mdm/enroll}/profile.go (100%) rename {enroll => mdm/enroll}/profile_test.go (100%) rename {enroll => mdm/enroll}/service.go (100%) rename {enroll => mdm/enroll}/transport_http.go (100%) diff --git a/blueprint/listener.go b/blueprint/listener.go index 86bfc76f..6e741d08 100644 --- a/blueprint/listener.go +++ b/blueprint/listener.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" "github.com/micromdm/mdm" - "github.com/micromdm/micromdm/checkin" "github.com/micromdm/micromdm/command" "github.com/micromdm/micromdm/device" + "github.com/micromdm/micromdm/mdm/checkin" "github.com/micromdm/micromdm/profile" "github.com/micromdm/micromdm/pubsub" ) diff --git a/cmd/micromdm/serve.go b/cmd/micromdm/serve.go index b23281c5..df87ebec 100644 --- a/cmd/micromdm/serve.go +++ b/cmd/micromdm/serve.go @@ -42,10 +42,8 @@ import ( "github.com/micromdm/micromdm/appstore" "github.com/micromdm/micromdm/blueprint" - "github.com/micromdm/micromdm/checkin" "github.com/micromdm/micromdm/command" configsvc "github.com/micromdm/micromdm/config" - "github.com/micromdm/micromdm/connect" "github.com/micromdm/micromdm/core/apply" "github.com/micromdm/micromdm/core/list" "github.com/micromdm/micromdm/core/remove" @@ -53,7 +51,9 @@ import ( "github.com/micromdm/micromdm/depsync" "github.com/micromdm/micromdm/deptoken" "github.com/micromdm/micromdm/device" - "github.com/micromdm/micromdm/enroll" + "github.com/micromdm/micromdm/mdm/checkin" + "github.com/micromdm/micromdm/mdm/connect" + "github.com/micromdm/micromdm/mdm/enroll" "github.com/micromdm/micromdm/profile" "github.com/micromdm/micromdm/pubsub" "github.com/micromdm/micromdm/pubsub/inmem" diff --git a/device/db.go b/device/db.go index 207bde59..549b2a5e 100644 --- a/device/db.go +++ b/device/db.go @@ -6,9 +6,9 @@ import ( "time" "github.com/boltdb/bolt" - "github.com/micromdm/micromdm/checkin" - "github.com/micromdm/micromdm/connect" "github.com/micromdm/micromdm/depsync" + "github.com/micromdm/micromdm/mdm/checkin" + "github.com/micromdm/micromdm/mdm/connect" "github.com/micromdm/micromdm/pubsub" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/checkin/checkin.go b/mdm/checkin/checkin.go similarity index 100% rename from checkin/checkin.go rename to mdm/checkin/checkin.go diff --git a/checkin/checkin_test.go b/mdm/checkin/checkin_test.go similarity index 100% rename from checkin/checkin_test.go rename to mdm/checkin/checkin_test.go diff --git a/checkin/endpoint.go b/mdm/checkin/endpoint.go similarity index 100% rename from checkin/endpoint.go rename to mdm/checkin/endpoint.go diff --git a/checkin/event.go b/mdm/checkin/event.go similarity index 98% rename from checkin/event.go rename to mdm/checkin/event.go index b6c9b3e7..28839c80 100644 --- a/checkin/event.go +++ b/mdm/checkin/event.go @@ -7,7 +7,7 @@ import ( "github.com/micromdm/mdm" uuid "github.com/satori/go.uuid" - "github.com/micromdm/micromdm/checkin/internal/checkinproto" + "github.com/micromdm/micromdm/mdm/checkin/internal/checkinproto" ) type Event struct { diff --git a/checkin/event_test.go b/mdm/checkin/event_test.go similarity index 96% rename from checkin/event_test.go rename to mdm/checkin/event_test.go index ff2a4cdc..83599452 100644 --- a/checkin/event_test.go +++ b/mdm/checkin/event_test.go @@ -8,7 +8,7 @@ import ( "github.com/groob/plist" "github.com/micromdm/mdm" - "github.com/micromdm/micromdm/checkin" + "github.com/micromdm/micromdm/mdm/checkin" ) var marshalTests = []string{ diff --git a/checkin/internal/checkinproto/checkin.go b/mdm/checkin/internal/checkinproto/checkin.go similarity index 100% rename from checkin/internal/checkinproto/checkin.go rename to mdm/checkin/internal/checkinproto/checkin.go diff --git a/checkin/internal/checkinproto/checkin.pb.go b/mdm/checkin/internal/checkinproto/checkin.pb.go similarity index 100% rename from checkin/internal/checkinproto/checkin.pb.go rename to mdm/checkin/internal/checkinproto/checkin.pb.go diff --git a/checkin/internal/checkinproto/checkin.proto b/mdm/checkin/internal/checkinproto/checkin.proto similarity index 100% rename from checkin/internal/checkinproto/checkin.proto rename to mdm/checkin/internal/checkinproto/checkin.proto diff --git a/checkin/service.go b/mdm/checkin/service.go similarity index 100% rename from checkin/service.go rename to mdm/checkin/service.go diff --git a/checkin/testdata/Authenticate.plist b/mdm/checkin/testdata/Authenticate.plist similarity index 100% rename from checkin/testdata/Authenticate.plist rename to mdm/checkin/testdata/Authenticate.plist diff --git a/checkin/testdata/CheckOut.plist b/mdm/checkin/testdata/CheckOut.plist similarity index 100% rename from checkin/testdata/CheckOut.plist rename to mdm/checkin/testdata/CheckOut.plist diff --git a/checkin/testdata/TokenUpdate.plist b/mdm/checkin/testdata/TokenUpdate.plist similarity index 100% rename from checkin/testdata/TokenUpdate.plist rename to mdm/checkin/testdata/TokenUpdate.plist diff --git a/checkin/transport_http.go b/mdm/checkin/transport_http.go similarity index 100% rename from checkin/transport_http.go rename to mdm/checkin/transport_http.go diff --git a/connect/connect.go b/mdm/connect/connect.go similarity index 100% rename from connect/connect.go rename to mdm/connect/connect.go diff --git a/connect/endpoint.go b/mdm/connect/endpoint.go similarity index 100% rename from connect/endpoint.go rename to mdm/connect/endpoint.go diff --git a/connect/event.go b/mdm/connect/event.go similarity index 95% rename from connect/event.go rename to mdm/connect/event.go index 08901d10..8546a1fb 100644 --- a/connect/event.go +++ b/mdm/connect/event.go @@ -7,7 +7,7 @@ import ( "github.com/micromdm/mdm" uuid "github.com/satori/go.uuid" - "github.com/micromdm/micromdm/connect/internal/connectproto" + "github.com/micromdm/micromdm/mdm/connect/internal/connectproto" ) type Event struct { diff --git a/connect/internal/connectproto/connect.go b/mdm/connect/internal/connectproto/connect.go similarity index 100% rename from connect/internal/connectproto/connect.go rename to mdm/connect/internal/connectproto/connect.go diff --git a/connect/internal/connectproto/connect.pb.go b/mdm/connect/internal/connectproto/connect.pb.go similarity index 100% rename from connect/internal/connectproto/connect.pb.go rename to mdm/connect/internal/connectproto/connect.pb.go diff --git a/connect/internal/connectproto/connect.proto b/mdm/connect/internal/connectproto/connect.proto similarity index 100% rename from connect/internal/connectproto/connect.proto rename to mdm/connect/internal/connectproto/connect.proto diff --git a/connect/logging.go b/mdm/connect/logging.go similarity index 100% rename from connect/logging.go rename to mdm/connect/logging.go diff --git a/connect/transport_http.go b/mdm/connect/transport_http.go similarity index 100% rename from connect/transport_http.go rename to mdm/connect/transport_http.go diff --git a/enroll/endpoint.go b/mdm/enroll/endpoint.go similarity index 100% rename from enroll/endpoint.go rename to mdm/enroll/endpoint.go diff --git a/enroll/profile.go b/mdm/enroll/profile.go similarity index 100% rename from enroll/profile.go rename to mdm/enroll/profile.go diff --git a/enroll/profile_test.go b/mdm/enroll/profile_test.go similarity index 100% rename from enroll/profile_test.go rename to mdm/enroll/profile_test.go diff --git a/enroll/service.go b/mdm/enroll/service.go similarity index 100% rename from enroll/service.go rename to mdm/enroll/service.go diff --git a/enroll/transport_http.go b/mdm/enroll/transport_http.go similarity index 100% rename from enroll/transport_http.go rename to mdm/enroll/transport_http.go diff --git a/push/db.go b/push/db.go index ccf4aff8..d1deaa75 100644 --- a/push/db.go +++ b/push/db.go @@ -5,9 +5,10 @@ import ( "fmt" "github.com/boltdb/bolt" - "github.com/micromdm/micromdm/checkin" - "github.com/micromdm/micromdm/pubsub" "github.com/pkg/errors" + + "github.com/micromdm/micromdm/mdm/checkin" + "github.com/micromdm/micromdm/pubsub" ) const PushBucket = "mdm.PushInfo" diff --git a/user/db.go b/user/db.go index 4bd0fa27..3c452303 100644 --- a/user/db.go +++ b/user/db.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" uuid "github.com/satori/go.uuid" - "github.com/micromdm/micromdm/checkin" + "github.com/micromdm/micromdm/mdm/checkin" "github.com/micromdm/micromdm/pubsub" ) diff --git a/webhook/command.go b/webhook/command.go index dd32cbdb..8abc0fc6 100644 --- a/webhook/command.go +++ b/webhook/command.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/micromdm/micromdm/connect" + "github.com/micromdm/micromdm/mdm/connect" "github.com/micromdm/micromdm/pubsub" "github.com/pkg/errors" )