kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update comments, tests, not expose indent option

Browse Source
This commit is contained in:
Phani Teja Marupaka
2021-07-09 00:17:09 -07:00
parent f81201b74d
commit c07ffa5c1e
4 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kyaml/kio/byteio_reader.go
View File

@@ -114,7 +114,7 @@ type ByteReader struct {
Reader io.Reader
// OmitReaderAnnotations will configures Read to skip setting the config.kubernetes.io/index
// annotation on Resources as they are Read.
// and internal.config.kubernetes.io/seqindent annotations on Resources as they are Read.
OmitReaderAnnotations bool
// AddSeqIndentAnnotation if true adds kioutil.SeqIndentAnnotation to each resource
@@ -314,20 +314,14 @@ func seqIndentAnno(node *yaml.Node, originalYAML string) string {
}
// marshal the node with 2 space sequence indentation and calculate the diff
out, err := yaml.MarshalWithOptions(rNode.Document(), &yaml.EncoderOptions{
MapIndent: yaml.DefaultMapIndent,
SeqIndent: yaml.WideSeqIndent,
})
out, err := yaml.MarshalWithOptions(rNode.Document(), &yaml.EncoderOptions{SeqIndent: yaml.WideSeqIndent})
if err != nil {
return ""
}
twoSpaceIndentDiff := copyutil.PrettyFileDiff(string(out), originalYAML)
// marshal the node with 0 space sequence indentation and calculate the diff
out, err = yaml.MarshalWithOptions(rNode.Document(), &yaml.EncoderOptions{
MapIndent: yaml.DefaultMapIndent,
SeqIndent: yaml.CompactSeqIndent,
})
out, err = yaml.MarshalWithOptions(rNode.Document(), &yaml.EncoderOptions{SeqIndent: yaml.CompactSeqIndent})
if err != nil {
return ""
}

4
kyaml/kio/byteio_readwriter_test.go
View File

@@ -425,7 +425,7 @@ spec:
`,
},
{
name: "round_trip with mixed indentations in same resource, least diff wins",
name: "round_trip with mixed indentations in same resource, wide wins",
input: `
apiVersion: apps/v1
kind: Deployment
@@ -450,7 +450,7 @@ env:
`,
},
{
name: "round_trip with mixed indentations in same resource, least diff wins",
name: "round_trip with mixed indentations in same resource, compact wins",
input: `
apiVersion: apps/v1
kind: Deployment

18
kyaml/kio/pkgio_reader.go
View File

@@ -40,6 +40,9 @@ type LocalPackageReadWriter struct {
KeepReaderAnnotations bool `yaml:"keepReaderAnnotations,omitempty"`
// AddSeqIndentAnnotation if true adds kioutil.SeqIndentAnnotation to each resource
AddSeqIndentAnnotation bool
// PackagePath is the path to the package directory.
PackagePath string `yaml:"path,omitempty"`
@@ -79,13 +82,14 @@ type LocalPackageReadWriter struct {
func (r *LocalPackageReadWriter) Read() ([]*yaml.RNode, error) {
nodes, err := LocalPackageReader{
PackagePath: r.PackagePath,
MatchFilesGlob: r.MatchFilesGlob,
IncludeSubpackages: r.IncludeSubpackages,
ErrorIfNonResources: r.ErrorIfNonResources,
SetAnnotations: r.SetAnnotations,
PackageFileName: r.PackageFileName,
FileSkipFunc: r.FileSkipFunc,
PackagePath: r.PackagePath,
MatchFilesGlob: r.MatchFilesGlob,
IncludeSubpackages: r.IncludeSubpackages,
ErrorIfNonResources: r.ErrorIfNonResources,
SetAnnotations: r.SetAnnotations,
PackageFileName: r.PackageFileName,
FileSkipFunc: r.FileSkipFunc,
AddSeqIndentAnnotation: r.AddSeqIndentAnnotation,
}.Read()
if err != nil {
return nil, errors.Wrap(err)