Skip to content

Commit 787c5ac

Browse files
committed
less panic
1 parent 4b9d2d9 commit 787c5ac

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

cmd/shared.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,17 @@ func ProcessMR(ctx context.Context, cCtx *cli.Context, mr string) error {
4040
return err
4141
}
4242

43-
if evalContext == nil {
43+
if evalContext == nil || !evalContext.IsValid() {
44+
fmt.Println("Evaluating context is empty, does the Merge Request exists?")
45+
4446
return nil
4547
}
4648

4749
fmt.Println("Evaluating context")
4850

4951
matches, err := cfg.Evaluate(evalContext)
5052
if err != nil {
51-
panic(err)
53+
return err
5254
}
5355

5456
// spew.Dump(matches)
@@ -60,15 +62,15 @@ func ProcessMR(ctx context.Context, cCtx *cli.Context, mr string) error {
6062
fmt.Println("Sync labels")
6163

6264
if err := sync(ctx, client, remoteLabels, matches); err != nil {
63-
panic(err)
65+
return err
6466
}
6567

6668
fmt.Println("Done!")
6769

6870
fmt.Println("Updating MR")
6971

7072
if err := apply(ctx, client, matches); err != nil {
71-
panic(err)
73+
return err
7274
}
7375

7476
fmt.Println("Done!")

pkg/scm/gitlab/context.go

+4
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,7 @@ func NewContext(ctx context.Context, baseURL, token string) (*Context, error) {
7474

7575
return evalContext, nil
7676
}
77+
78+
func (c *Context) IsValid() bool {
79+
return c != nil
80+
}

pkg/scm/interfaces.go

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ type MergeRequestClient interface {
2121
}
2222

2323
type EvalContext interface {
24+
IsValid() bool
2425
_isEvalContext()
2526
}
2627

0 commit comments

Comments
 (0)