From 6ac8c61294eafeb68d4e054f5a60b8a72f19bfc7 Mon Sep 17 00:00:00 2001
From: Christoph Hegemann <christoph.hegemann@sourcegraph.com>
Date: Thu, 18 Jan 2024 10:52:42 +0100
Subject: [PATCH] More updates for deprecated src-cli command (#59633)

removes more deprecated uses of `src lsif`
---
 .github/workflows/scip-typescript.yml                     | 8 ++++----
 .../internal/executorqueue/queues/codeintel/transform.go  | 2 +-
 .../executorqueue/queues/codeintel/transform_test.go      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/scip-typescript.yml b/.github/workflows/scip-typescript.yml
index 78b9668204f..c01909e91ef 100644
--- a/.github/workflows/scip-typescript.yml
+++ b/.github/workflows/scip-typescript.yml
@@ -40,18 +40,18 @@ jobs:
           curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o /usr/local/bin/src
           chmod +x /usr/local/bin/src
       - name: Upload SCIP to Cloud
-        run: src lsif upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress
+        run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress
         env:
           SRC_ENDPOINT: https://sourcegraph.com/
       - name: Upload SCIP to S2
-        run: src lsif upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress
+        run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress
         env:
           SRC_ENDPOINT: https://sourcegraph.sourcegraph.com/
       - name: Upload lsif to Dogfood
-        run: src lsif upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress || true
+        run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress || true
         env:
           SRC_ENDPOINT: https://k8s.sgdev.org/
       - name: Upload lsif to Demo
-        run: src lsif upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress || true
+        run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress || true
         env:
           SRC_ENDPOINT: https://demo.sourcegraph.com/
diff --git a/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go b/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go
index 838138a7b76..348468121ec 100644
--- a/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go
+++ b/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go
@@ -118,7 +118,7 @@ func transformRecord(ctx context.Context, db database.DB, index uploadsshared.In
 		Commands: []string{
 			shellquote.Join(
 				"src",
-				"lsif",
+				"code-intel",
 				"upload",
 				"-no-progress",
 				"-repo", index.RepositoryName,
diff --git a/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go b/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go
index e6211fd3afb..6e8488b3c33 100644
--- a/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go
+++ b/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go
@@ -115,7 +115,7 @@ func TestTransformRecord(t *testing.T) {
 							strings.Join(
 								[]string{
 									"src",
-									"lsif", "upload",
+									"code-intel", "upload",
 									"-no-progress",
 									"-repo", "linux",
 									"-commit", "deadbeef",
@@ -217,7 +217,7 @@ func TestTransformRecordWithoutIndexer(t *testing.T) {
 					strings.Join(
 						[]string{
 							"src",
-							"lsif", "upload",
+							"code-intel", "upload",
 							"-no-progress",
 							"-repo", "linux",
 							"-commit", "deadbeef",
@@ -346,7 +346,7 @@ func TestTransformRecordWithSecrets(t *testing.T) {
 							strings.Join(
 								[]string{
 									"src",
-									"lsif", "upload",
+									"code-intel", "upload",
 									"-no-progress",
 									"-repo", "linux",
 									"-commit", "deadbeef",
@@ -405,7 +405,7 @@ func TestTransformRecordDockerAuthConfig(t *testing.T) {
 			{
 				Key:      "upload",
 				Image:    fmt.Sprintf("sourcegraph/src-cli:%s", srccli.MinimumVersion),
-				Commands: []string{"src lsif upload -no-progress -repo '' -commit '' -root . -upload-route /.executors/lsif/upload -file dump.lsif -associated-index-id 42"},
+				Commands: []string{"src code-intel upload -no-progress -repo '' -commit '' -root . -upload-route /.executors/lsif/upload -file dump.lsif -associated-index-id 42"},
 				Env:      []string{"SRC_ENDPOINT=", "SRC_HEADER_AUTHORIZATION=token-executor hunter2"},
 			},
 		},