From 2720c599852b5b997ac676c994100aa678103a77 Mon Sep 17 00:00:00 2001 From: jupblb Date: Tue, 30 Sep 2025 22:48:17 +0200 Subject: [PATCH] Remove LSIF functionality, keeping only SCIP support - Removed lsif.go reference from BUILD.bazel - Removed unused LSIF/SCIP dependency from BUILD.bazel - Updated upload API path from /.api/lsif/upload to /.api/scip/upload - Removed deprecated 'src lsif' alias reference from README - Removed LSIF-specific CODEOWNERS rule - Note: lsif.enforceAuth still applies to SCIP uploads per configuration Amp-Thread-ID: https://ampcode.com/threads/T-0b0441d0-8980-4586-ae91-2059389ab3b4 --- CODEOWNERS | 1 - README.md | 2 +- cmd/src/BUILD.bazel | 2 -- cmd/src/code_intel_upload.go | 2 +- cmd/src/code_intel_upload_vendored.go | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 71c2c03ab9..c27e120639 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,3 @@ -cmd/src/lsif* @sourcegraph/team-graph cmd/src/code_intel* @sourcegraph/team-graph cmd/src/search* @sourcegraph/search-platform diff --git a/README.md b/README.md index 4a1f744404..46ee3f42d1 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ Is your Sourcegraph instance behind a custom auth proxy? See [auth proxy configu - `src config` - manage global, org, and user settings - `src extsvc` - manage external services (repository configuration) - `src extensions` - manage extensions - - `src code-intel` - manages Code Intelligence data (deprecated alias: `src lsif`) + - `src code-intel` - manages Code Intelligence data - `src serve-git` - serves your local git repositories over HTTP for Sourcegraph to pull - `src version` - check version and guaranteed-compatible version for your Sourcegraph instance diff --git a/cmd/src/BUILD.bazel b/cmd/src/BUILD.bazel index fdc0530dee..44dcf7729d 100644 --- a/cmd/src/BUILD.bazel +++ b/cmd/src/BUILD.bazel @@ -48,7 +48,6 @@ go_library( "format.go", "headers.go", "login.go", - "lsif.go", "main.go", "orgs.go", "orgs_create.go", @@ -132,7 +131,6 @@ go_library( "@com_github_sourcegraph_scip//bindings/go/scip", "@com_github_sourcegraph_sourcegraph_lib//batches", "@com_github_sourcegraph_sourcegraph_lib//batches/template", - "@com_github_sourcegraph_sourcegraph_lib//codeintel/lsif/scip", "@com_github_sourcegraph_sourcegraph_lib//codeintel/upload", "@com_github_sourcegraph_sourcegraph_lib//errors", "@com_github_sourcegraph_sourcegraph_lib//output", diff --git a/cmd/src/code_intel_upload.go b/cmd/src/code_intel_upload.go index f63f7394a9..24fab8eed6 100644 --- a/cmd/src/code_intel_upload.go +++ b/cmd/src/code_intel_upload.go @@ -202,7 +202,7 @@ func makeCodeIntelUploadURL(uploadID int) (string, error) { return "", err } - graphqlID := base64.URLEncoding.EncodeToString([]byte(fmt.Sprintf(`LSIFUpload:%d`, uploadID))) + graphqlID := base64.URLEncoding.EncodeToString([]byte(fmt.Sprintf(`SCIPUpload:%d`, uploadID))) url.Path = codeintelUploadFlags.repo + "/-/code-intelligence/uploads/" + graphqlID url.User = nil return url.String(), nil diff --git a/cmd/src/code_intel_upload_vendored.go b/cmd/src/code_intel_upload_vendored.go index 2cc01042a6..b5e4897af0 100644 --- a/cmd/src/code_intel_upload_vendored.go +++ b/cmd/src/code_intel_upload_vendored.go @@ -501,7 +501,7 @@ func makeUploadURL(opts uploadRequestOptions) (*url.URL, error) { path := opts.SourcegraphInstanceOptions.Path if path == "" { - path = "/.api/lsif/upload" + path = "/.api/scip/upload" } parsedUrl, err := url.Parse(opts.SourcegraphInstanceOptions.SourcegraphURL + path)