chore(go.d): simplify cli is help (#19246)
Ilya Mashchenko committed
Dec 18, 2024 at 14:24 UTC
c3b8eef463cee301ce5480aa7283e291c9df072e
2 files changed
+8
-5
src/go/cmd/godplugin/main.go
+1
-4
@@ -3,7 +3,6 @@
3
package main
4
5
import (
6
- "errors"
6
"fmt"
7
"log/slog"
8
"os"
@@ -15,7 +14,6 @@ import (
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
16
18
- "github.com/jessevdk/go-flags"
17
"go.uber.org/automaxprocs/maxprocs"
18
"golang.org/x/net/http/httpproxy"
19
@@ -75,8 +73,7 @@ func main() {
73
func parseCLI() *cli.Option {
74
opt, err := cli.Parse(os.Args)
75
if err != nil {
78
- var flagsErr *flags.Error
79
- if errors.As(err, &flagsErr) && errors.Is(flagsErr.Type, flags.ErrHelp) {
76
+ if cli.IsHelp(err) {
77
os.Exit(0)
78
}
79
os.Exit(1)
src/go/plugin/go.d/cli/cli.go
+7
-1
@@ -6,6 +6,8 @@ import (
6
"strconv"
7
8
"github.com/jessevdk/go-flags"
9
+
10
+ "github.com/netdata/netdata/go/plugins/pkg/executable"
11
)
12
13
// Option defines command line options.
@@ -24,7 +26,7 @@ func Parse(args []string) (*Option, error) {
26
UpdateEvery: 1,
27
}
28
parser := flags.NewParser(opt, flags.Default)
27
- parser.Name = "orchestrator"
29
+ parser.Name = executable.Name
30
parser.Usage = "[OPTIONS] [update every]"
31
32
rest, err := parser.ParseArgs(args)
@@ -40,3 +42,7 @@ func Parse(args []string) (*Option, error) {
42
43
return opt, nil
44
}
45
+
46
+func IsHelp(err error) bool {
47
+ return flags.WroteHelp(err)
48
+}