From c98a31093403222440eec9ae804123678198d489 Mon Sep 17 00:00:00 2001 From: Shoshana Malfatto Date: Wed, 9 Feb 2022 10:15:42 -0800 Subject: [PATCH] fn command failing unmarshal test --- kyaml/fn/framework/command/command_test.go | 11 +++++++++++ .../framework/command/testdata/standalone/config.yaml | 3 ++- .../command/testdata/standalone/expected.yaml | 6 ++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/kyaml/fn/framework/command/command_test.go b/kyaml/fn/framework/command/command_test.go index 2c8444ef57..50016d027f 100644 --- a/kyaml/fn/framework/command/command_test.go +++ b/kyaml/fn/framework/command/command_test.go @@ -5,6 +5,7 @@ package command_test import ( "bytes" + "fmt" "io/ioutil" "os" "path/filepath" @@ -66,6 +67,7 @@ ENTRYPOINT ["function"] func TestCommand_standalone(t *testing.T) { var config struct { A string `json:"a" yaml:"a"` + B int `json:"b" yaml:"b"` } fn := func(items []*yaml.RNode) ([]*yaml.RNode, error) { @@ -83,6 +85,10 @@ metadata: if err != nil { return nil, err } + err = items[i].PipeE(yaml.SetAnnotation("b", fmt.Sprintf("%v", config.B))) + if err != nil { + return nil, err + } } return items, nil @@ -99,6 +105,7 @@ metadata: func TestCommand_standalone_stdin(t *testing.T) { var config struct { A string `json:"a" yaml:"a"` + B int `json:"b" yaml:"b"` } p := &framework.SimpleProcessor{ @@ -119,6 +126,10 @@ metadata: if err != nil { return nil, err } + err = items[i].PipeE(yaml.SetAnnotation("b", fmt.Sprintf("%v", config.B))) + if err != nil { + return nil, err + } } return items, nil diff --git a/kyaml/fn/framework/command/testdata/standalone/config.yaml b/kyaml/fn/framework/command/testdata/standalone/config.yaml index 81f93e0665..f3cfb48d72 100644 --- a/kyaml/fn/framework/command/testdata/standalone/config.yaml +++ b/kyaml/fn/framework/command/testdata/standalone/config.yaml @@ -3,4 +3,5 @@ apiVersion: example.com/v1alpha1 kind: Foo -a: b \ No newline at end of file +a: c +b: d diff --git a/kyaml/fn/framework/command/testdata/standalone/expected.yaml b/kyaml/fn/framework/command/testdata/standalone/expected.yaml index 381ccf4c94..bf2bb5d419 100644 --- a/kyaml/fn/framework/command/testdata/standalone/expected.yaml +++ b/kyaml/fn/framework/command/testdata/standalone/expected.yaml @@ -8,7 +8,8 @@ metadata: namespace: default annotations: foo: bar2 - a: 'b' + a: 'c' + b: 'd' --- apiVersion: apps/v1 kind: Deployment @@ -17,4 +18,5 @@ metadata: namespace: default annotations: foo: bar1 - a: 'b' + a: 'c' + b: 'd'