kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 18:10:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix formatting nit with enableKyaml

Browse Source
This commit is contained in:
jregan
2020-12-17 11:02:37 -08:00
parent 02be687778
commit c32a809dbd
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
api/krusty/configmaps_test.go
View File

@@ -4,8 +4,10 @@
package krusty_test package krusty_test
import ( import (
"fmt"
"testing" "testing"
"sigs.k8s.io/kustomize/api/konfig"
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
) )
@@ -60,9 +62,8 @@ strong nuclear
weak nuclear weak nuclear
`) `)
m := th.Run("/app", th.MakeDefaultOptions()) m := th.Run("/app", th.MakeDefaultOptionsWithProperEnableKyaml())
th.AssertActualEqualsExpected(m, ` expFmt := `apiVersion: v1
apiVersion: v1
data: data:
MOUNTAIN: everest MOUNTAIN: everest
OCEAN: pacific OCEAN: pacific
@@ -95,15 +96,25 @@ apiVersion: v1
data: data:
MOUNTAIN: ZXZlcmVzdA== MOUNTAIN: ZXZlcmVzdA==
OCEAN: cGFjaWZpYw== OCEAN: cGFjaWZpYw==
forces.txt: CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbnVjbGVhcgo= forces.txt: %s
fruit: YXBwbGU= fruit: YXBwbGU=
passphrase: CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aGUgZXZpbCBkYXlzIGNvbWUgbm90Lgo= passphrase: %s
vegetable: YnJvY2NvbGk= vegetable: YnJvY2NvbGk=
kind: Secret kind: Secret
metadata: metadata:
name: blah-bob-ftht6hfgmb name: blah-bob-9t25t44gg4
type: Opaque type: Opaque
`) `
th.AssertActualEqualsExpected(
m, konfig.IfApiMachineryElseKyaml(
fmt.Sprintf(expFmt,
`CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbnVjbGVhcgo`,
`CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aGUgZXZpbCBkYXlzIGNvbWUgbm90Lgo`),
fmt.Sprintf(expFmt, `|
CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbn
VjbGVhcgo=`, `|
CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aG
UgZXZpbCBkYXlzIGNvbWUgbm90Lgo=`)))
} }
// TODO: These should be errors instead. // TODO: These should be errors instead.

6
api/testutils/kusttest/harness.go
View File

@@ -70,6 +70,12 @@ func (th Harness) MakeDefaultOptions() krusty.Options {
return th.MakeOptionsPluginsDisabled() return th.MakeOptionsPluginsDisabled()
} }
func (th Harness) MakeDefaultOptionsWithProperEnableKyaml() krusty.Options {
o := th.MakeOptionsPluginsDisabled()
o.UseKyaml = konfig.FlagEnableKyamlDefaultValue
return o
}
// This has no impact on Builtin plugins, as they are always enabled. // This has no impact on Builtin plugins, as they are always enabled.
func (th Harness) MakeOptionsPluginsDisabled() krusty.Options { func (th Harness) MakeOptionsPluginsDisabled() krusty.Options {
return *krusty.MakeDefaultOptions() return *krusty.MakeDefaultOptions()