Skip to content

fix: handle SecretVar JSON objects without value field in UnmarshalJSON #4723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akshaydeo merged 1 commit into from
Jul 12, 2026
Merged

fix: handle SecretVar JSON objects without value field in UnmarshalJSON #4723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions core/schemas/secretvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package schemas

import (
"bytes"
"database/sql/driver"
"fmt"
"os"
Expand Down Expand Up @@ -47,8 +48,7 @@ func NewSecretVar(value string) *SecretVar {
}
// If it's a valid JSON object following the SecretVar schema, unmarshal it
if sonic.Valid([]byte(value)) {
valueNode, _ := sonic.Get([]byte(val), "value")
if valueNode.Exists() {
if trimmed := bytes.TrimSpace([]byte(val)); len(trimmed) > 0 && trimmed[0] == '{' {
type secretVarCompat struct {
Val string `json:"value"`
Ref string `json:"ref"`
Expand Down Expand Up @@ -299,8 +299,7 @@ func (e *SecretVar) UnmarshalJSON(data []byte) error {
val = unquoted
}
if sonic.Valid(data) {
valueNode, _ := sonic.Get(data, "value")
if valueNode.Exists() {
if trimmed := bytes.TrimSpace(data); len(trimmed) > 0 && trimmed[0] == '{' {
type secretVarCompat struct {
Val string `json:"value"`
Ref string `json:"ref"`
Expand Down
33 changes: 33 additions & 0 deletions core/schemas/secretvar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,23 @@ func TestSecretVar_UnmarshalJSON_BackwardCompat(t *testing.T) {
os.Setenv("MY_KEY", "resolved-value")
defer os.Unsetenv("MY_KEY")

t.Run("from_env without value field", func(t *testing.T) {
input := `{"env_var":"MY_KEY","from_env":true}`
var sv SecretVar
if err := sv.UnmarshalJSON([]byte(input)); err != nil {
t.Fatalf("UnmarshalJSON failed: %v", err)
}
if sv.GetRawRef() != "env.MY_KEY" {
t.Errorf("expected ref %q, got %q", "env.MY_KEY", sv.GetRawRef())
}
if !sv.IsFromSecret() {
t.Error("expected IsFromSecret=true")
}
if sv.Val != "resolved-value" {
t.Errorf("expected Val=%q, got %q", "resolved-value", sv.Val)
}
})

t.Run("old env_var/from_env format", func(t *testing.T) {
input := `{"value":"my-api-key","env_var":"env.MY_KEY","from_env":true}`
var secretVar SecretVar
Expand Down Expand Up @@ -221,6 +238,22 @@ func TestNewSecretVar_SecretVarReference(t *testing.T) {
}
}

func TestNewSecretVar_FromEnvWithoutValueField(t *testing.T) {
os.Setenv("MY_KEY", "resolved-value")
defer os.Unsetenv("MY_KEY")

sv := NewSecretVar(`{"env_var":"MY_KEY","from_env":true}`)
if sv.GetRawRef() != "env.MY_KEY" {
t.Errorf("expected ref %q, got %q", "env.MY_KEY", sv.GetRawRef())
}
if !sv.IsFromSecret() {
t.Error("expected IsFromSecret=true")
}
if sv.Val != "resolved-value" {
t.Errorf("expected Val=%q, got %q", "resolved-value", sv.Val)
}
}

// TestSecretVar_RealWorldVertexCredentials tests the actual use case that triggered
// the double-escaping bug: Vertex AI service account credentials
func TestSecretVar_RealWorldVertexCredentials(t *testing.T) {
Expand Down
Loading