Skip to content

Commit f71d8fe

Browse files
committed
Fix exit codes
1 parent 371322e commit f71d8fe

7 files changed

Lines changed: 19 additions & 11 deletions

File tree

cmd/apply.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"io"
88
"io/ioutil"
99
"log"
10+
"os"
1011
)
1112

1213
// applyOptions store apply command options
@@ -48,7 +49,7 @@ func runApply(cmd *cobra.Command, options applyOptions) error {
4849
resourceManager := &rm.ResourceManager{}
4950

5051
if err := resourceManager.Init(config); err != nil {
51-
return err
52+
os.Exit(2)
5253
}
5354

5455
resources := resourceManager.GetResources()

cmd/compare.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package cmd
22

33
import (
4-
"errors"
54
"fmt"
65
"io"
76
"os"
@@ -42,7 +41,7 @@ func runCompare(cmd *cobra.Command, options compareOptions) error {
4241
config.Merge(cfg)
4342
resourceManager := &rm.ResourceManager{}
4443
if err := resourceManager.Init(config); err != nil {
45-
return err
44+
os.Exit(2)
4645
}
4746
changes, err := resourceManager.GetChanges()
4847
if err != nil {
@@ -52,8 +51,12 @@ func runCompare(cmd *cobra.Command, options compareOptions) error {
5251
return nil
5352
}
5453

54+
//print changes and exit with code 1
5555
printCompareDiff(cmd.OutOrStdout(), changes)
56-
return errors.New("end diff")
56+
fmt.Println("end diff")
57+
os.Exit(1)
58+
59+
return nil
5760
}
5861

5962
func printCompareDiff(out io.Writer, changes []rm.ResourceChange) {

cmd/execute.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func runExecute(cmd *cobra.Command, options executeOptions) error {
5959

6060
resourceManager := &rm.ResourceManager{}
6161
if err := resourceManager.Init(config); err != nil {
62-
return err
62+
os.Exit(2)
6363
}
6464
client := resourceManager.GetClient()
6565

cmd/inspect.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cmd
33
import (
44
"fmt"
55
"io"
6+
"os"
67

78
c "github.com/codilime/floodgate/config"
89
rm "github.com/codilime/floodgate/resourcemanager"
@@ -40,7 +41,7 @@ func runInspect(cmd *cobra.Command, options inspectOptions) error {
4041
config.Merge(cfg)
4142
resourceManager := &rm.ResourceManager{}
4243
if err := resourceManager.Init(config); err != nil {
43-
return err
44+
os.Exit(2)
4445
}
4546
fmt.Fprintln(cmd.OutOrStdout(), "Current Spinnaker resource status:")
4647
fmt.Fprintln(cmd.OutOrStdout(), "\nApplications:")

cmd/sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func runSync(cmd *cobra.Command, options syncOptions) error {
4444
config.Merge(cfg)
4545
resourceManager := &rm.ResourceManager{}
4646
if err := resourceManager.Init(config); err != nil {
47-
return err
47+
os.Exit(2)
4848
}
4949
if options.dryRun {
5050
changes, err := resourceManager.GetChanges()

parser/parser.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (p *Parser) ParseDirectories(directories []string) (*ParsedResourceData, er
6565
for _, entrypoint := range directories {
6666
output, err := p.loadFilesFromDirectory(entrypoint)
6767
if err != nil {
68-
log.Fatal(err)
68+
log.Warn(err)
6969
return nil, err
7070
}
7171
objects = append(objects, output...)
@@ -93,8 +93,8 @@ func (p *Parser) loadFilesFromDirectory(entrypoint string) ([]map[string]interfa
9393
}
9494
obj, err := fileLoader.LoadFile(path)
9595
if err != nil {
96-
log.Warn(f.Name(), " not loaded due to\n", err)
97-
return nil
96+
log.Warn(f.Name(), " not loaded due to")
97+
return err
9898
}
9999
objects = append(objects, obj...)
100100
log.Debugf("Loaded file: %s", path)

resourcemanager/resourcemanager.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ func (rm *ResourceManager) Init(config *c.Config, customOptions ...Option) error
5555
if err != nil {
5656
return err
5757
}
58-
rm.createResourcesFromData(resourceData)
58+
err = rm.createResourcesFromData(resourceData)
59+
if err != nil {
60+
return err
61+
}
5962
return nil
6063
}
6164

0 commit comments

Comments
 (0)