More plumbing · Entire
More plumbing
Changes
4
cmd/git-sync
- Mmain.go+147/-2
Mmain_test.go+41
pkg/gitsync/unstable
Mclient.go+4/-1
Mclient_test.go+5/-2
58 unmodified lines
59
60
61
62
63
64
65
66
98 unmodified lines
165
166
167
168
169
170
171
172
68 unmodified lines
241
242
243
244
245
246
247
248
249
250
251
252
28 unmodified lines
281
282
283
277
284
285
286
287
288
289
290
17 unmodified lines
308
309
310
311
312
313
314
109 unmodified lines
424
425
426
416
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
58 unmodified lines
fs.StringVar(&req.Source.URL, "source-url", "", "source repository URL")
fs.StringVar(&req.Target.URL, "target-url", "", "target repository URL")
fs.BoolVar(&req.Source.FollowInfoRefsRedirect, "source-follow-info-refs-redirect", envBool("GITSYNC_SOURCE_FOLLOW_INFO_REFS_REDIRECT"), "send follow-up source RPCs to the final /info/refs redirect host")
fs.BoolVar(&req.Target.FollowInfoRefsRedirect, "target-follow-info-refs-redirect", envBool("GITSYNC_TARGET_FOLLOW_INFO_REFS_REDIRECT"), "send follow-up target RPCs to the final /info/refs redirect host")
fs.StringVar(&sourceAuth.Token, "source-token", envOr("GITSYNC_SOURCE_TOKEN", ""), "source token/password")
fs.StringVar(&targetAuth.Token, "target-token", envOr("GITSYNC_TARGET_TOKEN", ""), "target token/password")
98 unmodified lines
fs.StringVar(&sourceAuth.Token, "source-token", envOr("GITSYNC_SOURCE_TOKEN", ""), "source token/password")
fs.StringVar(&targetAuth.Token, "target-token", envOr("GITSYNC_TARGET_TOKEN", ""), "target token/password")
68 unmodified lines
var jsonOutput bool
var sourceAuth gitsync.EndpointAuth
var targetAuth gitsync.EndpointAuth
var targetFollowInfoRefsRedirect bool
req := unstable.ProbeRequest{}
fs.StringVar(&req.Source.URL, "source-url", "", "source repository URL")
targetURL := fs.String("target-url", "", "optional target repository URL")
fs.BoolVar(&req.Source.FollowInfoRefsRedirect, "source-follow-info-refs-redirect", envBool("GITSYNC_SOURCE_FOLLOW_INFO_REFS_REDIRECT"), "send follow-up source RPCs to the final /info/refs redirect host")
fs.BoolVar(&targetFollowInfoRefsRedirect, "target-follow-info-refs-redirect", envBool("GITSYNC_TARGET_FOLLOW_INFO_REFS_REDIRECT"), "send follow-up target RPCs to the final /info/refs redirect host")
fs.StringVar(&sourceAuth.Token, "source-token", envOr("GITSYNC_SOURCE_TOKEN", ""), "source token/password")
fs.StringVar(&targetAuth.Token, "target-token", envOr("GITSYNC_TARGET_TOKEN", ""), "target token/password")
fs.StringVar(&sourceAuth.Username, "source-username", envOr("GITSYNC_SOURCE_USERNAME", "git"), "source basic auth username")
28 unmodified lines
return usageError("probe requires a source repository URL")
}
if *targetURL != "" {
req.Target = &gitsync.Endpoint{URL: *targetURL}
req.Target = &gitsync.Endpoint{
URL: *targetURL,
FollowInfoRefsRedirect: targetFollowInfoRefsRedirect,
}
}
result, err := unstable.New(unstable.Options{
17 unmodified lines
req := unstable.FetchRequest{}
fs.StringVar(&req.Source.URL, "source-url", "", "source repository URL")
fs.BoolVar(&req.Source.FollowInfoRefsRedirect, "source-follow-info-refs-redirect", envBool("GITSYNC_SOURCE_FOLLOW_INFO_REFS_REDIRECT"), "send follow-up source RPCs to the final /info/refs redirect host")
fs.StringVar(&sourceAuth.Token, "source-token", envOr("GITSYNC_SOURCE_TOKEN", ""), "source token/password")
fs.StringVar(&sourceAuth.Username, "source-username", envOr("GITSYNC_SOURCE_USERNAME", "git"), "source basic auth username")
fs.StringVar(&sourceAuth.BearerToken, "source-bearer-token", envOr("GITSYNC_SOURCE_BEARER_TOKEN", ""), "source bearer token")
109 unmodified lines
}
func usageError(message string) error {
usage := fmt.Sprintf("usage:\n git-sync sync [flags] <source-url> <target-url>\n git-sync replicate [flags] <source-url> <target-url>\n git-sync plan [flags] <source-url> <target-url>\n git-sync bootstrap [flags] <source-url> <target-url>\n git-sync probe [flags] <source-url> [target-url]\n git-sync fetch [flags] <source-url>\n\nsync flags:\n --branch main,dev\n --map main:stable\n --tags\n --force\n --prune\n --stats\n --measure-memory\n --json\n --materialized-max-objects %d\n --max-pack-bytes <bytes>\n --target-max-pack-bytes <bytes>\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n --source-bearer-token ...\n --target-bearer-token ...\n --source-insecure-skip-tls-verify\n --target-insecure-skip-tls-verify\n -v\n\nreplicate flags:\n --branch main,dev\n --map main:stable\n --tags\n --prune\n --stats\n --measure-memory\n --json\n --max-pack-bytes <bytes>\n --target-max-pack-bytes <bytes>\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n --source-bearer-token ...\n --target-bearer-token ...\n --source-insecure-skip-tls-verify\n --target-insecure-skip-tls-verify\n -v\n\nplan flags:\n --mode sync|replicate\n --branch main,dev\n --map main:stable\n --tags\n --force\n --prune\n --stats\n --measure-memory\n --json\n --max-pack-bytes <bytes>\n --target-max-pack-bytes <bytes>\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n --source-bearer-token ...\n --target-bearer-token ...\n --source-insecure-skip-tls-verify\n --target-insecure-skip-tls-verify\n -v\n\nbootstrap flags:\n --branch main,dev\n --map main:stable\n --tags\n --max-pack-bytes 104857600\n --target-max-pack-bytes 1073741824\n --stats\n --measure-memory\n --json\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n --source-bearer-token ...\n --target-bearer-token ...\n --source-insecure-skip-tls-verify\n --target-insecure-skip-tls-verify\n -v\n\nprobe flags:\n --tags\n --stats\n --measure-memory\n --json\n --protocol auto|v1|v2\n --source-token ...\n --source-username git\n --source-bearer-token ...\n --target-token ...\n --target-username git\n --target-bearer-token ...\n --source-insecure-skip-tls-verify\n --target-insecure-skip-tls-verify\n\nfetch flags:\n --branch main,dev\n --tags\n --stats\n --measure-memory\n --json\n --protocol auto|v1|v2\n --have-ref main\n --have <hash>\n --source-token ...\n --source-username git\n --source-bearer-token ...\n --source-insecure-skip-tls-verify\n", unstable.DefaultMaterializedMaxObjects)
usage := fmt.Sprintf(`usage:\n git-sync sync [flags] <source-url> <target-url>\n git-sync replicate [flags] <source-url> <target-url>\n git-sync plan [flags] <source-url> <target-url>\n git-sync bootstrap [flags] <source-url> <target-url>\n git-sync probe [flags] <source-url> [target-url]\n git-sync fetch [flags] <source-url>\n\nsync flags:\n --branch main,dev\n --map main:stable\n --tags\n --force\n --prune\n --stats\n --measure-memory\n --json\n --max-pack-bytes <bytes>\n --target-max-pack-bytes <bytes>\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n --source-bearer-token ...\n --target-bearer-token ...\n --source-insecure-skip-tls-verify\n --target-insecure-skip-tls-verify\n -v\n\nreplicate flags:\n --branch main,dev\n --map main:stable\n --tags\n --prune\n --stats\n --measure-memory\n --json\n --max-pack-bytes <bytes>\n --target-max-pack-bytes <bytes>\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n --source-bearer-token ...\n --target-bearer-token ...\n -v\n\nplan flags:\n --mode sync|replicate\n --branch main,dev\n --map main:stable\n --tags\n --force\n --prune\n --stats\n --measure-memory\n --json\n --max-pack-bytes <bytes>\n --target-max-pack-bytes <bytes>\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n -v\n\nbootstrap flags:\n --branch main,dev\n --map main:stable\n --tags\n --max-pack-bytes 104857600\n --target-max-pack-bytes 1073741824\n --stats\n --measure-memory\n --json\n --protocol auto|v1|v2\n --source-token ...\n --target-token ...\n --source-username git\n --target-username git\n --source-bearer-token ...\n --target-bearer-token ...\n -v\n\nprobe flags:\n --tags\n --stats\n --measure-memory\n --json\n --protocol auto|v1|v2\n --source-token ...\n --source-username git\n --source-bearer-token ...\n --target-token ...\n --target-username git\n --target-bearer-token ...\n\nfetch flags:\n --branch main,dev\n --tags\n --stats\n --measure-memory\n --json\n --protocol auto|v1|v2\n --have-ref main\n --have <hash>\n --source-token ...\n --source-username git\n --source-bearer-token ...\n --source-insecure-skip-tls-verify\n`, unstable.DefaultMaterializedMaxObjects)
if message == "" {
return errors.New(strings.TrimSpace(usage))
}
}
``
Mcmd/git-sync/main.go+147/-2
``
269 unmodified lines
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
296
297
298
299
300
301
302
292 unmodified lines
func TestRun_Fetch_SourceFollowInfoRefsRedirectFlag(t *testing.T) {
sourceRepo, sourceFS := newSourceRepo(t)
makeCommits(t, sourceRepo, sourceFS, 1)
sourceServer := newSmartHTTPRepoServer(t, sourceRepo)
defer sourceServer.Close()
entry := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch {
case r.Method == http.MethodGet && r.URL.Path == sourceServer.repoPath+"/info/refs":
http.Redirect(w, r, sourceServer.server.URL+r.URL.Path+"?"+r.URL.RawQuery, http.StatusTemporaryRedirect)
case r.Method == http.MethodPost:
http.Error(w, "entry domain rejects packs", http.StatusMethodNotAllowed)
default:
http.NotFound(w, r)
}
}))
defer entry.Close()
output, err := captureStdout(func() error {
return run(context.Background(), []string{
"fetch",
"--source-follow-info-refs-redirect",
"--branch", testBranch,
"--json",
entry.URL + sourceServer.repoPath,
})
})
if err != nil {
t.Fatalf("run fetch: %v", err)
}
var result map[string]any
if err := json.Unmarshal([]byte(output), &result); err != nil {
t.Fatalf("decode fetch json: %v\noutput=%s", err, output)
}
if got, ok := result["fetchedObjects"].(float64); !ok || got == 0 {
t.Fatalf("expected fetched objects from redirected source, got %#v", result["fetchedObjects"])
}
}
func captureStdout(fn func() error) (string, error) {
old := os.Stdout
r, w, err := os.Pipe()