Skip to content

Commit 62c59a5

Browse files
authored
codeintel: Update utils package; remove auth from redirect URL (#386)
1 parent b36136b commit 62c59a5

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

cmd/src/lsif_upload.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"encoding/json"
55
"flag"
66
"fmt"
7+
"net/url"
78
"os"
89
"strings"
910
"sync"
@@ -219,7 +220,13 @@ Examples:
219220
return err
220221
}
221222

222-
uploadURL := fmt.Sprintf("%s/%s/-/settings/code-intelligence/lsif-uploads/%s", cfg.Endpoint, *flags.repo, uploadID)
223+
endpointWithoutAuth, err := url.Parse(cfg.Endpoint)
224+
if err != nil {
225+
return err
226+
}
227+
endpointWithoutAuth.User = nil
228+
229+
uploadURL := fmt.Sprintf("%s/%s/-/settings/code-intelligence/lsif-uploads/%s", endpointWithoutAuth.String(), *flags.repo, uploadID)
223230

224231
if *flags.json {
225232
serialized, err := json.Marshal(map[string]interface{}{

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
2121
github.com/pkg/errors v0.9.1
2222
github.com/sourcegraph/campaignutils v0.0.0-20201016010611-63eb2bca27ad
23-
github.com/sourcegraph/codeintelutils v0.0.0-20201021234242-00a82702de0d
23+
github.com/sourcegraph/codeintelutils v0.0.0-20201118031531-b82ba3167b30
2424
github.com/sourcegraph/go-diff v0.6.0
2525
github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf
2626
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ github.com/sourcegraph/codeintelutils v0.0.0-20201021190916-9622286ad906 h1:QrFR
5656
github.com/sourcegraph/codeintelutils v0.0.0-20201021190916-9622286ad906/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo=
5757
github.com/sourcegraph/codeintelutils v0.0.0-20201021234242-00a82702de0d h1:C+cLrOgPEluecyFz28u9AqP+/4Zp2YxpOI7EAnhK5Zo=
5858
github.com/sourcegraph/codeintelutils v0.0.0-20201021234242-00a82702de0d/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo=
59+
github.com/sourcegraph/codeintelutils v0.0.0-20201118031531-b82ba3167b30 h1:HrRrPyskdkHc6MqQS3ehH+DSraFnOhtvBWQ6AzEJC1o=
60+
github.com/sourcegraph/codeintelutils v0.0.0-20201118031531-b82ba3167b30/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo=
5961
github.com/sourcegraph/go-diff v0.6.0 h1:WbN9e/jD8ujU+o0vd9IFN5AEwtfB0rn/zM/AANaClqQ=
6062
github.com/sourcegraph/go-diff v0.6.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
6163
github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI=

0 commit comments

Comments
 (0)