@ -22,12 +22,16 @@ import (
"fmt"
"fmt"
"io"
"io"
"log/slog"
"log/slog"
"os"
"path/filepath"
"strings"
"strings"
"testing"
"testing"
"time"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"
k8syaml "k8s.io/apimachinery/pkg/util/yaml"
fakeclientset "k8s.io/client-go/kubernetes/fake"
fakeclientset "k8s.io/client-go/kubernetes/fake"
"helm.sh/helm/v4/internal/logging"
"helm.sh/helm/v4/internal/logging"
@ -1826,15 +1830,12 @@ func TestRenderResources_PostRenderer_Success(t *testing.T) {
expectedBuf := ` -- -
expectedBuf := ` -- -
# Source : yellow / templates / foodpie # Source : yellow / templates / foodpie
foodpie : world foodpie : world
-- - -- -
# Source : yellow / templates / with - partials # Source : yellow / templates / with - partials
yellow : Earth yellow : Earth
-- - -- -
# Source : yellow / templates / yellow # Source : yellow / templates / yellow
yellow : world yellow : world
` `
expectedHook := ` kind : ConfigMap
expectedHook := ` kind : ConfigMap
metadata : metadata :
@ -1845,7 +1846,7 @@ data:
name : value
name : value
` `
assert . Equal ( t , expectedBuf , buf . String ( ) )
assert . Equal ( t , expectedBuf , string ( buf ) )
assert . Len ( t , hooks , 1 )
assert . Len ( t , hooks , 1 )
assert . Equal ( t , expectedHook , hooks [ 0 ] . Manifest )
assert . Equal ( t , expectedHook , hooks [ 0 ] . Manifest )
} }
@ -1941,22 +1942,19 @@ func TestRenderResources_PostRenderer_Integration(t *testing.T) {
assert . Empty ( t , notes ) // Notes should be empty for this test
assert . Empty ( t , notes ) // Notes should be empty for this test
// Verify that the post-renderer modifications are present in the output
// Verify that the post-renderer modifications are present in the output
output := buf . String ( )
output := string ( buf )
expected := ` -- -
expected := ` -- -
# Source : hello / templates / goodbye # Source : hello / templates / goodbye
goodbye : world goodbye : world
color : blue color : blue
-- - -- -
# Source : hello / templates / hello # Source : hello / templates / hello
hello : world hello : world
color : blue color : blue
-- - -- -
# Source : hello / templates / with - partials # Source : hello / templates / with - partials
hello : Earth hello : Earth
color : blue color : blue
` `
assert . Contains ( t , output , "color: blue" )
assert . Contains ( t , output , "color: blue" )
assert . Equal ( t , 3 , strings . Count ( output , "color: blue" ) )
assert . Equal ( t , 3 , strings . Count ( output , "color: blue" ) )
@ -2036,8 +2034,8 @@ spec:
require . NoError ( t , err )
require . NoError ( t , err )
assert . Len ( t , hooks , 1 )
assert . Len ( t , hooks , 1 )
assert . Equal ( t , "my-app" , hooks [ 0 ] . Name )
assert . Equal ( t , "my-app" , hooks [ 0 ] . Name )
assert . Contains ( t , buf . String ( ) , "kind: Deployment" )
assert . Contains ( t , string ( buf ) , "kind: Deployment" )
assert . Contains ( t , buf . String ( ) , "kind: ServiceAccount" )
assert . Contains ( t , string ( buf ) , "kind: ServiceAccount" )
} }
func TestRenderResources_PostRenderer_CombinedInvokesOnceWithEverything ( t * testing . T ) { func TestRenderResources_PostRenderer_CombinedInvokesOnceWithEverything ( t * testing . T ) {
@ -2221,7 +2219,7 @@ metadata:
// Hooks still round-trip through the release so they can execute.
// Hooks still round-trip through the release so they can execute.
require . Len ( t , hooks , 1 )
require . Len ( t , hooks , 1 )
assert . Contains ( t , hooks [ 0 ] . Manifest , "hook-cm" )
assert . Contains ( t , hooks [ 0 ] . Manifest , "hook-cm" )
assert . Contains ( t , manifestDoc . String ( ) , "template-cm" )
assert . Contains ( t , string ( manifestDoc ) , "template-cm" )
} }
func TestRenderResources_PostRenderer_NoHooksWithOnlyHooks ( t * testing . T ) { func TestRenderResources_PostRenderer_NoHooksWithOnlyHooks ( t * testing . T ) {
@ -2276,6 +2274,74 @@ metadata:
assert . ErrorContains ( t , err , "bogus" )
assert . ErrorContains ( t , err , "bogus" )
} }
func TestRenderResources_BlockScalarChomping ( t * testing . T ) {
tests := [ ] struct {
name string
indicator string
value string
wantNewlines [ 3 ] int // indexed by the number of authored trailing newlines
} {
{ "literal_clip" , "|" , "line1\nline2" , [ 3 ] int { 1 , 1 , 1 } } ,
{ "literal_strip" , "|-" , "line1\nline2" , [ 3 ] int { 0 , 0 , 0 } } ,
{ "literal_keep" , "|+" , "line1\nline2" , [ 3 ] int { 1 , 1 , 2 } } ,
{ "folded_clip" , ">" , "line1 line2" , [ 3 ] int { 1 , 1 , 1 } } ,
{ "folded_strip" , ">-" , "line1 line2" , [ 3 ] int { 0 , 0 , 0 } } ,
{ "folded_keep" , ">+" , "line1 line2" , [ 3 ] int { 1 , 1 , 2 } } ,
}
for _ , tc := range tests {
for trailing := range 3 {
for _ , output := range [ ] string { "buffer" , "output-dir" } {
t . Run ( fmt . Sprintf ( "%s/%d_newlines/%s" , tc . name , trailing , output ) , func ( t * testing . T ) {
var files [ ] * common . File
var wantOutput strings . Builder
for _ , name := range [ ] string { "first" , "last" } {
body := fmt . Sprintf ( "apiVersion: v1\nkind: ConfigMap\nmetadata:\n name: %s\ndata:\n cfg: %s\n line1\n line2" , name , tc . indicator )
path := "templates/" + name + ".yaml"
files = append ( files , & common . File { Name : path , Data : [ ] byte ( body + strings . Repeat ( "\n" , trailing ) ) } )
fmt . Fprintf ( & wantOutput , "---\n# Source: hello/%s\n%s%s" , path , body , strings . Repeat ( "\n" , max ( 1 , trailing ) ) )
}
outputDir := ""
if output == "output-dir" {
outputDir = t . TempDir ( )
}
cfg := actionConfigFixture ( t )
_ , rendered , _ , err := cfg . renderResources (
t . Context ( ) , buildChartWithTemplates ( files ) , nil , "test-release" , outputDir , false , false , false ,
nil , false , false , false , PostRenderStrategyCombined ,
)
require . NoError ( t , err )
if outputDir != "" {
assert . Empty ( t , rendered )
for _ , file := range files {
data , err := os . ReadFile ( filepath . Join ( outputDir , "hello" , file . Name ) )
require . NoError ( t , err )
rendered = append ( rendered , data ... )
}
}
assert . Equal ( t , wantOutput . String ( ) , string ( rendered ) )
var cm struct {
Data map [ string ] string ` json:"data" yaml:"data" `
}
wantValue := tc . value + strings . Repeat ( "\n" , tc . wantNewlines [ trailing ] )
// Kubernetes also normalizes a missing newline in a standalone document.
require . NoError ( t , k8syaml . NewYAMLOrJSONDecoder ( bytes . NewReader ( files [ 0 ] . Data ) , 4096 ) . Decode ( & cm ) )
assert . Equal ( t , wantValue , cm . Data [ "cfg" ] )
// Decode the whole stream without Kubernetes' implicit EOF newline.
decoder := yaml . NewDecoder ( bytes . NewReader ( rendered ) )
for range 2 {
require . NoError ( t , decoder . Decode ( & cm ) )
assert . Equal ( t , wantValue , cm . Data [ "cfg" ] )
}
require . ErrorIs ( t , decoder . Decode ( & cm ) , io . EOF )
} )
}
}
}
}
func TestDetermineReleaseSSAApplyMethod ( t * testing . T ) { func TestDetermineReleaseSSAApplyMethod ( t * testing . T ) {
assert . Equal ( t , release . ApplyMethodClientSideApply , determineReleaseSSApplyMethod ( false ) )
assert . Equal ( t , release . ApplyMethodClientSideApply , determineReleaseSSApplyMethod ( false ) )
assert . Equal ( t , release . ApplyMethodServerSideApply , determineReleaseSSApplyMethod ( true ) )
assert . Equal ( t , release . ApplyMethodServerSideApply , determineReleaseSSApplyMethod ( true ) )
胡玮文
2 days ago
committed by
GitHub