From ccd9e50f381fc93060f047c26aa1677c1483ba79 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Jun 2026 10:58:06 -0700
Subject: [PATCH] Fix: reorder cue buffer construction and add test for status
 with import statement (#7047) (#7057)

(cherry picked from commit 5369aa666a81f6d125be29647331c085d8eed623)

Signed-off-by: vishal210893 <vishal210893@gmail.com>
Co-authored-by: Vishal Kumar <vishal210893@gmail.com>
---
 pkg/cue/definition/health/health.go      |  2 +-
 pkg/cue/definition/health/health_test.go | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkg/cue/definition/health/health.go b/pkg/cue/definition/health/health.go
index ebcbfd50a..75b7951f6 100644
--- a/pkg/cue/definition/health/health.go
+++ b/pkg/cue/definition/health/health.go
@@ -146,7 +146,7 @@ func getStatusMap(templateContext map[string]interface{}, statusFields string, p
 		contextLabels = append(contextLabels, iter.Label())
 	}
 
-	cueBuffer := runtimeContextBuff + "\n" + statusFields
+	cueBuffer := statusFields + "\n" + runtimeContextBuff
 	val := cueCtx.CompileString(cueBuffer)
 	if val.Err() != nil {
 		return templateContext, nil, errors.WithMessage(val.Err(), "compile status fields template")
diff --git a/pkg/cue/definition/health/health_test.go b/pkg/cue/definition/health/health_test.go
index 5b4bee2a3..b397abad9 100644
--- a/pkg/cue/definition/health/health_test.go
+++ b/pkg/cue/definition/health/health_test.go
@@ -329,6 +329,19 @@ func TestGetStatus(t *testing.T) {
 				"sum": "4",
 			},
 		},
+		"test-status-with-import-statement": {
+			tpContext: map[string]interface{}{
+				"output": map[string]interface{}{},
+			},
+			parameter: make(map[string]interface{}),
+			statusCue: strings.TrimSpace(`
+				import "strings"
+				"my.details": strings.Join(["foo", "bar"], ",")
+			`),
+			expStatus: map[string]string{
+				"my.details": "foo,bar",
+			},
+		},
 		"test-key-input-too-large-skipped": {
 			tpContext: map[string]interface{}{
 				"output": map[string]interface{}{