wipclairew/mdm-interface

3 files changed, 22 insertions, 27 deletions

diff --git a/mdm/mdm.go b/mdm/mdm.go
index 59050bc87..7659ae8c5 100644
--- a/mdm/mdm.go
+++ b/mdm/mdm.go
@@ -5,10 +5,13 @@
 // in a platform-independent manner.
 package mdm
 
-import "sync/atomic"
+import (
+	"errors"
+	"sync/atomic"
+)
 
 type MDMHandler struct {
-	Settings *MDMSettings
+	Settings MDMSettings
 }
 
 var mdmHandler atomic.Value // of MDMHandler type
@@ -21,7 +24,7 @@ type MDMSettings interface {
 	ReadString(key string) (string, error)
 }
 
-func RegisterMDMSettings(settings *MDMSettings) *MDMHandler {
+func RegisterMDMSettings(settings MDMSettings) *MDMHandler {
 	if e, ok := mdmHandler.Load().(*MDMHandler); ok {
 		return e
 	}
@@ -29,3 +32,19 @@ func RegisterMDMSettings(settings *MDMSettings) *MDMHandler {
 	mdmHandler.Store(e)
 	return e
 }
+
+func ReadBool(key string) (bool, error) {
+	h := mdmHandler.Load().(*MDMHandler)
+	if h == nil {
+		return false, errors.New("nil handler")
+	}
+	return h.Settings.ReadBool(key)
+}
+
+func ReadString(key string) (string, error) {
+	h := mdmHandler.Load().(*MDMHandler)
+	if h == nil {
+		return "", errors.New("nil handler")
+	}
+	return h.Settings.ReadString(key)
+}
diff --git a/mdm/mdm_apple.go b/mdm/mdm_apple.go
deleted file mode 100644
index 42c53aca8..000000000
--- a/mdm/mdm_apple.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package mdm
-
-func NewAppleMDMHandler(settings *MDMSettings) *MDMHandler {
-	return &MDMHandler{Settings: settings}
-}
diff --git a/mdm/mdm_windows.go b/mdm/mdm_windows.go
deleted file mode 100644
index ff6081eb6..000000000
--- a/mdm/mdm_windows.go
+++ /dev/null
@@ -1,19 +0,0 @@
-//go:build windows
-
-package mdm
-
-func NewWindowsMDMHandler(settings *MDMSettings) *MDMHandler {
-	return &MDMHandler{Settings: settings}
-}
-
-// readRegistryBool reads a boolean value with the given key from the Windows registry.
-func readRegistryBool(key string) (bool, error) {
-	// TODO(angott): Windows support
-	return false, nil
-}
-
-// readRegistryBool reads a string value with the given key from the Windows registry.
-func readRegistryString(key string) (string, error) {
-	// TODO(angott): Windows support
-	return "", nil
-}