From e0ebac6c9ca69fc5f9bfbd8a73d840fd4813b8a0 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 16 May 2023 23:23:22 -0700 Subject: [PATCH 1/2] drop redundant NArg check when looping Args --- cmd/yamlfmt/yamlfmt.go | 43 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/cmd/yamlfmt/yamlfmt.go b/cmd/yamlfmt/yamlfmt.go index 652cf361f39..ca55154d483 100644 --- a/cmd/yamlfmt/yamlfmt.go +++ b/cmd/yamlfmt/yamlfmt.go @@ -28,29 +28,26 @@ import ( func main() { indent := flag.Int("indent", 2, "default indent") flag.Parse() - - if flag.NArg() > 0 { - for _, path := range flag.Args() { - sourceYaml, err := os.ReadFile(path) - if err != nil { - fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) - continue - } - rootNode, err := fetchYaml(sourceYaml) - if err != nil { - fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) - continue - } - writer, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) - if err != nil { - fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) - continue - } - err = streamYaml(writer, indent, rootNode) - if err != nil { - fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) - continue - } + for _, path := range flag.Args() { + sourceYaml, err := os.ReadFile(path) + if err != nil { + fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) + continue + } + rootNode, err := fetchYaml(sourceYaml) + if err != nil { + fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) + continue + } + writer, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) + if err != nil { + fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) + continue + } + err = streamYaml(writer, indent, rootNode) + if err != nil { + fmt.Fprintf(os.Stderr, "%s: %v\n", path, err) + continue } } } From fc4fb004cf6bb7f692198b31f099a983f034c1b4 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 16 May 2023 23:23:35 -0700 Subject: [PATCH 2/2] add reviewers and labels to yamlfmt --- cmd/yamlfmt/OWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmd/yamlfmt/OWNERS b/cmd/yamlfmt/OWNERS index 1cc9a523ff0..f1467bc8cba 100644 --- a/cmd/yamlfmt/OWNERS +++ b/cmd/yamlfmt/OWNERS @@ -1,4 +1,10 @@ # See the OWNERS docs at https://go.k8s.io/owners +reviewers: + - bentheelder + - dims approvers: - dims +labels: + - sig/testing + - sig/contributor-experience