github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

move type setting into an optional layer above normal printing

Browse Source
This commit is contained in:
David Eads
2018-05-16 14:19:21 -04:00
parent 304bce3cdf
commit 420dd9bf66
50 changed files with 239 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/kubectl/cmd/set/set_serviceaccount_test.go
View File

@@ -90,12 +90,7 @@ func TestSetServiceAccountLocal(t *testing.T) {
cmd.Flags().Set("local", "true")
testapi.Default = testapi.Groups[input.apiGroup]
saConfig := SetServiceAccountOptions{
PrintFlags: &printers.PrintFlags{
JSONYamlPrintFlags: printers.NewJSONYamlPrintFlags(scheme.Scheme),
NamePrintFlags: printers.NewNamePrintFlags("", scheme.Scheme),
OutputFormat: &outputFormat,
},
PrintFlags: printers.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
fileNameOptions: resource.FilenameOptions{
Filenames: []string{input.yaml}},
local: true,
@@ -133,12 +128,7 @@ func TestSetServiceAccountMultiLocal(t *testing.T) {
cmd.Flags().Set("output", outputFormat)
cmd.Flags().Set("local", "true")
opts := SetServiceAccountOptions{
PrintFlags: &printers.PrintFlags{
JSONYamlPrintFlags: printers.NewJSONYamlPrintFlags(scheme.Scheme),
NamePrintFlags: printers.NewNamePrintFlags("", scheme.Scheme),
OutputFormat: &outputFormat,
},
PrintFlags: printers.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
fileNameOptions: resource.FilenameOptions{
Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}},
local: true,
@@ -375,12 +365,7 @@ func TestSetServiceAccountRemote(t *testing.T) {
cmd := NewCmdServiceAccount(tf, streams)
cmd.Flags().Set("output", outputFormat)
saConfig := SetServiceAccountOptions{
PrintFlags: &printers.PrintFlags{
JSONYamlPrintFlags: printers.NewJSONYamlPrintFlags(scheme.Scheme),
NamePrintFlags: printers.NewNamePrintFlags("", scheme.Scheme),
OutputFormat: &outputFormat,
},
PrintFlags: printers.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
local: false,
IOStreams: streams,
@@ -422,13 +407,8 @@ func TestServiceAccountValidation(t *testing.T) {
cmd := NewCmdServiceAccount(tf, streams)
saConfig := &SetServiceAccountOptions{
PrintFlags: &printers.PrintFlags{
JSONYamlPrintFlags: printers.NewJSONYamlPrintFlags(scheme.Scheme),
NamePrintFlags: printers.NewNamePrintFlags("", scheme.Scheme),
OutputFormat: &outputFormat,
},
IOStreams: streams,
PrintFlags: printers.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
IOStreams: streams,
}
err := saConfig.Complete(tf, cmd, input.args)
assert.EqualError(t, err, input.errorString)