Skip to content

Commit 68fa2c8

Browse files
authored
fix: use %w in errors (#367)
Signed-off-by: Chris Gianelloni <wolf31o2@blinklabs.io>
1 parent 22be270 commit 68fa2c8

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

internal/config/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ func (c *Config) Load(configFile string) error {
7777
if configFile != "" {
7878
buf, err := os.ReadFile(configFile)
7979
if err != nil {
80-
return fmt.Errorf("error reading config file: %s", err)
80+
return fmt.Errorf("error reading config file: %w", err)
8181
}
8282
err = yaml.Unmarshal(buf, c)
8383
if err != nil {
84-
return fmt.Errorf("error parsing config file: %s", err)
84+
return fmt.Errorf("error parsing config file: %w", err)
8585
}
8686
}
8787
// Load config values from environment variables
8888
// We use "dummy" as the app name here to (mostly) prevent picking up env
8989
// vars that we hadn't explicitly specified in annotations above
9090
err := envconfig.Process("dummy", c)
9191
if err != nil {
92-
return fmt.Errorf("error processing environment: %s", err)
92+
return fmt.Errorf("error processing environment: %w", err)
9393
}
9494
return nil
9595
}

output/embedded/embedded.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (e *EmbeddedOutput) Start() error {
5151
}
5252
if e.callbackFunc != nil {
5353
if err := e.callbackFunc(evt); err != nil {
54-
e.errorChan <- fmt.Errorf("callback function error: %s", err)
54+
e.errorChan <- fmt.Errorf("callback function error: %w", err)
5555
return
5656
}
5757
}

output/push/push.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ func extractCIP20FromMetadata(metadata *cbor.LazyValue) (string, error) {
346346

347347
jsonBytes, err := json.Marshal(msgStruct)
348348
if err != nil {
349-
return "", fmt.Errorf("error marshalling message to JSON: %v", err)
349+
return "", fmt.Errorf("error marshalling message to JSON: %w", err)
350350
}
351351

352352
return string(jsonBytes), nil

output/webhook/webhook.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (w *WebhookOutput) SendWebhook(e *event.Event) error {
249249
bytes.NewReader(data),
250250
)
251251
if err != nil {
252-
return fmt.Errorf("%s", err)
252+
return fmt.Errorf("%w", err)
253253
}
254254
req.Header.Add("Content-Type", "application/json")
255255
req.Header.Add(
@@ -277,14 +277,14 @@ func (w *WebhookOutput) SendWebhook(e *event.Event) error {
277277
// Send payload
278278
resp, err := client.Do(req)
279279
if err != nil {
280-
return fmt.Errorf("%s", err)
280+
return fmt.Errorf("%w", err)
281281
}
282282
if resp == nil {
283283
return fmt.Errorf("failed to send payload: %s", data)
284284
}
285285
respBody, err := io.ReadAll(resp.Body)
286286
if err != nil {
287-
return fmt.Errorf("%s", err)
287+
return fmt.Errorf("%w", err)
288288
}
289289
defer resp.Body.Close()
290290

pipeline/pipeline.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (p *Pipeline) Start() error {
6262
// Start inputs
6363
for _, input := range p.inputs {
6464
if err := input.Start(); err != nil {
65-
return fmt.Errorf("failed to start input: %s", err)
65+
return fmt.Errorf("failed to start input: %w", err)
6666
}
6767
// Start background process to send input events to combined filter channel
6868
go p.chanCopyLoop(input.OutputChan(), p.filterChan)
@@ -72,7 +72,7 @@ func (p *Pipeline) Start() error {
7272
// Start filters
7373
for idx, filter := range p.filters {
7474
if err := filter.Start(); err != nil {
75-
return fmt.Errorf("failed to start input: %s", err)
75+
return fmt.Errorf("failed to start input: %w", err)
7676
}
7777
if idx == 0 {
7878
// Start background process to send events from combined filter channel to first filter plugin
@@ -96,7 +96,7 @@ func (p *Pipeline) Start() error {
9696
// Start outputs
9797
for _, output := range p.outputs {
9898
if err := output.Start(); err != nil {
99-
return fmt.Errorf("failed to start output: %s", err)
99+
return fmt.Errorf("failed to start output: %w", err)
100100
}
101101
// Start background error listener
102102
go p.errorChanWait(output.ErrorChan())
@@ -114,13 +114,13 @@ func (p *Pipeline) Stop() error {
114114
// Stop inputs
115115
for _, input := range p.inputs {
116116
if err := input.Stop(); err != nil {
117-
return fmt.Errorf("failed to stop input: %s", err)
117+
return fmt.Errorf("failed to stop input: %w", err)
118118
}
119119
}
120120
// Stop outputs
121121
for _, output := range p.outputs {
122122
if err := output.Stop(); err != nil {
123-
return fmt.Errorf("failed to stop output: %s", err)
123+
return fmt.Errorf("failed to stop output: %w", err)
124124
}
125125
}
126126
return nil

plugin/option.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,21 @@ func (p *PluginOption) ProcessEnvVars(envPrefix string) error {
114114
case PluginOptionTypeBool:
115115
value, err := strconv.ParseBool(value)
116116
if err != nil {
117-
return fmt.Errorf("error processing env vars: %s", err)
117+
return fmt.Errorf("error processing env vars: %w", err)
118118
}
119119
*(p.Dest.(*bool)) = value
120120
case PluginOptionTypeInt:
121121
// We limit to 32-bit to not get inconsistent behavior on 32-bit platforms
122122
value, err := strconv.ParseInt(value, 10, 32)
123123
if err != nil {
124-
return fmt.Errorf("error processing env vars: %s", err)
124+
return fmt.Errorf("error processing env vars: %w", err)
125125
}
126126
*(p.Dest.(*int)) = int(value)
127127
case PluginOptionTypeUint:
128128
// We limit to 32-bit to not get inconsistent behavior on 32-bit platforms
129129
value, err := strconv.ParseUint(value, 10, 32)
130130
if err != nil {
131-
return fmt.Errorf("error processing env vars: %s", err)
131+
return fmt.Errorf("error processing env vars: %w", err)
132132
}
133133
*(p.Dest.(*uint)) = uint(value)
134134
default:

0 commit comments

Comments
 (0)