Merge pull request #722 from fluxcd/fix-bitbucket-panic

stefanprodan · web-flow · commit 333e6c3d0704 · 2024-01-30T16:27:22.000+02:00
Fix BitBucket status update panic
diff --git a/internal/notifier/bitbucketserver.go b/internal/notifier/bitbucketserver.go
@@ -192,10 +192,10 @@ func (b BitbucketServer) duplicateBitbucketServerStatus(ctx context.Context, rev
 
 	// Make a GET call
 	d, err := b.Client.Do(req)
-	if err != nil && d.StatusCode != http.StatusNotFound {
+	if err != nil {
 		return false, fmt.Errorf("failed api call to check duplicate commit status: %w", err)
 	}
-	if isError(d) && d.StatusCode != http.StatusNotFound {
+	if d != nil && isError(d) && d.StatusCode != http.StatusNotFound {
 		defer d.Body.Close()
 		return false, fmt.Errorf("failed api call to check duplicate commit status: %d - %s", d.StatusCode, http.StatusText(d.StatusCode))
 	}

Original file line number	Diff line number	Diff line change
`@@ -192,10 +192,10 @@ func (b BitbucketServer) duplicateBitbucketServerStatus(ctx context.Context, rev`
`192`	`192`
`193`	`193`	`// Make a GET call`
`194`	`194`	`d, err := b.Client.Do(req)`
`195`		`- if err != nil && d.StatusCode != http.StatusNotFound {`
	`195`	`+ if err != nil {`
`196`	`196`	`return false, fmt.Errorf("failed api call to check duplicate commit status: %w", err)`
`197`	`197`	`}`
`198`		`- if isError(d) && d.StatusCode != http.StatusNotFound {`
	`198`	`+ if d != nil && isError(d) && d.StatusCode != http.StatusNotFound {`
`199`	`199`	`defer d.Body.Close()`
`200`	`200`	`return false, fmt.Errorf("failed api call to check duplicate commit status: %d - %s", d.StatusCode, http.StatusText(d.StatusCode))`
`201`	`201`	`}`