fix: remove redundant error wrapping in pull request operations (#704)

Copilot · crenshaw-dev · web-flow · commit 0b129efc7acb · 2025-11-19T21:38:02.000-05:00
* Initial plan

* fix: remove redundant error message wrapping in pull request operations

Co-authored-by: crenshaw-dev &lt;350466+crenshaw-dev@users.noreply.github.com&gt;

* test: add test for merge error message format and fix lint issues

Co-authored-by: crenshaw-dev &lt;350466+crenshaw-dev@users.noreply.github.com&gt;

---------

Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: crenshaw-dev &lt;350466+crenshaw-dev@users.noreply.github.com&gt;
diff --git a/internal/controller/pullrequest_controller.go b/internal/controller/pullrequest_controller.go
@@ -206,7 +206,7 @@ func (r *PullRequestReconciler) handleStateTransitions(ctx context.Context, pr *
 	if pr.Status.State == pr.Spec.State {
 		logger.Info("Updating PullRequest")
 		if err := r.updatePullRequest(ctx, *pr, provider); err != nil {
-			return false, fmt.Errorf("failed to update pull request: %w", err)
+			return false, fmt.Errorf("failed to update pull request: %w", err) // Top-level wrap for update errors
 		}
 		return false, nil
 	}
@@ -217,13 +217,13 @@ func (r *PullRequestReconciler) handleStateTransitions(ctx context.Context, pr *
 			// Because status id is empty, we need to create a new pull request
 			logger.Info("Creating PullRequest")
 			if err := r.createPullRequest(ctx, pr, provider); err != nil {
-				return false, fmt.Errorf("failed to create pull request: %w", err)
+				return false, fmt.Errorf("failed to create pull request: %w", err) // Top-level wrap for create errors
 			}
 		}
 	case promoterv1alpha1.PullRequestMerged:
 		logger.Info("Merging PullRequest")
 		if err := r.mergePullRequest(ctx, pr, provider); err != nil {
-			return false, fmt.Errorf("failed to merge pull request: %w", err)
+			return false, fmt.Errorf("failed to merge pull request: %w", err) // Top-level wrap for merge errors
 		}
 		if err := r.Delete(ctx, pr); err != nil {
 			return false, fmt.Errorf("failed to delete PullRequest: %w", err)
@@ -232,7 +232,7 @@ func (r *PullRequestReconciler) handleStateTransitions(ctx context.Context, pr *
 	case promoterv1alpha1.PullRequestClosed:
 		logger.Info("Closing PullRequest")
 		if err := r.closePullRequest(ctx, pr, provider); err != nil {
-			return false, fmt.Errorf("failed to close pull request: %w", err)
+			return false, fmt.Errorf("failed to close pull request: %w", err) // Top-level wrap for close errors
 		}
 		if err := r.Delete(ctx, pr); err != nil {
 			return false, fmt.Errorf("failed to delete PullRequest: %w", err)
@@ -325,7 +325,7 @@ func (r *PullRequestReconciler) handleFinalizer(ctx context.Context, pr *promote
 	// In this case, we can just remove the finalizer without attempting to close the PR.
 	if pr.Status.ID != "" {
 		if err := r.closePullRequest(ctx, pr, provider); err != nil {
-			return false, fmt.Errorf("failed to close pull request: %w", err)
+			return false, fmt.Errorf("failed to close pull request: %w", err) // Top-level wrap for close errors
 		}
 	}
 
@@ -339,7 +339,7 @@ func (r *PullRequestReconciler) handleFinalizer(ctx context.Context, pr *promote
 func (r *PullRequestReconciler) createPullRequest(ctx context.Context, pr *promoterv1alpha1.PullRequest, provider scms.PullRequestProvider) error {
 	id, err := provider.Create(ctx, pr.Spec.Title, pr.Spec.SourceBranch, pr.Spec.TargetBranch, pr.Spec.Description, *pr)
 	if err != nil {
-		return fmt.Errorf("failed to create pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	pr.Status.State = promoterv1alpha1.PullRequestOpen
 	pr.Status.PRCreationTime = metav1.Now()
@@ -356,7 +356,7 @@ func (r *PullRequestReconciler) createPullRequest(ctx context.Context, pr *promo
 
 func (r *PullRequestReconciler) updatePullRequest(ctx context.Context, pr promoterv1alpha1.PullRequest, provider scms.PullRequestProvider) error {
 	if err := provider.Update(ctx, pr.Spec.Title, pr.Spec.Description, pr); err != nil {
-		return fmt.Errorf("failed to update pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	r.Recorder.Event(&pr, "Normal", constants.PullRequestUpdatedReason, fmt.Sprintf("Pull Request %s updated", pr.Name))
 	return nil
@@ -379,7 +379,7 @@ func (r *PullRequestReconciler) mergePullRequest(ctx context.Context, pr *promot
 	pr.Spec.Commit.Message = updatedMessage
 
 	if err := provider.Merge(ctx, *pr); err != nil {
-		return fmt.Errorf("failed to merge pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	pr.Status.State = promoterv1alpha1.PullRequestMerged
 	return nil
@@ -407,7 +407,7 @@ func (r *PullRequestReconciler) closePullRequest(ctx context.Context, pr *promot
 		return nil
 	}
 	if err := provider.Close(ctx, *pr); err != nil {
-		return fmt.Errorf("failed to close pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	pr.Status.State = promoterv1alpha1.PullRequestClosed
 	return nil
diff --git a/internal/controller/pullrequest_controller_test.go b/internal/controller/pullrequest_controller_test.go
@@ -157,6 +157,60 @@ var _ = Describe("PullRequest Controller", func() {
 				g.Expect(pullRequest.Status.Conditions[0].Message).To(ContainSubstring("secret from ScmProvider not found"))
 			}, constants.EventuallyTimeout).Should(Succeed())
 		})
+
+		It("should report merge error without redundant wrapping", func() {
+			By("Creating a PullRequest with invalid merge SHA to trigger merge failure")
+
+			name, scmSecret, scmProvider, gitRepo, pullRequest := pullRequestResources(ctx, "merge-error-message-test")
+
+			typeNamespacedName := types.NamespacedName{
+				Name:      name,
+				Namespace: "default",
+			}
+
+			// Set an invalid merge SHA that won't match the actual source branch HEAD
+			pullRequest.Spec.MergeSha = "0000000000000000000000000000000000000000"
+
+			Expect(k8sClient.Create(ctx, scmSecret)).To(Succeed())
+			Expect(k8sClient.Create(ctx, scmProvider)).To(Succeed())
+			Expect(k8sClient.Create(ctx, gitRepo)).To(Succeed())
+			Expect(k8sClient.Create(ctx, pullRequest)).To(Succeed())
+
+			By("Waiting for PullRequest to be created and open")
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Get(ctx, typeNamespacedName, pullRequest)).To(Succeed())
+				g.Expect(pullRequest.Status.State).To(Equal(promoterv1alpha1.PullRequestOpen))
+				g.Expect(pullRequest.Status.ID).ToNot(BeEmpty())
+			}, constants.EventuallyTimeout).Should(Succeed())
+
+			By("Attempting to merge the PullRequest with invalid SHA")
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Get(ctx, typeNamespacedName, pullRequest)).To(Succeed())
+				pullRequest.Spec.State = promoterv1alpha1.PullRequestMerged
+				g.Expect(k8sClient.Update(ctx, pullRequest)).To(Succeed())
+			}, constants.EventuallyTimeout).Should(Succeed())
+
+			By("Verifying the error message is not redundantly wrapped")
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Get(ctx, typeNamespacedName, pullRequest)).To(Succeed())
+				g.Expect(pullRequest.Status.Conditions).ToNot(BeEmpty())
+				g.Expect(meta.IsStatusConditionFalse(pullRequest.Status.Conditions, string(conditions.Ready))).To(BeTrue())
+				g.Expect(pullRequest.Status.Conditions[0].Reason).To(Equal(string(conditions.ReconciliationError)))
+
+				// The error message should contain "Reconciliation failed" and "failed to merge pull request" only once each
+				message := pullRequest.Status.Conditions[0].Message
+				g.Expect(message).To(ContainSubstring("Reconciliation failed"))
+				g.Expect(message).To(ContainSubstring("failed to merge pull request"))
+
+				// Count occurrences - should not have redundant wrapping
+				// The message should be: "Reconciliation failed: failed to merge pull request: <actual error>"
+				// NOT: "Reconciliation failed: failed to merge pull request: failed to merge pull request: failed to merge pull request: <actual error>"
+				g.Expect(message).ToNot(ContainSubstring("failed to merge pull request: failed to merge pull request"))
+			}, constants.EventuallyTimeout).Should(Succeed())
+
+			By("Cleaning up the PullRequest")
+			Expect(k8sClient.Delete(ctx, pullRequest)).To(Succeed())
+		})
 	})
 
 	Context("When attempting to create a PullRequest with invalid initial state", func() {
diff --git a/internal/scms/fake/pullrequest.go b/internal/scms/fake/pullrequest.go
@@ -183,7 +183,7 @@ func (pr *PullRequest) Merge(ctx context.Context, pullRequest v1alpha1.PullReque
 
 	_, err = pr.runGitCmd(ctx, gitPath, "merge", "--no-ff", "origin/"+pullRequest.Spec.SourceBranch, "-m", pullRequest.Spec.Commit.Message)
 	if err != nil {
-		return fmt.Errorf("failed to merge branch: %w", err)
+		return err
 	}
 
 	_, err = pr.runGitCmd(ctx, gitPath, "push")
diff --git a/internal/scms/forgejo/pullrequest.go b/internal/scms/forgejo/pullrequest.go
@@ -65,7 +65,7 @@ func (pr *PullRequest) Create(ctx context.Context, title, head, base, descriptio
 		metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)
 	}
 	if err != nil {
-		return "", fmt.Errorf("failed to create pull request: %w", err)
+		return "", err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 
 	logger.V(4).Info("forgejo response status", "status", resp.Status)
@@ -100,7 +100,7 @@ func (pr *PullRequest) Update(ctx context.Context, title, description string, pr
 		metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)
 	}
 	if err != nil {
-		return fmt.Errorf("failed to update pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 
 	logger.V(4).Info("forgejo response status", "status", resp.Status)
@@ -140,7 +140,7 @@ func (pr *PullRequest) Close(ctx context.Context, prObj promoterv1alpha1.PullReq
 		metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)
 	}
 	if err != nil {
-		return fmt.Errorf("failed to close pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 
 	logger.V(4).Info("forgejo response status", "status", resp.Status)
@@ -181,7 +181,7 @@ func (pr *PullRequest) Merge(ctx context.Context, prObj promoterv1alpha1.PullReq
 		metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)
 	}
 	if err != nil {
-		return fmt.Errorf("failed to merge pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	logger.V(4).Info("forgejo response status", "status", resp.Status)
 	return nil
diff --git a/internal/scms/github/pullrequest.go b/internal/scms/github/pullrequest.go
@@ -60,7 +60,7 @@ func (pr *PullRequest) Create(ctx context.Context, title, head, base, descriptio
 		metrics.RecordSCMCall(gitRepo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, response.StatusCode, time.Since(start), getRateLimitMetrics(response.Rate))
 	}
 	if err != nil {
-		return "", fmt.Errorf("failed to create pull request: %w", err)
+		return "", err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	logger.Info("github rate limit",
 		"limit", response.Rate.Limit,
@@ -134,7 +134,7 @@ func (pr *PullRequest) Close(ctx context.Context, pullRequest v1alpha1.PullReque
 		metrics.RecordSCMCall(gitRepo, metrics.SCMAPIPullRequest, metrics.SCMOperationClose, response.StatusCode, time.Since(start), getRateLimitMetrics(response.Rate))
 	}
 	if err != nil {
-		return fmt.Errorf("failed to close pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	logger.Info("github rate limit",
 		"limit", response.Rate.Limit,
@@ -176,7 +176,7 @@ func (pr *PullRequest) Merge(ctx context.Context, pullRequest v1alpha1.PullReque
 		metrics.RecordSCMCall(gitRepo, metrics.SCMAPIPullRequest, metrics.SCMOperationMerge, response.StatusCode, time.Since(start), getRateLimitMetrics(response.Rate))
 	}
 	if err != nil {
-		return fmt.Errorf("failed to merge pull request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 	logger.Info("github rate limit",
 		"limit", response.Rate.Limit,
diff --git a/internal/scms/gitlab/pullrequest.go b/internal/scms/gitlab/pullrequest.go
@@ -66,7 +66,7 @@ func (pr *PullRequest) Create(ctx context.Context, title, head, base, desc strin
 		metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)
 	}
 	if err != nil {
-		return "", fmt.Errorf("failed to create pull request: %w", err)
+		return "", err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 
 	logGitLabRateLimitsIfAvailable(
@@ -212,7 +212,7 @@ func (pr *PullRequest) Merge(ctx context.Context, prObj v1alpha1.PullRequest) er
 		metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationMerge, resp.StatusCode, time.Since(start), nil)
 	}
 	if err != nil {
-		return fmt.Errorf("failed to merge request: %w", err)
+		return err //nolint:wrapcheck // Error wrapping handled at top level
 	}
 
 	logGitLabRateLimitsIfAvailable(

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ func (r PullRequestReconciler) handleStateTransitions(ctx context.Context, pr `
`206`	`206`	`if pr.Status.State == pr.Spec.State {`
`207`	`207`	`logger.Info("Updating PullRequest")`
`208`	`208`	`if err := r.updatePullRequest(ctx, *pr, provider); err != nil {`
`209`		`- return false, fmt.Errorf("failed to update pull request: %w", err)`
	`209`	`+ return false, fmt.Errorf("failed to update pull request: %w", err) // Top-level wrap for update errors`
`210`	`210`	`}`
`211`	`211`	`return false, nil`
`212`	`212`	`}`
`@@ -217,13 +217,13 @@ func (r PullRequestReconciler) handleStateTransitions(ctx context.Context, pr `
`217`	`217`	`// Because status id is empty, we need to create a new pull request`
`218`	`218`	`logger.Info("Creating PullRequest")`
`219`	`219`	`if err := r.createPullRequest(ctx, pr, provider); err != nil {`
`220`		`- return false, fmt.Errorf("failed to create pull request: %w", err)`
	`220`	`+ return false, fmt.Errorf("failed to create pull request: %w", err) // Top-level wrap for create errors`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`	`case promoterv1alpha1.PullRequestMerged:`
`224`	`224`	`logger.Info("Merging PullRequest")`
`225`	`225`	`if err := r.mergePullRequest(ctx, pr, provider); err != nil {`
`226`		`- return false, fmt.Errorf("failed to merge pull request: %w", err)`
	`226`	`+ return false, fmt.Errorf("failed to merge pull request: %w", err) // Top-level wrap for merge errors`
`227`	`227`	`}`
`228`	`228`	`if err := r.Delete(ctx, pr); err != nil {`
`229`	`229`	`return false, fmt.Errorf("failed to delete PullRequest: %w", err)`
`@@ -232,7 +232,7 @@ func (r PullRequestReconciler) handleStateTransitions(ctx context.Context, pr `
`232`	`232`	`case promoterv1alpha1.PullRequestClosed:`
`233`	`233`	`logger.Info("Closing PullRequest")`
`234`	`234`	`if err := r.closePullRequest(ctx, pr, provider); err != nil {`
`235`		`- return false, fmt.Errorf("failed to close pull request: %w", err)`
	`235`	`+ return false, fmt.Errorf("failed to close pull request: %w", err) // Top-level wrap for close errors`
`236`	`236`	`}`
`237`	`237`	`if err := r.Delete(ctx, pr); err != nil {`
`238`	`238`	`return false, fmt.Errorf("failed to delete PullRequest: %w", err)`
`@@ -325,7 +325,7 @@ func (r PullRequestReconciler) handleFinalizer(ctx context.Context, pr promote`
`325`	`325`	`// In this case, we can just remove the finalizer without attempting to close the PR.`
`326`	`326`	`if pr.Status.ID != "" {`
`327`	`327`	`if err := r.closePullRequest(ctx, pr, provider); err != nil {`
`328`		`- return false, fmt.Errorf("failed to close pull request: %w", err)`
	`328`	`+ return false, fmt.Errorf("failed to close pull request: %w", err) // Top-level wrap for close errors`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
`@@ -339,7 +339,7 @@ func (r PullRequestReconciler) handleFinalizer(ctx context.Context, pr promote`
`339`	`339`	`func (r PullRequestReconciler) createPullRequest(ctx context.Context, pr promoterv1alpha1.PullRequest, provider scms.PullRequestProvider) error {`
`340`	`340`	`id, err := provider.Create(ctx, pr.Spec.Title, pr.Spec.SourceBranch, pr.Spec.TargetBranch, pr.Spec.Description, *pr)`
`341`	`341`	`if err != nil {`
`342`		`- return fmt.Errorf("failed to create pull request: %w", err)`
	`342`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`343`	`343`	`}`
`344`	`344`	`pr.Status.State = promoterv1alpha1.PullRequestOpen`
`345`	`345`	`pr.Status.PRCreationTime = metav1.Now()`
`@@ -356,7 +356,7 @@ func (r PullRequestReconciler) createPullRequest(ctx context.Context, pr promo`
`356`	`356`
`357`	`357`	`func (r *PullRequestReconciler) updatePullRequest(ctx context.Context, pr promoterv1alpha1.PullRequest, provider scms.PullRequestProvider) error {`
`358`	`358`	`if err := provider.Update(ctx, pr.Spec.Title, pr.Spec.Description, pr); err != nil {`
`359`		`- return fmt.Errorf("failed to update pull request: %w", err)`
	`359`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`360`	`360`	`}`
`361`	`361`	`r.Recorder.Event(&pr, "Normal", constants.PullRequestUpdatedReason, fmt.Sprintf("Pull Request %s updated", pr.Name))`
`362`	`362`	`return nil`
`@@ -379,7 +379,7 @@ func (r PullRequestReconciler) mergePullRequest(ctx context.Context, pr promot`
`379`	`379`	`pr.Spec.Commit.Message = updatedMessage`
`380`	`380`
`381`	`381`	`if err := provider.Merge(ctx, *pr); err != nil {`
`382`		`- return fmt.Errorf("failed to merge pull request: %w", err)`
	`382`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`383`	`383`	`}`
`384`	`384`	`pr.Status.State = promoterv1alpha1.PullRequestMerged`
`385`	`385`	`return nil`
`@@ -407,7 +407,7 @@ func (r PullRequestReconciler) closePullRequest(ctx context.Context, pr promot`
`407`	`407`	`return nil`
`408`	`408`	`}`
`409`	`409`	`if err := provider.Close(ctx, *pr); err != nil {`
`410`		`- return fmt.Errorf("failed to close pull request: %w", err)`
	`410`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`411`	`411`	`}`
`412`	`412`	`pr.Status.State = promoterv1alpha1.PullRequestClosed`
`413`	`413`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func (pr *PullRequest) Merge(ctx context.Context, pullRequest v1alpha1.PullReque`
`183`	`183`
`184`	`184`	`_, err = pr.runGitCmd(ctx, gitPath, "merge", "--no-ff", "origin/"+pullRequest.Spec.SourceBranch, "-m", pullRequest.Spec.Commit.Message)`
`185`	`185`	`if err != nil {`
`186`		`- return fmt.Errorf("failed to merge branch: %w", err)`
	`186`	`+ return err`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`_, err = pr.runGitCmd(ctx, gitPath, "push")`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (pr *PullRequest) Create(ctx context.Context, title, head, base, descriptio`
`65`	`65`	`metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)`
`66`	`66`	`}`
`67`	`67`	`if err != nil {`
`68`		`- return "", fmt.Errorf("failed to create pull request: %w", err)`
	`68`	`+ return "", err //nolint:wrapcheck // Error wrapping handled at top level`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`logger.V(4).Info("forgejo response status", "status", resp.Status)`
`@@ -100,7 +100,7 @@ func (pr *PullRequest) Update(ctx context.Context, title, description string, pr`
`100`	`100`	`metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)`
`101`	`101`	`}`
`102`	`102`	`if err != nil {`
`103`		`- return fmt.Errorf("failed to update pull request: %w", err)`
	`103`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`logger.V(4).Info("forgejo response status", "status", resp.Status)`
`@@ -140,7 +140,7 @@ func (pr *PullRequest) Close(ctx context.Context, prObj promoterv1alpha1.PullReq`
`140`	`140`	`metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)`
`141`	`141`	`}`
`142`	`142`	`if err != nil {`
`143`		`- return fmt.Errorf("failed to close pull request: %w", err)`
	`143`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`logger.V(4).Info("forgejo response status", "status", resp.Status)`
`@@ -181,7 +181,7 @@ func (pr *PullRequest) Merge(ctx context.Context, prObj promoterv1alpha1.PullReq`
`181`	`181`	`metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)`
`182`	`182`	`}`
`183`	`183`	`if err != nil {`
`184`		`- return fmt.Errorf("failed to merge pull request: %w", err)`
	`184`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`185`	`185`	`}`
`186`	`186`	`logger.V(4).Info("forgejo response status", "status", resp.Status)`
`187`	`187`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func (pr *PullRequest) Create(ctx context.Context, title, head, base, descriptio`
`60`	`60`	`metrics.RecordSCMCall(gitRepo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, response.StatusCode, time.Since(start), getRateLimitMetrics(response.Rate))`
`61`	`61`	`}`
`62`	`62`	`if err != nil {`
`63`		`- return "", fmt.Errorf("failed to create pull request: %w", err)`
	`63`	`+ return "", err //nolint:wrapcheck // Error wrapping handled at top level`
`64`	`64`	`}`
`65`	`65`	`logger.Info("github rate limit",`
`66`	`66`	`"limit", response.Rate.Limit,`
`@@ -134,7 +134,7 @@ func (pr *PullRequest) Close(ctx context.Context, pullRequest v1alpha1.PullReque`
`134`	`134`	`metrics.RecordSCMCall(gitRepo, metrics.SCMAPIPullRequest, metrics.SCMOperationClose, response.StatusCode, time.Since(start), getRateLimitMetrics(response.Rate))`
`135`	`135`	`}`
`136`	`136`	`if err != nil {`
`137`		`- return fmt.Errorf("failed to close pull request: %w", err)`
	`137`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`138`	`138`	`}`
`139`	`139`	`logger.Info("github rate limit",`
`140`	`140`	`"limit", response.Rate.Limit,`
`@@ -176,7 +176,7 @@ func (pr *PullRequest) Merge(ctx context.Context, pullRequest v1alpha1.PullReque`
`176`	`176`	`metrics.RecordSCMCall(gitRepo, metrics.SCMAPIPullRequest, metrics.SCMOperationMerge, response.StatusCode, time.Since(start), getRateLimitMetrics(response.Rate))`
`177`	`177`	`}`
`178`	`178`	`if err != nil {`
`179`		`- return fmt.Errorf("failed to merge pull request: %w", err)`
	`179`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`180`	`180`	`}`
`181`	`181`	`logger.Info("github rate limit",`
`182`	`182`	`"limit", response.Rate.Limit,`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func (pr *PullRequest) Create(ctx context.Context, title, head, base, desc strin`
`66`	`66`	`metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationCreate, resp.StatusCode, time.Since(start), nil)`
`67`	`67`	`}`
`68`	`68`	`if err != nil {`
`69`		`- return "", fmt.Errorf("failed to create pull request: %w", err)`
	`69`	`+ return "", err //nolint:wrapcheck // Error wrapping handled at top level`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`logGitLabRateLimitsIfAvailable(`
`@@ -212,7 +212,7 @@ func (pr *PullRequest) Merge(ctx context.Context, prObj v1alpha1.PullRequest) er`
`212`	`212`	`metrics.RecordSCMCall(repo, metrics.SCMAPIPullRequest, metrics.SCMOperationMerge, resp.StatusCode, time.Since(start), nil)`
`213`	`213`	`}`
`214`	`214`	`if err != nil {`
`215`		`- return fmt.Errorf("failed to merge request: %w", err)`
	`215`	`+ return err //nolint:wrapcheck // Error wrapping handled at top level`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`logGitLabRateLimitsIfAvailable(`