Skip to content

Commit 2138bf5

Browse files
committed
unify error handling accross all commands
- change in dpservice-go library: unified the return values of gRPC functions - this fixes #639; empty struct is now always returned and accessing Status.Code field doesn't crash dpservice-cli - changes in dpservice-cli: removed checking for Status.Code as it is handled by error value - removed the check of Status.Code from RenderList(), Status is checked before, errorous Lists are not rendered and error is returned
1 parent 34fac0e commit 2138bf5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+81
-86
lines changed

cli/dpservice-cli/cmd/capture_start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func RunCaptureStart(ctx context.Context, dpdkClientFactory DPDKClientFactory, r
148148
},
149149
})
150150

151-
if err != nil && capture.Status.Code == 0 {
151+
if err != nil {
152152
return fmt.Errorf("error initializing packet capturing: %w", err)
153153
}
154154

cli/dpservice-cli/cmd/capture_status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func RunCaptureStatus(
4646
}()
4747

4848
capture, err := client.CaptureStatus(ctx)
49-
if err != nil && capture.Status.Code == 0 {
49+
if err != nil {
5050
return fmt.Errorf("error checking initialization status: %w", err)
5151
}
5252

cli/dpservice-cli/cmd/capture_stop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func RunCaptureStop(ctx context.Context, dpdkClientFactory DPDKClientFactory, re
4141

4242
captureStop, err := dpdkClient.CaptureStop(ctx)
4343

44-
if err != nil && captureStop.Status.Code == 0 {
44+
if err != nil {
4545
return fmt.Errorf("error stopping capturing: %w", err)
4646
}
4747

cli/dpservice-cli/cmd/common.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,13 @@ func (o *RendererOptions) RenderObject(operation string, w io.Writer, obj api.Ob
158158
}
159159

160160
func (o *RendererOptions) RenderList(operation string, w io.Writer, list api.List) error {
161-
if list.GetStatus().Code != 0 {
162-
operation = fmt.Sprintf("server error: %d, %s", list.GetStatus().Code, list.GetStatus().Message)
163-
if o.Output == "table" {
164-
o.Output = "name"
165-
}
166-
}
167161
renderer, err := o.NewRenderer(operation, w)
168162
if err != nil {
169163
return fmt.Errorf("error creating renderer: %w", err)
170164
}
171165
if err := renderer.Render(list); err != nil {
172166
return fmt.Errorf("error rendering %s: %w", list.GetItems()[0].GetKind(), err)
173167
}
174-
if list.GetStatus().Code != 0 {
175-
return fmt.Errorf(strconv.Itoa(apierrors.SERVER_ERROR))
176-
}
177168
return nil
178169
}
179170

cli/dpservice-cli/cmd/create_firewall_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func RunCreateFirewallRule(ctx context.Context, dpdkClientFactory DPDKClientFact
199199
Filter: protocolFilter.Filter},
200200
},
201201
})
202-
if err != nil && fwrule.Status.Code == 0 {
202+
if err != nil {
203203
return fmt.Errorf("error creating firewall rule: %w", err)
204204
}
205205

cli/dpservice-cli/cmd/create_interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func RunCreateInterface(ctx context.Context, dpdkClientFactory DPDKClientFactory
9797
Metering: &api.MeteringParams{TotalRate: opts.TotalMeterRate, PublicRate: opts.PublicMeterRate},
9898
},
9999
})
100-
if err != nil && iface.Status.Code == 0 {
100+
if err != nil {
101101
return fmt.Errorf("error creating interface: %w", err)
102102
}
103103

cli/dpservice-cli/cmd/create_loadbalancer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func RunCreateLoadBalancer(ctx context.Context, dpdkClientFactory DPDKClientFact
9393
Lbports: ports,
9494
},
9595
})
96-
if err != nil && lb.Status.Code == 0 {
96+
if err != nil {
9797
return fmt.Errorf("error creating loadbalancer: %w", err)
9898
}
9999

cli/dpservice-cli/cmd/create_loadbalancer_prefix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func RunCreateLoadBalancerPrefix(
8787
Prefix: opts.Prefix,
8888
},
8989
})
90-
if err != nil && lbprefix.Status.Code == 0 {
90+
if err != nil {
9191
return fmt.Errorf("error creating loadbalancer prefix: %w", err)
9292
}
9393

cli/dpservice-cli/cmd/create_loadbalancer_target.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func RunCreateLoadBalancerTarget(
8484
LoadBalancerTargetMeta: api.LoadBalancerTargetMeta{LoadbalancerID: opts.LoadBalancerID},
8585
Spec: api.LoadBalancerTargetSpec{TargetIP: &opts.TargetIP},
8686
})
87-
if err != nil && lbtarget.Status.Code == 0 {
87+
if err != nil {
8888
return fmt.Errorf("error creating loadbalancer target: %w", err)
8989
}
9090

cli/dpservice-cli/cmd/create_nat.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func RunCreateNat(ctx context.Context, dpdkClientFactory DPDKClientFactory, rend
8585
MaxPort: opts.MaxPort,
8686
},
8787
})
88-
if err != nil && nat.Status.Code == 0 {
88+
if err != nil {
8989
return fmt.Errorf("error creating nat: %w", err)
9090
}
9191

0 commit comments

Comments
 (0)