Skip to content

Commit

Permalink
only override wrapping kind if it wasn't set already
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Ortiz García committed Oct 12, 2021
1 parent a2fd901 commit 68af636
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 7 deletions.
19 changes: 19 additions & 0 deletions kyaml/fn/framework/framework_test.go
Expand Up @@ -139,6 +139,10 @@ results:
path: /path/to/deployment.yaml
- message: some error
severity: error`
outputOtherWrap := strings.NewReplacer(
"kind: ResourceList", "kind: SomethingElse",
"apiVersion: config.kubernetes.io/v1alpha1", "apiVersion: fakeVersion",
).Replace(outputResourceList)

testCases := []struct {
desc string
Expand Down Expand Up @@ -178,6 +182,21 @@ results:
input: singleDeployment,
want: outputResourceList,
},
{
desc: "no wrap has precedence",
noWrap: true,
wrapKind: kio.ResourceListKind,
wrapAPIVersion: kio.ResourceListAPIVersion,
input: singleDeployment,
want: singleDeployment,
},
{
desc: "honor specified wrapping kind",
wrapKind: "SomethingElse",
wrapAPIVersion: "fakeVersion",
input: resourceListDeployment,
want: outputOtherWrap,
},
}

for _, tc := range testCases {
Expand Down
17 changes: 10 additions & 7 deletions kyaml/kio/byteio_reader.go
Expand Up @@ -67,28 +67,31 @@ func (rw *ByteReadWriter) Read() ([]*yaml.RNode, error) {
WrapBareSeqNode: rw.WrapBareSeqNode,
}
val, err := b.Read()
rw.Results = b.Results

if rw.FunctionConfig == nil {
rw.FunctionConfig = b.FunctionConfig
}
rw.Results = b.Results

if !rw.NoWrap {
if !rw.NoWrap && rw.WrappingKind == "" {
rw.WrappingAPIVersion = b.WrappingAPIVersion
rw.WrappingKind = b.WrappingKind
}
return val, errors.Wrap(err)
}

func (rw *ByteReadWriter) Write(nodes []*yaml.RNode) error {
return ByteWriter{
w := ByteWriter{
Writer: rw.Writer,
KeepReaderAnnotations: rw.KeepReaderAnnotations,
Style: rw.Style,
FunctionConfig: rw.FunctionConfig,
Results: rw.Results,
WrappingAPIVersion: rw.WrappingAPIVersion,
WrappingKind: rw.WrappingKind,
}.Write(nodes)
}
if !rw.NoWrap {
w.WrappingAPIVersion = rw.WrappingAPIVersion
w.WrappingKind = rw.WrappingKind
}
return w.Write(nodes)
}

// ParseAll reads all of the inputs into resources
Expand Down

0 comments on commit 68af636

Please sign in to comment.