fix more issue

Signed-off-by: yxxhero <aiopsclub@163.com>

pkg/envvar/const.go

@@ -15,4 +15,5 @@ const (
 	GoccyGoYaml                = "HELMFILE_GOCCY_GOYAML"
 	CacheHome                  = "HELMFILE_CACHE_HOME"
 	Interactive                = "HELMFILE_INTERACTIVE"
+	EanbleGoccyGoYamlJsonStyle = "HELMFILE_ENABLE_GOCCY_GOYAML_JSON_STYLE"
 )

pkg/tmpl/context_funcs_test.go

@@ -4,12 +4,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/fs"
+	"os"
 	"path/filepath"
 	goruntime "runtime"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/helmfile/helmfile/pkg/envvar"
 	"github.com/helmfile/helmfile/pkg/filesystem"
 	"github.com/helmfile/helmfile/pkg/runtime"
 )
@@ -191,12 +193,20 @@ func TestToYaml(t *testing.T) {
 		input           any
 		expected        string
 		wantErr         bool
+		enableJsonStyle bool
 	}{
 		{
 			// https://github.com/helmfile/helmfile/issues/2024
 			name:            "test unmarshalling issue 2024",
+			enableJsonStyle: true,
 			input:           map[string]any{"thisShouldBeString": "01234567890123456789"},
-			expected: `thisShouldBeString: "01234567890123456789"
+			expected: `'thisShouldBeString': '01234567890123456789'
+`,
+		},
+		{
+			name:  "test unmarshalling issue 2024 with int64",
+			input: map[string]any{"thisShouldBeString": 1234567890123456789},
+			expected: `thisShouldBeString: 1234567890123456789
 `,
 		},
 		{
@@ -237,6 +247,12 @@ func TestToYaml(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			if tt.enableJsonStyle {
+				_ = os.Setenv(envvar.EanbleGoccyGoYamlJsonStyle, "true")
+			}
+			defer func() {
+				_ = os.Unsetenv(envvar.EanbleGoccyGoYamlJsonStyle)
+			}()
 			actual, err := ToYaml(tt.input)
 			if tt.wantErr {
 				require.Error(t, err)

pkg/yaml/yaml.go

@@ -3,12 +3,12 @@ package yaml
 import (
 	"bytes"
 	"io"
-	"strconv"
+	"os"
-	"strings"
 
 	"github.com/goccy/go-yaml"
 	v2 "gopkg.in/yaml.v2"
 
+	"github.com/helmfile/helmfile/pkg/envvar"
 	"github.com/helmfile/helmfile/pkg/runtime"
 )
 
@@ -68,20 +68,19 @@ func NewDecoder(data []byte, strict bool) func(any) error {
 func Marshal(v any) ([]byte, error) {
 	if runtime.GoccyGoYaml {
 		var b bytes.Buffer
-		yamlEncoder := yaml.NewEncoder(
+		yamlEncoderOpts := []yaml.EncodeOption{
-			&b,
 			yaml.Indent(2),
 			yaml.UseSingleQuote(true),
 			yaml.UseLiteralStyleIfMultiline(true),
-			yaml.CustomMarshaler(
-				func(v string) ([]byte, error) {
-					if strings.HasPrefix(v, "0") {
-						// check v is 0xxxx style number.
-						return []byte(strconv.Quote(v)), nil
 		}
-					return []byte(v), nil
+		// enable JSON style if the envvar is set
-				},
+		if os.Getenv(envvar.EanbleGoccyGoYamlJsonStyle) == "true" {
-			),
+			yamlEncoderOpts = append(yamlEncoderOpts, yaml.JSON(), yaml.Flow(false))
+		}
+
+		yamlEncoder := yaml.NewEncoder(
+			&b,
+			yamlEncoderOpts...,
 		)
 		err := yamlEncoder.Encode(v)
 		defer func() {