From d79b4d918af9446bfe222df8d07333c07a142117 Mon Sep 17 00:00:00 2001 From: Garo Brik Date: Mon, 18 Jan 2021 13:31:36 -0800 Subject: [PATCH 1/4] accept and pass associated-index-id flag --- cmd/src/lsif_upload.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmd/src/lsif_upload.go b/cmd/src/lsif_upload.go index e653321af3..39dfe8169d 100644 --- a/cmd/src/lsif_upload.go +++ b/cmd/src/lsif_upload.go @@ -55,6 +55,7 @@ Examples: uploadRoute *string rawVerbosity *int verbosity lsifUploadVerbosity + associatedIndexID *int } flagSet := flag.NewFlagSet("upload", flag.ExitOnError) @@ -71,6 +72,7 @@ Examples: flags.ignoreUploadFailures = flagSet.Bool("ignore-upload-failure", false, `Exit with status code zero on upload failure.`) flags.uploadRoute = flagSet.String("upload-route", "/.api/lsif/upload", "The path of the upload route.") flags.rawVerbosity = flagSet.Int("trace", 0, "-trace=0 shows no logs; -trace=1 shows requests and response metadata; -trace=2 shows headers, -trace=3 shows response body") + flags.associatedIndexID = flagSet.Int("associated-index-id", -1, "ID of the associated index record for this upload. For internal use only.") parseAndValidateFlags := func(args []string) error { flagSet.Parse(args) @@ -160,6 +162,10 @@ Examples: fmt.Println(argsString) } + if *flags.associatedIndexID < 0 { + flags.associatedIndexID = nil + } + return nil } @@ -180,6 +186,7 @@ Examples: GitHubToken: *flags.gitHubToken, File: *flags.file, MaxPayloadSizeBytes: *flags.maxPayloadSizeMb * 1000 * 1000, + AssociatedIndexID: flags.associatedIndexID, MaxRetries: 10, RetryInterval: time.Millisecond * 250, UploadProgressEvents: make(chan codeintelutils.UploadProgressEvent), From 9a069e46e8410d3d73cfd9b241cd2e050735dc02 Mon Sep 17 00:00:00 2001 From: Garo Brik Date: Mon, 18 Jan 2021 15:00:28 -0800 Subject: [PATCH 2/4] bump codeintelutils version --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f810456799..fac4ff24fe 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 github.com/pkg/errors v0.9.1 github.com/sourcegraph/campaignutils v0.0.0-20201124055807-2f9cfa9317e2 - github.com/sourcegraph/codeintelutils v0.0.0-20210113171425-9ec641b48a8e + github.com/sourcegraph/codeintelutils v0.0.0-20210118225004-6e6891d301ca github.com/sourcegraph/go-diff v0.6.1 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect diff --git a/go.sum b/go.sum index bcbbeb1b3a..6f1900b872 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ github.com/sourcegraph/campaignutils v0.0.0-20201124055807-2f9cfa9317e2 h1:MJu/6 github.com/sourcegraph/campaignutils v0.0.0-20201124055807-2f9cfa9317e2/go.mod h1:xm6i78Mk2t4DBLQDqEFc/3x6IPf7yYZCgbNaTQGhJHA= github.com/sourcegraph/codeintelutils v0.0.0-20210113171425-9ec641b48a8e h1:PdNc6fH0HHQ5xbnCwPkHuFdVCofQilFm9gG40fEQKms= github.com/sourcegraph/codeintelutils v0.0.0-20210113171425-9ec641b48a8e/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo= +github.com/sourcegraph/codeintelutils v0.0.0-20210118225004-6e6891d301ca h1:YotYereMYoAX/Q/2OS3zn2MJKgVbVdzQU65PRiaGHYE= +github.com/sourcegraph/codeintelutils v0.0.0-20210118225004-6e6891d301ca/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo= github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI= From 9308e1b9cb812b239a3d3ef6ac3bbc9d63aac704 Mon Sep 17 00:00:00 2001 From: Garo Brik Date: Mon, 18 Jan 2021 15:11:32 -0800 Subject: [PATCH 3/4] bump codeintelutils version again --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fac4ff24fe..b51815cb7d 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 github.com/pkg/errors v0.9.1 github.com/sourcegraph/campaignutils v0.0.0-20201124055807-2f9cfa9317e2 - github.com/sourcegraph/codeintelutils v0.0.0-20210118225004-6e6891d301ca + github.com/sourcegraph/codeintelutils v0.0.0-20210118231003-6698e102a8a1 github.com/sourcegraph/go-diff v0.6.1 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect diff --git a/go.sum b/go.sum index 6f1900b872..1d52d25c69 100644 --- a/go.sum +++ b/go.sum @@ -56,6 +56,8 @@ github.com/sourcegraph/codeintelutils v0.0.0-20210113171425-9ec641b48a8e h1:PdNc github.com/sourcegraph/codeintelutils v0.0.0-20210113171425-9ec641b48a8e/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo= github.com/sourcegraph/codeintelutils v0.0.0-20210118225004-6e6891d301ca h1:YotYereMYoAX/Q/2OS3zn2MJKgVbVdzQU65PRiaGHYE= github.com/sourcegraph/codeintelutils v0.0.0-20210118225004-6e6891d301ca/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo= +github.com/sourcegraph/codeintelutils v0.0.0-20210118231003-6698e102a8a1 h1:IPWruUo+BwPJqCHBVgjKxK6zTxMkOhwCSYpQ/jZHG/w= +github.com/sourcegraph/codeintelutils v0.0.0-20210118231003-6698e102a8a1/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo= github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI= From 7c4e788fe182d1dda631474e2ca0b0ab08b6e234 Mon Sep 17 00:00:00 2001 From: Garo Brik Date: Mon, 18 Jan 2021 15:14:45 -0800 Subject: [PATCH 4/4] mark 'upload-route' flag "for internal use only" --- cmd/src/lsif_upload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/src/lsif_upload.go b/cmd/src/lsif_upload.go index 39dfe8169d..ac0287359b 100644 --- a/cmd/src/lsif_upload.go +++ b/cmd/src/lsif_upload.go @@ -70,7 +70,7 @@ Examples: flags.noProgress = flagSet.Bool("no-progress", false, `Do not display a progress bar.`) flags.maxPayloadSizeMb = flagSet.Int("max-payload-size", 100, `The maximum upload size (in megabytes). Indexes exceeding this limit will be uploaded over multiple HTTP requests.`) flags.ignoreUploadFailures = flagSet.Bool("ignore-upload-failure", false, `Exit with status code zero on upload failure.`) - flags.uploadRoute = flagSet.String("upload-route", "/.api/lsif/upload", "The path of the upload route.") + flags.uploadRoute = flagSet.String("upload-route", "/.api/lsif/upload", "The path of the upload route. For internal use only.") flags.rawVerbosity = flagSet.Int("trace", 0, "-trace=0 shows no logs; -trace=1 shows requests and response metadata; -trace=2 shows headers, -trace=3 shows response body") flags.associatedIndexID = flagSet.Int("associated-index-id", -1, "ID of the associated index record for this upload. For internal use only.")