From ad95c00c7b7d0d2132401a5a9cbef2abb25b21e7 Mon Sep 17 00:00:00 2001
From: "flamingo[bot]" <277372822+flamingo[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2026 06:59:57 +0000
Subject: [PATCH 1/3] fix(FLEETMDM-002-2): 3 review findings across 3 files

---
 server/vulnerabilities/macoffice/sync.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/vulnerabilities/macoffice/sync.go b/server/vulnerabilities/macoffice/sync.go
index fe9800c8403..c90193b4169 100644
--- a/server/vulnerabilities/macoffice/sync.go
+++ b/server/vulnerabilities/macoffice/sync.go
@@ -32,7 +32,7 @@ func sync(
 ) error {
 	remote, url, err := ghClient.MacOfficeReleaseNotes(ctx)
 	if err != nil {
-		return err
+		return fmt.Errorf("get remote release notes: %w", err)
 	}
 
 	// Nothing published yet on remote repo, so we do nothing.
@@ -42,12 +42,12 @@ func sync(
 
 	local, err := fsClient.MacOfficeReleaseNotes()
 	if err != nil {
-		return err
+		return fmt.Errorf("get local release notes: %w", err)
 	}
 
 	if len(local) == 0 {
 		if _, err := ghClient.Download(url); err != nil {
-			return err
+			return fmt.Errorf("download release notes: %w", err)
 		}
 		return nil
 	}
@@ -58,7 +58,7 @@ func sync(
 
 	if local[0].Before(remote) {
 		if _, err := ghClient.Download(url); err != nil {
-			return err
+			return fmt.Errorf("download release notes: %w", err)
 		}
 	}
 
@@ -66,7 +66,7 @@ func sync(
 	for _, l := range local {
 		if l.Before(remote) {
 			if err := fsClient.Delete(l); err != nil {
-				return err
+				return fmt.Errorf("delete out of date release notes: %w", err)
 			}
 		}
 	}

From 54d0d76bf2161f4848969fe3c6906c90081dbfb2 Mon Sep 17 00:00:00 2001
From: "flamingo[bot]" <277372822+flamingo[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2026 06:59:59 +0000
Subject: [PATCH 2/3] fix(FLEETMDM-002-2): 3 review findings across 3 files

---
 server/service/client_debug.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/service/client_debug.go b/server/service/client_debug.go
index 37751d9ca0b..bc46218304d 100644
--- a/server/service/client_debug.go
+++ b/server/service/client_debug.go
@@ -20,6 +20,9 @@ func (c *Client) getRawBody(endpoint string) ([]byte, error) {
 		if err == nil && len(body) > 0 {
 			return nil, fmt.Errorf("get %s received status %d: %s", endpoint, response.StatusCode, body)
 		}
+		if err != nil {
+			return nil, fmt.Errorf("get %s received status %d, read response body: %w", endpoint, response.StatusCode, err)
+		}
 		return nil, fmt.Errorf("get %s received status %d", endpoint, response.StatusCode)
 	}
 

From e6faa8c08dd44dc8aeec36af6d9fdc16e7fb438a Mon Sep 17 00:00:00 2001
From: "flamingo[bot]" <277372822+flamingo[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2026 07:00:00 +0000
Subject: [PATCH 3/3] fix(FLEETMDM-002-2): 3 review findings across 3 files

---
 client/orbit_client.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/orbit_client.go b/client/orbit_client.go
index ac1bb19e4a2..098c4dd349d 100644
--- a/client/orbit_client.go
+++ b/client/orbit_client.go
@@ -192,6 +192,8 @@ func (oc *OrbitClient) requestWithExternal(verb string, pathOrURL string, params
 				if machineId != "" {
 					request.Header.Add("x-machine-id", machineId)
 				}
+			} else {
+				log.Debug().Msg("machineIdProvider is nil, not adding x-machine-id header")
 			}
 		}
 		// <<< OPENFRAME(agent-openframe-mode)