Skip to content

Commit 0b09433

Browse files
internal/task: use authenticated git client in priv patch workflow
For golang/go#65756. Change-Id: Iec9bfcd1ed02913323dc8e20a6b6eeb0eddf7f51 Reviewed-on: https://go-review.googlesource.com/c/build/+/566995 Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent ab586e6 commit 0b09433

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

cmd/relui/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ func main() {
308308
dh.RegisterDefinition("Sync go-private master branch with public", privateSyncTask.NewDefinition())
309309

310310
privateXPatchTask := &task.PrivXPatch{
311+
Git: gitClient,
311312
PublicGerrit: gerritClient,
312313
PrivateGerrit: privateGerritClient,
313314
PublicRepoURL: func(repo string) string {

internal/task/privx.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
)
2020

2121
type PrivXPatch struct {
22+
Git *Git
2223
PublicGerrit GerritClient
2324
PrivateGerrit GerritClient
2425
// PublicRepoURL returns a git clone URL for repo
@@ -75,9 +76,7 @@ func (x *PrivXPatch) NewDefinition(tagx *TagXReposTasks) *wf.Definition {
7576
// to replicate from one instance to another using the API alone. Rather
7677
// than adding workarounds for those edge cases, we just use Git
7778
// directly, which makes the process extremely simple.
78-
git := &Git{}
79-
80-
repo, err := git.Clone(ctx, x.PublicRepoURL(repoName))
79+
repo, err := x.Git.Clone(ctx, x.PublicRepoURL(repoName))
8180
if err != nil {
8281
return nil, err
8382
}

internal/task/privx_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ echo`), 0777); err != nil {
9090
var announcementHeader MailHeader
9191
var announcementMessage MailContent
9292
p := &PrivXPatch{
93+
Git: &Git{},
9394
PrivateGerrit: &privxClient{privRepoDir: privRepo.dir.dir},
9495
PublicGerrit: &privxClient{},
9596

0 commit comments

Comments
 (0)