From bf8119e8d19f374f0872ae2d87bd5e58657778a5 Mon Sep 17 00:00:00 2001 From: Eric Fritz Date: Tue, 31 Mar 2020 15:59:13 -0500 Subject: [PATCH] Rename lsif-server to precise-code-intel (#9376) --- .dockerignore | 6 ++-- .github/CODEOWNERS | 2 +- .github/workflows/lsif.yml | 6 ++-- .vscode/settings.json | 2 +- .vscode/tasks.json | 2 +- babel.config.js | 2 +- .../.eslintrc.js | 0 .../Dockerfile | 18 +++++----- .../README.md | 2 +- .../babel.config.js | 0 .../build.sh | 6 ++-- .../docs/api/api.md | 0 .../docs/api/api.yaml | 0 .../docs/api/manager.yaml | 0 .../docs/database/database.md | 0 .../docs/database/datamodel.md | 0 .../docs/database/datamodel.pg.md | 0 .../jest.config.js | 0 .../jest.setup.js | 0 .../main.go | 28 +++++++-------- .../package.json | 0 .../prometheus.yml | 0 .../src/@types/express-opentracing/index.d.ts | 0 .../src/api-server/api.ts | 0 .../src/api-server/backend/backend.test.ts | 0 .../src/api-server/backend/backend.ts | 0 .../src/api-server/backend/cursor.ts | 0 .../src/api-server/backend/database.ts | 2 +- .../src/api-server/backend/location.ts | 0 .../src/api-server/metrics.ts | 0 .../src/api-server/routes/internal.ts | 0 .../src/api-server/routes/lsif.ts | 4 ++- .../src/api-server/routes/uploads.ts | 0 .../src/api-server/settings.ts | 3 +- .../src/api-server/tasks.ts | 0 .../src/bundle-manager/backend/cache.test.ts | 0 .../src/bundle-manager/backend/cache.ts | 0 .../bundle-manager/backend/database.test.ts | 0 .../src/bundle-manager/backend/database.ts | 0 .../src/bundle-manager/backend/location.ts | 0 .../src/bundle-manager/manager.ts | 0 .../src/bundle-manager/metrics.ts | 0 .../src/bundle-manager/routes/database.ts | 0 .../src/bundle-manager/routes/uploads.ts | 0 .../src/bundle-manager/settings.ts | 5 +-- .../src/bundle-manager/tasks.ts | 2 +- .../src/shared/api/init.ts | 0 .../src/shared/api/middleware/errors.ts | 0 .../src/shared/api/middleware/metrics.ts | 0 .../src/shared/api/middleware/validation.ts | 0 .../src/shared/api/pagination/cursor.ts | 0 .../src/shared/api/pagination/limit-offset.ts | 0 .../src/shared/api/pagination/link.ts | 0 .../src/shared/config/config.ts | 0 .../src/shared/config/settings.ts | 0 .../src/shared/constants.ts | 0 .../src/shared/database/inserter.ts | 0 .../src/shared/database/logger.ts | 0 .../src/shared/database/metrics.ts | 0 .../src/shared/database/postgres.ts | 0 .../src/shared/database/settings.ts | 0 .../src/shared/database/sqlite.ts | 0 .../datastructures/bloom-filter.test.ts | 0 .../src/shared/datastructures/bloom-filter.ts | 0 .../shared/datastructures/default-map.test.ts | 0 .../src/shared/datastructures/default-map.ts | 0 .../datastructures/disjoint-set.test.ts | 0 .../src/shared/datastructures/disjoint-set.ts | 0 .../shared/datastructures/orderedset.test.ts | 0 .../src/shared/datastructures/orderedset.ts | 0 .../src/shared/datastructures/settings.ts | 0 .../src/shared/encoding/json.test.ts | 0 .../src/shared/encoding/json.ts | 0 .../src/shared/gitserver/gitserver.test.ts | 0 .../src/shared/gitserver/gitserver.ts | 0 .../src/shared/gitserver/metrics.ts | 0 .../src/shared/input.test.ts | 0 .../src/shared/input.ts | 0 .../src/shared/logging.ts | 0 .../src/shared/maps.test.ts | 0 .../src/shared/maps.ts | 0 .../src/shared/metrics.ts | 0 .../src/shared/models/hash.ts | 0 .../src/shared/models/pg.ts | 0 .../src/shared/models/queries.ts | 0 .../src/shared/models/sqlite.ts | 0 .../src/shared/models/util.ts | 0 .../src/shared/paths.ts | 0 .../src/shared/settings.ts | 0 .../src/shared/store/dependencies.test.ts | 0 .../src/shared/store/dependencies.ts | 0 .../src/shared/store/dumps.test.ts | 0 .../src/shared/store/dumps.ts | 0 .../src/shared/store/locks.ts | 0 .../src/shared/store/metrics.ts | 0 .../src/shared/store/uploads.ts | 0 .../src/shared/tasks.ts | 0 .../src/shared/test-util.ts | 0 .../src/shared/tracing.ts | 0 .../src/shared/util.ts | 0 .../src/shared/visibility.ts | 0 .../src/worker/conversion/batch.test.ts | 0 .../src/worker/conversion/batch.ts | 0 .../src/worker/conversion/conversion.ts | 0 .../src/worker/conversion/correlator.test.ts | 0 .../src/worker/conversion/correlator.ts | 0 .../src/worker/conversion/existence.test.ts | 0 .../src/worker/conversion/existence.ts | 0 .../src/worker/conversion/importer.ts | 0 .../src/worker/conversion/paths.ts | 0 .../src/worker/metrics.ts | 0 .../src/worker/settings.ts | 5 +-- .../src/worker/worker.ts | 6 ++-- .../test-data/lsif-go@ad3507cb.lsif.gz | Bin .../tsconfig.json | 0 .../tslint.json | 0 .../yarn.lock | 0 cmd/server/Dockerfile | 12 +++---- cmd/server/build.sh | 4 +-- cmd/server/shared/shared.go | 32 +++++++++--------- dev/Procfile | 6 ++-- dev/ci/yarn-run.sh | 2 +- dev/foreach-ts-project.sh | 2 +- dev/start.sh | 6 ++-- doc/admin/observability/metrics_guide.md | 2 +- doc/dev/architecture/index.md | 2 +- doc/dev/architecture/precise-code-intel.dot | 6 ++-- doc/dev/architecture/precise-code-intel.svg | 6 ++-- doc/dev/tech_stack.md | 2 +- .../prometheus/config/lsif_server_rules.yml | 6 ++-- enterprise/dev/ci/ci/pipeline-steps.go | 6 ++-- .../codeintel/lsifserver/client/client.go | 17 +++++----- .../codeintel/lsifserver/proxy/proxy.go | 2 +- jest.config.js | 7 +++- renovate.json | 2 +- tsconfig.json | 2 +- 136 files changed, 118 insertions(+), 107 deletions(-) rename cmd/{lsif-server => precise-code-intel}/.eslintrc.js (100%) rename cmd/{lsif-server => precise-code-intel}/Dockerfile (76%) rename cmd/{lsif-server => precise-code-intel}/README.md (93%) rename cmd/{lsif-server => precise-code-intel}/babel.config.js (100%) rename cmd/{lsif-server => precise-code-intel}/build.sh (72%) rename cmd/{lsif-server => precise-code-intel}/docs/api/api.md (100%) rename cmd/{lsif-server => precise-code-intel}/docs/api/api.yaml (100%) rename cmd/{lsif-server => precise-code-intel}/docs/api/manager.yaml (100%) rename cmd/{lsif-server => precise-code-intel}/docs/database/database.md (100%) rename cmd/{lsif-server => precise-code-intel}/docs/database/datamodel.md (100%) rename cmd/{lsif-server => precise-code-intel}/docs/database/datamodel.pg.md (100%) rename cmd/{lsif-server => precise-code-intel}/jest.config.js (100%) rename cmd/{lsif-server => precise-code-intel}/jest.setup.js (100%) rename cmd/{lsif-server => precise-code-intel}/main.go (67%) rename cmd/{lsif-server => precise-code-intel}/package.json (100%) rename cmd/{lsif-server => precise-code-intel}/prometheus.yml (100%) rename cmd/{lsif-server => precise-code-intel}/src/@types/express-opentracing/index.d.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/api.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/backend/backend.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/backend/backend.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/backend/cursor.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/backend/database.ts (99%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/backend/location.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/routes/internal.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/routes/lsif.ts (98%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/routes/uploads.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/settings.ts (93%) rename cmd/{lsif-server => precise-code-intel}/src/api-server/tasks.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/backend/cache.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/backend/cache.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/backend/database.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/backend/database.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/backend/location.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/manager.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/routes/database.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/routes/uploads.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/settings.ts (94%) rename cmd/{lsif-server => precise-code-intel}/src/bundle-manager/tasks.ts (98%) rename cmd/{lsif-server => precise-code-intel}/src/shared/api/init.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/api/middleware/errors.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/api/middleware/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/api/middleware/validation.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/api/pagination/cursor.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/api/pagination/limit-offset.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/api/pagination/link.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/config/config.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/config/settings.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/constants.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/database/inserter.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/database/logger.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/database/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/database/postgres.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/database/settings.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/database/sqlite.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/bloom-filter.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/bloom-filter.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/default-map.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/default-map.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/disjoint-set.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/disjoint-set.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/orderedset.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/orderedset.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/datastructures/settings.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/encoding/json.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/encoding/json.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/gitserver/gitserver.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/gitserver/gitserver.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/gitserver/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/input.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/input.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/logging.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/maps.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/maps.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/models/hash.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/models/pg.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/models/queries.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/models/sqlite.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/models/util.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/paths.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/settings.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/store/dependencies.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/store/dependencies.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/store/dumps.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/store/dumps.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/store/locks.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/store/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/store/uploads.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/tasks.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/test-util.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/tracing.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/util.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/shared/visibility.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/batch.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/batch.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/conversion.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/correlator.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/correlator.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/existence.test.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/existence.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/importer.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/conversion/paths.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/metrics.ts (100%) rename cmd/{lsif-server => precise-code-intel}/src/worker/settings.ts (82%) rename cmd/{lsif-server => precise-code-intel}/src/worker/worker.ts (96%) rename cmd/{lsif-server => precise-code-intel}/test-data/lsif-go@ad3507cb.lsif.gz (100%) rename cmd/{lsif-server => precise-code-intel}/tsconfig.json (100%) rename cmd/{lsif-server => precise-code-intel}/tslint.json (100%) rename cmd/{lsif-server => precise-code-intel}/yarn.lock (100%) diff --git a/.dockerignore b/.dockerignore index 5b0e86a0beb..4af2c40639b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -103,6 +103,6 @@ node_modules/ /packages/sourcegraph-extension-api/dist # Precise code intel -./cmd/lsif-server/node_modules -./cmd/lsif-server/out -./cmd/lsif-server/test-data +./cmd/precise-code-intel/node_modules +./cmd/precise-code-intel/out +./cmd/precise-code-intel/test-data diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index abe9e724ad0..7da5ea51490 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -250,7 +250,7 @@ Dockerfile @sourcegraph/distribution /cmd/frontend/db/discussion* @slimsag # LSIF -/cmd/lsif-server/ @sourcegraph/code-intel +/cmd/precise-code-intel/ @sourcegraph/code-intel /internal/lsif @sourcegraph/code-intel /enterprise/internal/codeintel @sourcegraph/code-intel /cmd/frontend/graphqlbackend/codeintel.go @sourcegraph/code-intel diff --git a/.github/workflows/lsif.yml b/.github/workflows/lsif.yml index 17ae11fba61..b9bca67e83f 100644 --- a/.github/workflows/lsif.yml +++ b/.github/workflows/lsif.yml @@ -38,15 +38,15 @@ jobs: steps: - uses: actions/checkout@v1 - name: Install dependencies - run: yarn --cwd cmd/lsif-server + run: yarn --cwd cmd/precise-code-intel - name: Generate LSIF data uses: sourcegraph/lsif-node-action@master with: - project_root: cmd/lsif-server + project_root: cmd/precise-code-intel - name: Upload LSIF data uses: sourcegraph/lsif-upload-action@master with: - root: cmd/lsif-server + root: cmd/precise-code-intel github_token: ${{ secrets.GITHUB_TOKEN }} lsif-shared: diff --git a/.vscode/settings.json b/.vscode/settings.json index 16a3860fbb3..409ee9d82d3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -64,7 +64,7 @@ "changeProcessCWD": true, }, { - "directory": "cmd/lsif-server", + "directory": "cmd/precise-code-intel", "changeProcessCWD": true, }, ], diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 58cda6cd28f..fda474dc3d7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -53,7 +53,7 @@ { "type": "npm", "script": "eslint", - "path": "cmd/lsif-server/", + "path": "cmd/precise-code-intel/", "problemMatcher": ["$eslint-stylish"], }, { diff --git a/babel.config.js b/babel.config.js index 0b7907bb034..28568fd4334 100644 --- a/babel.config.js +++ b/babel.config.js @@ -22,7 +22,7 @@ module.exports = api => { ], plugins: [ 'babel-plugin-lodash', - // Required to support typeoerm decorators in ./cmd/lsif-server + // Required to support typeorm decorators in ./cmd/precise-code-intel ['@babel/plugin-proposal-decorators', { legacy: true }], // Node 12 (released 2019 Apr 23) supports these natively, but there seem to be issues when used with TypeScript. ['@babel/plugin-proposal-class-properties', { loose: true }], diff --git a/cmd/lsif-server/.eslintrc.js b/cmd/precise-code-intel/.eslintrc.js similarity index 100% rename from cmd/lsif-server/.eslintrc.js rename to cmd/precise-code-intel/.eslintrc.js diff --git a/cmd/lsif-server/Dockerfile b/cmd/precise-code-intel/Dockerfile similarity index 76% rename from cmd/lsif-server/Dockerfile rename to cmd/precise-code-intel/Dockerfile index 68529259666..b42d38af8dc 100644 --- a/cmd/lsif-server/Dockerfile +++ b/cmd/precise-code-intel/Dockerfile @@ -1,15 +1,15 @@ # keep this in sync with docker-images/prometheus/Dockerfile FROM prom/prometheus:v2.15.2@sha256:35c52c0c2b76433bbfc44a5a7abc294c2f032ed80250be02b441db5dd91b203a AS prometheus -FROM alpine:3.10@sha256:e4355b66995c96b4b468159fc5c7e3540fcef961189ca13fee877798649f531a AS pci-builder +FROM alpine:3.10@sha256:e4355b66995c96b4b468159fc5c7e3540fcef961189ca13fee877798649f531a AS precise-code-intel-builder RUN apk add --no-cache nodejs-current=12.4.0-r0 nodejs-npm=10.19.0-r0 RUN npm install -g yarn@1.17.3 -COPY lsif-server/package.json lsif-server/yarn.lock lsif-server/tsconfig.json /pci/ -RUN yarn --cwd /pci -COPY lsif-server/src /pci/src -RUN yarn --cwd /pci run build +COPY precise-code-intel/package.json precise-code-intel/yarn.lock precise-code-intel/tsconfig.json /precise-code-intel/ +RUN yarn --cwd /precise-code-intel +COPY precise-code-intel/src /precise-code-intel/src +RUN yarn --cwd /precise-code-intel run build FROM sourcegraph/alpine:3.10@sha256:4d05cd5669726fc38823e92320659a6d1ef7879e62268adec5df658a0bacf65c @@ -41,12 +41,12 @@ RUN mkdir -p $PROMETHEUS_CONFIGURATION_DIR && chown -R sourcegraph:sourcegraph $ RUN mkdir -p /lsif-storage && chown -R sourcegraph:sourcegraph /lsif-storage USER sourcegraph -COPY --from=pci-builder /pci /pci -COPY ./lsif-server/lsif-server /usr/local/bin/lsif-server +COPY --from=precise-code-intel-builder /precise-code-intel /precise-code-intel +COPY ./precise-code-intel/precise-code-intel /usr/local/bin/precise-code-intel COPY --from=prometheus /bin/prometheus /bin/prometheus -COPY ./lsif-server/prometheus.yml $PROMETHEUS_CONFIGURATION_DIR/prometheus.yml +COPY ./precise-code-intel/prometheus.yml $PROMETHEUS_CONFIGURATION_DIR/prometheus.yml # http api server, bundle manager server, (first) worker metrics server, prometheus EXPOSE 3186 3187 3188 9090 ENV GO111MODULES=on LANG=en_US.utf8 LOG_LEVEL=debug -ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/lsif-server"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/precise-code-intel"] diff --git a/cmd/lsif-server/README.md b/cmd/precise-code-intel/README.md similarity index 93% rename from cmd/lsif-server/README.md rename to cmd/precise-code-intel/README.md index d8a28a71ae7..e6aec7fdb4c 100644 --- a/cmd/lsif-server/README.md +++ b/cmd/precise-code-intel/README.md @@ -23,7 +23,7 @@ This project is split into three parts, all currently written in TypeScript. The ## Entrypoint -The docker image for this part of the application wraps a server, a bundle manager, and a worker in a [goreman](https://github.com/mattn/goreman) supervisor. By default, there will be one API process and one worker process. The number of replicas per process can be tuned with the environment variables `LSIF_NUM_APIS` (zero or one), `LSIF_NUM_BUNDLE_MANAGERS` (zero or one), and `LSIF_NUM_WORKERS` (zero or more). +The docker image for this part of the application wraps a server, a bundle manager, and a worker in a [goreman](https://github.com/mattn/goreman) supervisor. By default, there will be one API process and one worker process. The number of replicas per process can be tuned with the environment variables `PRECISE_CODE_INTEL_NUM_APIS` (zero or more), `PRECISE_CODE_INTEL_NUM_BUNDLE_MANAGERS` (zero or one), and `PRECISE_CODE_INTEL_NUM_WORKERS` (zero or more). ### Prometheus metrics diff --git a/cmd/lsif-server/babel.config.js b/cmd/precise-code-intel/babel.config.js similarity index 100% rename from cmd/lsif-server/babel.config.js rename to cmd/precise-code-intel/babel.config.js diff --git a/cmd/lsif-server/build.sh b/cmd/precise-code-intel/build.sh similarity index 72% rename from cmd/lsif-server/build.sh rename to cmd/precise-code-intel/build.sh index 1e18086e87e..2991d5350ae 100755 --- a/cmd/lsif-server/build.sh +++ b/cmd/precise-code-intel/build.sh @@ -15,16 +15,16 @@ export GOARCH=amd64 export GOOS=linux export CGO_ENABLED=0 -cp -a ./cmd/lsif-server "$OUTPUT" +cp -a ./cmd/precise-code-intel "$OUTPUT" echo "--- go build" go build \ -trimpath \ -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION" \ - -o "$OUTPUT/lsif-server" github.com/sourcegraph/sourcegraph/cmd/lsif-server + -o "$OUTPUT/precise-code-intel" github.com/sourcegraph/sourcegraph/cmd/precise-code-intel echo "--- docker build" -docker build -f cmd/lsif-server/Dockerfile -t "$IMAGE" "$OUTPUT" \ +docker build -f cmd/precise-code-intel/Dockerfile -t "$IMAGE" "$OUTPUT" \ --progress=plain \ --build-arg COMMIT_SHA \ --build-arg DATE \ diff --git a/cmd/lsif-server/docs/api/api.md b/cmd/precise-code-intel/docs/api/api.md similarity index 100% rename from cmd/lsif-server/docs/api/api.md rename to cmd/precise-code-intel/docs/api/api.md diff --git a/cmd/lsif-server/docs/api/api.yaml b/cmd/precise-code-intel/docs/api/api.yaml similarity index 100% rename from cmd/lsif-server/docs/api/api.yaml rename to cmd/precise-code-intel/docs/api/api.yaml diff --git a/cmd/lsif-server/docs/api/manager.yaml b/cmd/precise-code-intel/docs/api/manager.yaml similarity index 100% rename from cmd/lsif-server/docs/api/manager.yaml rename to cmd/precise-code-intel/docs/api/manager.yaml diff --git a/cmd/lsif-server/docs/database/database.md b/cmd/precise-code-intel/docs/database/database.md similarity index 100% rename from cmd/lsif-server/docs/database/database.md rename to cmd/precise-code-intel/docs/database/database.md diff --git a/cmd/lsif-server/docs/database/datamodel.md b/cmd/precise-code-intel/docs/database/datamodel.md similarity index 100% rename from cmd/lsif-server/docs/database/datamodel.md rename to cmd/precise-code-intel/docs/database/datamodel.md diff --git a/cmd/lsif-server/docs/database/datamodel.pg.md b/cmd/precise-code-intel/docs/database/datamodel.pg.md similarity index 100% rename from cmd/lsif-server/docs/database/datamodel.pg.md rename to cmd/precise-code-intel/docs/database/datamodel.pg.md diff --git a/cmd/lsif-server/jest.config.js b/cmd/precise-code-intel/jest.config.js similarity index 100% rename from cmd/lsif-server/jest.config.js rename to cmd/precise-code-intel/jest.config.js diff --git a/cmd/lsif-server/jest.setup.js b/cmd/precise-code-intel/jest.setup.js similarity index 100% rename from cmd/lsif-server/jest.setup.js rename to cmd/precise-code-intel/jest.setup.js diff --git a/cmd/lsif-server/main.go b/cmd/precise-code-intel/main.go similarity index 67% rename from cmd/lsif-server/main.go rename to cmd/precise-code-intel/main.go index 0c9db2c5c08..1c4fbf8b529 100644 --- a/cmd/lsif-server/main.go +++ b/cmd/precise-code-intel/main.go @@ -14,9 +14,9 @@ import ( ) var ( - apis = env.Get("LSIF_NUM_APIS", "1", "the number of API instances to run (defaults to one)") - bundleManagers = env.Get("LSIF_NUM_BUNDLE_MANAGERS", "1", "the number of bundle manager instances to run (defaults to one)") - workers = env.Get("LSIF_NUM_WORKERS", "1", "the number of worker instances to run (defaults to one)") + apis = env.Get("PRECISE_CODE_INTEL_NUM_APIS", "1", "the number of API instances to run (defaults to one)") + bundleManagers = env.Get("PRECISE_CODE_INTEL_NUM_BUNDLE_MANAGERS", "1", "the number of bundle manager instances to run (defaults to one)") + workers = env.Get("PRECISE_CODE_INTEL_NUM_WORKERS", "1", "the number of worker instances to run (defaults to one)") // Set in docker image prometheusStorageDir = os.Getenv("PROMETHEUS_STORAGE_DIR") @@ -31,18 +31,18 @@ const ( func main() { numAPIs, err := strconv.ParseInt(apis, 10, 64) - if err != nil || numAPIs < 0 || numAPIs > 1 { - log.Fatalf("Invalid int %q for LSIF_NUM_APIS: %s", apis, err) + if err != nil || numAPIs < 0 { + log.Fatalf("Invalid int %q for PRECISE_CODE_INTEL_NUM_APIS: %s", apis, err) } numBundleManagers, err := strconv.ParseInt(bundleManagers, 10, 64) if err != nil || numBundleManagers < 0 || numBundleManagers > 1 { - log.Fatalf("Invalid int %q for LSIF_NUM_BUNDLE_MANAGERS: %s", bundleManagers, err) + log.Fatalf("Invalid int %q for PRECISE_CODE_INTEL_NUM_BUNDLE_MANAGERS: %s", bundleManagers, err) } numWorkers, err := strconv.ParseInt(workers, 10, 64) if err != nil || numWorkers < 0 { - log.Fatalf("Invalid int %q for LSIF_NUM_WORKERS: %s", workers, err) + log.Fatalf("Invalid int %q for PRECISE_CODE_INTEL_NUM_WORKERS: %s", workers, err) } if err := ioutil.WriteFile( @@ -69,17 +69,17 @@ func makeProcfile(numAPIs, numBundleManagers, numWorkers int64) string { } if numAPIs > 0 { - addProcess("pci-api-server", "node /pci/out/api-server/api.js") + addProcess("api-server", "node /precise-code-intel/out/api-server/api.js") } if numBundleManagers > 0 { - addProcess("pci-bundle-manager", "node /pci/out/bundle-manager/manager.js") + addProcess("bundle-manager", "node /precise-code-intel/out/bundle-manager/manager.js") } for i := 0; i < int(numWorkers); i++ { addProcess( - fmt.Sprintf("pci-worker-%d", i), - fmt.Sprintf("env METRICS_PORT=%d node /pci/out/worker/worker.js", workerPort+i), + fmt.Sprintf("worker-%d", i), + fmt.Sprintf("env METRICS_PORT=%d node /precise-code-intel/out/worker/worker.js", workerPort+i), ) } @@ -103,15 +103,15 @@ func makePrometheusTargets(numAPIs, numBundleManagers, numWorkers int64) string } if numAPIs > 0 { - addTarget("pci-api-server", apiPort) + addTarget("api-server", apiPort) } if numBundleManagers > 0 { - addTarget("pci-bundle-manager", bundleManagerPort) + addTarget("bundle-manager", bundleManagerPort) } for i := 0; i < int(numWorkers); i++ { - addTarget("pci-worker", workerPort+i) + addTarget("worker", workerPort+i) } return strings.Join(content, "\n") + "\n" diff --git a/cmd/lsif-server/package.json b/cmd/precise-code-intel/package.json similarity index 100% rename from cmd/lsif-server/package.json rename to cmd/precise-code-intel/package.json diff --git a/cmd/lsif-server/prometheus.yml b/cmd/precise-code-intel/prometheus.yml similarity index 100% rename from cmd/lsif-server/prometheus.yml rename to cmd/precise-code-intel/prometheus.yml diff --git a/cmd/lsif-server/src/@types/express-opentracing/index.d.ts b/cmd/precise-code-intel/src/@types/express-opentracing/index.d.ts similarity index 100% rename from cmd/lsif-server/src/@types/express-opentracing/index.d.ts rename to cmd/precise-code-intel/src/@types/express-opentracing/index.d.ts diff --git a/cmd/lsif-server/src/api-server/api.ts b/cmd/precise-code-intel/src/api-server/api.ts similarity index 100% rename from cmd/lsif-server/src/api-server/api.ts rename to cmd/precise-code-intel/src/api-server/api.ts diff --git a/cmd/lsif-server/src/api-server/backend/backend.test.ts b/cmd/precise-code-intel/src/api-server/backend/backend.test.ts similarity index 100% rename from cmd/lsif-server/src/api-server/backend/backend.test.ts rename to cmd/precise-code-intel/src/api-server/backend/backend.test.ts diff --git a/cmd/lsif-server/src/api-server/backend/backend.ts b/cmd/precise-code-intel/src/api-server/backend/backend.ts similarity index 100% rename from cmd/lsif-server/src/api-server/backend/backend.ts rename to cmd/precise-code-intel/src/api-server/backend/backend.ts diff --git a/cmd/lsif-server/src/api-server/backend/cursor.ts b/cmd/precise-code-intel/src/api-server/backend/cursor.ts similarity index 100% rename from cmd/lsif-server/src/api-server/backend/cursor.ts rename to cmd/precise-code-intel/src/api-server/backend/cursor.ts diff --git a/cmd/lsif-server/src/api-server/backend/database.ts b/cmd/precise-code-intel/src/api-server/backend/database.ts similarity index 99% rename from cmd/lsif-server/src/api-server/backend/database.ts rename to cmd/precise-code-intel/src/api-server/backend/database.ts index 547db446f3e..507bd66219f 100644 --- a/cmd/lsif-server/src/api-server/backend/database.ts +++ b/cmd/precise-code-intel/src/api-server/backend/database.ts @@ -167,7 +167,7 @@ export class Database { // private async request(method: string, searchParams: URLSearchParams, ctx: TracingContext): Promise { - const url = new URL(`/dbs/${this.dumpId}/${method}`, settings.LSIF_BUNDLE_MANAGER_URL) + const url = new URL(`/dbs/${this.dumpId}/${method}`, settings.PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL) url.search = searchParams.toString() const resp = await got.get(url.href) return parseJSON(resp.body) diff --git a/cmd/lsif-server/src/api-server/backend/location.ts b/cmd/precise-code-intel/src/api-server/backend/location.ts similarity index 100% rename from cmd/lsif-server/src/api-server/backend/location.ts rename to cmd/precise-code-intel/src/api-server/backend/location.ts diff --git a/cmd/lsif-server/src/api-server/metrics.ts b/cmd/precise-code-intel/src/api-server/metrics.ts similarity index 100% rename from cmd/lsif-server/src/api-server/metrics.ts rename to cmd/precise-code-intel/src/api-server/metrics.ts diff --git a/cmd/lsif-server/src/api-server/routes/internal.ts b/cmd/precise-code-intel/src/api-server/routes/internal.ts similarity index 100% rename from cmd/lsif-server/src/api-server/routes/internal.ts rename to cmd/precise-code-intel/src/api-server/routes/internal.ts diff --git a/cmd/lsif-server/src/api-server/routes/lsif.ts b/cmd/precise-code-intel/src/api-server/routes/lsif.ts similarity index 98% rename from cmd/lsif-server/src/api-server/routes/lsif.ts rename to cmd/precise-code-intel/src/api-server/routes/lsif.ts index d415a02fdbe..1a44979c469 100644 --- a/cmd/lsif-server/src/api-server/routes/lsif.ts +++ b/cmd/precise-code-intel/src/api-server/routes/lsif.ts @@ -120,7 +120,9 @@ export function createLsifRouter( await logAndTraceCall(ctx, 'Uploading payload to bundle manager', () => pipeline( fs.createReadStream(filename), - got.stream.post(new URL(`/uploads/${uploadId}`, settings.LSIF_BUNDLE_MANAGER_URL).href) + got.stream.post( + new URL(`/uploads/${uploadId}`, settings.PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL).href + ) ) ) diff --git a/cmd/lsif-server/src/api-server/routes/uploads.ts b/cmd/precise-code-intel/src/api-server/routes/uploads.ts similarity index 100% rename from cmd/lsif-server/src/api-server/routes/uploads.ts rename to cmd/precise-code-intel/src/api-server/routes/uploads.ts diff --git a/cmd/lsif-server/src/api-server/settings.ts b/cmd/precise-code-intel/src/api-server/settings.ts similarity index 93% rename from cmd/lsif-server/src/api-server/settings.ts rename to cmd/precise-code-intel/src/api-server/settings.ts index 7aed58cfd05..4cf4933d95c 100644 --- a/cmd/lsif-server/src/api-server/settings.ts +++ b/cmd/precise-code-intel/src/api-server/settings.ts @@ -4,7 +4,8 @@ import { readEnvInt } from '../shared/settings' export const HTTP_PORT = readEnvInt('HTTP_PORT', 3186) /** HTTP address for internal LSIF bundle manager server. */ -export const LSIF_BUNDLE_MANAGER_URL = process.env.LSIF_BUNDLE_MANAGER_URL || 'http://localhost:3187' +export const PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL = + process.env.PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL || 'http://localhost:3187' /** Where on the file system to temporarily store LSIF uploads. This need not be a persistent volume. */ export const STORAGE_ROOT = process.env.LSIF_STORAGE_ROOT || 'lsif-storage' diff --git a/cmd/lsif-server/src/api-server/tasks.ts b/cmd/precise-code-intel/src/api-server/tasks.ts similarity index 100% rename from cmd/lsif-server/src/api-server/tasks.ts rename to cmd/precise-code-intel/src/api-server/tasks.ts diff --git a/cmd/lsif-server/src/bundle-manager/backend/cache.test.ts b/cmd/precise-code-intel/src/bundle-manager/backend/cache.test.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/backend/cache.test.ts rename to cmd/precise-code-intel/src/bundle-manager/backend/cache.test.ts diff --git a/cmd/lsif-server/src/bundle-manager/backend/cache.ts b/cmd/precise-code-intel/src/bundle-manager/backend/cache.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/backend/cache.ts rename to cmd/precise-code-intel/src/bundle-manager/backend/cache.ts diff --git a/cmd/lsif-server/src/bundle-manager/backend/database.test.ts b/cmd/precise-code-intel/src/bundle-manager/backend/database.test.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/backend/database.test.ts rename to cmd/precise-code-intel/src/bundle-manager/backend/database.test.ts diff --git a/cmd/lsif-server/src/bundle-manager/backend/database.ts b/cmd/precise-code-intel/src/bundle-manager/backend/database.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/backend/database.ts rename to cmd/precise-code-intel/src/bundle-manager/backend/database.ts diff --git a/cmd/lsif-server/src/bundle-manager/backend/location.ts b/cmd/precise-code-intel/src/bundle-manager/backend/location.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/backend/location.ts rename to cmd/precise-code-intel/src/bundle-manager/backend/location.ts diff --git a/cmd/lsif-server/src/bundle-manager/manager.ts b/cmd/precise-code-intel/src/bundle-manager/manager.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/manager.ts rename to cmd/precise-code-intel/src/bundle-manager/manager.ts diff --git a/cmd/lsif-server/src/bundle-manager/metrics.ts b/cmd/precise-code-intel/src/bundle-manager/metrics.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/metrics.ts rename to cmd/precise-code-intel/src/bundle-manager/metrics.ts diff --git a/cmd/lsif-server/src/bundle-manager/routes/database.ts b/cmd/precise-code-intel/src/bundle-manager/routes/database.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/routes/database.ts rename to cmd/precise-code-intel/src/bundle-manager/routes/database.ts diff --git a/cmd/lsif-server/src/bundle-manager/routes/uploads.ts b/cmd/precise-code-intel/src/bundle-manager/routes/uploads.ts similarity index 100% rename from cmd/lsif-server/src/bundle-manager/routes/uploads.ts rename to cmd/precise-code-intel/src/bundle-manager/routes/uploads.ts diff --git a/cmd/lsif-server/src/bundle-manager/settings.ts b/cmd/precise-code-intel/src/bundle-manager/settings.ts similarity index 94% rename from cmd/lsif-server/src/bundle-manager/settings.ts rename to cmd/precise-code-intel/src/bundle-manager/settings.ts index 22d9f04b6c5..e1bbd666786 100644 --- a/cmd/lsif-server/src/bundle-manager/settings.ts +++ b/cmd/precise-code-intel/src/bundle-manager/settings.ts @@ -3,8 +3,9 @@ import { readEnvInt } from '../shared/settings' /** Which port to run the bundle manager API on. Defaults to 3187. */ export const HTTP_PORT = readEnvInt('HTTP_PORT', 3187) -/** HTTP address for internal LSIF HTTP API. */ -export const LSIF_API_SERVER_URL = process.env.LSIF_API_SERVER_URL || 'http://localhost:3186' +/** HTTP address for internal precise code intel API. */ +export const PRECISE_CODE_INTEL_API_SERVER_URL = + process.env.PRECISE_CODE_INTEL_API_SERVER_URL || 'http://localhost:3186' /** Where on the file system to store LSIF files. This should be a persistent volume. */ export const STORAGE_ROOT = process.env.LSIF_STORAGE_ROOT || 'lsif-storage' diff --git a/cmd/lsif-server/src/bundle-manager/tasks.ts b/cmd/precise-code-intel/src/bundle-manager/tasks.ts similarity index 98% rename from cmd/lsif-server/src/bundle-manager/tasks.ts rename to cmd/precise-code-intel/src/bundle-manager/tasks.ts index 48b0489d35e..f50b52e7079 100644 --- a/cmd/lsif-server/src/bundle-manager/tasks.ts +++ b/cmd/precise-code-intel/src/bundle-manager/tasks.ts @@ -189,7 +189,7 @@ async function makeServerRequest(route: string, payload?: T): Promise { async (): Promise => parseJSON( ( - await got.post(new URL(route, settings.LSIF_API_SERVER_URL).href, { + await got.post(new URL(route, settings.PRECISE_CODE_INTEL_API_SERVER_URL).href, { headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload), }) diff --git a/cmd/lsif-server/src/shared/api/init.ts b/cmd/precise-code-intel/src/shared/api/init.ts similarity index 100% rename from cmd/lsif-server/src/shared/api/init.ts rename to cmd/precise-code-intel/src/shared/api/init.ts diff --git a/cmd/lsif-server/src/shared/api/middleware/errors.ts b/cmd/precise-code-intel/src/shared/api/middleware/errors.ts similarity index 100% rename from cmd/lsif-server/src/shared/api/middleware/errors.ts rename to cmd/precise-code-intel/src/shared/api/middleware/errors.ts diff --git a/cmd/lsif-server/src/shared/api/middleware/metrics.ts b/cmd/precise-code-intel/src/shared/api/middleware/metrics.ts similarity index 100% rename from cmd/lsif-server/src/shared/api/middleware/metrics.ts rename to cmd/precise-code-intel/src/shared/api/middleware/metrics.ts diff --git a/cmd/lsif-server/src/shared/api/middleware/validation.ts b/cmd/precise-code-intel/src/shared/api/middleware/validation.ts similarity index 100% rename from cmd/lsif-server/src/shared/api/middleware/validation.ts rename to cmd/precise-code-intel/src/shared/api/middleware/validation.ts diff --git a/cmd/lsif-server/src/shared/api/pagination/cursor.ts b/cmd/precise-code-intel/src/shared/api/pagination/cursor.ts similarity index 100% rename from cmd/lsif-server/src/shared/api/pagination/cursor.ts rename to cmd/precise-code-intel/src/shared/api/pagination/cursor.ts diff --git a/cmd/lsif-server/src/shared/api/pagination/limit-offset.ts b/cmd/precise-code-intel/src/shared/api/pagination/limit-offset.ts similarity index 100% rename from cmd/lsif-server/src/shared/api/pagination/limit-offset.ts rename to cmd/precise-code-intel/src/shared/api/pagination/limit-offset.ts diff --git a/cmd/lsif-server/src/shared/api/pagination/link.ts b/cmd/precise-code-intel/src/shared/api/pagination/link.ts similarity index 100% rename from cmd/lsif-server/src/shared/api/pagination/link.ts rename to cmd/precise-code-intel/src/shared/api/pagination/link.ts diff --git a/cmd/lsif-server/src/shared/config/config.ts b/cmd/precise-code-intel/src/shared/config/config.ts similarity index 100% rename from cmd/lsif-server/src/shared/config/config.ts rename to cmd/precise-code-intel/src/shared/config/config.ts diff --git a/cmd/lsif-server/src/shared/config/settings.ts b/cmd/precise-code-intel/src/shared/config/settings.ts similarity index 100% rename from cmd/lsif-server/src/shared/config/settings.ts rename to cmd/precise-code-intel/src/shared/config/settings.ts diff --git a/cmd/lsif-server/src/shared/constants.ts b/cmd/precise-code-intel/src/shared/constants.ts similarity index 100% rename from cmd/lsif-server/src/shared/constants.ts rename to cmd/precise-code-intel/src/shared/constants.ts diff --git a/cmd/lsif-server/src/shared/database/inserter.ts b/cmd/precise-code-intel/src/shared/database/inserter.ts similarity index 100% rename from cmd/lsif-server/src/shared/database/inserter.ts rename to cmd/precise-code-intel/src/shared/database/inserter.ts diff --git a/cmd/lsif-server/src/shared/database/logger.ts b/cmd/precise-code-intel/src/shared/database/logger.ts similarity index 100% rename from cmd/lsif-server/src/shared/database/logger.ts rename to cmd/precise-code-intel/src/shared/database/logger.ts diff --git a/cmd/lsif-server/src/shared/database/metrics.ts b/cmd/precise-code-intel/src/shared/database/metrics.ts similarity index 100% rename from cmd/lsif-server/src/shared/database/metrics.ts rename to cmd/precise-code-intel/src/shared/database/metrics.ts diff --git a/cmd/lsif-server/src/shared/database/postgres.ts b/cmd/precise-code-intel/src/shared/database/postgres.ts similarity index 100% rename from cmd/lsif-server/src/shared/database/postgres.ts rename to cmd/precise-code-intel/src/shared/database/postgres.ts diff --git a/cmd/lsif-server/src/shared/database/settings.ts b/cmd/precise-code-intel/src/shared/database/settings.ts similarity index 100% rename from cmd/lsif-server/src/shared/database/settings.ts rename to cmd/precise-code-intel/src/shared/database/settings.ts diff --git a/cmd/lsif-server/src/shared/database/sqlite.ts b/cmd/precise-code-intel/src/shared/database/sqlite.ts similarity index 100% rename from cmd/lsif-server/src/shared/database/sqlite.ts rename to cmd/precise-code-intel/src/shared/database/sqlite.ts diff --git a/cmd/lsif-server/src/shared/datastructures/bloom-filter.test.ts b/cmd/precise-code-intel/src/shared/datastructures/bloom-filter.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/bloom-filter.test.ts rename to cmd/precise-code-intel/src/shared/datastructures/bloom-filter.test.ts diff --git a/cmd/lsif-server/src/shared/datastructures/bloom-filter.ts b/cmd/precise-code-intel/src/shared/datastructures/bloom-filter.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/bloom-filter.ts rename to cmd/precise-code-intel/src/shared/datastructures/bloom-filter.ts diff --git a/cmd/lsif-server/src/shared/datastructures/default-map.test.ts b/cmd/precise-code-intel/src/shared/datastructures/default-map.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/default-map.test.ts rename to cmd/precise-code-intel/src/shared/datastructures/default-map.test.ts diff --git a/cmd/lsif-server/src/shared/datastructures/default-map.ts b/cmd/precise-code-intel/src/shared/datastructures/default-map.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/default-map.ts rename to cmd/precise-code-intel/src/shared/datastructures/default-map.ts diff --git a/cmd/lsif-server/src/shared/datastructures/disjoint-set.test.ts b/cmd/precise-code-intel/src/shared/datastructures/disjoint-set.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/disjoint-set.test.ts rename to cmd/precise-code-intel/src/shared/datastructures/disjoint-set.test.ts diff --git a/cmd/lsif-server/src/shared/datastructures/disjoint-set.ts b/cmd/precise-code-intel/src/shared/datastructures/disjoint-set.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/disjoint-set.ts rename to cmd/precise-code-intel/src/shared/datastructures/disjoint-set.ts diff --git a/cmd/lsif-server/src/shared/datastructures/orderedset.test.ts b/cmd/precise-code-intel/src/shared/datastructures/orderedset.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/orderedset.test.ts rename to cmd/precise-code-intel/src/shared/datastructures/orderedset.test.ts diff --git a/cmd/lsif-server/src/shared/datastructures/orderedset.ts b/cmd/precise-code-intel/src/shared/datastructures/orderedset.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/orderedset.ts rename to cmd/precise-code-intel/src/shared/datastructures/orderedset.ts diff --git a/cmd/lsif-server/src/shared/datastructures/settings.ts b/cmd/precise-code-intel/src/shared/datastructures/settings.ts similarity index 100% rename from cmd/lsif-server/src/shared/datastructures/settings.ts rename to cmd/precise-code-intel/src/shared/datastructures/settings.ts diff --git a/cmd/lsif-server/src/shared/encoding/json.test.ts b/cmd/precise-code-intel/src/shared/encoding/json.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/encoding/json.test.ts rename to cmd/precise-code-intel/src/shared/encoding/json.test.ts diff --git a/cmd/lsif-server/src/shared/encoding/json.ts b/cmd/precise-code-intel/src/shared/encoding/json.ts similarity index 100% rename from cmd/lsif-server/src/shared/encoding/json.ts rename to cmd/precise-code-intel/src/shared/encoding/json.ts diff --git a/cmd/lsif-server/src/shared/gitserver/gitserver.test.ts b/cmd/precise-code-intel/src/shared/gitserver/gitserver.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/gitserver/gitserver.test.ts rename to cmd/precise-code-intel/src/shared/gitserver/gitserver.test.ts diff --git a/cmd/lsif-server/src/shared/gitserver/gitserver.ts b/cmd/precise-code-intel/src/shared/gitserver/gitserver.ts similarity index 100% rename from cmd/lsif-server/src/shared/gitserver/gitserver.ts rename to cmd/precise-code-intel/src/shared/gitserver/gitserver.ts diff --git a/cmd/lsif-server/src/shared/gitserver/metrics.ts b/cmd/precise-code-intel/src/shared/gitserver/metrics.ts similarity index 100% rename from cmd/lsif-server/src/shared/gitserver/metrics.ts rename to cmd/precise-code-intel/src/shared/gitserver/metrics.ts diff --git a/cmd/lsif-server/src/shared/input.test.ts b/cmd/precise-code-intel/src/shared/input.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/input.test.ts rename to cmd/precise-code-intel/src/shared/input.test.ts diff --git a/cmd/lsif-server/src/shared/input.ts b/cmd/precise-code-intel/src/shared/input.ts similarity index 100% rename from cmd/lsif-server/src/shared/input.ts rename to cmd/precise-code-intel/src/shared/input.ts diff --git a/cmd/lsif-server/src/shared/logging.ts b/cmd/precise-code-intel/src/shared/logging.ts similarity index 100% rename from cmd/lsif-server/src/shared/logging.ts rename to cmd/precise-code-intel/src/shared/logging.ts diff --git a/cmd/lsif-server/src/shared/maps.test.ts b/cmd/precise-code-intel/src/shared/maps.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/maps.test.ts rename to cmd/precise-code-intel/src/shared/maps.test.ts diff --git a/cmd/lsif-server/src/shared/maps.ts b/cmd/precise-code-intel/src/shared/maps.ts similarity index 100% rename from cmd/lsif-server/src/shared/maps.ts rename to cmd/precise-code-intel/src/shared/maps.ts diff --git a/cmd/lsif-server/src/shared/metrics.ts b/cmd/precise-code-intel/src/shared/metrics.ts similarity index 100% rename from cmd/lsif-server/src/shared/metrics.ts rename to cmd/precise-code-intel/src/shared/metrics.ts diff --git a/cmd/lsif-server/src/shared/models/hash.ts b/cmd/precise-code-intel/src/shared/models/hash.ts similarity index 100% rename from cmd/lsif-server/src/shared/models/hash.ts rename to cmd/precise-code-intel/src/shared/models/hash.ts diff --git a/cmd/lsif-server/src/shared/models/pg.ts b/cmd/precise-code-intel/src/shared/models/pg.ts similarity index 100% rename from cmd/lsif-server/src/shared/models/pg.ts rename to cmd/precise-code-intel/src/shared/models/pg.ts diff --git a/cmd/lsif-server/src/shared/models/queries.ts b/cmd/precise-code-intel/src/shared/models/queries.ts similarity index 100% rename from cmd/lsif-server/src/shared/models/queries.ts rename to cmd/precise-code-intel/src/shared/models/queries.ts diff --git a/cmd/lsif-server/src/shared/models/sqlite.ts b/cmd/precise-code-intel/src/shared/models/sqlite.ts similarity index 100% rename from cmd/lsif-server/src/shared/models/sqlite.ts rename to cmd/precise-code-intel/src/shared/models/sqlite.ts diff --git a/cmd/lsif-server/src/shared/models/util.ts b/cmd/precise-code-intel/src/shared/models/util.ts similarity index 100% rename from cmd/lsif-server/src/shared/models/util.ts rename to cmd/precise-code-intel/src/shared/models/util.ts diff --git a/cmd/lsif-server/src/shared/paths.ts b/cmd/precise-code-intel/src/shared/paths.ts similarity index 100% rename from cmd/lsif-server/src/shared/paths.ts rename to cmd/precise-code-intel/src/shared/paths.ts diff --git a/cmd/lsif-server/src/shared/settings.ts b/cmd/precise-code-intel/src/shared/settings.ts similarity index 100% rename from cmd/lsif-server/src/shared/settings.ts rename to cmd/precise-code-intel/src/shared/settings.ts diff --git a/cmd/lsif-server/src/shared/store/dependencies.test.ts b/cmd/precise-code-intel/src/shared/store/dependencies.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/store/dependencies.test.ts rename to cmd/precise-code-intel/src/shared/store/dependencies.test.ts diff --git a/cmd/lsif-server/src/shared/store/dependencies.ts b/cmd/precise-code-intel/src/shared/store/dependencies.ts similarity index 100% rename from cmd/lsif-server/src/shared/store/dependencies.ts rename to cmd/precise-code-intel/src/shared/store/dependencies.ts diff --git a/cmd/lsif-server/src/shared/store/dumps.test.ts b/cmd/precise-code-intel/src/shared/store/dumps.test.ts similarity index 100% rename from cmd/lsif-server/src/shared/store/dumps.test.ts rename to cmd/precise-code-intel/src/shared/store/dumps.test.ts diff --git a/cmd/lsif-server/src/shared/store/dumps.ts b/cmd/precise-code-intel/src/shared/store/dumps.ts similarity index 100% rename from cmd/lsif-server/src/shared/store/dumps.ts rename to cmd/precise-code-intel/src/shared/store/dumps.ts diff --git a/cmd/lsif-server/src/shared/store/locks.ts b/cmd/precise-code-intel/src/shared/store/locks.ts similarity index 100% rename from cmd/lsif-server/src/shared/store/locks.ts rename to cmd/precise-code-intel/src/shared/store/locks.ts diff --git a/cmd/lsif-server/src/shared/store/metrics.ts b/cmd/precise-code-intel/src/shared/store/metrics.ts similarity index 100% rename from cmd/lsif-server/src/shared/store/metrics.ts rename to cmd/precise-code-intel/src/shared/store/metrics.ts diff --git a/cmd/lsif-server/src/shared/store/uploads.ts b/cmd/precise-code-intel/src/shared/store/uploads.ts similarity index 100% rename from cmd/lsif-server/src/shared/store/uploads.ts rename to cmd/precise-code-intel/src/shared/store/uploads.ts diff --git a/cmd/lsif-server/src/shared/tasks.ts b/cmd/precise-code-intel/src/shared/tasks.ts similarity index 100% rename from cmd/lsif-server/src/shared/tasks.ts rename to cmd/precise-code-intel/src/shared/tasks.ts diff --git a/cmd/lsif-server/src/shared/test-util.ts b/cmd/precise-code-intel/src/shared/test-util.ts similarity index 100% rename from cmd/lsif-server/src/shared/test-util.ts rename to cmd/precise-code-intel/src/shared/test-util.ts diff --git a/cmd/lsif-server/src/shared/tracing.ts b/cmd/precise-code-intel/src/shared/tracing.ts similarity index 100% rename from cmd/lsif-server/src/shared/tracing.ts rename to cmd/precise-code-intel/src/shared/tracing.ts diff --git a/cmd/lsif-server/src/shared/util.ts b/cmd/precise-code-intel/src/shared/util.ts similarity index 100% rename from cmd/lsif-server/src/shared/util.ts rename to cmd/precise-code-intel/src/shared/util.ts diff --git a/cmd/lsif-server/src/shared/visibility.ts b/cmd/precise-code-intel/src/shared/visibility.ts similarity index 100% rename from cmd/lsif-server/src/shared/visibility.ts rename to cmd/precise-code-intel/src/shared/visibility.ts diff --git a/cmd/lsif-server/src/worker/conversion/batch.test.ts b/cmd/precise-code-intel/src/worker/conversion/batch.test.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/batch.test.ts rename to cmd/precise-code-intel/src/worker/conversion/batch.test.ts diff --git a/cmd/lsif-server/src/worker/conversion/batch.ts b/cmd/precise-code-intel/src/worker/conversion/batch.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/batch.ts rename to cmd/precise-code-intel/src/worker/conversion/batch.ts diff --git a/cmd/lsif-server/src/worker/conversion/conversion.ts b/cmd/precise-code-intel/src/worker/conversion/conversion.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/conversion.ts rename to cmd/precise-code-intel/src/worker/conversion/conversion.ts diff --git a/cmd/lsif-server/src/worker/conversion/correlator.test.ts b/cmd/precise-code-intel/src/worker/conversion/correlator.test.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/correlator.test.ts rename to cmd/precise-code-intel/src/worker/conversion/correlator.test.ts diff --git a/cmd/lsif-server/src/worker/conversion/correlator.ts b/cmd/precise-code-intel/src/worker/conversion/correlator.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/correlator.ts rename to cmd/precise-code-intel/src/worker/conversion/correlator.ts diff --git a/cmd/lsif-server/src/worker/conversion/existence.test.ts b/cmd/precise-code-intel/src/worker/conversion/existence.test.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/existence.test.ts rename to cmd/precise-code-intel/src/worker/conversion/existence.test.ts diff --git a/cmd/lsif-server/src/worker/conversion/existence.ts b/cmd/precise-code-intel/src/worker/conversion/existence.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/existence.ts rename to cmd/precise-code-intel/src/worker/conversion/existence.ts diff --git a/cmd/lsif-server/src/worker/conversion/importer.ts b/cmd/precise-code-intel/src/worker/conversion/importer.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/importer.ts rename to cmd/precise-code-intel/src/worker/conversion/importer.ts diff --git a/cmd/lsif-server/src/worker/conversion/paths.ts b/cmd/precise-code-intel/src/worker/conversion/paths.ts similarity index 100% rename from cmd/lsif-server/src/worker/conversion/paths.ts rename to cmd/precise-code-intel/src/worker/conversion/paths.ts diff --git a/cmd/lsif-server/src/worker/metrics.ts b/cmd/precise-code-intel/src/worker/metrics.ts similarity index 100% rename from cmd/lsif-server/src/worker/metrics.ts rename to cmd/precise-code-intel/src/worker/metrics.ts diff --git a/cmd/lsif-server/src/worker/settings.ts b/cmd/precise-code-intel/src/worker/settings.ts similarity index 82% rename from cmd/lsif-server/src/worker/settings.ts rename to cmd/precise-code-intel/src/worker/settings.ts index a4c93a6bd75..8b15061f546 100644 --- a/cmd/lsif-server/src/worker/settings.ts +++ b/cmd/precise-code-intel/src/worker/settings.ts @@ -3,8 +3,9 @@ import { readEnvInt } from '../shared/settings' /** Which port to run the metrics server on. Defaults to 3188. */ export const METRICS_PORT = readEnvInt('METRICS_PORT', 3188) -/** HTTP address for internal LSIF bundle manager server. */ -export const LSIF_BUNDLE_MANAGER_URL = process.env.LSIF_BUNDLE_MANAGER_URL || 'http://localhost:3187' +/** HTTP address for internal precise code intel bundle manager server. */ +export const PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL = + process.env.PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL || 'http://localhost:3187' /** Where on the file system to temporarily store LSIF uploads and SQLite files. This is NOT a persistent volume. */ export const STORAGE_ROOT = process.env.LSIF_STORAGE_ROOT || 'lsif-storage' diff --git a/cmd/lsif-server/src/worker/worker.ts b/cmd/precise-code-intel/src/worker/worker.ts similarity index 96% rename from cmd/lsif-server/src/worker/worker.ts rename to cmd/precise-code-intel/src/worker/worker.ts index 35b5d2dbe39..3b9c35d7efa 100644 --- a/cmd/lsif-server/src/worker/worker.ts +++ b/cmd/precise-code-intel/src/worker/worker.ts @@ -79,7 +79,7 @@ async function main(logger: Logger): Promise { logAndTraceCall(ctx, 'Converting upload', async (ctx: TracingContext) => { const sourcePath = path.join(settings.STORAGE_ROOT, uuid.v4()) const targetPath = path.join(settings.STORAGE_ROOT, uuid.v4()) - const url = new URL(`/uploads/${upload.id}`, settings.LSIF_BUNDLE_MANAGER_URL).href + const url = new URL(`/uploads/${upload.id}`, settings.PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL).href try { await logAndTraceCall(ctx, 'Downloading raw dump from bundle manager', () => @@ -101,7 +101,9 @@ async function main(logger: Logger): Promise { await logAndTraceCall(ctx, 'Uploading converted dump to bundle manager', () => pipeline( fs.createReadStream(targetPath), - got.stream.post(new URL(`/dbs/${upload.id}`, settings.LSIF_BUNDLE_MANAGER_URL).href) + got.stream.post( + new URL(`/dbs/${upload.id}`, settings.PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL).href + ) ) ) diff --git a/cmd/lsif-server/test-data/lsif-go@ad3507cb.lsif.gz b/cmd/precise-code-intel/test-data/lsif-go@ad3507cb.lsif.gz similarity index 100% rename from cmd/lsif-server/test-data/lsif-go@ad3507cb.lsif.gz rename to cmd/precise-code-intel/test-data/lsif-go@ad3507cb.lsif.gz diff --git a/cmd/lsif-server/tsconfig.json b/cmd/precise-code-intel/tsconfig.json similarity index 100% rename from cmd/lsif-server/tsconfig.json rename to cmd/precise-code-intel/tsconfig.json diff --git a/cmd/lsif-server/tslint.json b/cmd/precise-code-intel/tslint.json similarity index 100% rename from cmd/lsif-server/tslint.json rename to cmd/precise-code-intel/tslint.json diff --git a/cmd/lsif-server/yarn.lock b/cmd/precise-code-intel/yarn.lock similarity index 100% rename from cmd/lsif-server/yarn.lock rename to cmd/precise-code-intel/yarn.lock diff --git a/cmd/server/Dockerfile b/cmd/server/Dockerfile index 2144f048e11..8205f8a2eab 100644 --- a/cmd/server/Dockerfile +++ b/cmd/server/Dockerfile @@ -8,15 +8,15 @@ FROM alpine:3.10@sha256:e4355b66995c96b4b468159fc5c7e3540fcef961189ca13fee877798 COPY ctags-install-alpine.sh /ctags-install-alpine.sh RUN /ctags-install-alpine.sh -FROM alpine:3.10@sha256:e4355b66995c96b4b468159fc5c7e3540fcef961189ca13fee877798649f531a AS pci-builder +FROM alpine:3.10@sha256:e4355b66995c96b4b468159fc5c7e3540fcef961189ca13fee877798649f531a AS precise-code-intel-builder RUN apk add --no-cache nodejs-current=12.4.0-r0 nodejs-npm=10.19.0-r0 RUN npm install -g yarn@1.17.3 -COPY lsif-server/package.json lsif-server/yarn.lock lsif-server/tsconfig.json /pci/ -RUN yarn --cwd /pci -COPY lsif-server/src /pci/src -RUN yarn --cwd /pci run build +COPY precise-code-intel/package.json precise-code-intel/yarn.lock precise-code-intel/tsconfig.json /precise-code-intel/ +RUN yarn --cwd /precise-code-intel +COPY precise-code-intel/src /precise-code-intel/src +RUN yarn --cwd /precise-code-intel run build # TODO: Make this image use our sourcegraph/alpine:3.10 base image FROM alpine:3.10@sha256:e4355b66995c96b4b468159fc5c7e3540fcef961189ca13fee877798649f531a @@ -57,7 +57,7 @@ COPY --from=comby/comby:0.15.0@sha256:b3b57ed810be1489ccd1ef8fa42210d87d2d396e41 # hadolint ignore=DL3022 COPY --from=sourcegraph/syntect_server:c0297a1@sha256:333abb45cfaae9c9d37e576c3853843b00eca33a40a7c71f6b93211ed96528df /syntect_server /usr/local/bin/ COPY --from=ctags /usr/local/bin/universal-* /usr/local/bin/ -COPY --from=pci-builder /pci /pci +COPY --from=precise-code-intel-builder /precise-code-intel /precise-code-intel # hadolint ignore=DL3022 COPY --from=sourcegraph/prometheus:10.0.10@sha256:4d73d99f3b18d8e4e09f63671c51eabcba956e357ab33d682de8cf1540e3b863 /bin/prometheus /usr/local/bin diff --git a/cmd/server/build.sh b/cmd/server/build.sh index c32d95324bd..221b51887d7 100755 --- a/cmd/server/build.sh +++ b/cmd/server/build.sh @@ -85,8 +85,8 @@ cp -a ./cmd/symbols/.ctags.d "$OUTPUT" cp -a ./cmd/symbols/ctags-install-alpine.sh "$OUTPUT" cp -a ./dev/libsqlite3-pcre/install-alpine.sh "$OUTPUT/libsqlite3-pcre-install-alpine.sh" -echo "--- lsif server" -cp -a ./cmd/lsif-server "$OUTPUT" +echo "--- precise code intel" +cp -a ./cmd/precise-code-intel "$OUTPUT" echo "--- prometheus config" cp -r docker-images/prometheus/config "$OUTPUT/sg_config_prometheus" diff --git a/cmd/server/shared/shared.go b/cmd/server/shared/shared.go index bcc7f62cd66..a2ebdc3a639 100644 --- a/cmd/server/shared/shared.go +++ b/cmd/server/shared/shared.go @@ -24,19 +24,19 @@ const FrontendInternalHost = "127.0.0.1:3090" // defaultEnv is environment variables that will be set if not already set. var defaultEnv = map[string]string{ // Sourcegraph services running in this container - "SRC_GIT_SERVERS": "127.0.0.1:3178", - "SEARCHER_URL": "http://127.0.0.1:3181", - "REPO_UPDATER_URL": "http://127.0.0.1:3182", - "QUERY_RUNNER_URL": "http://127.0.0.1:3183", - "SRC_SYNTECT_SERVER": "http://127.0.0.1:9238", - "SYMBOLS_URL": "http://127.0.0.1:3184", - "REPLACER_URL": "http://127.0.0.1:3185", - "LSIF_API_SERVER_URL": "http://127.0.0.1:3186", - "LSIF_BUNDLE_MANAGER_URL": "http://127.0.0.1:3187", - "SRC_HTTP_ADDR": ":8080", - "SRC_HTTPS_ADDR": ":8443", - "SRC_FRONTEND_INTERNAL": FrontendInternalHost, - "GITHUB_BASE_URL": "http://127.0.0.1:3180", // points to github-proxy + "SRC_GIT_SERVERS": "127.0.0.1:3178", + "SEARCHER_URL": "http://127.0.0.1:3181", + "REPO_UPDATER_URL": "http://127.0.0.1:3182", + "QUERY_RUNNER_URL": "http://127.0.0.1:3183", + "SRC_SYNTECT_SERVER": "http://127.0.0.1:9238", + "SYMBOLS_URL": "http://127.0.0.1:3184", + "REPLACER_URL": "http://127.0.0.1:3185", + "PRECISE_CODE_INTEL_API_SERVER_URL": "http://127.0.0.1:3186", + "PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL": "http://127.0.0.1:3187", + "SRC_HTTP_ADDR": ":8080", + "SRC_HTTPS_ADDR": ":8443", + "SRC_FRONTEND_INTERNAL": FrontendInternalHost, + "GITHUB_BASE_URL": "http://127.0.0.1:3180", // points to github-proxy "GRAFANA_SERVER_URL": "http://127.0.0.1:3370", @@ -136,9 +136,9 @@ func Main() { `gitserver: gitserver`, `query-runner: query-runner`, `symbols: symbols`, - `pci-api-server: node /pci/out/api-server/api.js`, - `pci-bundle-manager: node /pci/out/bundle-manager/manager.js`, - `pci-worker: node /pci/out/worker/worker.js`, + `precise-code-intel-api-server: node /precise-code-intel/out/api-server/api.js`, + `precise-code-intel-bundle-manager: node /precise-code-intel/out/bundle-manager/manager.js`, + `precise-code-intel-worker: node /precise-code-intel/out/worker/worker.js`, `searcher: searcher`, `replacer: replacer`, `github-proxy: github-proxy`, diff --git a/dev/Procfile b/dev/Procfile index 7fa1f5472cd..114de7b82d8 100644 --- a/dev/Procfile +++ b/dev/Procfile @@ -18,9 +18,9 @@ zoekt-webserver-1: ./dev/zoekt/wrapper webserver 1 keycloak: ./dev/auth-provider/keycloak.sh jaeger: ./dev/jaeger.sh docsite: ./dev/docsite.sh -config doc/docsite.json serve -http=localhost:5080 -pci-api-server: yarn --cwd cmd/lsif-server run run:api-server -pci-bundle-manager: yarn --cwd cmd/lsif-server run run:bundle-manager -pci-worker: yarn --cwd cmd/lsif-server run run:worker +precise-code-intel-api-server: yarn --cwd cmd/precise-code-intel run run:api-server +precise-code-intel-bundle-manager: yarn --cwd cmd/precise-code-intel run run:bundle-manager +precise-code-intel-worker: yarn --cwd cmd/precise-code-intel run run:worker prometheus: ./dev/prometheus.sh grafana: ./dev/grafana.sh postgres_exporter: ./dev/postgres_exporter.sh diff --git a/dev/ci/yarn-run.sh b/dev/ci/yarn-run.sh index 3bdba4af0b3..5dc522ef24e 100755 --- a/dev/ci/yarn-run.sh +++ b/dev/ci/yarn-run.sh @@ -5,7 +5,7 @@ set -e echo "--- yarn" # mutex is necessary since CI runs various yarn installs in parallel yarn --mutex network --frozen-lockfile --network-timeout 60000 -yarn --mutex network --cwd cmd/lsif-server --frozen-lockfile --network-timeout 60000 +yarn --mutex network --cwd cmd/precise-code-intel --frozen-lockfile --network-timeout 60000 yarn --mutex network --cwd dev/release --frozen-lockfile --network-timeout 60000 for cmd in "$@" diff --git a/dev/foreach-ts-project.sh b/dev/foreach-ts-project.sh index ea1f2999b1b..b33c7390842 100755 --- a/dev/foreach-ts-project.sh +++ b/dev/foreach-ts-project.sh @@ -16,7 +16,7 @@ DIRS=( browser \ packages/sourcegraph-extension-api \ packages/@sourcegraph/extension-api-types \ - cmd/lsif-server \ + cmd/precise-code-intel \ dev/release ) diff --git a/dev/start.sh b/dev/start.sh index c80be6bd1d1..08893870ac0 100755 --- a/dev/start.sh +++ b/dev/start.sh @@ -48,8 +48,8 @@ export REPO_UPDATER_URL=http://127.0.0.1:3182 export REDIS_ENDPOINT=127.0.0.1:6379 export QUERY_RUNNER_URL=http://localhost:3183 export SYMBOLS_URL=http://localhost:3184 -export LSIF_API_SERVER_URL=http://localhost:3186 -export LSIF_BUNDLE_MANAGER_URL=http://localhost:3187 +export PRECISE_CODE_INTEL_API_SERVER_URL=http://localhost:3186 +export PRECISE_CODE_INTEL_BUNDLE_MANAGER_URL=http://localhost:3187 export SRC_SYNTECT_SERVER=http://localhost:9238 export SRC_FRONTEND_INTERNAL=localhost:3090 export SRC_PROF_HTTP= @@ -106,7 +106,7 @@ if [[ -n "$yarn_pid" ]]; then fi # Install precise code intel dependencies -pushd ./cmd/lsif-server 1> /dev/null +pushd ./cmd/precise-code-intel 1> /dev/null yarn --no-progress popd 1> /dev/null diff --git a/doc/admin/observability/metrics_guide.md b/doc/admin/observability/metrics_guide.md index 6423a4c6110..192a2d9ae9a 100644 --- a/doc/admin/observability/metrics_guide.md +++ b/doc/admin/observability/metrics_guide.md @@ -28,7 +28,7 @@ Sourcegraph's metrics include a single high-level metric `alert_count` which ind - `"frontend"` - `"github-proxy"` - `"gitserver"` - - `"lsif-server"` + - `"precise-code-intel"` - `"query-runner"` - `"replacer"` - `"repo-updater"` diff --git a/doc/dev/architecture/index.md b/doc/dev/architecture/index.md index e364336265e..ca16e9c6299 100644 --- a/doc/dev/architecture/index.md +++ b/doc/dev/architecture/index.md @@ -34,7 +34,7 @@ Our backend is composed of multiple services: - Most are Go services found in the [cmd](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/cmd) folder. - [Syntect server](https://sourcegraph.com/github.com/sourcegraph/syntect_server) is our syntax highlighting service written in Rust. It is not horizontally scalable so only 1 replica is supported. -- [Precise code intel system](https://github.com/sourcegraph/sourcegraph/tree/master/cmd/lsif-server) provides precise code intelligence based on the LSIF data format. It is written in TypeScript. +- [Precise code intel system](https://github.com/sourcegraph/sourcegraph/tree/master/cmd/precise-code-intel) provides precise code intelligence based on the LSIF data format. It is written in TypeScript. - [zoekt-indexserver](https://sourcegraph.com/github.com/sourcegraph/zoekt/-/tree/cmd/zoekt-sourcegraph-indexserver) and [zoekt-webserver](https://sourcegraph.com/github.com/sourcegraph/zoekt/-/tree/cmd/zoekt-webserver) provide indexed search. They are written in Go. ## Infrastructure diff --git a/doc/dev/architecture/precise-code-intel.dot b/doc/dev/architecture/precise-code-intel.dot index 29447970b52..b9eb287d7bc 100644 --- a/doc/dev/architecture/precise-code-intel.dot +++ b/doc/dev/architecture/precise-code-intel.dot @@ -59,17 +59,17 @@ digraph architecture { api_server [ label="api server" fillcolor="3" - URL="https://github.com/sourcegraph/sourcegraph/tree/master/cmd/lsif-server/src/server" + URL="https://github.com/sourcegraph/sourcegraph/tree/master/cmd/precise-code-intel/src/server" ] worker [ label="worker" fillcolor="4" - URL="https://github.com/sourcegraph/sourcegraph/tree/master/cmd/lsif-server/src/worker" + URL="https://github.com/sourcegraph/sourcegraph/tree/master/cmd/precise-code-intel/src/worker" ] bundle_manager [ label="bundle manager" fillcolor="5" - URL="https://github.com/sourcegraph/sourcegraph/tree/master/cmd/lsif-server/src/bundle-manager" + URL="https://github.com/sourcegraph/sourcegraph/tree/master/cmd/precise-code-intel/src/bundle-manager" ] } diff --git a/doc/dev/architecture/precise-code-intel.svg b/doc/dev/architecture/precise-code-intel.svg index 7c4f7322fbe..1faeac882d5 100644 --- a/doc/dev/architecture/precise-code-intel.svg +++ b/doc/dev/architecture/precise-code-intel.svg @@ -35,7 +35,7 @@ api_server - + api server @@ -68,7 +68,7 @@ bundle_manager - + bundle manager @@ -98,7 +98,7 @@ worker - + worker diff --git a/doc/dev/tech_stack.md b/doc/dev/tech_stack.md index 32b9918c252..127963c02ea 100644 --- a/doc/dev/tech_stack.md +++ b/doc/dev/tech_stack.md @@ -35,7 +35,7 @@ Why do we put up with this pain? As of October 2019, Syntect continues to be the ### Precise code intel system -The processes in the [precise code intel](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/cmd/lsif-server) system were written in TypeScript so we could directly depend on the official [LSIF type definitions that are published by Microsoft as a TypeScript interface](https://github.com/microsoft/lsif-node/blob/master/protocol/src/protocol.ts). +The processes in the [precise code intel](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/cmd/precise-code-intel) system were written in TypeScript so we could directly depend on the official [LSIF type definitions that are published by Microsoft as a TypeScript interface](https://github.com/microsoft/lsif-node/blob/master/protocol/src/protocol.ts). ### LSIF generators and language servers diff --git a/docker-images/prometheus/config/lsif_server_rules.yml b/docker-images/prometheus/config/lsif_server_rules.yml index a7fb9b6b226..172d8db0188 100644 --- a/docker-images/prometheus/config/lsif_server_rules.yml +++ b/docker-images/prometheus/config/lsif_server_rules.yml @@ -1,13 +1,13 @@ groups: - - name: lsif-server + - name: precise-code-intel rules: - record: alert_count labels: - service_name: lsif-server + service_name: precise-code-intel level: critical expr: 0 - record: alert_count labels: - service_name: lsif-server + service_name: precise-code-intel level: warning expr: 0 diff --git a/enterprise/dev/ci/ci/pipeline-steps.go b/enterprise/dev/ci/ci/pipeline-steps.go index 6c11d0c6be8..cabecb87fd2 100644 --- a/enterprise/dev/ci/ci/pipeline-steps.go +++ b/enterprise/dev/ci/ci/pipeline-steps.go @@ -19,7 +19,7 @@ var allDockerImages = []string{ "searcher", "server", "symbols", - "lsif-server", + "precise-code-intel", } // Verifies the docs formatting and builds the `docsite` command. @@ -90,8 +90,8 @@ func addBrowserExt(pipeline *bk.Pipeline) { // Tests the precise code intel system. func addPreciseCodeIntelSystem(pipeline *bk.Pipeline) { pipeline.AddStep(":jest:", - bk.Cmd("dev/ci/yarn-test-separate.sh cmd/lsif-server"), - bk.ArtifactPaths("cmd/lsif-server/coverage/coverage-final.json")) + bk.Cmd("dev/ci/yarn-test-separate.sh cmd/precise-code-intel"), + bk.ArtifactPaths("cmd/precise-code-intel/coverage/coverage-final.json")) } // Adds the shared frontend tests (shared between the web app and browser extension). diff --git a/enterprise/internal/codeintel/lsifserver/client/client.go b/enterprise/internal/codeintel/lsifserver/client/client.go index a4da599593c..74cbed19959 100644 --- a/enterprise/internal/codeintel/lsifserver/client/client.go +++ b/enterprise/internal/codeintel/lsifserver/client/client.go @@ -12,11 +12,10 @@ import ( ) var ( - // TODO - update this to precise-code-intel-api-server once we split them in k8s - lsifAPIServerURL = env.Get("LSIF_API_SERVER_URL", "k8s+http://lsif-server:3186", "precise-code-intel-api-server URL (or space separated list of precise-code-intel-api-server URLs)") + preciseCodeIntelAPIServerURL = env.Get("PRECISE_CODE_INTEL_API_SERVER_URL", "k8s+http://precise-code-intel:3186", "precise-code-intel-api-server URL (or space separated list of precise-code-intel-api-server URLs)") - lsifAPIServerURLsOnce sync.Once - lsifAPIServerURLs *endpoint.Map + preciseCodeIntelAPIServerURLsOnce sync.Once + preciseCodeIntelAPIServerURLs *endpoint.Map DefaultClient = &Client{ endpoint: LSIFURLs(), @@ -33,12 +32,12 @@ type Client struct { } func LSIFURLs() *endpoint.Map { - lsifAPIServerURLsOnce.Do(func() { - if len(strings.Fields(lsifAPIServerURL)) == 0 { - lsifAPIServerURLs = endpoint.Empty(errors.New("an precise-code-intel-api-server has not been configured")) + preciseCodeIntelAPIServerURLsOnce.Do(func() { + if len(strings.Fields(preciseCodeIntelAPIServerURL)) == 0 { + preciseCodeIntelAPIServerURLs = endpoint.Empty(errors.New("an precise-code-intel-api-server has not been configured")) } else { - lsifAPIServerURLs = endpoint.New(lsifAPIServerURL) + preciseCodeIntelAPIServerURLs = endpoint.New(preciseCodeIntelAPIServerURL) } }) - return lsifAPIServerURLs + return preciseCodeIntelAPIServerURLs } diff --git a/enterprise/internal/codeintel/lsifserver/proxy/proxy.go b/enterprise/internal/codeintel/lsifserver/proxy/proxy.go index 7d0c7193392..769a93a4868 100644 --- a/enterprise/internal/codeintel/lsifserver/proxy/proxy.go +++ b/enterprise/internal/codeintel/lsifserver/proxy/proxy.go @@ -121,7 +121,7 @@ func isSiteAdmin(ctx context.Context) bool { return false } - log15.Error("lsif-server proxy: failed to get up current user", "error", err) + log15.Error("precise-code-intel proxy: failed to get up current user", "error", err) return false } diff --git a/jest.config.js b/jest.config.js index 922f37949b1..5acef3c8418 100644 --- a/jest.config.js +++ b/jest.config.js @@ -6,5 +6,10 @@ const config = require('./jest.config.base') /** @type {jest.InitialOptions} */ module.exports = { ...config, - projects: ['browser/jest.config.js', 'shared/jest.config.js', 'web/jest.config.js', 'cmd/lsif-server/jest.config.js'], + projects: [ + 'browser/jest.config.js', + 'shared/jest.config.js', + 'web/jest.config.js', + 'cmd/precise-code-intel/jest.config.js', + ], } diff --git a/renovate.json b/renovate.json index f79c6f87174..ed59bfbf113 100644 --- a/renovate.json +++ b/renovate.json @@ -17,7 +17,7 @@ "reviewers": ["beyang"] }, { - "paths": ["cmd/lsif-server/*"], + "paths": ["cmd/precise-code-intel/*"], "reviewers": ["team:code-intel"] } ] diff --git a/tsconfig.json b/tsconfig.json index 248061fceb4..a23afab07a4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,7 @@ { "path": "web/src/regression" }, { "path": "browser" }, { "path": "browser/src/e2e" }, - { "path": "cmd/lsif-server" }, + { "path": "cmd/precise-code-intel" }, { "path": "schema" }, { "path": "packages/sourcegraph-extension-api" }, { "path": "packages/@sourcegraph/extension-api-types" },