ensure we only run check for events that are refs changed

Signed-off-by: Ryan Currah <[email protected]>

eventsources/sources/bitbucketserver/start.go

@@ -30,6 +30,7 @@ import (
 
 	bitbucketv1 "github.com/gfleury/go-bitbucket-v1"
 	"github.com/mitchellh/mapstructure"
+	"golang.org/x/exp/slices"
 
 	"github.com/argoproj/argo-events/common"
 	"github.com/argoproj/argo-events/common/logging"
@@ -94,13 +95,13 @@ func (router *Router) HandleRoute(writer http.ResponseWriter, request *http.Requ
 		return
 	}
 
-	// When enabled and webhook event type is repo:refs_changed, checks if a pull request is opened for the commit,
-	// if one is opened the event will be skipped.
-	if bitbucketserverEventSource.SkipRefsOnOpenPullRequest {
+	// When SkipRefsOnOpenPullRequest is enabled and webhook event type is repo:refs_changed,
+	// check if a Pull Request is opened for the commit, if one is opened the event will be skipped.
+	if bitbucketserverEventSource.SkipRefsOnOpenPullRequest && slices.Contains(bitbucketserverEventSource.Events, "repo:refs_changed") {
 		refsChanged := refsChangedWebhookEvent{}
 		err := json.Unmarshal(body, &refsChanged)
 		if err != nil {
-			logger.Errorf("unable to inspect webhook body", zap.Error(err))
+			logger.Errorf("failed to read webhook body", zap.Error(err))
 			common.SendErrorResponse(writer, err.Error())
 			route.Metrics.EventProcessingFailed(route.EventSourceName, route.EventName)
 			return
@@ -110,14 +111,14 @@ func (router *Router) HandleRoute(writer http.ResponseWriter, request *http.Requ
 		if refsChanged.EventKey == "repo:refs_changed" && len(refsChanged.Changes) > 0 && refsChanged.Changes[0].Type != "DELETE" {
 			hasOpenPR, err := router.refsChangedHasOpenPullRequest(refsChanged)
 			if err != nil {
-				logger.Errorf("unable to check if changed ref has an open pull request", zap.Error(err))
+				logger.Errorf("failed to check if changed ref has an open pull request", zap.Error(err))
 				common.SendErrorResponse(writer, err.Error())
 				route.Metrics.EventProcessingFailed(route.EventSourceName, route.EventName)
 				return
 			}
 
 			// Do not publish an event if a Pull Request is already opened since we will
-			// receive a pr:from_ref_updated event which would start multiple workflows
+			// receive a pr:from_ref_updated event, which would start multiple workflows
 			if hasOpenPR {
 				logger.Info("request successfully processed")
 				common.SendSuccessResponse(writer, "success")