From f0579c0ba29e304bbd51a776011fd18f4623942e Mon Sep 17 00:00:00 2001
From: Michal <michal.pristas@elastic.co>
Date: Wed, 26 Nov 2025 09:52:24 +0100
Subject: [PATCH] [refactor] removed unused 'upgrade_status' field

---
 internal/pkg/api/handleAck.go          |  4 --
 internal/pkg/api/handleAck_test.go     | 61 --------------------------
 internal/pkg/api/handleCheckin.go      |  1 -
 internal/pkg/api/handleCheckin_test.go |  2 +-
 internal/pkg/dl/constants.go           |  1 -
 5 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/internal/pkg/api/handleAck.go b/internal/pkg/api/handleAck.go
index a456062670..ada3eef486 100644
--- a/internal/pkg/api/handleAck.go
+++ b/internal/pkg/api/handleAck.go
@@ -612,22 +612,18 @@ func (ack *AckT) handleUpgrade(ctx context.Context, zlog zerolog.Logger, agent *
 			zlog.Info().Msg("marking agent upgrade as failed, agent logs contain failure message")
 			doc = bulk.UpdateFields{
 				dl.FieldUpgradeStartedAt: nil,
-				dl.FieldUpgradeStatus:    "failed",
 			}
 		} else if event.Payload.Retry {
 			zlog.Info().Int("retry_attempt", event.Payload.RetryAttempt).Msg("marking agent upgrade as retrying")
-			doc[dl.FieldUpgradeStatus] = "retrying" // Keep FieldUpgradeStatedAt abd FieldUpgradeded at to original values
 		} else {
 			zlog.Info().Int("retry_attempt", event.Payload.RetryAttempt).Msg("marking agent upgrade as failed, agent logs contain failure message")
 			doc = bulk.UpdateFields{
 				dl.FieldUpgradeStartedAt: nil,
-				dl.FieldUpgradeStatus:    "failed",
 			}
 		}
 	} else {
 		doc = bulk.UpdateFields{
 			dl.FieldUpgradeStartedAt: nil,
-			dl.FieldUpgradeStatus:    nil,
 			dl.FieldUpgradedAt:       now,
 		}
 		if agent.UpgradeDetails == nil {
diff --git a/internal/pkg/api/handleAck_test.go b/internal/pkg/api/handleAck_test.go
index d6a68ceacc..67bb6b2b14 100644
--- a/internal/pkg/api/handleAck_test.go
+++ b/internal/pkg/api/handleAck_test.go
@@ -719,67 +719,6 @@ func TestAckHandleUpgrade(t *testing.T) {
 			ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
 			Agent:      &model.AgentMetadata{Version: "8.0.0"},
 		},
-	}, {
-		name: "retry signaled",
-		event: UpgradeEvent{
-			Error: ptr("upgrade error"),
-			Payload: &struct {
-				Retry        bool `json:"retry"`
-				RetryAttempt int  `json:"retry_attempt"`
-			}{
-				Retry:        true,
-				RetryAttempt: 1,
-			},
-		},
-		bulker: func(t *testing.T) *ftesting.MockBulk {
-			m := ftesting.NewMockBulk()
-			m.On("Update", mock.Anything, mock.Anything, mock.Anything, mock.MatchedBy(func(p []byte) bool {
-				var body struct {
-					Doc struct {
-						Status string `json:"upgrade_status"`
-					} `json:"doc"`
-				}
-				if err := json.Unmarshal(p, &body); err != nil {
-					t.Fatal(err)
-				}
-				return body.Doc.Status == "retrying"
-			}), mock.Anything).Return(nil).Once()
-			return m
-		},
-		agent: &model.Agent{
-			ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
-			Agent:      &model.AgentMetadata{Version: "8.0.0"},
-		},
-	}, {
-		name: "no more retries",
-		event: UpgradeEvent{
-			Error: ptr("upgrade error"),
-			Payload: &struct {
-				Retry        bool `json:"retry"`
-				RetryAttempt int  `json:"retry_attempt"`
-			}{
-				Retry: false,
-			},
-		},
-		bulker: func(t *testing.T) *ftesting.MockBulk {
-			m := ftesting.NewMockBulk()
-			m.On("Update", mock.Anything, mock.Anything, mock.Anything, mock.MatchedBy(func(p []byte) bool {
-				var body struct {
-					Doc struct {
-						Status string `json:"upgrade_status"`
-					} `json:"doc"`
-				}
-				if err := json.Unmarshal(p, &body); err != nil {
-					t.Fatal(err)
-				}
-				return body.Doc.Status == "failed"
-			}), mock.Anything).Return(nil).Once()
-			return m
-		},
-		agent: &model.Agent{
-			ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
-			Agent:      &model.AgentMetadata{Version: "8.0.0"},
-		},
 	}, {
 		name:  "keep upgrade_attempts if upgrade_details is not nil",
 		event: UpgradeEvent{},
diff --git a/internal/pkg/api/handleCheckin.go b/internal/pkg/api/handleCheckin.go
index 1aa720f8a7..d0b9788e28 100644
--- a/internal/pkg/api/handleCheckin.go
+++ b/internal/pkg/api/handleCheckin.go
@@ -565,7 +565,6 @@ func (ct *CheckinT) markUpgradeComplete(ctx context.Context, agent *model.Agent)
 	doc := bulk.UpdateFields{
 		dl.FieldUpgradeDetails:   nil,
 		dl.FieldUpgradeStartedAt: nil,
-		dl.FieldUpgradeStatus:    nil,
 		dl.FieldUpgradedAt:       time.Now().UTC().Format(time.RFC3339),
 	}
 	body, err := doc.Marshal()
diff --git a/internal/pkg/api/handleCheckin_test.go b/internal/pkg/api/handleCheckin_test.go
index a02bd9c0e7..bc85d1c45a 100644
--- a/internal/pkg/api/handleCheckin_test.go
+++ b/internal/pkg/api/handleCheckin_test.go
@@ -419,7 +419,7 @@ func TestProcessUpgradeDetails(t *testing.T) {
 					t.Logf("bulk match unmarshal error: %v", err)
 					return false
 				}
-				return doc.Doc[dl.FieldUpgradeDetails] == nil && doc.Doc[dl.FieldUpgradeStartedAt] == nil && doc.Doc[dl.FieldUpgradeStatus] == nil && doc.Doc[dl.FieldUpgradedAt] != ""
+				return doc.Doc[dl.FieldUpgradeDetails] == nil && doc.Doc[dl.FieldUpgradeStartedAt] == nil && doc.Doc[dl.FieldUpgradedAt] != ""
 			}), mock.Anything, mock.Anything).Return(nil)
 			return mBulk
 		},
diff --git a/internal/pkg/dl/constants.go b/internal/pkg/dl/constants.go
index 7937d62877..b474b1d58d 100644
--- a/internal/pkg/dl/constants.go
+++ b/internal/pkg/dl/constants.go
@@ -53,7 +53,6 @@ const (
 	FieldUnenrolledAt     = "unenrolled_at"
 	FieldUpgradedAt       = "upgraded_at"
 	FieldUpgradeStartedAt = "upgrade_started_at"
-	FieldUpgradeStatus    = "upgrade_status"
 	FieldUpgradeDetails   = "upgrade_details"
 	FieldUpgradeAttempts  = "upgrade_attempts"