fix(bitbucket-cloud): resolve CEL expression failure on push events

Bitbucket Cloud push events set processedEvent.Event to the string
"push", but CEL evaluation expects Event to be a JSON object
(map[string]interface{}). This caused all CEL expressions to fail
with "cannot unmarshal string into Go value of type
map[string]interface{}". Remove the incorrect Event assignment and
use triggertype constants for TriggerTarget and EventType.

Signed-off-by: Zaki Shaikh <zashaikh@redhat.com>

Author: zakisk

pkg/provider/bitbucketcloud/parse_payload.go

@@ -148,9 +148,8 @@ func (v *Provider) ParsePayload(ctx context.Context, run *params.Run, request *h
 		processedEvent.PullRequestNumber = e.PullRequest.ID
 		processedEvent.PullRequestTitle = e.PullRequest.Title
 	case *types.PushRequestEvent:
-		processedEvent.Event = "push"
-		processedEvent.TriggerTarget = "push"
-		processedEvent.EventType = "push"
+		processedEvent.TriggerTarget = triggertype.Push
+		processedEvent.EventType = triggertype.Push.String()
 		processedEvent.Organization = e.Repository.Workspace.Slug
 		processedEvent.Repository = strings.Split(e.Repository.FullName, "/")[1]
 		processedEvent.SHA = e.Push.Changes[0].New.Target.Hash

pkg/provider/bitbucketcloud/parse_payload_test.go

@@ -265,6 +265,7 @@ func TestParsePayload(t *testing.T) {
 			assert.Equal(t, tt.expectedSender, got.Sender)
 			assert.Equal(t, tt.expectedSHA, got.SHA, "%s != %s", tt.expectedSHA, got.SHA)
 			assert.Equal(t, tt.expectedEventType, got.EventType, "%s != %s", tt.expectedEventType, got.EventType)
+			assert.Assert(t, got.Event != nil)
 
 			if tt.expectedRef != "" {
 				assert.Equal(t, tt.expectedRef, got.BaseBranch, tt.expectedRef, got.BaseBranch)

test/bitbucket_cloud_pullrequest_test.go

@@ -107,6 +107,42 @@ func TestBitbucketCloudPullRequestCancelInProgressMerged(t *testing.T) {
 	assert.Equal(t, prs.Items[0].GetStatusCondition().GetCondition(apis.ConditionSucceeded).GetReason(), "Cancelled", "should have been cancelled")
 }
 
+func TestBitbucketCloudCELExpressionOnPush(t *testing.T) {
+	targetNS := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-ns")
+	ctx := context.Background()
+
+	runcnx, opts, bprovider, err := tbb.Setup(ctx)
+	if err != nil {
+		t.Skip(err.Error())
+		return
+	}
+	bcrepo := tbb.CreateCRD(ctx, t, bprovider, runcnx, opts, targetNS)
+	targetRefName := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-test")
+	title := "TestPullRequest - " + targetRefName
+
+	entries, err := payload.GetEntries(
+		map[string]string{".tekton/pipelinerun.yaml": "testdata/pipelinerun-cel-expression.yaml"},
+		targetNS, targetRefName, triggertype.Push.String(), map[string]string{})
+	assert.NilError(t, err)
+
+	repobranch, err := tbb.MakePush(t, bprovider, runcnx, bcrepo, opts, title, targetRefName, entries)
+	assert.NilError(t, err)
+	defer tbb.TearDown(ctx, t, runcnx, bprovider, opts, -1, repobranch.Name, targetNS, false)
+
+	hash, ok := repobranch.Target["hash"].(string)
+	assert.Assert(t, ok)
+
+	sopt := twait.SuccessOpt{
+		TargetNS:        targetNS,
+		OnEvent:         triggertype.Push.String(),
+		NumberofPRMatch: 1,
+		SHA:             hash,
+		Title:           title,
+		MinNumberStatus: 1,
+	}
+	twait.Succeeded(ctx, t, runcnx, opts, sopt)
+}
+
 // Local Variables:
 // compile-command: "go test -tags=e2e -v -run TestBitbucketCloudPullRequest$ ."
 // End:

test/pkg/bitbucketcloud/pr.go

@@ -17,6 +17,29 @@ import (
 func MakePR(t *testing.T, bprovider bitbucketcloud.Provider, runcnx *params.Run, bcrepo *bitbucket.Repository, opts options.E2E, title, targetRefName string,
 	entries map[string]string,
 ) (*types.PullRequest, *bitbucket.RepositoryBranch) {
+	repobranch, err := MakePush(t, bprovider, runcnx, bcrepo, opts, title, targetRefName, entries)
+	assert.NilError(t, err)
+
+	intf, err := bprovider.Client().Repositories.PullRequests.Create(&bitbucket.PullRequestsOptions{
+		Owner:        opts.Organization,
+		RepoSlug:     opts.Repo,
+		Title:        title,
+		Message:      "A new PR for testing",
+		SourceBranch: targetRefName,
+	})
+	assert.NilError(t, err)
+
+	pr := &types.PullRequest{}
+	err = mapstructure.Decode(intf, pr)
+	assert.NilError(t, err)
+	runcnx.Clients.Log.Infof("Created PR %s", pr.Links.HTML.HRef)
+
+	return pr, repobranch
+}
+
+func MakePush(t *testing.T, bprovider bitbucketcloud.Provider, runcnx *params.Run, bcrepo *bitbucket.Repository, opts options.E2E, title, targetRefName string,
+	entries map[string]string,
+) (*bitbucket.RepositoryBranch, error) {
 	commitAuthor := "OpenShift Pipelines E2E test"
 	commitEmail := "e2e-pipelines@redhat.com"
 
@@ -38,29 +61,20 @@ func MakePR(t *testing.T, bprovider bitbucketcloud.Provider, runcnx *params.Run,
 		Branch:   targetRefName,
 		Author:   fmt.Sprintf("%s <%s>", commitAuthor, commitEmail),
 	})
-	assert.NilError(t, err)
+	if err != nil {
+		return nil, err
+	}
+
 	runcnx.Clients.Log.Infof("Using repo %s branch %s", bcrepo.Full_name, targetRefName)
 
 	repobranch, err := bprovider.Client().Repositories.Repository.GetBranch(&bitbucket.RepositoryBranchOptions{
 		Owner:      opts.Organization,
 		RepoSlug:   opts.Repo,
 		BranchName: targetRefName,
 	})
-	assert.NilError(t, err)
-
-	intf, err := bprovider.Client().Repositories.PullRequests.Create(&bitbucket.PullRequestsOptions{
-		Owner:        opts.Organization,
-		RepoSlug:     opts.Repo,
-		Title:        title,
-		Message:      "A new PR for testing",
-		SourceBranch: targetRefName,
-	})
-	assert.NilError(t, err)
-
-	pr := &types.PullRequest{}
-	err = mapstructure.Decode(intf, pr)
-	assert.NilError(t, err)
-	runcnx.Clients.Log.Infof("Created PR %s", pr.Links.HTML.HRef)
+	if err != nil {
+		return nil, err
+	}
 
-	return pr, repobranch
+	return repobranch, nil
 }

test/pkg/bitbucketcloud/setup.go

@@ -60,19 +60,23 @@ func TearDown(ctx context.Context, t *testing.T, runcnx *params.Run, bprovider b
 		runcnx.Clients.Log.Infof("Not cleaning up and closing PR since TEST_NOCLEANUP is set")
 		return
 	}
-	runcnx.Clients.Log.Infof("Closing PR #%d", prNumber)
-	_, err := bprovider.Client().Repositories.PullRequests.Decline(&bitbucket.PullRequestsOptions{
-		ID:       fmt.Sprintf("%d", prNumber),
-		Owner:    opts.Organization,
-		RepoSlug: opts.Repo,
-	})
-	if noerror {
-		runcnx.Clients.Log.Infof("Error closing PR #%d: %v", prNumber, err)
-	} else {
-		assert.NilError(t, err)
+
+	if prNumber != -1 {
+		runcnx.Clients.Log.Infof("Closing PR #%d", prNumber)
+		_, err := bprovider.Client().Repositories.PullRequests.Decline(&bitbucket.PullRequestsOptions{
+			ID:       fmt.Sprintf("%d", prNumber),
+			Owner:    opts.Organization,
+			RepoSlug: opts.Repo,
+		})
+		if noerror {
+			runcnx.Clients.Log.Infof("Error closing PR #%d: %v", prNumber, err)
+		} else {
+			assert.NilError(t, err)
+		}
 	}
+
 	runcnx.Clients.Log.Infof("Deleting ref %s", ref)
-	err = bprovider.Client().Repositories.Repository.DeleteBranch(
+	err := bprovider.Client().Repositories.Repository.DeleteBranch(
 		&bitbucket.RepositoryBranchDeleteOptions{
 			Owner:    opts.Organization,
 			RepoSlug: opts.Repo,

test/testdata/pipelinerun-cel-expression.yaml

@@ -0,0 +1,18 @@
+---
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: "\\ .PipelineName //"
+  annotations:
+    pipelinesascode.tekton.dev/target-namespace: "\\ .TargetNamespace //"
+    pipelinesascode.tekton.dev/on-cel-expression: >-
+      event == "\\ .TargetEvent //" && target_branch == "\\ .TargetBranch //"
+spec:
+  pipelineSpec:
+    tasks:
+      - name: cel-expression-task
+        taskSpec:
+          steps:
+            - name: test-cel-expression-values
+              image: registry.access.redhat.com/ubi10/ubi-micro
+              command: ["/bin/echo", "HELLOMOTO"]