diff --git a/cmd/merge.go b/cmd/merge.go index 3572d85..770ae49 100644 --- a/cmd/merge.go +++ b/cmd/merge.go @@ -32,7 +32,7 @@ If append flag is set then existing arrays will be merged with the arrays from e cmdMerge.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the yaml file inplace") cmdMerge.PersistentFlags().BoolVarP(&overwriteFlag, "overwrite", "x", false, "update the yaml file by overwriting existing values") cmdMerge.PersistentFlags().BoolVarP(&autoCreateFlag, "autocreate", "c", true, "automatically create any missing entries") - cmdMerge.PersistentFlags().StringVarP(&arrayMergeStrategyFlag, "array", "a", "update", "array merge strategy (update/append/overwrite)") + cmdMerge.PersistentFlags().StringVarP(&arrayMergeStrategyFlag, "arrays", "a", "update", "array merge strategy (update/append/overwrite)") cmdMerge.PersistentFlags().StringVarP(&docIndex, "doc", "d", "0", "process document index number (0 based, * for all documents)") return cmdMerge } diff --git a/cmd/merge_test.go b/cmd/merge_test.go index 1729928..3ef0e66 100644 --- a/cmd/merge_test.go +++ b/cmd/merge_test.go @@ -97,7 +97,7 @@ func TestMergeOverwriteDeepExampleCmd(t *testing.T) { func TestMergeAppendCmd(t *testing.T) { cmd := getRootCommand() - result := test.RunCmd(cmd, "merge --autocreate=false --array=append ../examples/data1.yaml ../examples/data2.yaml") + result := test.RunCmd(cmd, "merge --autocreate=false --arrays=append ../examples/data1.yaml ../examples/data2.yaml") if result.Error != nil { t.Error(result.Error) } @@ -123,7 +123,7 @@ func TestMergeAppendArraysCmd(t *testing.T) { defer test.RemoveTempYamlFile(mergeFilename) cmd := getRootCommand() - result := test.RunCmd(cmd, fmt.Sprintf("merge --array=append -d* %s %s", filename, mergeFilename)) + result := test.RunCmd(cmd, fmt.Sprintf("merge --arrays=append -d* %s %s", filename, mergeFilename)) if result.Error != nil { t.Error(result.Error) } @@ -181,7 +181,7 @@ usage: func TestMergeOverwriteAndAppendCmd(t *testing.T) { cmd := getRootCommand() - result := test.RunCmd(cmd, "merge --autocreate=false --array=append --overwrite ../examples/data1.yaml ../examples/data2.yaml") + result := test.RunCmd(cmd, "merge --autocreate=false --arrays=append --overwrite ../examples/data1.yaml ../examples/data2.yaml") if result.Error != nil { t.Error(result.Error) } @@ -208,7 +208,7 @@ b: [6]` defer test.RemoveTempYamlFile(mergeFilename) cmd := getRootCommand() - result := test.RunCmd(cmd, fmt.Sprintf("merge --autocreate=false --array=overwrite --overwrite %s %s", filename, mergeFilename)) + result := test.RunCmd(cmd, fmt.Sprintf("merge --autocreate=false --arrays=overwrite --overwrite %s %s", filename, mergeFilename)) if result.Error != nil { t.Error(result.Error) } @@ -223,7 +223,7 @@ c: func TestMergeRootArraysCmd(t *testing.T) { cmd := getRootCommand() - result := test.RunCmd(cmd, "merge --array=append ../examples/sample_array.yaml ../examples/sample_array_2.yaml") + result := test.RunCmd(cmd, "merge --arrays=append ../examples/sample_array.yaml ../examples/sample_array_2.yaml") if result.Error != nil { t.Error(result.Error) } @@ -238,7 +238,7 @@ func TestMergeRootArraysCmd(t *testing.T) { func TestMergeOverwriteArraysCmd(t *testing.T) { cmd := getRootCommand() - result := test.RunCmd(cmd, "merge --array=overwrite ../examples/sample_array.yaml ../examples/sample_array_2.yaml") + result := test.RunCmd(cmd, "merge --arrays=overwrite ../examples/sample_array.yaml ../examples/sample_array_2.yaml") if result.Error != nil { t.Error(result.Error) }