Skip to content

Commit ed0b4db

Browse files
cmagliecmaglie
committed
Moved errorcodes into feedback 
1 parent 6241da5 commit ed0b4db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+151
-183
lines changed

‎cli/arguments/arguments.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package arguments
1818
import (
1919
"strings"
2020

21-
"github.com/arduino/arduino-cli/cli/errorcodes"
2221
"github.com/arduino/arduino-cli/cli/feedback"
2322
"github.com/arduino/arduino-cli/i18n"
2423
"github.com/spf13/cobra"
@@ -35,7 +34,7 @@ func CheckFlagsConflicts(command *cobra.Command, flagNames ...string) {
3534
}
3635
flags := "--" + strings.Join(flagNames, ", --")
3736
msg := tr("Can't use the following flags together: %s", flags)
38-
feedback.Fatal(msg, errorcodes.ErrBadArgument)
37+
feedback.Fatal(msg, feedback.ErrBadArgument)
3938
}
4039

4140
// CheckFlagsMandatory is a helper function useful to report errors when at least one flag is not used in a group of "required" flags
@@ -46,6 +45,6 @@ func CheckFlagsMandatory(command *cobra.Command, flagNames ...string) {
4645
}
4746
flags := "--" + strings.Join(flagNames, ", --")
4847
msg := tr("Flag %[1]s is mandatory when used in conjunction with: %[2]s", "--"+flagName, flags)
49-
feedback.Fatal(msg, errorcodes.ErrBadArgument)
48+
feedback.Fatal(msg, feedback.ErrBadArgument)
5049
}
5150
}

‎cli/arguments/fqbn.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020

2121
"github.com/arduino/arduino-cli/arduino"
2222
"github.com/arduino/arduino-cli/arduino/sketch"
23-
"github.com/arduino/arduino-cli/cli/errorcodes"
2423
"github.com/arduino/arduino-cli/cli/feedback"
2524
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2625
"github.com/spf13/cobra"
@@ -80,18 +79,18 @@ func CalculateFQBNAndPort(portArgs *Port, fqbnArg *Fqbn, instance *rpc.Instance,
8079
}
8180
if fqbn == "" {
8281
if portArgs == nil || portArgs.address == "" {
83-
feedback.FatalError(&arduino.MissingFQBNError{}, errorcodes.ErrGeneric)
82+
feedback.FatalError(&arduino.MissingFQBNError{}, feedback.ErrGeneric)
8483
}
8584
fqbn, port := portArgs.DetectFQBN(instance)
8685
if fqbn == "" {
87-
feedback.FatalError(&arduino.MissingFQBNError{}, errorcodes.ErrGeneric)
86+
feedback.FatalError(&arduino.MissingFQBNError{}, feedback.ErrGeneric)
8887
}
8988
return fqbn, port
9089
}
9190

9291
port, err := portArgs.GetPort(instance, sk)
9392
if err != nil {
94-
feedback.Fatal(tr("Error getting port metadata: %v", err), errorcodes.ErrGeneric)
93+
feedback.Fatal(tr("Error getting port metadata: %v", err), feedback.ErrGeneric)
9594
}
9695
return fqbn, port.ToRPC()
9796
}

‎cli/arguments/port.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/arduino/arduino-cli/arduino"
2323
"github.com/arduino/arduino-cli/arduino/discovery"
2424
"github.com/arduino/arduino-cli/arduino/sketch"
25-
"github.com/arduino/arduino-cli/cli/errorcodes"
2625
"github.com/arduino/arduino-cli/cli/feedback"
2726
"github.com/arduino/arduino-cli/commands"
2827
"github.com/arduino/arduino-cli/commands/board"
@@ -146,7 +145,7 @@ func (p *Port) DetectFQBN(inst *rpc.Instance) (string, *rpc.Port) {
146145
Timeout: p.timeout.Get().Milliseconds(),
147146
})
148147
if err != nil {
149-
feedback.Fatal(tr("Error during FQBN detection: %v", err), errorcodes.ErrGeneric)
148+
feedback.Fatal(tr("Error during FQBN detection: %v", err), feedback.ErrGeneric)
150149
}
151150
for _, detectedPort := range detectedPorts {
152151
port := detectedPort.GetPort()
@@ -157,10 +156,10 @@ func (p *Port) DetectFQBN(inst *rpc.Instance) (string, *rpc.Port) {
157156
continue
158157
}
159158
if len(detectedPort.MatchingBoards) > 1 {
160-
feedback.FatalError(&arduino.MultipleBoardsDetectedError{Port: port}, errorcodes.ErrBadArgument)
159+
feedback.FatalError(&arduino.MultipleBoardsDetectedError{Port: port}, feedback.ErrBadArgument)
161160
}
162161
if len(detectedPort.MatchingBoards) == 0 {
163-
feedback.FatalError(&arduino.NoBoardsDetectedError{Port: port}, errorcodes.ErrBadArgument)
162+
feedback.FatalError(&arduino.NoBoardsDetectedError{Port: port}, feedback.ErrBadArgument)
164163
}
165164
return detectedPort.MatchingBoards[0].Fqbn, port
166165
}

