Skip to content

Commit 1900471

Browse files
lianxmforlianxmfor
authored
Merge pull request #925 from oom-ai/chore-cli-out
chore(oomcli): unique output
2 parents 9f4706a + 846b022 commit 1900471

24 files changed

+83
-82
lines changed

‎oomcli/cmd/apply.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"context"
5-
"log"
5+
"fmt"
66
"os"
77

88
"github.com/spf13/cobra"
@@ -26,15 +26,15 @@ var applyCmd = &cobra.Command{
2626

2727
file, err := os.Open(applyOpt.FilePath)
2828
if err != nil {
29-
log.Fatal(err)
29+
exit(err)
3030
}
3131
defer file.Close()
3232

3333
if err := oomStore.Apply(ctx, apply.ApplyOpt{R: file}); err != nil {
34-
log.Fatalf("apply failed: %+v", err)
34+
exitf("apply failed: %+v", err)
3535
}
3636

37-
log.Println("applied")
37+
fmt.Fprintf(os.Stderr, "applied")
3838
},
3939
}
4040

‎oomcli/cmd/docgen.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"fmt"
66
"io"
7-
"log"
87
"strings"
98

109
"github.com/spf13/cobra"
@@ -38,7 +37,7 @@ func genDocTree(sb *strings.Builder, cmd *cobra.Command) {
3837
out := new(bytes.Buffer)
3938
err := genMarkdown(cmd, out)
4039
if err != nil {
41-
log.Fatal(err)
40+
exit(err)
4241
}
4342
sb.WriteString(out.String())
4443

‎oomcli/cmd/edit_entity.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package cmd
22

33
import (
44
"context"
5-
"log"
5+
"fmt"
6+
"os"
67

78
"github.com/spf13/cobra"
89

@@ -21,7 +22,7 @@ var editEntityCmd = &cobra.Command{
2122
Short: "Edit entity resources",
2223
PreRun: func(cmd *cobra.Command, args []string) {
2324
if len(args) > 1 {
24-
log.Fatalf("argument at most one, got %d", len(args))
25+
exitf("argument at most one, got %d", len(args))
2526
} else if len(args) == 1 {
2627
editEntityOpt.entityName = &args[0]
2728
}
@@ -33,18 +34,18 @@ var editEntityCmd = &cobra.Command{
3334

3435
entities, err := queryEntities(ctx, oomStore, editEntityOpt.entityName)
3536
if err != nil {
36-
log.Fatal(err)
37+
exit(err)
3738
}
3839

3940
fileName, err := writeEntitiesToTempFile(ctx, oomStore, entities)
4041
if err != nil {
41-
log.Fatal(err)
42+
exit(err)
4243
}
4344

4445
if err = edit(ctx, oomStore, fileName); err != nil {
45-
log.Fatalf("apply failed: %+v", err)
46+
exitf("apply failed: %+v", err)
4647
}
47-
log.Println("applied")
48+
fmt.Fprintf(os.Stderr, "applied")
4849
},
4950
}
5051

@@ -55,7 +56,7 @@ func init() {
5556
func writeEntitiesToTempFile(ctx context.Context, oomStore *oomstore.OomStore, entities types.EntityList) (string, error) {
5657
tempFile, err := getTempFile()
5758
if err != nil {
58-
log.Fatal(err)
59+
exit(err)
5960
}
6061
defer tempFile.Close()
6162

‎oomcli/cmd/edit_feature.go‎

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

33
import (
44
"context"
5-
"log"
5+
"fmt"
6+
"os"
67

78
"github.com/oom-ai/oomstore/pkg/oomstore"
89
"github.com/oom-ai/oomstore/pkg/oomstore/types"
@@ -27,7 +28,7 @@ var editFeatureCmd = &cobra.Command{
2728
}
2829

2930
if len(args) > 1 {
30-
log.Fatalf("argument at most one, got %d", len(args))
31+
exitf("argument at most one, got %d", len(args))
3132
} else if len(args) == 1 {
3233
editFeatureOpt.FeatureFullNames = &[]string{args[0]}
3334
}
@@ -40,18 +41,18 @@ var editFeatureCmd = &cobra.Command{
4041

4142
features, err := queryFeatures(ctx, oomStore, editFeatureOpt.ListFeatureOpt)
4243
if err != nil {
43-
log.Fatal(err)
44+
exit(err)
4445
}
4546

4647
fileName, err := writeFeaturesToTempFile(ctx, oomStore, features)
4748
if err != nil {
48-
log.Fatal(err)
49+
exit(err)
4950
}
5051

5152
if err = edit(ctx, oomStore, fileName); err != nil {
52-
log.Fatalf("apply failed: %+v", err)
53+
exitf("apply failed: %+v", err)
5354
}
54-
log.Println("applied")
55+
fmt.Fprintf(os.Stderr, "applied")
5556
},
5657
}
5758

‎oomcli/cmd/edit_group.go‎

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

33
import (
44
"context"
5-
"log"
5+
"fmt"
6+
"os"
67

78
"github.com/spf13/cobra"
89

@@ -26,7 +27,7 @@ var editGroupCmd = &cobra.Command{
2627
}
2728

2829
if len(args) > 1 {
29-
log.Fatalf("argument at most one, got %d", len(args))
30+
exitf("argument at most one, got %d", len(args))
3031
} else if len(args) == 1 {
3132
editGroupOpt.groupName = &args[0]
3233
}
@@ -38,18 +39,18 @@ var editGroupCmd = &cobra.Command{
3839

3940
groups, err := queryGroups(ctx, oomStore, editGroupOpt.entityName, editGroupOpt.groupName)
4041
if err != nil {
41-
log.Fatal(err)
42+
exit(err)
4243
}
4344

4445
fileName, err := writeGroupsToTempFile(ctx, oomStore, groups)
4546
if err != nil {
46-
log.Fatal(err)
47+
exit(err)
4748
}
4849

4950
if err = edit(ctx, oomStore, fileName); err != nil {
50-
log.Fatalf("apply failed: %+v", err)
51+
exitf("apply failed: %+v", err)
5152
}
52-
log.Println("applied")
53+
fmt.Fprintf(os.Stderr, "applied")
5354
},
5455
}
5556

‎oomcli/cmd/export.go‎

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

33
import (
44
"context"
5-
"log"
65

76
"github.com/oom-ai/oomstore/pkg/oomstore/types"
87
"github.com/spf13/cobra"
@@ -25,7 +24,7 @@ var exportCmd = &cobra.Command{
2524
defer oomStore.Close()
2625

2726
if err := export(ctx, oomStore, exportOpt, *exportOutput); err != nil {
28-
log.Fatalf("failed exporting features: %+v\n", err)
27+
exitf("failed exporting features: %+v\n", err)
2928
}
3029
},
3130
}

‎oomcli/cmd/get_meta_entity.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package cmd
33
import (
44
"context"
55
"io"
6-
"log"
76
"os"
87

98
"github.com/spf13/cobra"
@@ -24,7 +23,7 @@ var getMetaEntityCmd = &cobra.Command{
2423
Short: "Get existing entity given specific conditions",
2524
PreRun: func(cmd *cobra.Command, args []string) {
2625
if len(args) > 1 {
27-
log.Fatalf("argument at most one, got %d", len(args))
26+
exitf("argument at most one, got %d", len(args))
2827
} else if len(args) == 1 {
2928
getMetaEntityOpt.entityName = &args[0]
3029
}
@@ -36,11 +35,11 @@ var getMetaEntityCmd = &cobra.Command{
3635

3736
entities, err := queryEntities(ctx, oomStore, getMetaEntityOpt.entityName)
3837
if err != nil {
39-
log.Fatal(err)
38+
exit(err)
4039
}
4140

4241
if err = serializeEntitiesToWriter(ctx, os.Stdout, oomStore, entities, *getMetaOutput); err != nil {
43-
log.Fatalf("failed printing entities, error: %+v\n", err)
42+
exitf("failed printing entities, error: %+v\n", err)
4443
}
4544
},
4645
}

‎oomcli/cmd/get_meta_feature.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"io"
7-
"log"
87
"os"
98

109
"github.com/pkg/errors"
@@ -39,11 +38,11 @@ var getMetaFeatureCmd = &cobra.Command{
3938

4039
features, err := queryFeatures(ctx, oomStore, getMetaFeatureOpt)
4140
if err != nil {
42-
log.Fatal(err)
41+
exit(err)
4342
}
4443

4544
if err := serializeFeatureToWriter(os.Stdout, features, *getMetaOutput); err != nil {
46-
log.Fatalf("failed printing features: %+v\n", err)
45+
exitf("failed printing features: %+v\n", err)
4746
}
4847
},
4948
}

‎oomcli/cmd/get_meta_group.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"io"
7-
"log"
87
"os"
98

109
"github.com/oom-ai/oomstore/pkg/oomstore"
@@ -29,7 +28,7 @@ var getMetaGroupCmd = &cobra.Command{
2928
}
3029

3130
if len(args) > 1 {
32-
log.Fatalf("argument at most one, got %d", len(args))
31+
exitf("argument at most one, got %d", len(args))
3332
} else if len(args) == 1 {
3433
getMetaGroupOpt.groupName = &args[0]
3534
}
@@ -41,11 +40,11 @@ var getMetaGroupCmd = &cobra.Command{
4140

4241
groups, err := queryGroups(ctx, oomStore, getMetaGroupOpt.entityName, getMetaGroupOpt.groupName)
4342
if err != nil {
44-
log.Fatalf("%+v", err)
43+
exitf("%+v", err)
4544
}
4645

4746
if err = serializeGroupToWriter(ctx, os.Stdout, oomStore, groups, *getMetaOutput); err != nil {
48-
log.Fatalf("%+v", err)
47+
exitf("%+v", err)
4948
}
5049
},
5150
}

‎oomcli/cmd/get_meta_revision.go‎

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

33
import (
44
"context"
5-
"log"
65
"os"
76
"strconv"
87

@@ -26,7 +25,7 @@ var getMetaRevisionCmd = &cobra.Command{
2625
},
2726
Run: func(cmd *cobra.Command, args []string) {
2827
if len(args) > 1 {
29-
log.Fatalf("argument at most one, got %d", len(args))
28+
exitf("argument at most one, got %d", len(args))
3029
}
3130

3231
ctx := context.Background()
@@ -38,26 +37,26 @@ var getMetaRevisionCmd = &cobra.Command{
3837
if getRevisionOpt.groupName != nil {
3938
group, err := oomStore.GetGroupByName(ctx, *getRevisionOpt.groupName)
4039
if err != nil {
41-
log.Fatalf("failed to get feature group name=%s: %+v", *getRevisionOpt.groupName, err)
40+
exitf("failed to get feature group name=%s: %+v", *getRevisionOpt.groupName, err)
4241
}
4342
groupID = &group.ID
4443
}
4544

4645
revisions, err := oomStore.ListRevision(ctx, groupID)
4746
if err != nil {
48-
log.Fatalf("failed geting revisions, error %+v\n", err)
47+
exitf("failed geting revisions, error %+v\n", err)
4948
}
5049

5150
if len(args) > 0 {
5251
if revisions = revisions.Filter(func(r *types.Revision) bool {
5352
return strconv.Itoa(r.ID) == args[0]
5453
}); len(revisions) == 0 {
55-
log.Fatalf("revision '%s' not found", args[0])
54+
exitf("revision '%s' not found", args[0])
5655
}
5756
}
5857

5958
if err := serializeMetadata(os.Stdout, revisions, *getMetaOutput, *getMetaWide); err != nil {
60-
log.Fatalf("failed printing entities, error %+v\n", err)
59+
exitf("failed printing entities, error %+v\n", err)
6160
}
6261
},
6362
}

0 commit comments

Comments
 (0)