fix(vcs): notif bitbucket cloud (#6183)

Signed-off-by: Yvonnick Esnault <[email protected]>
ovh · May 25, 2022 · a070b16 · a070b16
1 parent 3d47f79
commit a070b16
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/engine/api/repositoriesmanager/repositories_manager.go b/engine/api/repositoriesmanager/repositories_manager.go
@@ -25,6 +25,13 @@ import (
 	"github.com/ovh/cds/sdk/telemetry"
 )
 
+func (c *vcsClient) IsBitbucketCloud() bool {
+	if c.vcsProject != nil {
+		return c.vcsProject.Type == "bitbucketcloud"
+	}
+	return false
+}
+
 func (c *vcsClient) IsGerrit(ctx context.Context, db gorp.SqlExecutor) (bool, error) {
 	if c.vcsProject != nil {
 		return c.vcsProject.Type == "gerrit", nil

diff --git a/engine/api/workflow/workflow_run_event.go b/engine/api/workflow/workflow_run_event.go
@@ -119,6 +119,12 @@ loopNotif:
 		NodeName: nodeRun.WorkflowNodeName,
 	})
 
+	if e.vcsClient.IsBitbucketCloud() {
+		if len(expected) > 36 { // 40 maxlength on bitbucket cloud
+			expected = expected[:36]
+		}
+	}
+
 	var statusFound *sdk.VCSCommitStatus
 	for i, status := range statuses {
 		if status.Decription == expected {

diff --git a/engine/vcs/bitbucketcloud/client_status.go b/engine/vcs/bitbucketcloud/client_status.go
@@ -39,7 +39,7 @@ func (client *bitbucketcloudClient) SetStatus(ctx context.Context, event sdk.Eve
 	var err error
 	switch event.EventType {
 	case fmt.Sprintf("%T", sdk.EventRunWorkflowNode{}):
-		data, err = processEventWorkflowNodeRun(event, client.uiURL, disableStatusDetails)
+		data, err = client.processEventWorkflowNodeRun(event, client.uiURL, disableStatusDetails)
 	default:
 		log.Error(ctx, "bitbucketcloud.SetStatus> Unknown event %v", event)
 		return nil
@@ -135,7 +135,7 @@ func processBbitbucketState(s Status) string {
 	}
 }
 
-func processEventWorkflowNodeRun(event sdk.Event, cdsUIURL string, disableStatusDetails bool) (statusData, error) {
+func (client *bitbucketcloudClient) processEventWorkflowNodeRun(event sdk.Event, cdsUIURL string, disableStatusDetails bool) (statusData, error) {
 	data := statusData{}
 	var eventNR sdk.EventRunWorkflowNode
 	if err := sdk.JSONUnmarshal(event.Payload, &eventNR); err != nil {
@@ -180,6 +180,9 @@ func processEventWorkflowNodeRun(event sdk.Event, cdsUIURL string, disableStatus
 	}
 
 	data.context = sdk.VCSCommitStatusDescription(event.ProjectKey, event.WorkflowName, eventNR)
+	if len(data.context) > 36 { // 40 maxlength on bitbucket cloud
+		data.context = data.context[:36]
+	}
 	data.desc = eventNR.NodeName + ": " + eventNR.Status
 	return data, nil
 }
diff --git a/sdk/vcs.go b/sdk/vcs.go
@@ -355,6 +355,7 @@ type VCSAuthorizedClientService interface {
 	VCSAuthorizedClientCommon
 	PullRequests(ctx context.Context, repo string, mods ...VCSRequestModifier) ([]VCSPullRequest, error)
 	IsGerrit(ctx context.Context, db gorp.SqlExecutor) (bool, error)
+	IsBitbucketCloud() bool
 }
 
 type VCSRequestModifier func(r *http.Request)