Switch to using admgencmd for DeclarativeManagement v1 command

jessepeterson · Apr 21, 2023 · d3f961f · d3f961f
1 parent 749b0c5
commit d3f961f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 29 deletions.
diff --git a/notifier/cmd.go b/notifier/cmd.go
diff --git a/notifier/cmd_dm.go b/notifier/cmd_dm.go
diff --git a/notifier/enqueue.go b/notifier/enqueue.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/google/uuid"
+	"github.com/groob/plist"
 )
 
 const agent = "kmfddm/0"
@@ -33,9 +34,15 @@ func (n *Notifier) sendCommand(ctx context.Context, ids []string) error {
 		}
 	}
 
-	cmdUUID := uuid.NewString()
-	logs = append(logs, "command_uuid", cmdUUID)
-	cmdBytes, err := NewMDMCommand(cmdUUID, tokens)
+	c := NewDeclarativeManagementCommand()
+	c.CommandUUID = uuid.NewString()
+	if len(tokens) > 0 {
+		c.Command.Data = &tokens
+	}
+
+	logs = append(logs, "command_uuid", c.CommandUUID)
+
+	cmdBytes, err := plist.Marshal(c)
 	if err != nil {
 		logs = append(logs, "err", err)
 		return err

diff --git a/notifier/gen_cmd_dm.go b/notifier/gen_cmd_dm.go
@@ -0,0 +1,6 @@
+package notifier
+
+// git clone git@github.com:apple/device-management.git
+// go install github.com/jessepeterson/admgen/cmd/admgencmd/...@latest
+
+//go:generate admgencmd -pkg notifier -o cmd_dm.go -no-shared -no-responses -no-depend device-management/mdm/commands/declarativemanagement.yaml