‎cli/arguments/sketch.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"fmt"
2020

2121
"github.com/arduino/arduino-cli/arduino/sketch"
22-
"github.com/arduino/arduino-cli/cli/errorcodes"
2322
"github.com/arduino/arduino-cli/cli/feedback"
2423
"github.com/arduino/go-paths-helper"
2524
"github.com/sirupsen/logrus"
@@ -34,7 +33,7 @@ func InitSketchPath(path string) (sketchPath *paths.Path) {
3433
} else {
3534
wd, err := paths.Getwd()
3635
if err != nil {
37-
feedback.Fatal(tr("Couldn't get current working directory: %v", err), errorcodes.ErrGeneric)
36+
feedback.Fatal(tr("Couldn't get current working directory: %v", err), feedback.ErrGeneric)
3837
}
3938
logrus.Infof("Reading sketch from dir: %s", wd)
4039
sketchPath = wd
@@ -47,7 +46,7 @@ func InitSketchPath(path string) (sketchPath *paths.Path) {
4746
func NewSketch(sketchPath *paths.Path) *sketch.Sketch {
4847
sketch, err := sketch.New(sketchPath)
4948
if err != nil {
50-
feedback.Fatal(tr("Error opening sketch: %v", err), errorcodes.ErrGeneric)
49+
feedback.Fatal(tr("Error opening sketch: %v", err), feedback.ErrGeneric)
5150
}
5251
return sketch
5352
}

‎cli/board/attach.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"os"
2121

2222
"github.com/arduino/arduino-cli/cli/arguments"
23-
"github.com/arduino/arduino-cli/cli/errorcodes"
2423
"github.com/arduino/arduino-cli/cli/feedback"
2524
"github.com/spf13/cobra"
2625
)
@@ -67,7 +66,7 @@ func runAttachCommand(path string, port *arguments.Port, fqbn string) {
6766
address, protocol, _ := port.GetPortAddressAndProtocol(nil, sk)
6867
if address != "" {
6968
if err := sk.SetDefaultPort(address, protocol); err != nil {
70-
feedback.Fatal(fmt.Sprintf("%s: %s", tr("Error saving sketch metadata"), err), errorcodes.ErrGeneric)
69+
feedback.Fatal(fmt.Sprintf("%s: %s", tr("Error saving sketch metadata"), err), feedback.ErrGeneric)
7170
}
7271
current.Port = &boardAttachPortResult{
7372
Address: address,
@@ -76,7 +75,7 @@ func runAttachCommand(path string, port *arguments.Port, fqbn string) {
7675
}
7776
if fqbn != "" {
7877
if err := sk.SetDefaultFQBN(fqbn); err != nil {
79-
feedback.Fatal(fmt.Sprintf("%s: %s", tr("Error saving sketch metadata"), err), errorcodes.ErrGeneric)
78+
feedback.Fatal(fmt.Sprintf("%s: %s", tr("Error saving sketch metadata"), err), feedback.ErrGeneric)
8079
}
8180
current.Fqbn = fqbn
8281
}

‎cli/board/details.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"os"
2222

2323
"github.com/arduino/arduino-cli/cli/arguments"
24-
"github.com/arduino/arduino-cli/cli/errorcodes"
2524
"github.com/arduino/arduino-cli/cli/feedback"
2625
"github.com/arduino/arduino-cli/cli/instance"
2726
"github.com/arduino/arduino-cli/commands/board"
@@ -67,7 +66,7 @@ func runDetailsCommand(cmd *cobra.Command, args []string) {
6766
})
6867

6968
if err != nil {
70-
feedback.Fatal(tr("Error getting board details: %v", err), errorcodes.ErrGeneric)
69+
feedback.Fatal(tr("Error getting board details: %v", err), feedback.ErrGeneric)
7170
}
7271

7372
feedback.PrintResult(detailsResult{details: res})

‎cli/board/list.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
"github.com/arduino/arduino-cli/arduino/cores"
2424
"github.com/arduino/arduino-cli/cli/arguments"
25-
"github.com/arduino/arduino-cli/cli/errorcodes"
2625
"github.com/arduino/arduino-cli/cli/feedback"
2726
"github.com/arduino/arduino-cli/cli/instance"
2827
"github.com/arduino/arduino-cli/commands/board"
@@ -80,7 +79,7 @@ func runListCommand(cmd *cobra.Command, args []string) {
8079
func watchList(cmd *cobra.Command, inst *rpc.Instance) {
8180
eventsChan, closeCB, err := board.Watch(&rpc.BoardListWatchRequest{Instance: inst})
8281
if err != nil {
83-
feedback.Fatal(tr("Error detecting boards: %v", err), errorcodes.ErrNetwork)
82+
feedback.Fatal(tr("Error detecting boards: %v", err), feedback.ErrNetwork)
8483
}
8584
defer closeCB()
8685

‎cli/board/listall.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"os"
2222
"sort"
2323

24-
"github.com/arduino/arduino-cli/cli/errorcodes"
2524
"github.com/arduino/arduino-cli/cli/feedback"
2625
"github.com/arduino/arduino-cli/cli/instance"
2726
"github.com/arduino/arduino-cli/commands/board"
@@ -61,7 +60,7 @@ func runListAllCommand(cmd *cobra.Command, args []string) {
6160
IncludeHiddenBoards: showHiddenBoard,
6261
})
6362
if err != nil {
64-
feedback.Fatal(tr("Error listing boards: %v", err), errorcodes.ErrGeneric)
63+
feedback.Fatal(tr("Error listing boards: %v", err), feedback.ErrGeneric)
6564
}
6665

6766
feedback.PrintResult(resultAll{list})

‎cli/board/search.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"sort"
2323
"strings"
2424

25-
"github.com/arduino/arduino-cli/cli/errorcodes"
2625
"github.com/arduino/arduino-cli/cli/feedback"
2726
"github.com/arduino/arduino-cli/cli/instance"
2827
"github.com/arduino/arduino-cli/commands/board"
@@ -59,7 +58,7 @@ func runSearchCommand(cmd *cobra.Command, args []string) {
5958
IncludeHiddenBoards: showHiddenBoard,
6059
})
6160
if err != nil {
62-
feedback.Fatal(tr("Error searching boards: %v", err), errorcodes.ErrGeneric)
61+
feedback.Fatal(tr("Error searching boards: %v", err), feedback.ErrGeneric)
6362
}
6463

6564
feedback.PrintResult(searchResults{res.Boards})

‎cli/burnbootloader/burnbootloader.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"os"
2121

2222
"github.com/arduino/arduino-cli/cli/arguments"
23-
"github.com/arduino/arduino-cli/cli/errorcodes"
2423
"github.com/arduino/arduino-cli/cli/feedback"
2524
"github.com/arduino/arduino-cli/cli/instance"
2625
"github.com/arduino/arduino-cli/commands/upload"
@@ -70,7 +69,7 @@ func runBootloaderCommand(command *cobra.Command, args []string) {
7069
// We don't need a Sketch to upload a board's bootloader
7170
discoveryPort, err := port.GetPort(instance, nil)
7271
if err != nil {
73-
feedback.Fatal(tr("Error during Upload: %v", err), errorcodes.ErrGeneric)
72+
feedback.Fatal(tr("Error during Upload: %v", err), feedback.ErrGeneric)
7473
}
7574

7675
stdOut, stdErr, res := feedback.OutputStreams()
@@ -83,7 +82,7 @@ func runBootloaderCommand(command *cobra.Command, args []string) {
8382
Programmer: programmer.String(),
8483
DryRun: dryRun,
8584
}, stdOut, stdErr); err != nil {
86-
feedback.Fatal(tr("Error during Upload: %v", err), errorcodes.ErrGeneric)
85+
feedback.Fatal(tr("Error during Upload: %v", err), feedback.ErrGeneric)
8786
}
8887
feedback.PrintResult(res())
8988
}

‎cli/cache/clean.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package cache
1818
import (
1919
"os"
2020

21-
"github.com/arduino/arduino-cli/cli/errorcodes"
2221
"github.com/arduino/arduino-cli/cli/feedback"
2322
"github.com/arduino/arduino-cli/configuration"
2423
"github.com/sirupsen/logrus"
@@ -43,6 +42,6 @@ func runCleanCommand(cmd *cobra.Command, args []string) {
4342
cachePath := configuration.DownloadsDir(configuration.Settings)
4443
err := cachePath.RemoveAll()
4544
if err != nil {
46-
feedback.Fatal(tr("Error cleaning caches: %v", err), errorcodes.ErrGeneric)
45+
feedback.Fatal(tr("Error cleaning caches: %v", err), feedback.ErrGeneric)
4746
}
4847
}

‎cli/cli.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"github.com/arduino/arduino-cli/cli/core"
3131
"github.com/arduino/arduino-cli/cli/daemon"
3232
"github.com/arduino/arduino-cli/cli/debug"
33-
"github.com/arduino/arduino-cli/cli/errorcodes"
3433
"github.com/arduino/arduino-cli/cli/feedback"
3534
"github.com/arduino/arduino-cli/cli/generatedocs"
3635
"github.com/arduino/arduino-cli/cli/globals"
@@ -149,7 +148,7 @@ func preRun(cmd *cobra.Command, args []string) {
149148
// initialize inventory
150149
err := inventory.Init(configuration.DataDir(configuration.Settings).String())
151150
if err != nil {
152-
feedback.Fatal(fmt.Sprintf("Error: %v", err), errorcodes.ErrBadArgument)
151+
feedback.Fatal(fmt.Sprintf("Error: %v", err), feedback.ErrBadArgument)
153152
}
154153

155154
// https://no-color.org/
@@ -200,7 +199,7 @@ func preRun(cmd *cobra.Command, args []string) {
200199
if logFile != "" {
201200
file, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
202201
if err != nil {
203-
feedback.Fatal(tr("Unable to open file for logging: %s", logFile), errorcodes.ErrBadCall)
202+
feedback.Fatal(tr("Unable to open file for logging: %s", logFile), feedback.ErrGeneric)
204203
}
205204

206205
// we use a hook so we don't get color codes in the log file
@@ -213,7 +212,7 @@ func preRun(cmd *cobra.Command, args []string) {
213212

214213
// configure logging filter
215214
if lvl, found := toLogLevel(configuration.Settings.GetString("logging.level")); !found {
216-
feedback.Fatal(tr("Invalid option for --log-level: %s", configuration.Settings.GetString("logging.level")), errorcodes.ErrBadArgument)
215+
feedback.Fatal(tr("Invalid option for --log-level: %s", configuration.Settings.GetString("logging.level")), feedback.ErrBadArgument)
217216
} else {
218217
logrus.SetLevel(lvl)
219218
}
@@ -225,7 +224,7 @@ func preRun(cmd *cobra.Command, args []string) {
225224
// check the right output format was passed
226225
format, found := feedback.ParseOutputFormat(outputFormat)
227226
if !found {
228-
feedback.Fatal(tr("Invalid output format: %s", outputFormat), errorcodes.ErrBadCall)
227+
feedback.Fatal(tr("Invalid output format: %s", outputFormat), feedback.ErrBadArgument)
229228
}
230229

231230
// use the output format to configure the Feedback
@@ -246,7 +245,7 @@ func preRun(cmd *cobra.Command, args []string) {
246245
if outputFormat != "text" {
247246
cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
248247
logrus.Warn("Calling help on JSON format")
249-
feedback.Fatal(tr("Invalid Call : should show Help, but it is available only in TEXT mode."), errorcodes.ErrBadCall)
248+
feedback.Fatal(tr("Invalid Call : should show Help, but it is available only in TEXT mode."), feedback.ErrBadArgument)
250249
})
251250
}
252251
}

‎cli/compile/compile.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"github.com/fatih/color"
3636
"github.com/sirupsen/logrus"
3737

38-
"github.com/arduino/arduino-cli/cli/errorcodes"
3938
"github.com/arduino/arduino-cli/cli/instance"
4039
"github.com/arduino/arduino-cli/commands/compile"
4140
"github.com/arduino/arduino-cli/commands/upload"
@@ -147,14 +146,14 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
147146
logrus.Info("Executing `arduino-cli compile`")
148147

149148
if dumpProfile && feedback.GetFormat() != feedback.Text {
150-
feedback.Fatal(tr("You cannot use the %[1]s flag together with %[2]s.", "--dump-profile", "--format json"), errorcodes.ErrBadArgument)
149+
feedback.Fatal(tr("You cannot use the %[1]s flag together with %[2]s.", "--dump-profile", "--format json"), feedback.ErrBadArgument)
151150
}
152151
if profileArg.Get() != "" {
153152
if len(libraries) > 0 {
154-
feedback.Fatal(tr("You cannot use the %s flag while compiling with a profile.", "--libraries"), errorcodes.ErrBadArgument)
153+
feedback.Fatal(tr("You cannot use the %s flag while compiling with a profile.", "--libraries"), feedback.ErrBadArgument)
155154
}
156155
if len(library) > 0 {
157-
feedback.Fatal(tr("You cannot use the %s flag while compiling with a profile.", "--library"), errorcodes.ErrBadArgument)
156+
feedback.Fatal(tr("You cannot use the %s flag while compiling with a profile.", "--library"), feedback.ErrBadArgument)
158157
}
159158
}
160159

@@ -181,13 +180,13 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
181180
if sourceOverrides != "" {
182181
data, err := paths.New(sourceOverrides).ReadFile()
183182
if err != nil {
184-
feedback.Fatal(tr("Error opening source code overrides data file: %v", err), errorcodes.ErrGeneric)
183+
feedback.Fatal(tr("Error opening source code overrides data file: %v", err), feedback.ErrGeneric)
185184
}
186185
var o struct {
187186
Overrides map[string]string `json:"overrides"`
188187
}
189188
if err := json.Unmarshal(data, &o); err != nil {
190-
feedback.Fatal(tr("Error: invalid source code overrides data file: %v", err), errorcodes.ErrGeneric)
189+
feedback.Fatal(tr("Error: invalid source code overrides data file: %v", err), feedback.ErrGeneric)
191190
}
192191
overrides = o.Overrides
193192
}
@@ -228,14 +227,14 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
228227
Protocol: port.Protocol,
229228
})
230229
if err != nil {
231-
feedback.Fatal(tr("Error during Upload: %v", err), errorcodes.ErrGeneric)
230+
feedback.Fatal(tr("Error during Upload: %v", err), feedback.ErrGeneric)
232231
}
233232

234233
fields := map[string]string{}
235234
if len(userFieldRes.UserFields) > 0 {
236235
feedback.Print(tr("Uploading to specified board using %s protocol requires the following info:", port.Protocol))
237236
if f, err := arguments.AskForUserFields(userFieldRes.UserFields); err != nil {
238-
feedback.FatalError(err, errorcodes.ErrBadArgument)
237+
feedback.FatalError(err, feedback.ErrBadArgument)
239238
} else {
240239
fields = f
241240
}
@@ -254,7 +253,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
254253
}
255254

256255
if err := upload.Upload(context.Background(), uploadRequest, stdOut, stdErr); err != nil {
257-
feedback.Fatal(tr("Error during Upload: %v", err), errorcodes.ErrGeneric)
256+
feedback.Fatal(tr("Error during Upload: %v", err), feedback.ErrGeneric)
258257
}
259258
}
260259

@@ -308,7 +307,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
308307

309308
// Output profile as a result
310309
if _, err := stdOut.Write([]byte(profile)); err != nil {
311-
feedback.FatalError(err, errorcodes.ErrGeneric)
310+
feedback.FatalError(err, feedback.ErrGeneric)
312311
}
313312
feedback.PrintResult(stdIORes())
314313
os.Exit(0)
@@ -351,7 +350,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
351350
}
352351
}
353352
}
354-
feedback.Fatal(msg, errorcodes.ErrGeneric)
353+
feedback.Fatal(msg, feedback.ErrGeneric)
355354
}
356355
}
357356

0 commit comments

Comments
 (0)