Skip to content

Commit 50166fa

Browse files
committed
fix: improve the error handling and wrapping
1 parent b373e9f commit 50166fa

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

pkg/cmd/run/root.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"syscall"
2525
"time"
2626

27+
"github.com/pkg/errors"
2728
"github.com/spf13/cobra"
2829

2930
"github.com/nitrictech/newcli/pkg/build"
@@ -45,7 +46,8 @@ var runCmd = &cobra.Command{
4546
signal.Notify(term, os.Interrupt, syscall.SIGTERM)
4647
signal.Notify(term, os.Interrupt, syscall.SIGINT)
4748

48-
ctx, _ := filepath.Abs(".")
49+
ctx, err := filepath.Abs(".")
50+
cobra.CheckErr(err)
4951

5052
files, err := filepath.Glob(filepath.Join(ctx, args[0]))
5153
cobra.CheckErr(err)
@@ -97,7 +99,6 @@ var runCmd = &cobra.Command{
9799
Pool: pool,
98100
TolerateMissingServices: true,
99101
})
100-
101102
cobra.CheckErr(err)
102103

103104
memerr := make(chan error)
@@ -119,9 +120,9 @@ var runCmd = &cobra.Command{
119120

120121
select {
121122
case membraneError := <-memerr:
122-
fmt.Println(fmt.Sprintf("Membrane Error: %v, exiting", membraneError))
123+
fmt.Println(errors.WithMessage(membraneError, "membrane error, exiting"))
123124
case sigTerm := <-term:
124-
fmt.Println(fmt.Sprintf("Received %v, exiting", sigTerm))
125+
fmt.Printf("Received %v, exiting\n", sigTerm)
125126
}
126127

127128
for _, f := range functions {

pkg/provider/run/minio.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@ const (
5555
// StartMinio -
5656
func (m *MinioServer) Start() error {
5757
runDir, err := filepath.Abs(m.dir)
58-
5958
if err != nil {
6059
return err
6160
}
6261

63-
os.MkdirAll(runDir, runPerm)
62+
err = os.MkdirAll(runDir, runPerm)
63+
if err != nil {
64+
return errors.WithMessage(err, "mkdirall")
65+
}
6466

6567
// TODO: Create new buckets on the fly
6668
//for bName := range l.s.Buckets {

pkg/templates/contents.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ package templates
1818

1919
import (
2020
"context"
21-
"errors"
2221
"fmt"
2322
"os"
2423
"path"
2524
"path/filepath"
2625

2726
"github.com/hashicorp/go-getter"
27+
"github.com/pkg/errors"
2828
"gopkg.in/yaml.v2"
2929

3030
"github.com/nitrictech/newcli/pkg/utils"
@@ -90,17 +90,16 @@ func ListTemplates() (TemplatesConfig, error) {
9090

9191
// download file
9292
if err := client.Get(); err != nil {
93-
return TemplatesConfig{}, fmt.Errorf("Error getting path %s: %v", client.Src, err)
93+
return TemplatesConfig{}, fmt.Errorf("error getting path %s: %v", client.Src, err)
9494
}
9595

9696
var config, err = ReadTemplatesConfig()
97-
9897
if err != nil {
9998
return TemplatesConfig{}, err
10099
}
101100

102101
if config.Templates == nil {
103-
return TemplatesConfig{}, errors.New("Templates array does not exist in respositories.yml")
102+
return TemplatesConfig{}, errors.New("templates array does not exist in respositories.yml")
104103
}
105104

106105
var transformedConfig = TemplatesConfig{}
@@ -139,10 +138,6 @@ func DownloadDirectoryContents(templatePath string, destDir string, force bool)
139138

140139
// TODO add spinner
141140

142-
// downloads files
143-
if err := client.Get(); err != nil {
144-
return fmt.Errorf("Error getting path %s: %v", client.Src, err)
145-
}
146-
147-
return nil
141+
err = client.Get()
142+
return errors.WithMessagef(err, "error getting path %s", client.Src)
148143
}

0 commit comments

Comments
 (0)