write out metadata json and plist files to root install directory

cmd/launcher/internal/record_metadata.go

@@ -0,0 +1,69 @@
+package internal
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"runtime"
+	"time"
+
+	"github.com/groob/plist"
+	"github.com/kolide/kit/version"
+	"github.com/kolide/launcher/pkg/agent/types"
+	"github.com/kolide/launcher/pkg/debug/checkups"
+)
+
+type metadata struct {
+	DeviceId       string `json:"device_id" plist:"device_id"`
+	OrganizationId string `json:"organization_id" plist:"organization_id"`
+	Timestamp      string `json:"timestamp" plist:"timestamp"`
+	Version        string `json:"version" plist:"version"`
+}
+
+// RecordMetadata writes out both a json and plist (for darwin) file including all information
+// in the metadata struct to the root install directory
+func RecordMetadata(rootDir string, ctx context.Context, knapsack types.Knapsack) error {
+	metadataJSONFile := filepath.Join(rootDir, "metadata.json")
+	sdc := checkups.NewServerDataCheckup(knapsack)
+	if err := sdc.Run(ctx, io.Discard); err != nil {
+		return fmt.Errorf("unable to gather metadata, error: %w", err)
+	}
+
+	metadata := metadata{
+		DeviceId:       sdc.DeviceId,
+		OrganizationId: sdc.OrganizationId,
+		Timestamp:      time.Now().String(),
+		Version:        version.Version().Version,
+	}
+
+	metadataJSON, err := json.MarshalIndent(metadata, "", "  ")
+	if err != nil {
+		return fmt.Errorf("unable to JSON marshal metadata, error: %w", err)
+	}
+
+	err = os.WriteFile(metadataJSONFile, metadataJSON, 0644)
+	if err != nil {
+		return fmt.Errorf("unable to write JSON metadata, error: %w", err)
+	}
+
+	if runtime.GOOS != "darwin" {
+		return nil
+	}
+
+	metadataPlistFile := filepath.Join(rootDir, "metadata.plist")
+	metadataPlist, err := plist.MarshalIndent(metadata, "  ")
+
+	if err != nil {
+		return fmt.Errorf("unable to Plist marshal metadata, error: %w", err)
+	}
+
+	err = os.WriteFile(metadataPlistFile, metadataPlist, 0644)
+	if err != nil {
+		return fmt.Errorf("unable to write plist metadata, error: %w", err)
+	}
+
+	return nil
+}

cmd/launcher/launcher.go

@@ -193,6 +193,9 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err
 	// we expect we're live. Record the version for osquery to
 	// pickup
 	internal.RecordLauncherVersion(rootDirectory)
+	if err = internal.RecordMetadata(rootDirectory, ctx, k); err != nil {
+		level.Error(logger).Log("msg", "unable to write metadata", "error", err.Error())
+	}
 
 	// create the certificate pool
 	var rootPool *x509.CertPool

pkg/debug/checkups/server_data.go

@@ -16,10 +16,16 @@ var serverProvidedDataKeys = []string{
 }
 
 type serverDataCheckup struct {
-	k       types.Knapsack
-	status  Status
-	summary string
-	data    map[string]any
+	k              types.Knapsack
+	status         Status
+	summary        string
+	data           map[string]any
+	DeviceId       string
+	OrganizationId string
+}
+
+func NewServerDataCheckup(k types.Knapsack) *serverDataCheckup {
+	return &serverDataCheckup{k: k}
 }
 
 func (sdc *serverDataCheckup) Data() any             { return sdc.data }
@@ -48,9 +54,13 @@ func (sdc *serverDataCheckup) Run(ctx context.Context, extraFH io.Writer) error
 			continue
 		}
 
+		// we set the device and organization ids for individual access by downstream consumers
 		if key == "device_id" && string(val) != "" {
+			sdc.DeviceId = string(val)
 			sdc.status = Passing
 			sdc.summary = "successfully collected server data"
+		} else if key == "organization_id" && string(val) != "" {
+			sdc.OrganizationId = string(val)
 		}
 
 		sdc.data[key] = string(val)