fix: commit status for unauthorized user in Bitbucket Data Center

For unauthorized users waiting for /ok-to-test approval, build status
was incorrectly showing as "running" instead of "pending". This was
caused by the CreateStatus function setting statusOpts.Conclusion to
"UNKNOWN" when statusOpts.Status was "queued", instead of preserving
the "pending" conclusion.

The fix ensures that when status is "queued" and conclusion is "pending",
the pending state is preserved, resulting in the correct "pending" build
status in Bitbucket Data Center while waiting for repository admin
approval via /ok-to-test comment.

fixes: openshift-pipelines#2148

JIRA: https://issues.redhat.com/browse/SRVKP-8269

Signed-off-by: Zaki Shaikh <[email protected]>

Author: zakisk

pkg/provider/bitbucketdatacenter/bitbucketdatacenter.go

@@ -101,8 +101,12 @@ func (v *Provider) CreateStatus(ctx context.Context, event *info.Event, statusOp
 		statusOpts.Conclusion = "FAILED"
 		statusOpts.Title = "❌ Failed"
 	case "pending":
-		statusOpts.Conclusion = "INPROGRESS"
-		statusOpts.Title = "⚡ CI has started"
+		if statusOpts.Status == "queued" {
+			statusOpts.Conclusion = "UNKNOWN"
+		} else {
+			statusOpts.Conclusion = "INPROGRESS"
+			statusOpts.Title = "⚡ CI has started"
+		}
 	case "success":
 		statusOpts.Conclusion = "SUCCESSFUL"
 		statusOpts.Title = "Commit has been validated"
@@ -119,18 +123,18 @@ func (v *Provider) CreateStatus(ctx context.Context, event *info.Event, statusOp
 
 	key := statusOpts.PipelineRunName
 	if key == "" {
-		key = statusOpts.Conclusion
+		key = statusOpts.Title
 	}
 
 	if v.pacInfo.ApplicationName != "" {
-		key = fmt.Sprintf("%s/%s", v.pacInfo.ApplicationName, key)
+		key = fmt.Sprintf("%s / %s", v.pacInfo.ApplicationName, key)
 	}
 
 	OrgAndRepo := fmt.Sprintf("%s/%s", event.Organization, event.Repository)
 	opts := &scm.StatusInput{
 		State: convertState(statusOpts.Conclusion),
 		Label: key,
-		Desc:  statusOpts.Title,
+		Desc:  statusOpts.Text,
 		Link:  detailsURL,
 	}
 	_, _, err := v.Client().Repositories.CreateStatus(ctx, OrgAndRepo, event.SHA, opts)
@@ -167,6 +171,8 @@ func convertState(from string) scm.State {
 		return scm.StatePending
 	case "SUCCESSFUL":
 		return scm.StateSuccess
+	case "UNKNOWN":
+		return scm.StateUnknown
 	default:
 		return scm.StateUnknown
 	}

pkg/provider/bitbucketdatacenter/bitbucketdatacenter_test.go

@@ -111,7 +111,6 @@ func TestCreateStatus(t *testing.T) {
 	tests := []struct {
 		name                  string
 		status                provider.StatusOpts
-		expectedDescSubstr    string
 		expectedCommentSubstr string
 		pacOpts               info.PacOpts
 		nilClient             bool
@@ -126,69 +125,86 @@ func TestCreateStatus(t *testing.T) {
 			name: "good/skipped",
 			status: provider.StatusOpts{
 				Conclusion: "skipped",
+				Text:       "Skipping",
 			},
-			expectedDescSubstr: "Skipping",
-			pacOpts:            pacopts,
+
+			pacOpts: pacopts,
 		},
 		{
 			name: "good/neutral",
 			status: provider.StatusOpts{
 				Conclusion: "neutral",
+				Text:       "stopped",
 			},
-			expectedDescSubstr: "stopped",
-			pacOpts:            pacopts,
+
+			pacOpts: pacopts,
 		},
 		{
 			name: "good/completed with comment",
 			status: provider.StatusOpts{
 				Conclusion: "success",
 				Status:     "completed",
-				Text:       "Happy as a bunny",
+				Text:       "validated",
 			},
-			expectedDescSubstr:    "validated",
+
 			expectedCommentSubstr: "Happy as a bunny",
 			pacOpts:               pacopts,
 		},
 		{
 			name: "good/failed",
 			status: provider.StatusOpts{
 				Conclusion: "failure",
+				Text:       "Failed",
 			},
-			expectedDescSubstr: "Failed",
-			pacOpts:            pacopts,
+
+			pacOpts: pacopts,
 		},
 		{
 			name: "good/details url",
 			status: provider.StatusOpts{
 				Conclusion: "failure",
 				DetailsURL: "http://fail.com",
+				Text:       "Failed",
 			},
-			expectedDescSubstr: "Failed",
-			pacOpts:            pacopts,
+
+			pacOpts: pacopts,
 		},
 		{
 			name: "good/pending",
 			status: provider.StatusOpts{
 				Conclusion: "pending",
+				Text:       "started",
 			},
-			expectedDescSubstr: "started",
-			pacOpts:            pacopts,
+
+			pacOpts: pacopts,
 		},
 		{
 			name: "good/success",
 			status: provider.StatusOpts{
 				Conclusion: "success",
+				Text:       "validated",
 			},
-			expectedDescSubstr: "validated",
-			pacOpts:            pacopts,
+
+			pacOpts: pacopts,
 		},
 		{
 			name: "good/completed",
 			status: provider.StatusOpts{
 				Conclusion: "completed",
+				Text:       "Completed",
 			},
-			expectedDescSubstr: "Completed",
-			pacOpts:            pacopts,
+
+			pacOpts: pacopts,
+		},
+		{
+			name: "good/pending",
+			status: provider.StatusOpts{
+				Conclusion: "pending",
+				Status:     "queued",
+				Text:       "Pending approval, waiting for an /ok-to-test",
+			},
+
+			pacOpts: pacopts,
 		},
 	}
 	for _, tt := range tests {
@@ -210,7 +226,7 @@ func TestCreateStatus(t *testing.T) {
 				run:               &params.Run{},
 				pacInfo:           &tt.pacOpts,
 			}
-			bbtest.MuxCreateAndTestCommitStatus(t, mux, event, tt.expectedDescSubstr, tt.status)
+			bbtest.MuxCreateAndTestCommitStatus(t, mux, event, tt.status.Text, tt.status)
 			bbtest.MuxCreateComment(t, mux, event, tt.expectedCommentSubstr, pullRequestNumber)
 			err := v.CreateStatus(ctx, event, tt.status)
 			if tt.wantErrSubstr != "" {