forked from
tangled.org/core
Monorepo for Tangled
knotserver: create a fork PR link
Signed-off-by: Will Andrews <did:plc:dadhhalkfcq3gucaq25hjqon>
+147
-7
+22
knotserver/git/git.go
+22
knotserver/git/git.go
···
13
13
"time"
14
14
15
15
"github.com/go-git/go-git/v5"
16
+
gogit "github.com/go-git/go-git/v5"
16
17
"github.com/go-git/go-git/v5/config"
17
18
"github.com/go-git/go-git/v5/plumbing"
18
19
"github.com/go-git/go-git/v5/plumbing/object"
···
279
280
}
280
281
281
282
return strings.TrimSpace(string(output)), nil
283
+
}
284
+
285
+
func (g *GitRepo) Remote() (string, error) {
286
+
remote, err := g.r.Remote("origin")
287
+
if errors.Is(err, gogit.ErrRemoteNotFound) {
288
+
return "", nil
289
+
}
290
+
if err != nil {
291
+
return "", err
292
+
}
293
+
294
+
if remote == nil {
295
+
return "", nil
296
+
}
297
+
298
+
urls := remote.Config().URLs
299
+
if len(urls) == 0 {
300
+
return "", nil
301
+
}
302
+
303
+
return urls[0], nil
282
304
}
283
305
284
306
// WriteTar writes itself from a tree into a binary tar file format.
+67
-7
knotserver/internal.go
+67
-7
knotserver/internal.go
···
8
8
"net/http"
9
9
"net/url"
10
10
"os"
11
+
"path"
11
12
"path/filepath"
12
13
"strings"
13
14
···
453
454
return err
454
455
}
455
456
457
+
remote, err := gr.Remote()
458
+
if err != nil {
459
+
return fmt.Errorf("checking for upstream remote: %w", err)
460
+
}
461
+
456
462
defaultBranch, err := gr.FindMainBranch()
457
463
if err != nil {
458
464
return err
···
471
477
user = userIdent.Handle.String()
472
478
}
473
479
474
-
query := url.Values{}
475
-
query.Set("source", "branch")
476
-
query.Set("sourceBranch", pushedBranch)
477
-
query.Set("targetBranch", defaultBranch)
478
-
479
-
basePath, err := url.JoinPath(h.c.AppViewEndpoint, user, repoName, "pulls", "new")
480
+
pullURL, err := h.createPullURL(h.c.AppViewEndpoint, remote, user, repoName, pushedBranch, defaultBranch)
480
481
if err != nil {
481
482
return err
482
483
}
483
-
pullURL := basePath + "?" + query.Encode()
484
484
485
485
ZWS := "\u200B"
486
486
*clientMsgs = append(*clientMsgs, ZWS)
···
488
488
*clientMsgs = append(*clientMsgs, " "+pullURL)
489
489
*clientMsgs = append(*clientMsgs, ZWS)
490
490
return nil
491
+
}
492
+
493
+
func (h *InternalHandle) createPullURL(appviewURL, remote, user, repoName, pushedBranch, defaultBranch string) (string, error) {
494
+
if remote != "" {
495
+
return h.createForkPullURL(appviewURL, remote, user, repoName, pushedBranch, defaultBranch)
496
+
}
497
+
498
+
query := url.Values{}
499
+
500
+
query.Set("source", "branch")
501
+
query.Set("sourceBranch", pushedBranch)
502
+
query.Set("targetBranch", defaultBranch)
503
+
504
+
basePath, err := url.JoinPath(appviewURL, user, repoName, "pulls", "new")
505
+
if err != nil {
506
+
return "", err
507
+
}
508
+
pullURL := basePath + "?" + query.Encode()
509
+
return pullURL, nil
510
+
}
511
+
512
+
func (h *InternalHandle) createForkPullURL(appviewURL, remote, user, repoName, pushedBranch, defaultBranch string) (string, error) {
513
+
query := url.Values{}
514
+
515
+
query.Set("fork", fmt.Sprintf("%s/%s", user, repoName))
516
+
query.Set("source", "fork")
517
+
query.Set("sourceBranch", pushedBranch)
518
+
query.Set("targetBranch", defaultBranch)
519
+
520
+
repoPath, err := h.getRemoteOwnerRepoNamePath(remote)
521
+
if err != nil {
522
+
return "", err
523
+
}
524
+
525
+
basePath, err := url.JoinPath(appviewURL, repoPath, "pulls", "new")
526
+
if err != nil {
527
+
return "", err
528
+
}
529
+
pullURL := basePath + "?" + query.Encode()
530
+
return pullURL, nil
531
+
}
532
+
533
+
func (h *InternalHandle) getRemoteOwnerRepoNamePath(remote string) (string, error) {
534
+
u, err := url.Parse(remote)
535
+
if err != nil {
536
+
return "", fmt.Errorf("invalid remote: %w", err)
537
+
}
538
+
539
+
if u.Scheme != "file" {
540
+
return u.Path, nil
541
+
}
542
+
543
+
repoDid := path.Base(u.String())
544
+
545
+
owner, name, err := h.db.GetRepoKeyOwner(repoDid)
546
+
if err != nil {
547
+
return "", err
548
+
}
549
+
550
+
return fmt.Sprintf("%s/%s", owner, name), nil
491
551
}
492
552
493
553
func Internal(ctx context.Context, c *config.Config, db *db.DB, e *rbac.Enforcer, n *notifier.Notifier, res *idresolver.Resolver) http.Handler {
+58
knotserver/internal_test.go
+58
knotserver/internal_test.go
···
1
+
package knotserver
2
+
3
+
import (
4
+
"testing"
5
+
6
+
"github.com/alecthomas/assert/v2"
7
+
"github.com/stretchr/testify/require"
8
+
"tangled.org/core/knotserver/db"
9
+
)
10
+
11
+
const (
12
+
appviewURL = "https://tangled.org/"
13
+
user = "did:plc:dadhhalkfcq3gucaq25hjqon"
14
+
pushedBranch = "feature-abc"
15
+
defaultBranch = "main"
16
+
)
17
+
18
+
func TestCreatePullURL(t *testing.T) {
19
+
20
+
tt := map[string]struct {
21
+
repoName string
22
+
remote string
23
+
expectedURL string
24
+
}{
25
+
"not a fork": {
26
+
repoName: "knot-testing",
27
+
remote: "",
28
+
expectedURL: "https://tangled.org/did:plc:dadhhalkfcq3gucaq25hjqon/knot-testing/pulls/new?source=branch&sourceBranch=feature-abc&targetBranch=main",
29
+
},
30
+
"is fork": {
31
+
repoName: "knot-testing-fork",
32
+
remote: "https://knot1.tangled.sh/did:plc:dadhhalkfcq3gucaq25hjqon/knot-testing",
33
+
expectedURL: "https://tangled.org/did:plc:dadhhalkfcq3gucaq25hjqon/knot-testing/pulls/new?fork=did%3Aplc%3Adadhhalkfcq3gucaq25hjqon%2Fknot-testing-fork&source=fork&sourceBranch=feature-abc&targetBranch=main",
34
+
},
35
+
"is fork on same knot": {
36
+
repoName: "knot-testing-fork",
37
+
remote: "file:///home/git/repositories/did:plc:ixran6dpypl5lslliiqceshs",
38
+
expectedURL: "https://tangled.org/did:plc:dadhhalkfcq3gucaq25hjqon/knot-testing/pulls/new?fork=did%3Aplc%3Adadhhalkfcq3gucaq25hjqon%2Fknot-testing-fork&source=fork&sourceBranch=feature-abc&targetBranch=main",
39
+
},
40
+
}
41
+
42
+
for name, tc := range tt {
43
+
t.Run(name, func(t *testing.T) {
44
+
database, err := db.Setup(t.Context(), ":memory:")
45
+
require.NoError(t, err)
46
+
err = database.StoreRepoKey("did:plc:ixran6dpypl5lslliiqceshs", []byte{}, "did:plc:dadhhalkfcq3gucaq25hjqon", "knot-testing", "at://uri")
47
+
require.NoError(t, err)
48
+
49
+
h := InternalHandle{
50
+
db: database,
51
+
}
52
+
res, err := h.createPullURL(appviewURL, tc.remote, user, tc.repoName, pushedBranch, defaultBranch)
53
+
require.NoError(t, err)
54
+
55
+
assert.Equal(t, tc.expectedURL, res)
56
+
})
57
+
}
58
+
}