Skip to content

Commit da9fd91

Browse files
committed
Avoid duplicate Cobra CLI error output in generated commands
1 parent 1e5f5cf commit da9fd91

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

cmd/builder/main.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
package main
55

66
import (
7+
"os"
8+
79
"github.com/spf13/cobra"
810

911
"go.opentelemetry.io/collector/cmd/builder/internal"
@@ -12,5 +14,8 @@ import (
1214
func main() {
1315
cmd, err := internal.Command()
1416
cobra.CheckErr(err)
15-
cobra.CheckErr(cmd.Execute())
17+
18+
if err := cmd.Execute(); err != nil {
19+
os.Exit(1)
20+
}
1621
}

cmd/mdatagen/main.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ package main
66
//go:generate mdatagen metadata.yaml
77

88
import (
9+
"os"
10+
911
"github.com/spf13/cobra"
1012

1113
"go.opentelemetry.io/collector/cmd/mdatagen/internal"
@@ -14,5 +16,8 @@ import (
1416
func main() {
1517
cmd, err := internal.NewCommand()
1618
cobra.CheckErr(err)
17-
cobra.CheckErr(cmd.Execute())
19+
20+
if err := cmd.Execute(); err != nil {
21+
os.Exit(1)
22+
}
1823
}

0 commit comments

Comments
 (0)