feat: correctly implement bitbucket & add OpenAIAdapter
This commit is contained in:
101
internal/gitadapters/bitbucket/controller.go
Normal file
101
internal/gitadapters/bitbucket/controller.go
Normal file
@@ -0,0 +1,101 @@
|
||||
package bitbucket
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"git.schreifuchs.ch/schreifuchs/pierre-bot/internal/pierre"
|
||||
)
|
||||
|
||||
func (b *BitbucketAdapter) GetDiff(ctx context.Context, projectKey, repositorySlug string, pullRequestID int) (diff io.ReadCloser, err error) {
|
||||
r, err := b.CreateRequest(
|
||||
ctx,
|
||||
http.MethodGet,
|
||||
nil,
|
||||
"/projects/", projectKey, "repos", repositorySlug, "pull-requests", fmt.Sprintf("%d.diff", pullRequestID),
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
response, err := http.DefaultClient.Do(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if response.StatusCode != http.StatusOK {
|
||||
sb := &strings.Builder{}
|
||||
io.Copy(sb, response.Body)
|
||||
err = fmt.Errorf("error while fetching bitbucket diff staus %d, body %s", response.Status, sb.String())
|
||||
}
|
||||
|
||||
diff = response.Body
|
||||
return
|
||||
}
|
||||
|
||||
func (b *BitbucketAdapter) GetPR(ctx context.Context, projectKey, repositorySlug string, pullRequestID int) (pr PullRequest, err error) {
|
||||
r, err := b.CreateRequest(
|
||||
ctx,
|
||||
http.MethodGet,
|
||||
nil,
|
||||
"/projects/", projectKey, "repos", repositorySlug, "pull-requests", strconv.Itoa(pullRequestID),
|
||||
)
|
||||
|
||||
response, err := http.DefaultClient.Do(r)
|
||||
defer response.Body.Close() // Add this
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
err = json.NewDecoder(response.Body).Decode(&pr)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (b *BitbucketAdapter) AddComment(ctx context.Context, owner, repo string, prID int, comment pierre.Comment) (err error) {
|
||||
// pr, err := b.GetPR(ctx, owner, repo, prID)
|
||||
// if err != nil {
|
||||
// return
|
||||
// }
|
||||
|
||||
commentDTO := Comment{
|
||||
Content: comment.Message,
|
||||
Anchor: Anchor{
|
||||
Path: comment.File,
|
||||
Line: comment.Line,
|
||||
LineType: "ADDED",
|
||||
FileType: "TO",
|
||||
DiffType: "EFFECTIVE",
|
||||
// FromHash: pr.ToRef.LatestCommit,
|
||||
// ToHash: pr.FromRef.LatestCommit,
|
||||
},
|
||||
}
|
||||
|
||||
r, err := b.CreateRequest(ctx,
|
||||
http.MethodPost,
|
||||
commentDTO,
|
||||
"/projects/", owner, "/repos/", repo, "/pull-requests/", strconv.Itoa(prID), "/comments",
|
||||
)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
response, err := http.DefaultClient.Do(r)
|
||||
defer response.Body.Close() // Add this
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if response.StatusCode >= 300 || response.StatusCode < 200 {
|
||||
sb := &strings.Builder{}
|
||||
io.Copy(sb, response.Body)
|
||||
err = fmt.Errorf("error while creating comment staus %d, body %s", response.StatusCode, sb.String())
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
44
internal/gitadapters/bitbucket/model.go
Normal file
44
internal/gitadapters/bitbucket/model.go
Normal file
@@ -0,0 +1,44 @@
|
||||
package bitbucket
|
||||
|
||||
type Anchor struct {
|
||||
Path string `json:"path"`
|
||||
Line int `json:"line"`
|
||||
LineType string `json:"lineType,omitempty"`
|
||||
FileType string `json:"fileType"`
|
||||
FromHash string `json:"fromHash,omitempty"`
|
||||
ToHash string `json:"toHash,omitempty"`
|
||||
DiffType string `json:"diffType,omitempty"`
|
||||
}
|
||||
|
||||
type Comment struct {
|
||||
Content string `json:"text"`
|
||||
Anchor Anchor `json:"anchor"`
|
||||
}
|
||||
|
||||
type PullRequest struct {
|
||||
ID int64 `json:"id"`
|
||||
Version int `json:"version"`
|
||||
Title string `json:"title"`
|
||||
State string `json:"state"`
|
||||
Open bool `json:"open"`
|
||||
Closed bool `json:"closed"`
|
||||
FromRef Ref `json:"fromRef"`
|
||||
ToRef Ref `json:"toRef"`
|
||||
Description string `json:"description"`
|
||||
}
|
||||
|
||||
type Ref struct {
|
||||
ID string `json:"id"`
|
||||
DisplayID string `json:"displayId"`
|
||||
LatestCommit string `json:"latestCommit"`
|
||||
Repository Repository `json:"repository"`
|
||||
}
|
||||
|
||||
type Repository struct {
|
||||
Slug string `json:"slug"`
|
||||
Project Project `json:"project"`
|
||||
}
|
||||
|
||||
type Project struct {
|
||||
Key string `json:"key"`
|
||||
}
|
||||
20
internal/gitadapters/bitbucket/resource.go
Normal file
20
internal/gitadapters/bitbucket/resource.go
Normal file
@@ -0,0 +1,20 @@
|
||||
package bitbucket
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"git.schreifuchs.ch/schreifuchs/pierre-bot/internal/gitadapters/baseadapter"
|
||||
)
|
||||
|
||||
type BitbucketAdapter struct {
|
||||
baseadapter.Rest
|
||||
}
|
||||
|
||||
func NewBitbucket(baseURL string, bearerToken string) *BitbucketAdapter {
|
||||
baseURL, _ = strings.CutSuffix(baseURL, "/")
|
||||
baseURL += "/rest/api/1.0"
|
||||
|
||||
return &BitbucketAdapter{
|
||||
Rest: baseadapter.NewRest(baseURL, bearerToken),
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user