Merge pull request #448 from andreaskaris/issue447

dave-tucker · web-flow · commit 642adfde5e43 · 2025-07-02T12:47:55.000+01:00
BpfApplicationReconcilers: wrap loadRequest error
diff --git a/controllers/bpfman-agent/cl_application_program.go b/controllers/bpfman-agent/cl_application_program.go
@@ -742,7 +742,7 @@ func (r *ClBpfApplicationReconciler) getLoadRequest() (*gobpfman.LoadRequest, er
 func (r *ClBpfApplicationReconciler) load(ctx context.Context) error {
 	loadRequest, err := r.getLoadRequest()
 	if err != nil {
-		return fmt.Errorf("failed to get LoadRequest")
+		return fmt.Errorf("failed to get LoadRequest: %w", err)
 	}
 
 	loadResponse, err := r.BpfmanClient.Load(ctx, loadRequest)
diff --git a/controllers/bpfman-agent/ns_application_program.go b/controllers/bpfman-agent/ns_application_program.go
@@ -659,7 +659,7 @@ func (r *NsBpfApplicationReconciler) getLoadRequest() (*gobpfman.LoadRequest, er
 func (r *NsBpfApplicationReconciler) load(ctx context.Context) error {
 	loadRequest, err := r.getLoadRequest()
 	if err != nil {
-		return fmt.Errorf("failed to get LoadRequest")
+		return fmt.Errorf("failed to get LoadRequest: %w", err)
 	}
 
 	loadResponse, err := r.BpfmanClient.Load(ctx, loadRequest)

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ func (r ClBpfApplicationReconciler) getLoadRequest() (gobpfman.LoadRequest, er`
`742`	`742`	`func (r *ClBpfApplicationReconciler) load(ctx context.Context) error {`
`743`	`743`	`loadRequest, err := r.getLoadRequest()`
`744`	`744`	`if err != nil {`
`745`		`- return fmt.Errorf("failed to get LoadRequest")`
	`745`	`+ return fmt.Errorf("failed to get LoadRequest: %w", err)`
`746`	`746`	`}`
`747`	`747`
`748`	`748`	`loadResponse, err := r.BpfmanClient.Load(ctx, loadRequest)`
Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ func (r NsBpfApplicationReconciler) getLoadRequest() (gobpfman.LoadRequest, er`
`659`	`659`	`func (r *NsBpfApplicationReconciler) load(ctx context.Context) error {`
`660`	`660`	`loadRequest, err := r.getLoadRequest()`
`661`	`661`	`if err != nil {`
`662`		`- return fmt.Errorf("failed to get LoadRequest")`
	`662`	`+ return fmt.Errorf("failed to get LoadRequest: %w", err)`
`663`	`663`	`}`
`664`	`664`
`665`	`665`	`loadResponse, err := r.BpfmanClient.Load(ctx, loadRequest)`