Revert "[BIVS-3417] add repo URLs to build trigger requests for Bitbucket Ser…" (#233)

This reverts commit 19fa968.

Author: molnarm

service/hook/bitbucketserver/bitbucketserver.go

@@ -66,19 +66,12 @@ type UserInfoModel struct {
 
 // RepositoryInfoModel ...
 type RepositoryInfoModel struct {
-	Slug    string                 `json:"slug"`
-	ID      int                    `json:"id"`
-	Name    string                 `json:"name"`
-	Public  bool                   `json:"public"`
-	Scm     string                 `json:"scmId"`
-	Project ProjectInfoModel       `json:"project"`
-	Links   map[string][]LinkModel `json:"links"`
-}
-
-// LinkModel ...
-type LinkModel struct {
-	Name string `json:"name"`
-	Href string `json:"href"`
+	Slug    string           `json:"slug"`
+	ID      int              `json:"id"`
+	Name    string           `json:"name"`
+	Public  bool             `json:"public"`
+	Scm     string           `json:"scmId"`
+	Project ProjectInfoModel `json:"project"`
 }
 
 // CommitModel ...
@@ -223,11 +216,10 @@ func transformPushEvent(pushEvent PushEventModel) hookCommon.TransformResultMode
 
 			aTriggerAPIParams := bitriseapi.TriggerAPIParamsModel{
 				BuildParams: bitriseapi.BuildParamsModel{
-					Branch:            aChange.Ref.DisplayID,
-					CommitHash:        aChange.ToHash,
-					CommitMessage:     headCommmitMessage,
-					CommitMessages:    allCommitMessages,
-					BaseRepositoryURL: pushEvent.RepositoryInfo.getRepositoryURL(),
+					Branch:         aChange.Ref.DisplayID,
+					CommitHash:     aChange.ToHash,
+					CommitMessage:  headCommmitMessage,
+					CommitMessages: allCommitMessages,
 				},
 				TriggeredBy: hookCommon.GenerateTriggeredBy(ProviderID, pushEvent.Actor.Name),
 			}
@@ -242,11 +234,10 @@ func transformPushEvent(pushEvent PushEventModel) hookCommon.TransformResultMode
 
 			aTriggerAPIParams := bitriseapi.TriggerAPIParamsModel{
 				BuildParams: bitriseapi.BuildParamsModel{
-					Tag:               aChange.Ref.DisplayID,
-					CommitHash:        aChange.ToHash,
-					CommitMessage:     headCommmitMessage,
-					CommitMessages:    allCommitMessages,
-					BaseRepositoryURL: pushEvent.RepositoryInfo.getRepositoryURL(),
+					Tag:            aChange.Ref.DisplayID,
+					CommitHash:     aChange.ToHash,
+					CommitMessage:  headCommmitMessage,
+					CommitMessages: allCommitMessages,
 				},
 				TriggeredBy: hookCommon.GenerateTriggeredBy(ProviderID, pushEvent.Actor.Name),
 			}
@@ -288,42 +279,23 @@ func transformPullRequestEvent(pullRequest PullRequestEventModel) hookCommon.Tra
 		TriggerAPIParams: []bitriseapi.TriggerAPIParamsModel{
 			{
 				BuildParams: bitriseapi.BuildParamsModel{
-					CommitMessage:            commitMsg,
-					CommitHash:               pullRequest.PullRequest.FromRef.LatestCommit,
-					Branch:                   pullRequest.PullRequest.FromRef.DisplayID,
-					BranchRepoOwner:          pullRequest.PullRequest.FromRef.Repository.Project.Key,
-					BranchDest:               pullRequest.PullRequest.ToRef.DisplayID,
-					BranchDestRepoOwner:      pullRequest.PullRequest.ToRef.Repository.Project.Key,
-					PullRequestID:            &pullRequest.PullRequest.ID,
-					BaseRepositoryURL:        pullRequest.PullRequest.ToRef.Repository.getRepositoryURL(),
-					HeadRepositoryURL:        pullRequest.PullRequest.FromRef.Repository.getRepositoryURL(),
-					PullRequestRepositoryURL: pullRequest.PullRequest.FromRef.Repository.getRepositoryURL(),
-					PullRequestAuthor:        pullRequest.PullRequest.Author.User.Name,
-					PullRequestComment:       comment,
-					PullRequestCommentID:     commentID,
+					CommitMessage:        commitMsg,
+					CommitHash:           pullRequest.PullRequest.FromRef.LatestCommit,
+					Branch:               pullRequest.PullRequest.FromRef.DisplayID,
+					BranchRepoOwner:      pullRequest.PullRequest.FromRef.Repository.Project.Key,
+					BranchDest:           pullRequest.PullRequest.ToRef.DisplayID,
+					BranchDestRepoOwner:  pullRequest.PullRequest.ToRef.Repository.Project.Key,
+					PullRequestID:        &pullRequest.PullRequest.ID,
+					PullRequestAuthor:    pullRequest.PullRequest.Author.User.Name,
+					PullRequestComment:   comment,
+					PullRequestCommentID: commentID,
 				},
 				TriggeredBy: hookCommon.GenerateTriggeredBy(ProviderID, pullRequest.Actor.Name),
 			},
 		},
 	}
 }
 
-func (repository RepositoryInfoModel) getRepositoryURL() string {
-	if cloneLinks, ok := repository.Links["clone"]; ok {
-		for _, link := range cloneLinks {
-			if link.Name == "ssh" && !repository.Public {
-				return link.Href
-			}
-
-			if link.Name == "http" && repository.Public {
-				return link.Href
-			}
-		}
-	}
-
-	return ""
-}
-
 func isAcceptEventType(eventKey string) bool {
 	return slices.Contains([]string{"repo:refs_changed", "pr:opened", "pr:modified", "pr:merged", "diagnostics:ping", "pr:from_ref_updated", "pr:comment:added", "pr:comment:edited"}, eventKey)
 }