diff --git a/.aspect/bazelrc/ci.sourcegraph.bazelrc b/.aspect/bazelrc/ci.sourcegraph.bazelrc index 572c553af4927..98307106d9ff5 100644 --- a/.aspect/bazelrc/ci.sourcegraph.bazelrc +++ b/.aspect/bazelrc/ci.sourcegraph.bazelrc @@ -5,44 +5,47 @@ try-import %workspace%/.aspect/bazelrc/ci.generated.bazelrc # Use repo caching for building and testing. # Article: https://buildkite.com/blog/how-bazel-built-its-ci-system-on-top-of-buildkite # Docs: https://bazel.build/reference/command-line-reference#flag--repository_cache -build --repository_cache=/home/buildkite/repocache-sourcegraph +common --repository_cache=/home/buildkite/repocache-sourcegraph # We need /usr/local/bin # TODO(DevX) we should be narrower here. -build --test_env=PATH +common --test_env=PATH # Needed for DB in CI -build --test_env=PGUSER -build --test_env=PGSSLMODE -build --test_env=PGDATABASE +common --test_env=PGUSER=postgres +common --test_env=PGPASSWORD=postgres +common --test_env=PGSSLMODE=disable +common --test_env=PGDATABASE=postgres # Allow tests to understand they're running in CI, which forces dbtest to drop database even in case of failures. # TODO(JH) we should instead wipe all templates after a job finishes. -build --test_env=CI +common --test_env=CI # Ensure we're not exhausting database connections. -build --test_env=GOMAXPROCS=10 -build --test_env=TESTDB_MAXOPENCONNS=15 +common --test_env=GOMAXPROCS=10 +common --test_env=TESTDB_MAXOPENCONNS=15 # Needed for E2E -build --test_env=BUILDKITE +common --test_env=BUILDKITE # Needed for mocha tests # We have to use the `--define` flag here instead of `--test_env` because # the mocha tests target is the build target and it's tested with `build_test`. -build --define=E2E_HEADLESS=false -build --define=E2E_SOURCEGRAPH_BASE_URL="http://localhost:7080" -build --define=DISPLAY=:99 +common --define=E2E_HEADLESS=false +# if we set this to localhost, chrome will refuse to conenct since local host is in its HTTP Strict Transport Security +# by setting the loopback address we get passed that +common --define=E2E_SOURCEGRAPH_BASE_URL="http://127.0.0.1:7080" +common --define=DISPLAY=:99 # Provides git commit, branch information to build targets like Percy via status file. # https://bazel.build/docs/user-manual#workspace-status -build --workspace_status_command=./dev/bazel_buildkite_stamp_vars.sh +common --workspace_status_command=./dev/bazel_buildkite_stamp_vars.sh # temp -build --test_env=INCLUDE_ADMIN_ONBOARDING=false +common --test_env=INCLUDE_ADMIN_ONBOARDING=false # Used for container_structure_tests -build --test_env=DOCKER_HOST +common --test_env=DOCKER_HOST # Used by migration rules -build --action_env=PGUSER=postgres +common --action_env=PGUSER=postgres diff --git a/.aspect/bazelrc/performance.bazelrc b/.aspect/bazelrc/performance.bazelrc index fff4c7c5eed2b..26dbbe1f8d34d 100644 --- a/.aspect/bazelrc/performance.bazelrc +++ b/.aspect/bazelrc/performance.bazelrc @@ -27,12 +27,3 @@ build --experimental_reuse_sandbox_directories # author. # Docs: https://bazel.build/reference/command-line-reference#flag--legacy_external_runfiles build --nolegacy_external_runfiles - -# Some actions are always IO-intensive but require little compute. It's wasteful to put the output -# in the remote cache, it just saturates the network and fills the cache storage causing earlier -# evictions. It's also not worth sending them for remote execution. -# For actions like PackageTar it's usually faster to just re-run the work locally every time. -# You'll have to look at an execution log to figure out what other action mnemonics you care about. -# In some cases you may need to patch rulesets to add a mnemonic to actions that don't have one. -# https://bazel.build/reference/command-line-reference#flag--modify_execution_info -build --modify_execution_info=PackageTar=+no-remote diff --git a/.aspect/workflows/bazelrc b/.aspect/workflows/bazelrc new file mode 100644 index 0000000000000..2b7d0e2b67045 --- /dev/null +++ b/.aspect/workflows/bazelrc @@ -0,0 +1,3 @@ +common --remote_download_minimal +common --nobuild_runfile_links +common --noexperimental_reuse_sandbox_directories diff --git a/.aspect/workflows/config.yaml b/.aspect/workflows/config.yaml new file mode 100644 index 0000000000000..54ccfae340f9c --- /dev/null +++ b/.aspect/workflows/config.yaml @@ -0,0 +1,30 @@ +--- +bazel: + rcfiles: + - ".aspect/bazelrc/ci.sourcegraph.bazelrc" + flags: + # This flag is required because otherwise the integration tests fail with `fcmod` Operation not permitted + # which is probably related to the launced containers writing to mapped in directories as root and then + # when the container exits the files that are left over are root. + # TODO(burmudar): launch containers with uid/guid mapped in + - --noexperimental_reuse_sandbox_directories +env: + REDIS_CACHE_ENDPOINT: ":6379" + GIT_PAGER: '' +tasks: + # Checks that BUILD files are formatted + buildifier: + # Checks that BUILD file content is up-to-date with sources + gazelle: + target: //:configure + fix_target: //:configure + # Checks that all tests are passing + test: + include_eternal_tests: true + targets: + - //... + - //testing:grpc_backend_integration_test + # This target should only really run when on main which we aren't handling. For the time being while we + # evaluate Aspect Workflows it is ok + # TODO(burmudar): Let this only run on main branch + - //testing:codeintel_integration_test diff --git a/.eslintrc.js b/.eslintrc.js index 9bd5e4cdc48a0..75b90793d20f5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,13 +17,19 @@ const config = { '**/vendor/*.js', 'svelte.config.js', 'vite.config.ts', + 'vitest.config.ts', + 'postcss.config.js', 'playwright.config.ts', + 'bundlesize.config.js', + 'prettier.config.js', + 'svgo.config.js', '.vscode-test', '**/*.json', '**/*.d.ts', 'eslint-relative-formatter.js', 'typedoc.js', - 'bundlesize.config.js', + 'client/web/dev/**/*', + 'graphql-schema-linter.config.js', ], extends: ['@sourcegraph/eslint-config', 'plugin:storybook/recommended'], env: { @@ -37,8 +43,8 @@ const config = { ecmaFeatures: { jsx: true, }, - EXPERIMENTAL_projectService: true, - project: __dirname + '/tsconfig.all.json', + EXPERIMENTAL_useProjectService: true, + project: true, }, settings: { react: { diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 7cc5bb26eec45..0000000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,14 +0,0 @@ -# Lines starting with '#' are comments. -# Each line is a file pattern followed by one or more owners. -# https://help.github.com/articles/about-codeowners/ -# -# Order is important; the last matching pattern takes the most -# precedence. - -# We prefer to use Codenotify (https://github.com/sourcegraph/codenotify) instead of CODEOWNERS. -# More context is in this blog post: https://about.sourcegraph.com/blog/a-different-way-to-think-about-code-ownership/ -# If you are tempted to add an entry to CODEOWNERS, please try using Codenotify first for some amount of time. -# If Codenotify does not satisfy your needs, then you can open a PR to propose adding a new entry to CODEOWNERS and Nick will review. -# The PR description should describe why using Codenotify was insufficient. Thanks! -CODEOWNERS @nicksnyder -.github/CODEOWNERS @nicksnyder diff --git a/.github/ISSUE_TEMPLATE/good_first_issue.md b/.github/ISSUE_TEMPLATE/good_first_issue.md index 6a0a4b0c5fe1e..dac97a9a4ae22 100644 --- a/.github/ISSUE_TEMPLATE/good_first_issue.md +++ b/.github/ISSUE_TEMPLATE/good_first_issue.md @@ -37,5 +37,5 @@ T-shirt size estimate: **S**. ## Contributors 1. Check out [contributing guidelines](https://github.com/sourcegraph/sourcegraph/blob/main/CONTRIBUTING.md). -2. Join the Sourcegraph [Community Space](https://srcgr.ph/join-community-space) on Slack and join the `#help` channel where the Sourcegraph team can help you! +2. Join the Sourcegraph [Community Space](https://srcgr.ph/join-community-space) on Discord where the Sourcegraph team can help you! 3. Check out [the good first issues board](https://github.com/orgs/sourcegraph/projects/210) to find more curated issues. diff --git a/.github/workflows/licenses-check.yml b/.github/workflows/licenses-check.yml index 193a27a723851..a1c16c86f18e9 100644 --- a/.github/workflows/licenses-check.yml +++ b/.github/workflows/licenses-check.yml @@ -33,7 +33,7 @@ jobs: with: ruby-version: "3.2.2" # Not needed with a .ruby-version file - uses: actions/setup-ruby@v1 - uses: actions/setup-go@v2 - with: { go-version: "1.20" } + with: { go-version: "1.21" } - name: Install license_finder diff --git a/.github/workflows/pr-auditor.yml b/.github/workflows/pr-auditor.yml index e83c8ee658d42..defce42ce6ca6 100644 --- a/.github/workflows/pr-auditor.yml +++ b/.github/workflows/pr-auditor.yml @@ -13,7 +13,7 @@ jobs: with: repository: 'sourcegraph/pr-auditor' - uses: actions/setup-go@v4 - with: { go-version: '1.20' } + with: { go-version: '1.21' } - run: './check-pr.sh' env: diff --git a/.github/workflows/sg-binary-release.yml b/.github/workflows/sg-binary-release.yml index b443008226d9a..6fafc23678523 100644 --- a/.github/workflows/sg-binary-release.yml +++ b/.github/workflows/sg-binary-release.yml @@ -100,7 +100,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.20.8 + go-version: 1.21.4 - name: Build and upload macOS if: startsWith(matrix.os, 'macos-') == true diff --git a/.github/workflows/sg-setup.yml b/.github/workflows/sg-setup.yml index 464b19864e8f4..78a653c570274 100644 --- a/.github/workflows/sg-setup.yml +++ b/.github/workflows/sg-setup.yml @@ -24,7 +24,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.20.10 + go-version: 1.21.4 - name: Install asdf plugins uses: asdf-vm/actions/install@v1 diff --git a/.gitignore b/.gitignore index 64c0672b4fce7..6ad74f09cd10c 100644 --- a/.gitignore +++ b/.gitignore @@ -98,6 +98,7 @@ sourcegraph-webapp-*.tgz *.tsbuildinfo graphql-operations.ts *.module.scss.d.ts +*.module.css.d.ts dll-bundle # Extensions diff --git a/.prettierignore b/.prettierignore index cba1e1765a010..0a6b5e2ac50d1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -19,7 +19,7 @@ vendor/ .nyc_output/ out/ dist/ -dist-types/ +client/web/dist/ client/shared/src/schema/*.d.ts ts-node-* testdata diff --git a/.tool-versions b/.tool-versions index 02599e3a4c30b..329eb790d535f 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -golang 1.20.10 +golang 1.21.4 nodejs 20.8.1 fd 8.6.0 shfmt 3.5.0 @@ -10,6 +10,6 @@ trivy 0.30.3 kustomize 4.5.7 awscli 2.4.7 python 3.11.3 system -rust 1.68.0 +rust 1.73.0 ruby 3.1.3 pnpm 8.9.2 diff --git a/BUILD.bazel b/BUILD.bazel index c1b1cd0e19e40..70ac840864a3f 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -9,8 +9,8 @@ load("@io_bazel_rules_go//proto/wkt:well_known_types.bzl", "WELL_KNOWN_TYPES_API load("@npm//:defs.bzl", "npm_link_all_packages") load("//dev/linters/staticcheck:analyzers.bzl", "STATIC_CHECK_ANALYZERS") load("@npm//:eslint/package_json.bzl", eslint_bin = "bin") -load("//:stamp_tags.bzl", "stamp_tags") load("//dev:eslint.bzl", "eslint_test_with_types") +load("@buildifier_prebuilt//:rules.bzl", "buildifier") # Gazelle config # @@ -180,6 +180,28 @@ eslint_test_with_types( ], ) +buildifier( + name = "buildifier", + exclude_patterns = [ + "./.git/*", + "cmd/symbols/squirrel/test_repos/starlark/**/*", + ], + # TODO: enable these lint checks + # lint_mode = "fix", + mode = "fix", +) + +buildifier( + name = "buildifier.check", + exclude_patterns = [ + "./.git/*", + "cmd/symbols/squirrel/test_repos/starlark/**/*", + ], + # TODO: enable these lint checks + # lint_mode = "warn", + mode = "diff", +) + # Go gazelle_binary( @@ -201,6 +223,13 @@ gazelle( gazelle = ":gazelle-buf", ) +sh_binary( + name = "configure", + srcs = ["//dev/ci:bazel-configure.sh"], + data = ["@go_sdk//:bin/go"], + env = {"GO": "$(rootpath @go_sdk//:bin/go)"}, +) + go_library( name = "sourcegraph", srcs = [ @@ -301,3 +330,18 @@ exports_files([ "CONTRIBUTING.md", ".swcrc", ]) + +# sg msp settings + +bool_flag( + name = "sg_msp", + build_setting_default = False, + visibility = ["//visibility:public"], +) + +config_setting( + name = "sg_msp_flag", + flag_values = { + "//:sg_msp": "True", + }, +) diff --git a/CHANGELOG.md b/CHANGELOG.md index 016eb1a2e8fb1..3fdbf2f3bf6e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,13 @@ All notable changes to Sourcegraph are documented in this file. - The setting `experimentalFeatures.searchQueryInput` now refers to the new query input as `v2` (not `experimental`). - Search-based code intel doesn't include the currently selected search context anymore. It was possible to get into a situation where search-based code intel wouldn't find any information due to being restricted by the current search context. [#58010](https://github.com/sourcegraph/sourcegraph/pull/58010) +- The last commit which changed a file/directory is now shown in the files panel on the repo and file pages. To avoid duplicating information and confusion, the commits panel was removed. [58328](https://github.com/sourcegraph/sourcegraph/pull/58328) +- Clicking on a search result now opens the blob view at the same commit as the search result. Before, blob views were opened at the tip of the default branch, which sometimes caused inconsistencies in line numbers if the index was out of date. [#58381](https://github.com/sourcegraph/sourcegraph/pull/58381) +- The `exclude` configuration for code host configuration has been updated to allow chaining multiple conditions together and filtering GitHub repositories based on their size or number of GitHub stars. [#58377](https://github.com/sourcegraph/sourcegraph/pull/58377) and [#58405](https://github.com/sourcegraph/sourcegraph/pull/58405) + - Multiple attributes on _a single_ `exclude` entry now have to be all true for a repository to be excluded. Example: `{"exclude": [{"name": "github.com/example/example"}, {"id": "my-id"}]}` will _only_ exclude repositories that have the name _and_ the id mentioned. + - GitHub code host connections can exclude by size and stars now: `{"exclude": [{"name": "github.com/example/example"}, {"stars": "< 100", "size": ">= 1GB"}]}` + - For `size` and `stars` the supported operators are `<`, `>`, `<=`, `>=`. + - For `size` the supported units are `B`, `b`, `kB`, `KB`, `kiB`, `KiB`, `MiB`, `MB`, `GiB`, `GB`. No decimals points are supported. ### Fixed @@ -34,6 +41,7 @@ All notable changes to Sourcegraph are documented in this file. - Fixed a bug where typing in the GraphQL editor in the Site Admin API console could cause the cursor to jump to the start of the editor. [#57862](https://github.com/sourcegraph/sourcegraph/pull/57862) - The blame column no longer ignores whitespace-only changes by default. [#58134](https://github.com/sourcegraph/sourcegraph/pull/58134) - Long lines now wrap correctly in the diff view. [#58138](https://github.com/sourcegraph/sourcegraph/pull/58138) +- Fixed an issue in the search input where pressing Enter after selecting a suggestion would sometimes insert another suggestions instead of submitting the query. [#58186](https://github.com/sourcegraph/sourcegraph/pull/58186) ### Removed @@ -43,26 +51,35 @@ All notable changes to Sourcegraph are documented in this file. - The GitHub Proxy service is no longer required and has been removed from deployment options. [#55290](https://github.com/sourcegraph/sourcegraph/issues/55290) - The VSCode search extension "Sourcegraph for VS Code" has been sunset and removed from Sourcegraph repository. [#58023](https://github.com/sourcegraph/sourcegraph/pull/58023) +- The `rateLimit` configuration for Perforce code host connections has been removed to avoid confusion, it was unused. [#58188](https://github.com/sourcegraph/sourcegraph/pull/58188) - The feature flag `search-ranking` is now completely removed. [#58156](https://github.com/sourcegraph/sourcegraph/pull/58156) - The notepad UI, notebook creation feature. [#58217](https://github.com/sourcegraph/sourcegraph/pull/58217) -## Unreleased 5.2.3 +## Unreleased 5.2.4 ### Added -- +- Added the ability to use Workload Identity, Managed Identity and Environmental credentials when using the Azure OpenAI completions and embeddings providers [#58289](https://github.com/sourcegraph/sourcegraph/pull/58289) +- Added support for cloning via SSH from Azure DevOps. [#58655](https://github.com/sourcegraph/sourcegraph/pull/58655) + +### Fixed + +- Fixed two issues in Zoekt that could cause out of memory errors during search indexing. [sourcegraph/zoekt#686](https://github.com/sourcegraph/zoekt/pull/686), [sourcegraph/zoekt#689](https://github.com/sourcegraph/zoekt/pull/689) ### Changed -- +### Removed -### Fixed +## 5.2.3 -- +### Added -### Removed +- Added configurable GraphQL query cost limitations to prevent unintended resource exhaustion. Default values are now provided and enforced, replacing the previously unlimited behaviour. For more information, please refer to: [GraphQL Cost Limits Documentation](https://docs.sourcegraph.com/api/graphql#cost-limits). See details at [#58346](https://github.com/sourcegraph/sourcegraph/pull/58346). +- Sourcegraph now supports connecting to Bitbucket Cloud using Workspace Access Tokens. [#58465](https://github.com/sourcegraph/sourcegraph/pull/58465). -- +### Fixed + +- Defining file filters for embeddings jobs no longer causes all files to be skipped if `MaxFileSizeBytes` isn't defined. [#58262](https://github.com/sourcegraph/sourcegraph/pull/58262) ## 5.2.2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 86395a9b50e1f..9dd61c27544ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,6 +26,7 @@ All interactions with the Sourcegraph open source project are governed by the 6. Once you've chosen an issue, **comment on it to announce that you will be working on it**, making it visible for others that this issue is being tackled. If you end up not creating a pull request for this issue, please delete your comment. 7. If you have any questions, please [refer to the docs first](https://docs.sourcegraph.com/). If you don’t find any relevant information, mention the issue author. 8. The issue author will try to provide guidance. Sourcegraph always works in async mode. We will try to answer as soon as possible, but please keep time zones differences in mind. +9. Join the [Sourcegraph Community Space](https://srcgr.ph/join-community-space) on Discord where the Sourcegraph team can help you! ## Can I pick up this issue? @@ -47,7 +48,6 @@ All open issues are not yet solved. If the task is interesting to you, take it a ### Pull Requests - [How to structure](https://docs.sourcegraph.com/dev/background-information/pull_request_reviews#what-makes-an-effective-pull-request-pr) -- [PR guidelines](https://handbook.sourcegraph.com/departments/engineering/dev/onboarding/pr-checklist/) - Git branch name convention: `[developer-initials]/short-feature-description` - [Examples on Github](https://github.com/sourcegraph/sourcegraph/pulls?q=is%3Apr+label%3Ateam%2Ffrontend-platform) - (For Sourcegraph team) [How to accept contributions](https://docs.sourcegraph.com/dev/contributing/accepting_contribution) diff --git a/WORKSPACE b/WORKSPACE index 17712c0947c39..4605a4cfe3ea8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,9 +15,9 @@ bazel_skylib_workspace() http_archive( name = "aspect_bazel_lib", - sha256 = "cbf473d630ab67b36461d83b38fdc44e56f45b78d03c405e4958280211124d79", - strip_prefix = "bazel-lib-1.36.0", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.36.0/bazel-lib-v1.36.0.tar.gz", + sha256 = "262e3d6693cdc16dd43880785cdae13c64e6a3f63f75b1993c716295093d117f", + strip_prefix = "bazel-lib-1.38.1", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.38.1/bazel-lib-v1.38.1.tar.gz", ) # rules_js defines an older rules_nodejs, so we override it here @@ -51,10 +51,19 @@ http_archive( http_archive( name = "io_bazel_rules_go", - sha256 = "51dc53293afe317d2696d4d6433a4c33feedb7748a9e352072e2ec3c0dafd2c6", + sha256 = "d6ab6b57e48c09523e93050f13698f708428cfd5e619252e369d377af6597707", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.40.1/rules_go-v0.40.1.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.40.1/rules_go-v0.40.1.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip", + ], +) + +http_archive( + name = "rules_proto", + sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd", + strip_prefix = "rules_proto-5.3.0-21.7", + urls = [ + "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz", ], ) @@ -67,19 +76,19 @@ http_archive( http_archive( name = "rules_buf", - sha256 = "523a4e06f0746661e092d083757263a249fedca535bd6dd819a8c50de074731a", - strip_prefix = "rules_buf-0.1.1", + sha256 = "bc2488ee497c3fbf2efee19ce21dceed89310a08b5a9366cc133dd0eb2118498", + strip_prefix = "rules_buf-0.2.0", urls = [ - "https://github.com/bufbuild/rules_buf/archive/refs/tags/v0.1.1.zip", + "https://github.com/bufbuild/rules_buf/archive/refs/tags/v0.2.0.zip", ], ) http_archive( name = "bazel_gazelle", - sha256 = "ecba0f04f96b4960a5b250c8e8eeec42281035970aa8852dda73098274d14a1d", + sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz", ], ) @@ -113,6 +122,13 @@ http_archive( urls = ["https://github.com/GoogleContainerTools/container-structure-test/archive/104a53ede5f78fff72172639781ac52df9f5b18f.zip"], ) +http_archive( + name = "buildifier_prebuilt", + sha256 = "e46c16180bc49487bfd0f1ffa7345364718c57334fa0b5b67cb5f27eba10f309", + strip_prefix = "buildifier-prebuilt-6.1.0", + urls = ["https://github.com/keith/buildifier-prebuilt/archive/6.1.0.tar.gz"], +) + # hermetic_cc_toolchain setup ================================ HERMETIC_CC_TOOLCHAIN_VERSION = "v2.1.2" @@ -223,32 +239,8 @@ esbuild_register_toolchains( ) # Go toolchain setup -load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains") - -rules_proto_grpc_toolchains() - -rules_proto_grpc_repos() - -load("@rules_proto_grpc//doc:repositories.bzl", rules_proto_grpc_doc_repos = "doc_repos") - -rules_proto_grpc_doc_repos() - -load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") - -rules_proto_dependencies() - -rules_proto_toolchains() - -load("@rules_buf//buf:repositories.bzl", "rules_buf_dependencies", "rules_buf_toolchains") - -rules_buf_dependencies() - -rules_buf_toolchains(version = "v1.11.0") - -load("@rules_buf//gazelle/buf:repositories.bzl", "gazelle_buf_dependencies") - -gazelle_buf_dependencies() +load("@rules_buf//buf:defs.bzl", "buf_dependencies") load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") load("//:linter_deps.bzl", "linter_dependencies") @@ -269,7 +261,7 @@ go_repository( build_file_proto_mode = "disable_global", importpath = "google.golang.org/protobuf", sum = "h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=", - version = "v1.29.1", + version = "v1.31.1", ) # keep # Pin protoc-gen-go-grpc to 1.3.0 @@ -289,23 +281,19 @@ go_rules_dependencies() go_register_toolchains( nogo = "@//:sg_nogo", - version = "1.20.10", + version = "1.21.4", ) linter_dependencies() gazelle_dependencies() -load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") - -protobuf_deps() - # rust toolchain setup load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set") rules_rust_dependencies() -rust_version = "1.68.0" +rust_version = "1.73.0" rust_register_toolchains( edition = "2021", @@ -380,10 +368,6 @@ load("//dev:oci_deps.bzl", "oci_deps") oci_deps() -load("//cmd/embeddings/shared:assets.bzl", "embbedings_assets_deps") - -embbedings_assets_deps() - load("@container_structure_test//:repositories.bzl", "container_structure_test_register_toolchain") container_structure_test_register_toolchain(name = "cst") @@ -395,3 +379,47 @@ tool_deps() load("//tools/release:schema_deps.bzl", "schema_deps") schema_deps() + +# Buildifier +load("@buildifier_prebuilt//:deps.bzl", "buildifier_prebuilt_deps") + +buildifier_prebuilt_deps() + +load("@buildifier_prebuilt//:defs.bzl", "buildifier_prebuilt_register_toolchains") + +buildifier_prebuilt_register_toolchains() + +load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") + +rules_proto_dependencies() + +rules_proto_toolchains() + +load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains") +load("@rules_proto_grpc//go:repositories.bzl", rules_proto_grpc_go_repos = "go_repos") +load("@rules_proto_grpc//doc:repositories.bzl", rules_proto_grpc_doc_repos = "doc_repos") + +rules_proto_grpc_toolchains() + +rules_proto_grpc_repos() + +rules_proto_grpc_go_repos() + +rules_proto_grpc_doc_repos() + +load("@rules_buf//buf:repositories.bzl", "rules_buf_dependencies", "rules_buf_toolchains") + +rules_buf_dependencies() + +rules_buf_toolchains( + sha256 = "05dfb45d2330559d258e1230f5a25e154f0a328afda2a434348b5ba4c124ece7", + version = "v1.28.1", +) + +load("@rules_buf//gazelle/buf:repositories.bzl", "gazelle_buf_dependencies") + +gazelle_buf_dependencies() + +load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") + +protobuf_deps() diff --git a/client/branded/BUILD.bazel b/client/branded/BUILD.bazel index 92672052ddfff..bb5f6da18d254 100644 --- a/client/branded/BUILD.bazel +++ b/client/branded/BUILD.bazel @@ -86,6 +86,7 @@ ts_project( "src/search-ui/components/RepoMetadata.tsx", "src/search-ui/components/RepoSearchResult.tsx", "src/search-ui/components/ResultContainer.tsx", + "src/search-ui/components/SearchResultPreviewButton.tsx", "src/search-ui/components/SearchResultStar.tsx", "src/search-ui/components/SmartSearchPreview.tsx", "src/search-ui/components/SymbolSearchResult.tsx", @@ -135,6 +136,7 @@ ts_project( "src/search-ui/input/experimental/utils.ts", "src/search-ui/input/toggles/QueryInputToggle.tsx", "src/search-ui/input/toggles/SmartSearchToggle.tsx", + "src/search-ui/input/toggles/SmartSearchToggleExtended.tsx", "src/search-ui/input/toggles/Toggles.tsx", "src/search-ui/input/toggles/index.ts", "src/search-ui/results/AnnotatedSearchExample.tsx", @@ -151,12 +153,13 @@ ts_project( "src/search-ui/results/sidebar/QuickLink.tsx", "src/search-ui/results/sidebar/SearchFilterSection.tsx", "src/search-ui/results/sidebar/SearchReference.tsx", - "src/search-ui/results/sidebar/SearchSidebar.tsx", "src/search-ui/results/sidebar/SearchTypeLink.tsx", + "src/search-ui/results/sidebar/StickySearchSidebar.tsx", "src/search-ui/results/sidebar/helpers.ts", "src/search-ui/results/sidebar/revisions.ts", "src/search-ui/results/use-items-to-show.ts", "src/search-ui/results/useSearchResultsKeyboardNavigation.ts", + "src/search-ui/stores/results-store.ts", "src/search-ui/util/index.ts", "src/search-ui/util/query.ts", "src/search-ui/util/stars.ts", @@ -198,6 +201,7 @@ ts_project( "//:node_modules/ts-key-enum", "//:node_modules/use-callback-ref", "//:node_modules/use-resize-observer", + "//:node_modules/zustand", "//client/shared:graphql_operations", "//client/shared:shared_lib", ], @@ -279,6 +283,7 @@ vitest_test( timeout = "long", data = [ ":branded_tests", + ":module_styles", ":snapshots", ], ) diff --git a/client/branded/src/search-ui/components/FileContentSearchResult.tsx b/client/branded/src/search-ui/components/FileContentSearchResult.tsx index e229e1439a9d1..4ce09b83e8ac4 100644 --- a/client/branded/src/search-ui/components/FileContentSearchResult.tsx +++ b/client/branded/src/search-ui/components/FileContentSearchResult.tsx @@ -25,6 +25,7 @@ import { CopyPathAction } from './CopyPathAction' import { FileMatchChildren } from './FileMatchChildren' import { RepoFileLink } from './RepoFileLink' import { ResultContainer } from './ResultContainer' +import { SearchResultPreviewButton } from './SearchResultPreviewButton' import resultContainerStyles from './ResultContainer.module.scss' import styles from './SearchResult.module.scss' @@ -105,6 +106,14 @@ export const FileContentSearchResult: React.FunctionComponent { + const settings = settingsCascade.final + if (!isErrorLike(settings)) { + return settings?.experimentalFeatures?.newSearchNavigationUI + } + return false + }, [settingsCascade]) + // The number of lines of context to show before and after each match. const context = useMemo(() => { if (location?.pathname === '/search') { @@ -250,6 +259,7 @@ export const FileContentSearchResult: React.FunctionComponent} >
void @@ -26,10 +29,19 @@ export const FilePathSearchResult: React.FunctionComponent { const repoAtRevisionURL = getRepositoryUrl(result.repository, result.branches) const revisionDisplayName = getRevision(result.branches, result.commit) + const newSearchUIEnabled = useMemo(() => { + const settings = settingsCascade.final + if (!isErrorLike(settings)) { + return settings?.experimentalFeatures?.newSearchNavigationUI + } + return false + }, [settingsCascade]) + const title = ( } >
{result.pathMatches ? 'Path match' : 'File contains matching content'} diff --git a/client/branded/src/search-ui/components/ResultContainer.module.scss b/client/branded/src/search-ui/components/ResultContainer.module.scss index 5f0462676b385..ded4f5494c281 100644 --- a/client/branded/src/search-ui/components/ResultContainer.module.scss +++ b/client/branded/src/search-ui/components/ResultContainer.module.scss @@ -17,7 +17,10 @@ align-items: center; flex-wrap: wrap; position: sticky; - top: 0; + // With 0 value there is a rendering bug in Safari where this block + // doesn't fit tight enough and hence it's leaving a gap between sticky + // header and top of the scrolling block + top: -1px; z-index: 1; // Show on top of search result contents background-color: var(--body-bg); diff --git a/client/branded/src/search-ui/components/ResultContainer.tsx b/client/branded/src/search-ui/components/ResultContainer.tsx index 3a472444d32f3..ef0cb9cb61077 100644 --- a/client/branded/src/search-ui/components/ResultContainer.tsx +++ b/client/branded/src/search-ui/components/ResultContainer.tsx @@ -1,11 +1,11 @@ -import React from 'react' +import React, { ReactElement } from 'react' import classNames from 'classnames' import type { SearchMatch } from '@sourcegraph/shared/src/search/stream' import type { ForwardReferenceExoticComponent } from '@sourcegraph/wildcard' -import { formatRepositoryStarCount } from '../util/stars' +import { formatRepositoryStarCount } from '../util' import { CodeHostIcon } from './CodeHostIcon' import { LastSyncedIcon } from './LastSyncedIcon' @@ -24,6 +24,7 @@ export interface ResultContainerProps { repoName?: string className?: string rankingDebug?: string + actions?: ReactElement | boolean onResultClicked?: () => void } @@ -55,9 +56,10 @@ export const ResultContainer: ForwardReferenceExoticComponent< repoName, className, rankingDebug, + actions, + repoLastFetched, as: Component = 'div', onResultClicked, - repoLastFetched, } = props const formattedRepositoryStarCount = formatRepositoryStarCount(repoStars) @@ -84,6 +86,8 @@ export const ResultContainer: ForwardReferenceExoticComponent< > {title}
+ + {actions} {formattedRepositoryStarCount && ( diff --git a/client/branded/src/search-ui/components/SearchResultPreviewButton.tsx b/client/branded/src/search-ui/components/SearchResultPreviewButton.tsx new file mode 100644 index 0000000000000..88f3aa1ddb0a3 --- /dev/null +++ b/client/branded/src/search-ui/components/SearchResultPreviewButton.tsx @@ -0,0 +1,33 @@ +import { FC } from 'react' + +import { Button } from '@sourcegraph/wildcard' + +import { useSearchResultState, type SearchResultPreview } from '../stores/results-store' + +interface SearchResultPreviewButtonProps { + result: SearchResultPreview +} + +export const SearchResultPreviewButton: FC = props => { + const { result } = props + const { previewBlob, setPreviewBlob, clearPreview } = useSearchResultState() + + const isActive = + previewBlob?.repository === result.repository && + previewBlob?.path === result.path && + previewBlob.commit === result.commit + + const handleClick = (): void => { + if (isActive) { + clearPreview() + } else { + setPreviewBlob(result) + } + } + + return ( + + ) +} diff --git a/client/branded/src/search-ui/index.ts b/client/branded/src/search-ui/index.ts index 4ebcebd22bf86..22551a352f7de 100644 --- a/client/branded/src/search-ui/index.ts +++ b/client/branded/src/search-ui/index.ts @@ -10,10 +10,12 @@ export * from './results/progress/StreamingProgressCount' export * from './results/progress/utils' export * from './results/sidebar/FilterLink' export * from './results/sidebar/revisions' -export * from './results/sidebar/SearchSidebar' +export * from './results/sidebar/StickySearchSidebar' export * from './results/sidebar/QuickLink' export * from './results/sidebar/helpers' export * from './results/sidebar/SearchReference' export * from './results/sidebar/SearchTypeLink' export * from './results/StreamingSearchResultsList' export * from './util' + +export { useSearchResultState } from './stores/results-store' diff --git a/client/branded/src/search-ui/input/codemirror/token-info.ts b/client/branded/src/search-ui/input/codemirror/token-info.ts index 265fc6acae1ca..d28be2b88704e 100644 --- a/client/branded/src/search-ui/input/codemirror/token-info.ts +++ b/client/branded/src/search-ui/input/codemirror/token-info.ts @@ -86,7 +86,7 @@ export function tokenInfo(): Extension { effect.is(setHighlighedTokenPosition) ) if (effect) { - position = effect?.value + position = effect.value } if (position !== null) { // Mapping the position might not be necessary since we clear diff --git a/client/branded/src/search-ui/input/experimental/suggestionsExtension.ts b/client/branded/src/search-ui/input/experimental/suggestionsExtension.ts index 9dffabf44282b..975ae6320a09a 100644 --- a/client/branded/src/search-ui/input/experimental/suggestionsExtension.ts +++ b/client/branded/src/search-ui/input/experimental/suggestionsExtension.ts @@ -245,6 +245,16 @@ enum QueryState { Complete, } +/** + * Used to identify whether two queries refer to the same + * completion request. A new completion request is triggered + * by e.g. typing into the query input or moving the cursor. + * This is used to properly reset internal state. + * + * Because objects are always unique we can use them as IDs. + */ +interface CompletionID {} + /** * Wrapper around the configered sources. Keeps track of the state and results. */ @@ -252,7 +262,8 @@ class Query { constructor( public readonly sources: readonly Source[], public readonly state: QueryState, - public readonly result: Result + public readonly result: Result, + private readonly completionID: CompletionID ) {} public update(transaction: Transaction): Query { @@ -276,7 +287,7 @@ class Query { // Only "apply" the effect if the results are for the curent query. This prevents // overwriting the results from stale requests. if (effect.is(updateResultEffect) && effect.value.query === query) { - query = query.updateWithSuggestionResult(effect.value.result) + query = query.updateWithSuggestionResult(effect.value.result, query.completionID) } else if (effect.is(startCompletionEffect)) { query = query.run(transaction.state) } else if (effect.is(hideCompletionEffect)) { @@ -287,23 +298,28 @@ class Query { return query } + private createNewCompletionID(): CompletionID { + // We use an object as completion ID because objects are always unique. + return {} + } + private run(state: EditorState): Query { const selectedMode = getSelectedMode(state) const activeSources = this.sources.filter(source => source.mode === selectedMode?.name) const result = combineResults( activeSources.map(source => source.query(state, state.selection.main.head, selectedMode?.name)) ) - return this.updateWithSuggestionResult(result) + return this.updateWithSuggestionResult(result, this.createNewCompletionID()) } - private updateWithSuggestionResult(result: SuggestionResult): Query { + private updateWithSuggestionResult(result: SuggestionResult, completionID: CompletionID): Query { return result.next - ? new PendingQuery(this.sources, Result.fromSuggestionResult(result), result.next) - : new Query(this.sources, QueryState.Complete, Result.fromSuggestionResult(result)) + ? new PendingQuery(this.sources, Result.fromSuggestionResult(result), result.next, completionID) + : new Query(this.sources, QueryState.Complete, Result.fromSuggestionResult(result), completionID) } private updateWithState(state: QueryState.Inactive | QueryState.Complete): Query { - return state !== this.state ? new Query(this.sources, state, this.result) : this + return state !== this.state ? new Query(this.sources, state, this.result, this.completionID) : this } public isInactive(): boolean { @@ -313,15 +329,22 @@ class Query { public isPending(): this is PendingQuery { return this.state === QueryState.Pending } + + public isSameRequest(query: Query): boolean { + return this.completionID === query.completionID + } } class PendingQuery extends Query { constructor( public readonly sources: readonly Source[], public readonly result: Result, - public readonly fetch: () => Promise + public readonly fetch: () => Promise, + // Used to identify whether two queries refer to the same + // completion request. + completionID: CompletionID ) { - super(sources, QueryState.Pending, result) + super(sources, QueryState.Pending, result, completionID) } } @@ -378,15 +401,16 @@ class SuggestionsState { let state: SuggestionsState = this const sources = transaction.state.facet(suggestionSources) - let query = sources === state.query.sources ? state.query : new Query(sources, QueryState.Inactive, emptyResult) + let query = + sources === state.query.sources ? state.query : new Query(sources, QueryState.Inactive, emptyResult, {}) query = query.update(transaction) if (query !== state.query) { state = new SuggestionsState( query, !query.isInactive(), - // Preserve the currently selected option if the query was pending - // (ensures that the selected option doesn't change when new options become available) - state.query.isPending() ? state.selectedOption : -1 + // Preserve the currently selected option if the query _was_ pending and refers to the same request. + // This ensures that the selected option doesn't change as new options become available. + state.query.isPending() && state.query.isSameRequest(query) ? state.selectedOption : -1 ) } @@ -436,7 +460,7 @@ const hideCompletionEffect = StateEffect.define() const updateResultEffect = StateEffect.define<{ query: Query; result: SuggestionResult }>() const suggestionsStateField = StateField.define({ create() { - return new SuggestionsState(new Query([], QueryState.Inactive, emptyResult), false, -1) + return new SuggestionsState(new Query([], QueryState.Inactive, emptyResult, {}), false, -1) }, update(state, transaction) { diff --git a/client/branded/src/search-ui/input/toggles/SmartSearchToggleExtended.tsx b/client/branded/src/search-ui/input/toggles/SmartSearchToggleExtended.tsx new file mode 100644 index 0000000000000..f0eb473ee7fed --- /dev/null +++ b/client/branded/src/search-ui/input/toggles/SmartSearchToggleExtended.tsx @@ -0,0 +1,171 @@ +import React, { useCallback, useEffect, useState } from 'react' + +import { mdiClose, mdiRadioboxBlank, mdiRadioboxMarked, mdiHeart } from '@mdi/js' +import classNames from 'classnames' + +import { + Button, + Icon, + Input, + Label, + Popover, + PopoverContent, + PopoverTrigger, + Position, + Tooltip, + H4, + H2, +} from '@sourcegraph/wildcard' + +import type { ToggleProps } from './QueryInputToggle' + +import smartStyles from './SmartSearchToggle.module.scss' +import styles from './Toggles.module.scss' + +export const smartSearchIconSvgPath = + 'M11.3956 20H10.2961L11.3956 13.7778H7.54754C6.58003 13.7778 7.18473 13.1111 7.20671 13.0844C8.62499 11.0578 10.7579 8.03556 13.6054 4H14.7049L13.6054 10.2222H17.4645C17.9042 10.2222 18.1461 10.3911 17.9042 10.8089C13.5615 16.9333 11.3956 20 11.3956 20Z' + +export enum SearchModes { + Smart = 'Smart', + PreciseNew = 'Precise (NEW) πŸ’–', + Precise = 'Precise (legacy)', +} + +interface SmartSearchToggleProps extends Omit { + onSelect: (mode: SearchModes) => void + mode: SearchModes +} + +/** + * A toggle displayed in the QueryInput. + */ +export const SmartSearchToggleExtended: React.FunctionComponent = ({ + onSelect, + interactive = true, + mode, + className, +}) => { + const tooltipValue = mode.toString() + + const interactiveProps = interactive ? {} : { tabIndex: -1, 'aria-hidden': true } + + const [isPopoverOpen, setIsPopoverOpen] = useState(false) + + return ( + setIsPopoverOpen(event.isOpen)}> + + + + + + + setIsPopoverOpen(false)} /> + + ) +} + +const SmartSearchToggleMenu: React.FunctionComponent< + Pick & { closeMenu: () => void } +> = ({ onSelect, mode, closeMenu }) => { + const [getMode, setMode] = useState(mode) + useEffect(() => { + setMode(mode) + }, [mode]) + + const onChange = useCallback( + (value: SearchModes) => { + setMode(value) + // Wait a tiny bit for user to see the selection change before closing the popover + setTimeout(() => { + onSelect(value) + closeMenu() + }, 100) + }, + [onSelect, closeMenu] + ) + + return ( + +
+

+ Search Mode Picker +

+ +
+ + + + + ) +} + +const RadioItem: React.FunctionComponent<{ + value: SearchModes + isChecked: boolean + onSelect: (value: SearchModes) => void + header: string + description: string +}> = ({ value, isChecked, onSelect, header, description }) => ( + +) diff --git a/client/branded/src/search-ui/input/toggles/Toggles.tsx b/client/branded/src/search-ui/input/toggles/Toggles.tsx index 48e5cea2bab9e..82f2960680756 100644 --- a/client/branded/src/search-ui/input/toggles/Toggles.tsx +++ b/client/branded/src/search-ui/input/toggles/Toggles.tsx @@ -5,17 +5,18 @@ import classNames from 'classnames' import { SearchPatternType } from '@sourcegraph/shared/src/graphql-operations' import { - type SearchPatternTypeProps, type CaseSensitivityProps, type SearchPatternTypeMutationProps, type SubmitSearchProps, SearchMode, type SearchModeProps, + type SearchPatternTypeProps, } from '@sourcegraph/shared/src/search' import { findFilter, FilterKind } from '@sourcegraph/shared/src/search/query/query' import { QueryInputToggle } from './QueryInputToggle' import { SmartSearchToggle } from './SmartSearchToggle' +import { SmartSearchToggleExtended, SearchModes } from './SmartSearchToggleExtended' import styles from './Toggles.module.scss' @@ -28,6 +29,11 @@ export interface TogglesProps navbarSearchQuery: string className?: string showSmartSearchButton?: boolean + /** + * If set to true, the search mode picker will let the user select the new + * pattern type as a new alternative + */ + showExtendedPicker?: boolean /** * If set to false makes all buttons non-actionable. The main use case for * this prop is showing the toggles in examples. This is different from @@ -53,6 +59,7 @@ export const Toggles: React.FunctionComponent { + const newPatternType = + patternType !== SearchPatternType.newStandardRC1 + ? SearchPatternType.newStandardRC1 + : SearchPatternType.standard + + setPatternType(newPatternType) + + // We always want precise mode when switching to the experimental pattern type. + setSearchMode(SearchMode.Precise) + + submitOnToggle({ newPatternType }) + }, [patternType, setPatternType, submitOnToggle, setSearchMode]) + const toggleStructuralSearch = useCallback((): void => { const newPatternType: SearchPatternType = patternType !== SearchPatternType.structural ? SearchPatternType.structural : SearchPatternType.standard @@ -100,10 +121,30 @@ export const Toggles: React.FunctionComponent { const newSearchMode: SearchMode = enabled ? SearchMode.SmartSearch : SearchMode.Precise + // Disable the experimental pattern type the user activates smart search + if (patternType === SearchPatternType.newStandardRC1) { + setPatternType(SearchPatternType.standard) + } + setSearchMode(newSearchMode) submitOnToggle({ newSearchMode }) }, - [setSearchMode, submitOnToggle] + [setSearchMode, submitOnToggle, patternType, setPatternType] + ) + + // This is hacky and is just for demo purposes. Once we have made the new + // pattern type the default we can revert this. + const onSelectSearchMode = useCallback( + (mode: SearchModes): void => { + if (mode === SearchModes.Smart) { + onSelectSmartSearch(true) + } else if (mode === SearchModes.PreciseNew) { + toggleNewStandard() + } else { + onSelectSmartSearch(false) + } + }, + [onSelectSmartSearch, toggleNewStandard] ) return ( @@ -168,14 +209,28 @@ export const Toggles: React.FunctionComponent {showSmartSearchButton &&
} - {showSmartSearchButton && ( - - )} + {showSmartSearchButton && + (showExtendedPicker ? ( + + ) : ( + + ))}
) diff --git a/client/branded/src/search-ui/results/NoResultsPage.tsx b/client/branded/src/search-ui/results/NoResultsPage.tsx index a7a12944b8341..148ce8a938e5a 100644 --- a/client/branded/src/search-ui/results/NoResultsPage.tsx +++ b/client/branded/src/search-ui/results/NoResultsPage.tsx @@ -3,12 +3,7 @@ import React, { useCallback, useEffect } from 'react' import { mdiClose, mdiOpenInNew } from '@mdi/js' import classNames from 'classnames' -import { - type QueryState, - type SearchContextProps, - SearchMode, - type SubmitSearchParameters, -} from '@sourcegraph/shared/src/search' +import { type SearchContextProps, SearchMode, type SubmitSearchParameters } from '@sourcegraph/shared/src/search' import { NoResultsSectionID as SectionID } from '@sourcegraph/shared/src/settings/temporary/searchSidebar' import { useTemporarySetting } from '@sourcegraph/shared/src/settings/temporary/useTemporarySetting' import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' @@ -53,7 +48,6 @@ interface NoResultsPageProps extends TelemetryProps, Pick void searchMode?: SearchMode setSearchMode?: (mode: SearchMode) => void submitSearch?: (parameters: SubmitSearchParameters) => void @@ -68,7 +62,6 @@ export const NoResultsPage: React.FunctionComponent )} - {showQueryExamples && setQueryState && ( + {showQueryExamples && ( <>

Search basics

diff --git a/client/branded/src/search-ui/results/StreamingSearchResultsList.tsx b/client/branded/src/search-ui/results/StreamingSearchResultsList.tsx index 12df1a126ffb4..370c3b3ac819e 100644 --- a/client/branded/src/search-ui/results/StreamingSearchResultsList.tsx +++ b/client/branded/src/search-ui/results/StreamingSearchResultsList.tsx @@ -26,12 +26,14 @@ import { import type { SettingsCascadeProps } from '@sourcegraph/shared/src/settings/settings' import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' -import { CommitSearchResult } from '../components/CommitSearchResult' -import { FileContentSearchResult } from '../components/FileContentSearchResult' -import { FilePathSearchResult } from '../components/FilePathSearchResult' +import { + CommitSearchResult, + FileContentSearchResult, + FilePathSearchResult, + RepoSearchResult, + SymbolSearchResult, +} from '../components' import { OwnerSearchResult } from '../components/OwnerSearchResult' -import { RepoSearchResult } from '../components/RepoSearchResult' -import { SymbolSearchResult } from '../components/SymbolSearchResult' import { NoResultsPage } from './NoResultsPage' import { StreamingSearchResultFooter } from './StreamingSearchResultsFooter' @@ -77,7 +79,6 @@ export interface StreamingSearchResultsListProps * allow modifying the query. */ queryState?: QueryState - setQueryState?: (queryState: QueryState) => void buildSearchURLQueryFromQueryState?: (queryParameters: BuildSearchQueryURLParameters) => string searchMode?: SearchMode @@ -92,7 +93,7 @@ export interface StreamingSearchResultsListProps * An optional callback invoked whenever a search result is clicked. * It's passed the index of the result in the list and the result type. */ - logSearchResultClicked?: (index: number, type: string) => void + logSearchResultClicked?: (index: number, type: string, resultsLength: number) => void enableRepositoryMetadata?: boolean } @@ -116,7 +117,6 @@ export const StreamingSearchResultsList: React.FunctionComponent< enableKeyboardNavigation, showQueryExamplesOnNoResultsPage, queryState, - setQueryState, buildSearchURLQueryFromQueryState, searchMode, setSearchMode, @@ -157,7 +157,7 @@ export const StreamingSearchResultsList: React.FunctionComponent< location={location} telemetryService={telemetryService} result={result} - onSelect={() => logSearchResultClicked?.(index, 'fileMatch')} + onSelect={() => logSearchResultClicked?.(index, 'fileMatch', resultsNumber)} defaultExpanded={false} showAllMatches={false} allExpanded={allExpanded} @@ -173,7 +173,7 @@ export const StreamingSearchResultsList: React.FunctionComponent< index={index} telemetryService={telemetryService} result={result} - onSelect={() => logSearchResultClicked?.(index, 'symbolMatch')} + onSelect={() => logSearchResultClicked?.(index, 'symbolMatch', resultsNumber)} fetchHighlightedFileLineRanges={fetchHighlightedFileLineRanges} repoDisplayName={displayRepoName(result.repository)} settingsCascade={settingsCascade} @@ -185,10 +185,11 @@ export const StreamingSearchResultsList: React.FunctionComponent< logSearchResultClicked?.(index, 'filePathMatch')} + onSelect={() => logSearchResultClicked?.(index, 'filePathMatch', resultsNumber)} repoDisplayName={displayRepoName(result.repository)} containerClassName={resultClassName} telemetryService={telemetryService} + settingsCascade={settingsCascade} /> )} @@ -200,7 +201,7 @@ export const StreamingSearchResultsList: React.FunctionComponent< index={index} result={result} platformContext={platformContext} - onSelect={() => logSearchResultClicked?.(index, 'commit')} + onSelect={() => logSearchResultClicked?.(index, 'commit', resultsNumber)} openInNewTab={openMatchesInNewTab} containerClassName={resultClassName} as="li" @@ -212,7 +213,7 @@ export const StreamingSearchResultsList: React.FunctionComponent< logSearchResultClicked?.(index, 'repo')} + onSelect={() => logSearchResultClicked?.(index, 'repo', resultsNumber)} containerClassName={resultClassName} buildSearchURLQueryFromQueryState={buildSearchURLQueryFromQueryState} queryState={queryState} @@ -228,7 +229,7 @@ export const StreamingSearchResultsList: React.FunctionComponent< index={index} result={result} as="li" - onSelect={() => logSearchResultClicked?.(index, 'person')} + onSelect={() => logSearchResultClicked?.(index, 'person', resultsNumber)} containerClassName={resultClassName} telemetryService={telemetryService} queryState={queryState} @@ -255,6 +256,7 @@ export const StreamingSearchResultsList: React.FunctionComponent< prefetchFileEnabled, prefetchFile, location, + resultsNumber, telemetryService, allExpanded, fetchHighlightedFileLineRanges, @@ -306,7 +308,6 @@ export const StreamingSearchResultsList: React.FunctionComponent< telemetryService={telemetryService} showSearchContext={searchContextsEnabled} showQueryExamples={showQueryExamplesOnNoResultsPage} - setQueryState={setQueryState} searchMode={searchMode} setSearchMode={setSearchMode} submitSearch={submitSearch} diff --git a/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.test.ts b/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.test.ts index 5242ea42589d7..c0eb3e589af3a 100644 --- a/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.test.ts +++ b/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.test.ts @@ -11,25 +11,49 @@ describe('exhaustive search validation', () => { expect(validateQueryForExhaustiveSearch('context:global rev:* insights')).toStrictEqual([]) }) + test('[repo:has.content() predicate]', () => { + expect(validateQueryForExhaustiveSearch('context:global repo:has.content(insights) foo').length).toStrictEqual( + 0 + ) + }) + + test('[repo:has.meta() predicate]', () => { + expect(validateQueryForExhaustiveSearch('context:global repo:has.meta(insights) foo').length).toStrictEqual(0) + }) + describe('works properly with invalid query', () => { test('[multiple rev operator case]', () => { expect(validateQueryForExhaustiveSearch('context:global rev:* insights rev:vk').length).toStrictEqual(1) }) - test('[has regexp generic patter]', () => { + test('[has regexp generic pattern]', () => { expect(validateQueryForExhaustiveSearch('context:global .* patterntype:regexp').length).toStrictEqual(1) }) - test('[repo:has.file() operator]', () => { - expect(validateQueryForExhaustiveSearch('context:global repo:has.file(insights)').length).toStrictEqual(1) - }) - - test('[file:has.content() operator]', () => { + test('[file:has.content() predicate]', () => { expect(validateQueryForExhaustiveSearch('context:global file:has.content(insights)').length).toStrictEqual( 1 ) }) + test('[file:has.owner() predicate]', () => { + expect( + validateQueryForExhaustiveSearch('context:global file:has.owner(insights) foo').length + ).toStrictEqual(1) + }) + + test('[f:has.contributor() predicate]', () => { + expect( + validateQueryForExhaustiveSearch('context:global f:has.contributor(insights) foo').length + ).toStrictEqual(1) + }) + + test('[f:contains.content() predicate]', () => { + expect( + validateQueryForExhaustiveSearch('context:global f:contains.content(insights) foo').length + ).toStrictEqual(1) + }) + test('[or operator]', () => { expect(validateQueryForExhaustiveSearch('insights or batch-changes').length).toStrictEqual(1) }) @@ -49,9 +73,9 @@ describe('exhaustive search validation', () => { test('[all cases combined]', () => { expect( validateQueryForExhaustiveSearch( - 'context:global (repo:has.file(insights) rev:* ) or (file:has.content(batch-changes) rev:vk batch) or (patterntype:regexp .*)' + 'context:global (file:has.content(batch-changes) rev:vk batch) or (patterntype:regexp .* rev:foo)' ).length - ).toStrictEqual(5) + ).toStrictEqual(4) }) }) }) diff --git a/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.ts b/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.ts index d3a3c2f7736df..96e0bbaba67a8 100644 --- a/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.ts +++ b/client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.ts @@ -7,7 +7,6 @@ enum ValidationErrorType { INVALID_QUERY = 'invalid_query', GENERIC_REGEXP = 'generic_regexp', HAS_CONTENT_PREDICATE = 'has_content_predicate', - HAS_FILE_PREDICATE = 'has_file_predicate', OR_OPERATOR = 'or_operator', AND_OPERATOR = 'and_operator', } @@ -68,21 +67,16 @@ export function validateQueryForExhaustiveSearch(query: string): ValidationError }) } - const repoHasContentFilter = filters.some(filter => filter.value?.value.startsWith('has.content(')) - - if (repoHasContentFilter) { + const filePredicates = ['has.content', 'has.owner', 'has.contributor', 'contains.content'] + const fileHasContentFilter = filters.some( + filter => + filePredicates.some(startString => filter.value?.value.startsWith(startString)) && + filter.field.value?.startsWith('f') + ) + if (fileHasContentFilter) { validationErrors.push({ type: ValidationErrorType.HAS_CONTENT_PREDICATE, - reason: 'repo.has.content predicate is not compatible', - }) - } - - const repoHasFileFilter = filters.some(filter => filter.value?.value.startsWith('has.file(')) - - if (repoHasFileFilter) { - validationErrors.push({ - type: ValidationErrorType.HAS_FILE_PREDICATE, - reason: 'repo.has.file predicate is not compatible', + reason: 'file: predicate is not compatible', }) } diff --git a/client/branded/src/search-ui/results/sidebar/SearchSidebar.tsx b/client/branded/src/search-ui/results/sidebar/StickySearchSidebar.tsx similarity index 87% rename from client/branded/src/search-ui/results/sidebar/SearchSidebar.tsx rename to client/branded/src/search-ui/results/sidebar/StickySearchSidebar.tsx index 22e90d8f8e796..697ca0580cbbd 100644 --- a/client/branded/src/search-ui/results/sidebar/SearchSidebar.tsx +++ b/client/branded/src/search-ui/results/sidebar/StickySearchSidebar.tsx @@ -45,27 +45,8 @@ interface SearchSidebarProps extends HTMLAttributes { * Also provides shared through context internal state for compound SearchSidebarSection * components. */ -export const SearchSidebar: FC> = props => { +export const StickySearchSidebar: FC> = props => { const { children, className, onClose, ...attributes } = props - const [collapsedSections, setCollapsedSections] = useTemporarySetting('search.collapsedSidebarSections', {}) - - const persistToggleState = useCallback( - (id: string, open: boolean) => { - setCollapsedSections(openSections => { - const newSettings: TemporarySettings['search.collapsedSidebarSections'] = { - ...openSections, - [id]: !open, - } - return newSettings - }) - }, - [setCollapsedSections] - ) - - const sidebarStore = useMemo( - () => ({ collapsedSections, persistToggleState }), - [collapsedSections, persistToggleState] - ) return (
- { - // collapsedSections is undefined on first render. To prevent the sections - // being rendered open and immediately closing them, we render them only after - // we got the settings. - collapsedSections && ( - {children} - ) - } + {children} ) } +export const PersistSidebarStoreProvider: FC> = props => { + const [collapsedSections, setCollapsedSections] = useTemporarySetting('search.collapsedSidebarSections', {}) + + const persistToggleState = useCallback( + (id: string, open: boolean) => { + setCollapsedSections(openSections => { + const newSettings: TemporarySettings['search.collapsedSidebarSections'] = { + ...openSections, + [id]: !open, + } + return newSettings + }) + }, + [setCollapsedSections] + ) + + const sidebarStore = useMemo( + () => ({ collapsedSections, persistToggleState }), + [collapsedSections, persistToggleState] + ) + + // collapsedSections is undefined on first render. To prevent the sections + // being rendered open and immediately closing them, we render them only after + // we got the settings. + if (!collapsedSections) { + return null + } + + return {props.children} +} + interface SearchSidebarSectionProps extends Omit, 'startCollapsed' | 'onToggle'> { sectionId: SectionID diff --git a/client/branded/src/search-ui/stores/results-store.ts b/client/branded/src/search-ui/stores/results-store.ts new file mode 100644 index 0000000000000..0373ef0adffab --- /dev/null +++ b/client/branded/src/search-ui/stores/results-store.ts @@ -0,0 +1,21 @@ +import create from 'zustand' + +import type { ContentMatch, PathMatch } from '@sourcegraph/shared/src/search/stream' + +/** + * At the moment search result preview panel supports only + * blob-like type of search results to preview. + */ +export type SearchResultPreview = ContentMatch | PathMatch + +export interface SearchResultState { + previewBlob: SearchResultPreview | null + setPreviewBlob: (blobInfo: SearchResultPreview) => void + clearPreview: () => void +} + +export const useSearchResultState = create((set, get) => ({ + previewBlob: null, + setPreviewBlob: blobInfo => set({ previewBlob: blobInfo }), + clearPreview: () => set({ previewBlob: null }), +})) diff --git a/client/browser/BUILD.bazel b/client/browser/BUILD.bazel index 635297bfd794c..e82df65f0ed2b 100644 --- a/client/browser/BUILD.bazel +++ b/client/browser/BUILD.bazel @@ -342,6 +342,7 @@ vitest_test( timeout = "moderate", data = [ ":browser_tests", + ":module_styles", ":snapshots", ], ) diff --git a/client/codeintellify/vitest.config.ts b/client/codeintellify/vitest.config.ts index e16b5fdd7c1ab..0a2927f06bd01 100644 --- a/client/codeintellify/vitest.config.ts +++ b/client/codeintellify/vitest.config.ts @@ -3,7 +3,6 @@ import { defineProjectWithDefaults } from '../../vitest.shared' export default defineProjectWithDefaults(__dirname, { test: { environment: 'jsdom', - setupFiles: ['src/testSetup.test.ts'], - singleThread: true, // got `failed to terminate worker` occasionally in Bazel CI + setupFiles: ['src/testSetup.test.ts', '../testing/src/fetch.js'], }, }) diff --git a/client/shared/BUILD.bazel b/client/shared/BUILD.bazel index f41c3fa1eef27..3676c9e7e3ce8 100644 --- a/client/shared/BUILD.bazel +++ b/client/shared/BUILD.bazel @@ -353,6 +353,7 @@ ts_project( "//:node_modules/@types/minimatch", "//:node_modules/@types/node", "//:node_modules/@types/react", + "//:node_modules/@types/whatwg-url", "//:node_modules/classnames", "//:node_modules/comlink", "//:node_modules/core-js", @@ -372,6 +373,7 @@ ts_project( "//:node_modules/use-deep-compare-effect", "//:node_modules/util", "//:node_modules/utility-types", + "//:node_modules/whatwg-url", "//:node_modules/zustand", "//schema:settings", #keep ], @@ -519,6 +521,7 @@ filegroup( vitest_test( name = "test", data = [ + ":module_styles", ":shared_tests", ":snapshots", ], diff --git a/client/shared/dev/BUILD.bazel b/client/shared/dev/BUILD.bazel index 167a8daf28e04..c7ea16f4212f8 100644 --- a/client/shared/dev/BUILD.bazel +++ b/client/shared/dev/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library") -load("//dev:defs.bzl", "ts_binary", "ts_project") +load("//dev:defs.bzl", "ts_binary") # gazelle:ignore @@ -57,6 +57,7 @@ js_binary( name = "run_mocha_tests_with_percy", data = [ "//:node_modules/@percy/cli", + "//:node_modules/@percy/puppeteer", "//:node_modules/mocha", "//:node_modules/puppeteer", "//:node_modules/resolve-bin", diff --git a/client/shared/dev/generateCssModulesTypes.ts b/client/shared/dev/generateCssModulesTypes.ts index 120f76190ccfd..12494db2777e3 100644 --- a/client/shared/dev/generateCssModulesTypes.ts +++ b/client/shared/dev/generateCssModulesTypes.ts @@ -2,8 +2,8 @@ import { spawn } from 'child_process' import path from 'path' const REPO_ROOT = path.join(__dirname, '../../..') -const CSS_MODULES_GLOB = path.resolve(__dirname, '../../*/src/**/*.module.scss') -const JETBRAINS_CSS_MODULES_GLOB = path.resolve(__dirname, '../../jetbrains/webview/**/*.module.scss') +const CSS_MODULES_GLOB = path.resolve(__dirname, '../../*/src/**/*.module.{scss,css}') +const JETBRAINS_CSS_MODULES_GLOB = path.resolve(__dirname, '../../jetbrains/webview/**/*.module.{scss,css}') const TSM_COMMAND = `pnpm exec tsm --logLevel error "{${CSS_MODULES_GLOB},${JETBRAINS_CSS_MODULES_GLOB}}" --includePaths node_modules client` const [BIN, ...ARGS] = TSM_COMMAND.split(' ') diff --git a/client/shared/dev/runMochaTestsWithPercy.js b/client/shared/dev/runMochaTestsWithPercy.js index 7758a75145651..eaf467e7ea46a 100644 --- a/client/shared/dev/runMochaTestsWithPercy.js +++ b/client/shared/dev/runMochaTestsWithPercy.js @@ -13,11 +13,10 @@ const resolveBin = require('resolve-bin') /** @returns {Record} env vars */ function getEnvVars() { // JS_BINARY__EXECROOT – Set by Bazel `js_run_binary` rule. - // BAZEL_VOLATILE_STATUS_FILE – Set by Bazel when the `stamp` attribute on the `js_run_binary_rule` equals 1. - // https://docs.aspect.build/rules/aspect_rules_js/docs/js_run_binary#stamp - const { JS_BINARY__EXECROOT, BAZEL_VOLATILE_STATUS_FILE } = process.env + // BAZEL_BINDIR – Set by Bazel `js_run_binary` rule. + const { JS_BINARY__EXECROOT, BAZEL_BINDIR } = process.env - if (!JS_BINARY__EXECROOT || !BAZEL_VOLATILE_STATUS_FILE) { + if (!JS_BINARY__EXECROOT || !BAZEL_BINDIR) { throw new Error('Missing required environment variables') } @@ -26,7 +25,18 @@ function getEnvVars() { // build the correct visual diff report and auto-accept change on `main` if we're on it. // https://github.com/percy/cli/blob/059ec21653a07105e223aa5a3ec1f815a7123ad7/packages/env/src/environment.js#L138-L139 // https://bazel.build/docs/user-manual#workspace-status - const statusFilePath = path.join(JS_BINARY__EXECROOT, BAZEL_VOLATILE_STATUS_FILE) + // + // NB: we derive the volatile-status.txt file path from the BAZEL_BINDIR since we are + // intentionally pulling volatile data without defining the volatile status as an input so we + // don't bust the cache with its contents of volatile-status.txt + // (https://github.com/bazelbuild/bazel/issues/16231). This can be improved in the future by using + // the new --experimental_remote_cache_key_ignore_stamping flag in Bazel to filter out the + // volatile-status.txt file from the action inputs + // (https://github.com/bazelbuild/bazel/pull/16240) + const statusFilePath = path.join( + path.dirname(path.dirname(path.join(JS_BINARY__EXECROOT, BAZEL_BINDIR))), + 'volatile-status.txt' + ) const volatileEnvVariables = Object.fromEntries( readFileSync(statusFilePath, 'utf8') .split('\n') diff --git a/client/shared/src/api/extension/test/extensionHost.documentHighlights.test.ts b/client/shared/src/api/extension/test/extensionHost.documentHighlights.test.ts index 6d1e9ec821728..fe722decf79a0 100644 --- a/client/shared/src/api/extension/test/extensionHost.documentHighlights.test.ts +++ b/client/shared/src/api/extension/test/extensionHost.documentHighlights.test.ts @@ -37,7 +37,7 @@ describe('getDocumentHighlights from ExtensionHost API, it aims to have more e2e }) it('restarts document highlights call if a provider was added or removed', () => { - const typescriptFileUri = 'file:///f.ts' + const typescriptFileUri = 'git://repo#src/f.ts' const { extensionHostAPI, extensionAPI } = initializeExtensionHostTest( { initialSettings, clientApplication: 'sourcegraph', sourcegraphURL: 'https://example.com/' }, diff --git a/client/shared/src/api/extension/test/extensionHost.hover.test.ts b/client/shared/src/api/extension/test/extensionHost.hover.test.ts index ef8c3d7a77934..4de966aac1442 100644 --- a/client/shared/src/api/extension/test/extensionHost.hover.test.ts +++ b/client/shared/src/api/extension/test/extensionHost.hover.test.ts @@ -38,7 +38,7 @@ describe('getHover from ExtensionHost API, it aims to have more e2e feel', () => }) it('restarts hover call if a provider was added or removed', () => { - const typescriptFileUri = 'file:///f.ts' + const typescriptFileUri = 'git://repo#src/f.ts' const { extensionHostAPI, extensionAPI } = initializeExtensionHostTest( { initialSettings, clientApplication: 'sourcegraph', sourcegraphURL: 'https://example.com/' }, diff --git a/client/shared/src/api/extension/test/extensionHost.providers.test.ts b/client/shared/src/api/extension/test/extensionHost.providers.test.ts index 51244bbe0447f..9363670947d0b 100644 --- a/client/shared/src/api/extension/test/extensionHost.providers.test.ts +++ b/client/shared/src/api/extension/test/extensionHost.providers.test.ts @@ -13,6 +13,8 @@ const scheduler = (): TestScheduler => new TestScheduler((a, b) => expect(a).toE type Provider = RegisteredProvider> +const documentURI = 'git://repo#src/f.ts' + const getResultsFromProviders = (providersObservable: Observable, document: TextDocumentIdentifier) => callProviders( providersObservable, @@ -31,18 +33,19 @@ describe('callProviders()', () => { describe('1 provider', () => { it('returns empty non loading result with no providers', () => { scheduler().run(({ cold, expectObservable }) => - expectObservable( - getResultsFromProviders(cold('-a', { a: [] }), { uri: 'file:///f.ts' }) - ).toBe('-a', { - a: { isLoading: false, result: [] }, - }) + expectObservable(getResultsFromProviders(cold('-a', { a: [] }), { uri: documentURI })).toBe( + '-a', + { + a: { isLoading: false, result: [] }, + } + ) ) }) it('returns a result from a provider synchronously with raw values', () => { scheduler().run(({ cold, expectObservable }) => expectObservable( - getResultsFromProviders(cold('-a', { a: [provide(1)] }), { uri: 'file:///f.ts' }) + getResultsFromProviders(cold('-a', { a: [provide(1)] }), { uri: documentURI }) ).toBe('-(lr)', { l: { isLoading: true, result: [LOADING] }, r: { isLoading: false, result: [1] }, @@ -54,7 +57,7 @@ describe('callProviders()', () => { scheduler().run(({ cold, expectObservable }) => expectObservable( getResultsFromProviders(cold('-a', { a: [provide(cold('--a', { a: 1 }))] }), { - uri: 'file:///f.ts', + uri: documentURI, }) ).toBe('-l-r', { l: { isLoading: true, result: [LOADING] }, @@ -69,7 +72,7 @@ describe('callProviders()', () => { scheduler().run(({ cold, expectObservable }) => expectObservable( getResultsFromProviders(cold('-a', { a: [provide(1), provide(2)] }), { - uri: 'file:///f.ts', + uri: documentURI, }) ).toBe('-(lr)', { l: { isLoading: true, result: [1, LOADING] }, @@ -85,7 +88,7 @@ describe('callProviders()', () => { cold('-a', { a: [provide(cold('-a', { a: 1 })), provide(cold('-a', { a: 2 }))], }), - { uri: 'file:///f.ts' } + { uri: documentURI } ) ).toBe('-lr', { l: { isLoading: true, result: [LOADING, LOADING] }, @@ -101,7 +104,7 @@ describe('callProviders()', () => { cold('-a', { a: [provide(cold('-a', { a: 1 })), provide(cold('-#', {}, new Error('boom!')))], }), - { uri: 'file:///f.ts' } + { uri: documentURI } ) ).toBe('-lr', { l: { isLoading: true, result: [LOADING, LOADING] }, @@ -116,7 +119,7 @@ describe('callProviders()', () => { scheduler().run(({ cold, expectObservable }) => expectObservable( getResultsFromProviders(cold('-a', { a: [provide(1, '*.ts'), provide(2, '*.js')] }), { - uri: 'file:///f.ts', + uri: documentURI, }) ).toBe('-(lr)', { l: { isLoading: true, result: [LOADING] }, @@ -135,7 +138,7 @@ describe('callProviders()', () => { a: [provide(cold('-a', { a: 1 })), provide(cold('-a', { a: 2 }))], b: [provide(cold('-a', { a: 3 }))], }), - { uri: 'file:///f.ts' } + { uri: documentURI } ) ).toBe('-abcd', { a: { isLoading: true, result: [LOADING, LOADING] }, diff --git a/client/shared/src/backend/apolloCache.ts b/client/shared/src/backend/apolloCache.ts index dc6396126190a..3861fedbf484e 100644 --- a/client/shared/src/backend/apolloCache.ts +++ b/client/shared/src/backend/apolloCache.ts @@ -35,6 +35,8 @@ export const generateCache = (): InMemoryCache => Changeset: ['ExternalChangeset', 'HiddenExternalChangeset'], TeamMember: ['User'], Owner: ['Person', 'Team'], + TreeEntry: ['GitBlob', 'GitTree'], + File2: ['GitBlob', 'VirtualFile'], }, }) diff --git a/client/shared/src/backend/repo.ts b/client/shared/src/backend/repo.ts index 5934b0a1e3910..a0e380828c387 100644 --- a/client/shared/src/backend/repo.ts +++ b/client/shared/src/backend/repo.ts @@ -74,7 +74,7 @@ export const fetchTreeEntries = memoizeObservable( fragment TreeFields on GitTree { isRoot url - entries(first: $first, recursiveSingleChild: true) { + entries(first: $first) { ...TreeEntryFields } } @@ -87,7 +87,6 @@ export const fetchTreeEntries = memoizeObservable( url commit } - isSingleChild } `, variables: args, diff --git a/client/shared/src/codeintel/legacy-extensions/lsif/api.ts b/client/shared/src/codeintel/legacy-extensions/lsif/api.ts index ef92ee84efb47..b9e6c2ac87013 100644 --- a/client/shared/src/codeintel/legacy-extensions/lsif/api.ts +++ b/client/shared/src/codeintel/legacy-extensions/lsif/api.ts @@ -23,7 +23,7 @@ export async function queryLSIF

( }: P, queryGraphQL: QueryGraphQLFn> ): Promise { - const { repo, commit, path } = parseGitURI(new URL(uri)) + const { repo, commit, path } = parseGitURI(uri) const queryArguments = { repository: repo, commit, path, ...rest } const data = await queryGraphQL(query, queryArguments) return data.repository?.commit?.blob?.lsif || null diff --git a/client/shared/src/codeintel/legacy-extensions/lsif/locations.ts b/client/shared/src/codeintel/legacy-extensions/lsif/locations.ts index 803a385772079..620470a6e4a7f 100644 --- a/client/shared/src/codeintel/legacy-extensions/lsif/locations.ts +++ b/client/shared/src/codeintel/legacy-extensions/lsif/locations.ts @@ -23,7 +23,7 @@ export function nodeToLocation( textDocument: sourcegraph.TextDocument, { resource: { repository, commit, path }, range }: LocationConnectionNode ): sourcegraph.Location { - const { repo: currentRepo, commit: currentCommit } = parseGitURI(new URL(textDocument.uri)) + const { repo: currentRepo, commit: currentCommit } = parseGitURI(textDocument.uri) return { uri: new URL(`git://${repository?.name || currentRepo}?${commit?.oid || currentCommit}#${path}`), diff --git a/client/shared/src/codeintel/legacy-extensions/lsif/providers.ts b/client/shared/src/codeintel/legacy-extensions/lsif/providers.ts index 9f4e5205323a0..7b84d533241f5 100644 --- a/client/shared/src/codeintel/legacy-extensions/lsif/providers.ts +++ b/client/shared/src/codeintel/legacy-extensions/lsif/providers.ts @@ -1,11 +1,8 @@ -import { once } from 'lodash' - import * as scip from '../../scip' import type * as sourcegraph from '../api' import type { Logger } from '../logging' import type { CombinedProviders, DefinitionAndHover } from '../providers' import { cache } from '../util' -import { API } from '../util/api' import { queryGraphQL as sgQueryGraphQL, type QueryGraphQLFn } from '../util/graphql' import { asyncGeneratorFromPromise } from '../util/ix' import { raceWithDelayOffset } from '../util/promise' @@ -26,10 +23,7 @@ import { makeStencilFn, type StencilFn } from './stencil' export function createProviders(hasImplementationsField: boolean, logger: Logger): CombinedProviders { const providers = createGraphQLProviders( sgQueryGraphQL, - makeStencilFn( - sgQueryGraphQL, - once(() => new API().hasStencils()) - ), + makeStencilFn(sgQueryGraphQL), makeRangeWindowFactory(hasImplementationsField, sgQueryGraphQL) ) diff --git a/client/shared/src/codeintel/legacy-extensions/lsif/stencil.ts b/client/shared/src/codeintel/legacy-extensions/lsif/stencil.ts index 8a98687f4f493..37b791e39ee08 100644 --- a/client/shared/src/codeintel/legacy-extensions/lsif/stencil.ts +++ b/client/shared/src/codeintel/legacy-extensions/lsif/stencil.ts @@ -8,13 +8,8 @@ import { type GenericLSIFResponse, queryLSIF } from './api' export const stencil = async ( uri: string, - hasStencilSupport: () => Promise, queryGraphQL: QueryGraphQLFn> = sgQueryGraphQL ): Promise => { - if (!(await hasStencilSupport())) { - return undefined - } - const response = await queryLSIF({ query: stencilQuery, uri }, queryGraphQL) return response?.stencil } @@ -45,6 +40,5 @@ const stencilQuery = gql` export type StencilFn = (uri: string) => Promise export const makeStencilFn = ( - queryGraphQL: QueryGraphQLFn>, - hasStencilSupport: () => Promise = () => Promise.resolve(true) -): StencilFn => cache(uri => stencil(uri, hasStencilSupport, queryGraphQL), { max: 10 }) + queryGraphQL: QueryGraphQLFn> +): StencilFn => cache(uri => stencil(uri, queryGraphQL), { max: 10 }) diff --git a/client/shared/src/codeintel/legacy-extensions/providers.ts b/client/shared/src/codeintel/legacy-extensions/providers.ts index 43b9207d55074..916c57253e5b6 100644 --- a/client/shared/src/codeintel/legacy-extensions/providers.ts +++ b/client/shared/src/codeintel/legacy-extensions/providers.ts @@ -233,7 +233,7 @@ export function createDefinitionProvider( textDocument: sourcegraph.TextDocument, position: sourcegraph.Position ): AsyncGenerator { - const { repo } = parseGitURI(new URL(textDocument.uri)) + const { repo } = parseGitURI(textDocument.uri) const repoId = (await api.resolveRepo(repo)).id const emitter = new TelemetryEmitter(languageID, repoId, !quiet) const commonFields = { provider: 'definition', repo, textDocument, position, emitter, logger } @@ -324,7 +324,7 @@ export function createReferencesProvider( position: sourcegraph.Position, context: sourcegraph.ReferenceContext ): AsyncGenerator { - const { repo } = parseGitURI(new URL(textDocument.uri)) + const { repo } = parseGitURI(textDocument.uri) const repoId = (await api.resolveRepo(repo)).id const emitter = new TelemetryEmitter(languageID, repoId) const commonFields = { repo, textDocument, position, emitter, logger, provider: 'references' } @@ -432,7 +432,7 @@ export function createImplementationsProvider( textDocument: sourcegraph.TextDocument, position: sourcegraph.Position ): AsyncGenerator { - const { repo } = parseGitURI(new URL(textDocument.uri)) + const { repo } = parseGitURI(textDocument.uri) const repoId = (await api.resolveRepo(repo)).id const emitter = new TelemetryEmitter(languageID, repoId) const commonFields = { repo, textDocument, position, emitter, logger, provider: 'implementations' } @@ -476,7 +476,7 @@ function logLocationResults, emitter?.emitOnce(action) // Emit xrepo event if we contain a result from another repository - if (asArray(results).some(location => parseGitURI(location.uri).repo !== repo)) { + if (asArray(results).some(location => parseGitURI(location.uri.toString()).repo !== repo)) { emitter?.emitOnce(action + '.xrepo') } @@ -492,7 +492,7 @@ function logLocationResults, arrayResults = arrayResults.slice(0, 500) } - const { path } = parseGitURI(new URL(textDocument.uri)) + const { path } = parseGitURI(textDocument.uri) const { line, character } = position logger.log({ @@ -533,7 +533,7 @@ export function createHoverProvider( textDocument: sourcegraph.TextDocument, position: sourcegraph.Position ): AsyncGenerator | null | undefined, void, undefined> { - const { repo, path } = parseGitURI(new URL(textDocument.uri)) + const { repo, path } = parseGitURI(textDocument.uri) const repoId = (await api.resolveRepo(repo)).id const emitter = new TelemetryEmitter(languageID, repoId) const commonLogFields = { path, line: position.line, character: position.character } @@ -626,7 +626,7 @@ export function createDocumentHighlightProvider( textDocument: sourcegraph.TextDocument, position: sourcegraph.Position ): AsyncGenerator { - const { repo } = parseGitURI(new URL(textDocument.uri)) + const { repo } = parseGitURI(textDocument.uri) const repoId = (await api.resolveRepo(repo)).id const emitter = new TelemetryEmitter(languageID, repoId) diff --git a/client/shared/src/codeintel/legacy-extensions/search/providers.test.ts b/client/shared/src/codeintel/legacy-extensions/search/providers.test.ts index 07c5ff531f72c..2bbc1403904d3 100644 --- a/client/shared/src/codeintel/legacy-extensions/search/providers.test.ts +++ b/client/shared/src/codeintel/legacy-extensions/search/providers.test.ts @@ -139,9 +139,6 @@ describe('search providers', () => { const stubResolveRepo = sinon.stub(api, 'resolveRepo') stubResolveRepo.callsFake(repo => Promise.resolve({ name: repo, isFork, isArchived, id })) - const stubHasLocalCodeIntelField = sinon.stub(api, 'hasLocalCodeIntelField') - stubHasLocalCodeIntelField.callsFake(() => Promise.resolve(true)) - const stubFindSymbol = sinon.stub(api, 'findLocalSymbol') stubFindSymbol.callsFake(() => Promise.resolve(undefined)) diff --git a/client/shared/src/codeintel/legacy-extensions/search/providers.ts b/client/shared/src/codeintel/legacy-extensions/search/providers.ts index 5ffd2c13280b4..20d5908a58ed6 100644 --- a/client/shared/src/codeintel/legacy-extensions/search/providers.ts +++ b/client/shared/src/codeintel/legacy-extensions/search/providers.ts @@ -60,7 +60,7 @@ export function createProviders( cachedFileContents.delete(Array.from(cachedFileContents.keys())[index]) } - const { repo, commit, path } = parseGitURI(new URL(uri)) + const { repo, commit, path } = parseGitURI(uri) const fileContent = api.getFileContent(repo, commit, path) cachedFileContents.set(uri, fileContent) return fileContent @@ -119,7 +119,7 @@ export function createProviders( return null } const { text, searchToken } = contentAndToken - const { repo, commit, path } = parseGitURI(new URL(textDocument.uri)) + const { repo, commit, path } = parseGitURI(textDocument.uri) const { isFork, isArchived } = await api.resolveRepo(repo) // Construct base definition query without scoping terms @@ -173,7 +173,7 @@ export function createProviders( return [] } const { searchToken } = contentAndToken - const { repo, commit } = parseGitURI(new URL(textDocument.uri)) + const { repo, commit } = parseGitURI(textDocument.uri) const { isFork, isArchived } = await api.resolveRepo(repo) // Construct base references query without scoping terms diff --git a/client/shared/src/codeintel/legacy-extensions/search/queries.ts b/client/shared/src/codeintel/legacy-extensions/search/queries.ts index a88452a9a30ae..60d7124b1a471 100644 --- a/client/shared/src/codeintel/legacy-extensions/search/queries.ts +++ b/client/shared/src/codeintel/legacy-extensions/search/queries.ts @@ -72,7 +72,7 @@ const excludelist = new Set(['thrift', 'proto', 'graphql']) * @param includelist The file extensions for the current language. */ function fileExtensionTerm(textDocument: sourcegraph.TextDocument, includelist: string[]): string { - const { path } = parseGitURI(new URL(textDocument.uri)) + const { path } = parseGitURI(textDocument.uri) const extension = extname(path).slice(1) if (!extension || excludelist.has(extension) || !includelist.includes(extension)) { return '' diff --git a/client/shared/src/codeintel/legacy-extensions/search/squirrel.ts b/client/shared/src/codeintel/legacy-extensions/search/squirrel.ts index f6044f985f06b..b410662dcac79 100644 --- a/client/shared/src/codeintel/legacy-extensions/search/squirrel.ts +++ b/client/shared/src/codeintel/legacy-extensions/search/squirrel.ts @@ -12,7 +12,7 @@ export const mkSquirrel = (api: API): PromiseProviders => ({ const local = await api.findLocalSymbol(document, position) if (local?.def) { - return mkSourcegraphLocation({ ...parseGitURI(new URL(document.uri)), range: local.def }) + return mkSourcegraphLocation({ ...parseGitURI(document.uri), range: local.def }) } const symbolInfo = await api.fetchSymbolInfo(document, position) @@ -30,7 +30,7 @@ export const mkSquirrel = (api: API): PromiseProviders => ({ length: symbolInfo.definition.range.length, }, } - return mkSourcegraphLocation({ ...parseGitURI(new URL(document.uri)), ...location }) + return mkSourcegraphLocation({ ...parseGitURI(document.uri), ...location }) }, async references(document, position) { const symbol = await api.findLocalSymbol(document, position) @@ -40,9 +40,7 @@ export const mkSquirrel = (api: API): PromiseProviders => ({ symbol.refs = sortBy(symbol.refs, reference => reference.row) - return symbol.refs.map(reference => - mkSourcegraphLocation({ ...parseGitURI(new URL(document.uri)), range: reference }) - ) + return symbol.refs.map(reference => mkSourcegraphLocation({ ...parseGitURI(document.uri), range: reference })) }, async hover(document, position) { const symbol = await api.findLocalSymbol(document, position) diff --git a/client/shared/src/codeintel/legacy-extensions/util/api.ts b/client/shared/src/codeintel/legacy-extensions/util/api.ts index bc2d042d65acf..20c251ff6ba2c 100644 --- a/client/shared/src/codeintel/legacy-extensions/util/api.ts +++ b/client/shared/src/codeintel/legacy-extensions/util/api.ts @@ -1,4 +1,3 @@ -import { once } from 'lodash' import gql from 'tagged-template-noop' import { isErrorLike } from '@sourcegraph/common' @@ -86,7 +85,7 @@ export class API { } const metaRequest = (async (name: string): Promise => { - const queryWithFork = gql` + const query = gql` query LegacyResolveRepo($name: String!) { repository(name: $name) { id @@ -97,14 +96,6 @@ export class API { } ` - const queryWithoutFork = gql` - query LegacyResolveRepo2($name: String!) { - repository(name: $name) { - name - } - } - ` - interface Response { repository: { id: string @@ -114,7 +105,7 @@ export class API { } } - const data = await queryGraphQL((await this.hasForkField()) ? queryWithFork : queryWithoutFork, { + const data = await queryGraphQL(query, { name, }) @@ -131,107 +122,6 @@ export class API { return metaRequest } - /** - * Determines via introspection if the GraphQL API has isFork field on the Repository type. - * - * TODO(efritz) - Remove this when we no longer need to support pre-3.15 instances. - */ - private async hasForkField(): Promise { - const introspectionQuery = gql` - query LegacyRepositoryIntrospection { - __type(name: "Repository") { - fields { - name - } - } - } - ` - - interface IntrospectionResponse { - __type: { fields: { name: string }[] } - } - - return (await queryGraphQL(introspectionQuery)).__type.fields.some( - field => field.name === 'isFork' - ) - } - - /** - * Determines via introspection if the GraphQL API has local code intelligence available - * - * TODO(chrismwendt) - Remove this when we no longer need to support versions without local code - * intelligence - */ - public hasLocalCodeIntelField = once(async () => { - const introspectionQuery = gql` - query LegacyLocalCodeIntelIntrospectionQuery { - __type(name: "GitBlob") { - fields { - name - } - } - } - ` - - interface IntrospectionResponse { - __type: { fields: { name: string }[] } - } - - return (await queryGraphQL(introspectionQuery)).__type.fields.some( - field => field.name === 'localCodeIntel' - ) - }) - - /** - * Determines via introspection if the GraphQL API has symbol info available - * - * TODO(chrismwendt) - Remove this when we no longer need to support versions without symbol info - */ - public hasSymbolInfo = once(async () => { - const introspectionQuery = gql` - query LegacySymbolInfoIntrospectionQuery { - __type(name: "GitBlob") { - fields { - name - } - } - } - ` - - interface IntrospectionResponse { - __type: { fields: { name: string }[] } - } - - return (await queryGraphQL(introspectionQuery)).__type.fields.some( - field => field.name === 'symbolInfo' - ) - }) - - /** - * Determines via introspection if the GraphQL API has symbolInfo.range available - * - * TODO(chrismwendt) - Remove this when we no longer need to support versions without symbolInfo.range - */ - public hasSymbolLocationRange = once(async () => { - const introspectionQuery = gql` - query LegacySymbolLocationRangeIntrospectionQuery { - __type(name: "SymbolLocation") { - fields { - name - } - } - } - ` - - interface IntrospectionResponse { - __type: { fields: { name: string }[] } - } - - return (await queryGraphQL(introspectionQuery)).__type.fields.some( - field => field.name === 'range' - ) - }) - public fetchLocalCodeIntelPayload = cache( async ({ repo, commit, path }: RepoCommitPath): Promise => { const vars = { repository: repo, commit, path } @@ -260,11 +150,7 @@ export class API { document: sourcegraph.TextDocument, position: sourcegraph.Position ): Promise => { - if (!(await this.hasLocalCodeIntelField())) { - return - } - - const { repo, commit, path } = parseGitURI(new URL(document.uri)) + const { repo, commit, path } = parseGitURI(document.uri) const payload = await this.fetchLocalCodeIntelPayload({ repo, commit, path }) if (!payload) { @@ -291,20 +177,12 @@ export class API { document: sourcegraph.TextDocument, position: sourcegraph.Position ): Promise => { - if (!(await this.hasSymbolInfo())) { - return - } - - const query = (await this.hasSymbolLocationRange()) - ? symbolInfoDefinitionQueryWithRange - : symbolInfoDefinitionQueryWithoutRange - - const { repo, commit, path } = parseGitURI(new URL(document.uri)) + const { repo, commit, path } = parseGitURI(document.uri) const vars = { repository: repo, commit, path, line: position.line, character: position.character } const response = await (async (): Promise => { try { - return await queryGraphQL(query, vars) + return await queryGraphQL(symbolInfoDefinitionQuery, vars) } catch (error) { if (isKnownSquirrelErrorLike(error)) { return { repository: null } @@ -373,34 +251,6 @@ export class API { }) return data.search.results.results.filter(isDefined) } - - /** - * Determines via introspection if the GraphQL API supports stencils - * - * TODO(chrismwendt) - Remove this when we no longer need to support Sourcegraph versions that don't - * have stencil support - */ - public async hasStencils(): Promise { - const introspectionQuery = gql` - query LegacyStencilIntrospectionQuery { - __type(name: "GitBlobLSIFData") { - fields { - name - } - } - } - ` - - interface IntrospectionResponse { - __type: { fields: { name: string }[] } - } - - return Boolean( - (await queryGraphQL(introspectionQuery)).__type?.fields.some( - field => field.name === 'stencil' - ) - ) - } } function buildSearchQuery(fileLocal: boolean): string { @@ -577,29 +427,7 @@ const symbolInfoFlexibleToCanonical = (flexible: SymbolInfoFlexible): SymbolInfo hover: flexible.hover, }) -const symbolInfoDefinitionQueryWithoutRange = gql` - query LegacySymbolInfo($repository: String!, $commit: String!, $path: String!, $line: Int!, $character: Int!) { - repository(name: $repository) { - commit(rev: $commit) { - blob(path: $path) { - symbolInfo(line: $line, character: $character) { - definition { - repo - commit - path - line - character - length - } - hover - } - } - } - } - } -` - -const symbolInfoDefinitionQueryWithRange = gql` +const symbolInfoDefinitionQuery = gql` query LegacySymbolInfo2($repository: String!, $commit: String!, $path: String!, $line: Int!, $character: Int!) { repository(name: $repository) { commit(rev: $commit) { diff --git a/client/shared/src/codeintel/legacy-extensions/util/uri.test.ts b/client/shared/src/codeintel/legacy-extensions/util/uri.test.ts index 217626fd7048d..a19a0e3a8734f 100644 --- a/client/shared/src/codeintel/legacy-extensions/util/uri.test.ts +++ b/client/shared/src/codeintel/legacy-extensions/util/uri.test.ts @@ -7,9 +7,7 @@ import { parseGitURI } from './uri' describe('parseGitURI', () => { it('returns components', () => { assert.deepStrictEqual( - parseGitURI( - new URL('git://github.com/microsoft/vscode?dbd76d987cf1a412401bdbd3fb785217ac94197e#src/vs/css.js') - ), + parseGitURI('git://github.com/microsoft/vscode?dbd76d987cf1a412401bdbd3fb785217ac94197e#src/vs/css.js'), { repo: 'github.com/microsoft/vscode', commit: 'dbd76d987cf1a412401bdbd3fb785217ac94197e', @@ -21,9 +19,7 @@ describe('parseGitURI', () => { it('decodes repos with spaces', () => { assert.deepStrictEqual( parseGitURI( - new URL( - 'git://sourcegraph.visualstudio.com/Test%20Repo?dbd76d987cf1a412401bdbd3fb785217ac94197e#src/vs/css.js' - ) + 'git://sourcegraph.visualstudio.com/Test%20Repo?dbd76d987cf1a412401bdbd3fb785217ac94197e#src/vs/css.js' ), { repo: 'sourcegraph.visualstudio.com/Test Repo', diff --git a/client/shared/src/codeintel/legacy-extensions/util/uri.ts b/client/shared/src/codeintel/legacy-extensions/util/uri.ts index a57994d0e9d67..c9ac6ee943cc1 100644 --- a/client/shared/src/codeintel/legacy-extensions/util/uri.ts +++ b/client/shared/src/codeintel/legacy-extensions/util/uri.ts @@ -1,12 +1,15 @@ +import { parseRepoURI } from '../../../util/url' + /** * Extracts the components of a text document URI. * - * @param url The text document URL. + * @param uri The text document URL. */ -export function parseGitURI({ hostname, pathname, search, hash }: URL): { repo: string; commit: string; path: string } { +export function parseGitURI(uri: string): { repo: string; commit: string; path: string } { + const result = parseRepoURI(uri) return { - repo: hostname + decodeURIComponent(pathname), - commit: decodeURIComponent(search.slice(1)), - path: decodeURIComponent(hash.slice(1)), + repo: result.repoName, + commit: result.revision ?? '', + path: result.filePath ?? '', } } diff --git a/client/shared/src/search/query/scanner.ts b/client/shared/src/search/query/scanner.ts index a4a559972708c..c060824137513 100644 --- a/client/shared/src/search/query/scanner.ts +++ b/client/shared/src/search/query/scanner.ts @@ -538,6 +538,7 @@ export const scanSearchQuery = ( switch (patternType) { case SearchPatternType.standard: case SearchPatternType.lucky: + case SearchPatternType.newStandardRC1: case SearchPatternType.keyword: { return scanStandard(query) } diff --git a/client/shared/src/search/stream.ts b/client/shared/src/search/stream.ts index 1017f5e6fff76..00b47b536ad24 100644 --- a/client/shared/src/search/stream.ts +++ b/client/shared/src/search/stream.ts @@ -579,21 +579,19 @@ export function getRepositoryUrl(repository: string, branches?: string[]): strin } export function getRevision(branches?: string[], version?: string): string { - let revision = '' - if (branches) { - const branch = branches[0] - if (branch !== '') { - revision = branch - } - } else if (version) { - revision = version + if (branches && branches.length > 0) { + return branches[0] } - - return revision + if (version) { + return version + } + return '' } export function getFileMatchUrl(fileMatch: ContentMatch | SymbolMatch | PathMatch): string { - const revision = getRevision(fileMatch.branches, fileMatch.commit) + // We are not using getRevision here, because we want to flip the logic from + // "branches first" to "revsion first" + const revision = fileMatch.commit ?? fileMatch.branches?.[0] const encodedFilePath = fileMatch.path.split('/').map(encodeURIComponent).join('/') return `/${fileMatch.repository}${revision ? '@' + revision : ''}/-/blob/${encodedFilePath}` } diff --git a/client/shared/src/settings/settings.tsx b/client/shared/src/settings/settings.tsx index 5c4da20b8c68f..7f4ec0362d0af 100644 --- a/client/shared/src/settings/settings.tsx +++ b/client/shared/src/settings/settings.tsx @@ -308,6 +308,7 @@ const defaultFeatures: SettingsExperimentalFeatures = { showMultilineSearchConsole: false, codeMonitoringWebHooks: true, showCodeMonitoringLogs: true, + showFullTreeContext: false, codeInsightsCompute: false, editor: 'codemirror6', codeInsightsRepoUI: 'search-query-or-strict-list', diff --git a/client/shared/src/settings/temporary/TemporarySettings.ts b/client/shared/src/settings/temporary/TemporarySettings.ts index bfe48ac135c22..2af60143a5737 100644 --- a/client/shared/src/settings/temporary/TemporarySettings.ts +++ b/client/shared/src/settings/temporary/TemporarySettings.ts @@ -85,6 +85,8 @@ export interface TemporarySettingsSchema { 'admin.hasDismissedCodeHostPrivacyWarning': boolean 'admin.hasCompletedLicenseCheck': boolean 'simple.search.toggle': boolean + 'cody.onboarding.completed': boolean + 'cody.onboarding.step': number } /** @@ -146,6 +148,8 @@ const TEMPORARY_SETTINGS: Record = { 'admin.hasDismissedCodeHostPrivacyWarning': null, 'admin.hasCompletedLicenseCheck': null, 'simple.search.toggle': null, + 'cody.onboarding.completed': null, + 'cody.onboarding.step': null, } export const TEMPORARY_SETTINGS_KEYS = Object.keys(TEMPORARY_SETTINGS) as readonly (keyof TemporarySettings)[] diff --git a/client/shared/src/util/url.ts b/client/shared/src/util/url.ts index d95ad0622fe37..f02673f05ae32 100644 --- a/client/shared/src/util/url.ts +++ b/client/shared/src/util/url.ts @@ -1,3 +1,5 @@ +import { parseURL } from 'whatwg-url' + import { addLineRangeQueryParameter, encodeURIPathComponent, @@ -177,14 +179,22 @@ const parsePosition = (string: string): Position => { * @deprecated Migrate to using URLs to the Sourcegraph raw API (or other concrete URLs) instead. */ export function parseRepoURI(uri: RepoURI): ParsedRepoURI { - const parsed = new URL(uri) - const repoName = parsed.hostname + decodeURIComponent(parsed.pathname) - const revision = decodeURIComponent(parsed.search.slice('?'.length)) || undefined + // We are not using the environments URL constructor because Chrome and Firefox do + // not correctly parse out the hostname for URLs . We have a polyfill for the main web app + // (see client/shared/src/polyfills/configure-core-js.ts) but that might not be used in all apps. + const parsed = parseURL(uri) + if (!parsed?.host) { + throw new Error('Unable to parse repo URI: ' + uri) + } + const pathname = + typeof parsed.path === 'string' ? parsed.path : parsed.path.length === 0 ? '' : '/' + parsed.path.join('/') + const repoName = String(parsed.host) + decodeURIComponent(pathname) + const revision = parsed.query ? decodeURIComponent(parsed.query) : undefined let commitID: string | undefined if (revision?.match(/[\dA-f]{40}/)) { commitID = revision } - const fragmentSplit = parsed.hash.slice('#'.length).split(':').map(decodeURIComponent) + const fragmentSplit = parsed.fragment ? parsed.fragment.split(':').map(decodeURIComponent) : [] let filePath: string | undefined let position: UIPosition | undefined let range: UIRange | undefined @@ -207,7 +217,7 @@ export function parseRepoURI(uri: RepoURI): ParsedRepoURI { } } if (fragmentSplit.length > 2) { - throw new Error('unexpected fragment: ' + parsed.hash) + throw new Error('unexpected fragment: ' + parsed.fragment) } return { repoName, revision, commitID, filePath: filePath || undefined, position, range } diff --git a/client/testing/BUILD.bazel b/client/testing/BUILD.bazel index 8c3e05d4a1304..a7d81adcd200c 100644 --- a/client/testing/BUILD.bazel +++ b/client/testing/BUILD.bazel @@ -31,6 +31,7 @@ ts_project( "src/mockMatchMedia.ts", "src/mockResizeObserver.ts", "src/mockUniqueId.ts", + "src/perTestSetup.ts", "src/reactCleanup.ts", ], tsconfig = ":tsconfig", @@ -40,6 +41,7 @@ ts_project( "//:node_modules/@testing-library/react", "//:node_modules/@types/lodash", "//:node_modules/@types/mockdate", + "//:node_modules/@types/node", "//:node_modules/lodash", "//:node_modules/mockdate", "//:node_modules/resize-observer-polyfill", diff --git a/client/testing/src/perTestSetup.ts b/client/testing/src/perTestSetup.ts new file mode 100644 index 0000000000000..45686d09cb7f5 --- /dev/null +++ b/client/testing/src/perTestSetup.ts @@ -0,0 +1,9 @@ +import { TextEncoder, TextDecoder } from 'node:util' + +// TextEncoder and TextDecoder are not available in a jsdom environment but +// required in various contexts. +if (!global.TextEncoder) { + global.TextEncoder = TextEncoder + // @ts-expect-error The interface of TextDecoder is not compatible with whatever TS thinks gobal.TextDecoder is. + global.TextDecoder = TextDecoder +} diff --git a/client/web-sveltekit/BUILD.bazel b/client/web-sveltekit/BUILD.bazel index 2a6234f908f5d..b02cf418394a3 100644 --- a/client/web-sveltekit/BUILD.bazel +++ b/client/web-sveltekit/BUILD.bazel @@ -2,9 +2,7 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") load("//client/shared/dev:generate_graphql_operations.bzl", "generate_graphql_operations") load("@aspect_rules_js//js:defs.bzl", "js_library") load("@npm//:defs.bzl", "npm_link_all_packages") -load("@aspect_rules_js//js:defs.bzl", "js_run_binary", "js_run_devserver") load("@npm//:vite/package_json.bzl", vite_bin = "bin") -load("@aspect_rules_ts//ts:defs.bzl", "ts_config") # gazelle:ignore diff --git a/client/web-sveltekit/src/app.html b/client/web-sveltekit/src/app.html index 02b1c75e6dda9..7a7e97215b1eb 100644 --- a/client/web-sveltekit/src/app.html +++ b/client/web-sveltekit/src/app.html @@ -1,4 +1,4 @@ - + diff --git a/client/web-sveltekit/src/lib/branded.ts b/client/web-sveltekit/src/lib/branded.ts index ce480e69ad09a..79fc934ebd48a 100644 --- a/client/web-sveltekit/src/lib/branded.ts +++ b/client/web-sveltekit/src/lib/branded.ts @@ -1,11 +1,17 @@ export { formatRepositoryStarCount } from '@sourcegraph/branded/src/search-ui/util/stars' export { limitHit, sortBySeverity } from '@sourcegraph/branded/src/search-ui/results/progress/utils' -export { - basicSyntaxColumns, - exampleQueryColumns, -} from '@sourcegraph/branded/src/search-ui/components/QueryExamples.constants' export { createDefaultSuggestions } from '@sourcegraph/branded/src/search-ui/input/codemirror' -export { multiline } from '@sourcegraph/branded/src/search-ui/input/codemirror/multiline' export { parseInputAsQuery } from '@sourcegraph/branded/src/search-ui/input/codemirror/parsedQuery' export { querySyntaxHighlighting } from '@sourcegraph/branded/src/search-ui/input/codemirror/syntax-highlighting' export { decorateQuery } from '@sourcegraph/branded/src/search-ui/util/query' +export * from '@sourcegraph/branded/src/search-ui/input/codemirror/multiline' +export * from '@sourcegraph/branded/src/search-ui/input/codemirror/event-handlers' +export { tokenInfo } from '@sourcegraph/branded/src/search-ui/input/codemirror/token-info' +export * from '@sourcegraph/branded/src/search-ui/input/codemirror/diagnostics' +export * from '@sourcegraph/branded/src/search-ui/input/experimental/modes' +export * from '@sourcegraph/branded/src/search-ui/input/experimental/utils' +export * from '@sourcegraph/branded/src/search-ui/input/experimental/suggestionsExtension' +export { placeholder } from '@sourcegraph/branded/src/search-ui/input/codemirror/placeholder' +export { showWhenEmptyWithoutContext } from '@sourcegraph/branded/src/search-ui/input/experimental/placeholder' +export { filterDecoration } from '@sourcegraph/branded/src/search-ui/input/experimental/codemirror/syntax-highlighting' +export { overrideContextOnPaste } from '@sourcegraph/branded/src/search-ui/input/experimental/codemirror/searchcontext' diff --git a/client/web-sveltekit/src/lib/codemirror/theme.ts b/client/web-sveltekit/src/lib/codemirror/theme.ts new file mode 100644 index 0000000000000..03b49904c4a46 --- /dev/null +++ b/client/web-sveltekit/src/lib/codemirror/theme.ts @@ -0,0 +1,8 @@ +import { EditorView } from '@codemirror/view' + +export const defaultTheme = EditorView.baseTheme({ + // Overwrites the default cursor color, which has too low contrast in dark mode + '.theme-dark & .cm-cursor': { + borderLeftColor: 'var(--grey-07)', + }, +}) diff --git a/client/web-sveltekit/src/lib/codemirror/utils.ts b/client/web-sveltekit/src/lib/codemirror/utils.ts new file mode 100644 index 0000000000000..17dda466acac4 --- /dev/null +++ b/client/web-sveltekit/src/lib/codemirror/utils.ts @@ -0,0 +1,59 @@ +import { Compartment, type StateEffect, type Extension } from '@codemirror/state' +import type { EditorView } from '@codemirror/view' + +type Extensions = Record +type UpdatedExtensions = { [key in keyof T]: Extension } + +interface Compartments { + extension: Extension + /** + * Initialize compartments with a different value + */ + init(extensions: UpdatedExtensions): Extension + /** + * Update compartments. Only compartments for which the provided + * value has changed will be updated. + */ + update(view: EditorView, extensions: UpdatedExtensions): void +} + +/** + * Helper function for creating a compartments extension. Each record + * entry will get its own compartment and the value will be the initial + * value of the compartment. + */ +export function createCompartments>(extensions: T): Compartments { + const compartments: Record = {} + + function init(extensions: UpdatedExtensions, compartments: Record): Extension { + const extension: Extension[] = [] + for (const [name, ext] of Object.entries(extensions)) { + let compartment = compartments[name] + if (!compartment) { + compartment = compartments[name] = new Compartment() + } + extension.push(compartment.of(ext)) + } + return extension + } + + return { + extension: init(extensions, compartments), + init(extensions) { + return init(extensions, compartments) + }, + update(view, extensions) { + const effects: StateEffect[] = [] + + for (const [name, ext] of Object.entries(extensions)) { + if (compartments[name].get(view.state) !== ext) { + effects.push(compartments[name].reconfigure(ext)) + } + } + + if (effects.length > 0) { + view.dispatch({ effects }) + } + }, + } +} diff --git a/client/web-sveltekit/src/lib/common.ts b/client/web-sveltekit/src/lib/common.ts index 89dd687fd10eb..bd988ffb1e68c 100644 --- a/client/web-sveltekit/src/lib/common.ts +++ b/client/web-sveltekit/src/lib/common.ts @@ -14,3 +14,4 @@ export { pluralize, numberWithCommas } from '@sourcegraph/common/src/util/string export { renderMarkdown } from '@sourcegraph/common/src/util/markdown/markdown' export { highlightNodeMultiline, highlightNode } from '@sourcegraph/common/src/util/highlightNode' export { logger } from '@sourcegraph/common/src/util/logger' +export { isSafari } from '@sourcegraph/common/src/util/browserDetection' diff --git a/client/web-sveltekit/src/lib/dom.ts b/client/web-sveltekit/src/lib/dom.ts index cad2d8c8c15e1..5c9fe8816e74f 100644 --- a/client/web-sveltekit/src/lib/dom.ts +++ b/client/web-sveltekit/src/lib/dom.ts @@ -99,3 +99,31 @@ export const highlightRanges: Action = (node, parameters) => { + let offset = parameters.offset ?? 0 + + function setMaxHeight(): void { + node.style.maxHeight = window.innerHeight - node.getBoundingClientRect().top + offset + 'px' + } + + window.addEventListener('resize', setMaxHeight) + + setMaxHeight() + + return { + update(parameter) { + offset = parameter.offset ?? 0 + setMaxHeight() + }, + + destroy() { + window.removeEventListener('resize', setMaxHeight) + }, + } +} diff --git a/client/web-sveltekit/src/lib/repo/api/tree.ts b/client/web-sveltekit/src/lib/repo/api/tree.ts index ed5373819d54c..ade3c9d59f53e 100644 --- a/client/web-sveltekit/src/lib/repo/api/tree.ts +++ b/client/web-sveltekit/src/lib/repo/api/tree.ts @@ -40,8 +40,7 @@ const treeEntriesQuery = gql` submodule { commit } - isSingleChild - entries(first: $first, recursiveSingleChild: false) { + entries(first: $first) { canonicalURL name path @@ -49,7 +48,6 @@ const treeEntriesQuery = gql` submodule { commit } - isSingleChild } } } diff --git a/client/web-sveltekit/src/lib/search-ui.ts b/client/web-sveltekit/src/lib/search-ui.ts new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/client/web-sveltekit/src/lib/search/BaseQueryInput.svelte b/client/web-sveltekit/src/lib/search/BaseQueryInput.svelte new file mode 100644 index 0000000000000..4aa91ac6dd6aa --- /dev/null +++ b/client/web-sveltekit/src/lib/search/BaseQueryInput.svelte @@ -0,0 +1,175 @@ + + + + +{#if browser} +

+{:else} +
+ +
+{/if} + + diff --git a/client/web-sveltekit/src/lib/search/CodeMirrorQueryInput.svelte b/client/web-sveltekit/src/lib/search/CodeMirrorQueryInput.svelte deleted file mode 100644 index 47ffe2cfc479b..0000000000000 --- a/client/web-sveltekit/src/lib/search/CodeMirrorQueryInput.svelte +++ /dev/null @@ -1,219 +0,0 @@ - - -{#if browser} -
-{:else} -
- -
-{/if} - - diff --git a/client/web-sveltekit/src/lib/search/EmphasizedLabel.svelte b/client/web-sveltekit/src/lib/search/EmphasizedLabel.svelte new file mode 100644 index 0000000000000..ded6e254bba48 --- /dev/null +++ b/client/web-sveltekit/src/lib/search/EmphasizedLabel.svelte @@ -0,0 +1,27 @@ + + +{#if spans} + {#each spans as [start, end, match]} + {#if match} + {label.slice(start, end + 1)} + {:else} + {label.slice(start, end + 1)} + {/if} + {/each} +{:else} + {label} +{/if} + + diff --git a/client/web-sveltekit/src/lib/search/SearchBox.svelte b/client/web-sveltekit/src/lib/search/SearchBox.svelte deleted file mode 100644 index 5efe8bc8095a0..0000000000000 --- a/client/web-sveltekit/src/lib/search/SearchBox.svelte +++ /dev/null @@ -1,238 +0,0 @@ - - -
- - context:{$queryState.searchContext} - - queryState.setQuery(event.detail.query)} - on:submit={handleSubmit} - patternType={$queryState.patternType} - /> - - - - - - - - - - - - - - -
- {@const delayedClose = () => setTimeout(() => toggle(false), 100)} -
-

SmartSearch

- -
-
- - -
-
- - - - - diff --git a/client/web-sveltekit/src/lib/search/SyntaxHighlightedQuery.svelte b/client/web-sveltekit/src/lib/search/SyntaxHighlightedQuery.svelte index 31571c09e4c49..768561f6741ab 100644 --- a/client/web-sveltekit/src/lib/search/SyntaxHighlightedQuery.svelte +++ b/client/web-sveltekit/src/lib/search/SyntaxHighlightedQuery.svelte @@ -1,15 +1,23 @@ {#if decorations} - {#each decorations as { key, className, value } (key)} - {value} + {#each decorations as { key, className, value, token } (key)} + + {#if matches} + + {:else} + {value} + {/if} + {/each} {:else} {query} diff --git a/client/web-sveltekit/src/lib/search/input/ActionInfo.svelte b/client/web-sveltekit/src/lib/search/input/ActionInfo.svelte new file mode 100644 index 0000000000000..18dd04ece4b44 --- /dev/null +++ b/client/web-sveltekit/src/lib/search/input/ActionInfo.svelte @@ -0,0 +1,37 @@ + + +Press {displayName} to +{#if action.type === 'completion'} + add to your query +{:else if action.type === 'goto'} + go to the suggestion +{:else if action.type === 'command'} + execute the command +{/if} + + diff --git a/client/web-sveltekit/src/lib/search/input/SearchInput.svelte b/client/web-sveltekit/src/lib/search/input/SearchInput.svelte new file mode 100644 index 0000000000000..f1b6588d23546 --- /dev/null +++ b/client/web-sveltekit/src/lib/search/input/SearchInput.svelte @@ -0,0 +1,339 @@ + + + + +
+ +
+
+ queryState.setQuery(event.detail)} + on:enter={handleSubmit} + patternType={$queryState.patternType} + interpretComments={false} + {extension} + /> + {#if !mode} + + + + + + + + + + {#if showSmartSearchButton} + + + {/if} + {/if} +
+
+ +
+
+ + diff --git a/client/web-sveltekit/src/lib/search/input/SmartSearchToggleButton.svelte b/client/web-sveltekit/src/lib/search/input/SmartSearchToggleButton.svelte new file mode 100644 index 0000000000000..a905ffb064c2c --- /dev/null +++ b/client/web-sveltekit/src/lib/search/input/SmartSearchToggleButton.svelte @@ -0,0 +1,120 @@ + + + + + + +
+ {@const delayedClose = () => setTimeout(() => toggle(false), 100)} +
+

SmartSearch

+ +
+
+ + +
+
+ + + diff --git a/client/web-sveltekit/src/lib/search/input/SuggestionOption.svelte b/client/web-sveltekit/src/lib/search/input/SuggestionOption.svelte new file mode 100644 index 0000000000000..4a8eff7d465db --- /dev/null +++ b/client/web-sveltekit/src/lib/search/input/SuggestionOption.svelte @@ -0,0 +1,174 @@ + + + + +
  • + {#if option.icon} +
    +
    + {/if} +
    +
    +
    + {#if field} + + + + + : + {#if value} + + {/if} + + {:else if option.render === RenderAs.QUERY} + + {:else} + + {/if} +
    + {#if option.description} +
    + {option.description} +
    + {/if} +
    +
    +
    + {option.action.name ?? actionNames[option.action.type]} +
    + {#if option.alternativeAction} +
    + {option.alternativeAction.name ?? actionNames[option.alternativeAction.type]} +
    + {/if} +
    +
    +
    • + + diff --git a/client/web-sveltekit/src/lib/search/input/Suggestions.svelte b/client/web-sveltekit/src/lib/search/input/Suggestions.svelte new file mode 100644 index 0000000000000..f92a97cfff99a --- /dev/null +++ b/client/web-sveltekit/src/lib/search/input/Suggestions.svelte @@ -0,0 +1,202 @@ + + +
    + {#if show} +
    + {#each suggestions as group, groupIndex (group.title)} + {#if group.options.length > 0} +
      + + {#each group.options as option, rowIndex (option)} + + {/each} +
    + {/if} + {/each} +
    + {#if selectedOption} +
    + + {' '} + {#if selectedOption.alternativeAction} + + {/if} + +
    + {/if} + {/if} +
    + + diff --git a/client/web-sveltekit/src/lib/search/queryExamples.ts b/client/web-sveltekit/src/lib/search/queryExamples.ts deleted file mode 100644 index 403ba1005979c..0000000000000 --- a/client/web-sveltekit/src/lib/search/queryExamples.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { basicSyntaxColumns, exampleQueryColumns } from '$lib/branded' - -export function getQueryExamples(): { title: string; columns: typeof basicSyntaxColumns }[] { - return [ - { - title: 'Code search basics', - columns: basicSyntaxColumns('test', 'repo', 'org/repo'), - }, - { - title: 'Search query examples', - columns: exampleQueryColumns, - }, - ] -} diff --git a/client/web-sveltekit/src/lib/search/state.ts b/client/web-sveltekit/src/lib/search/state.ts index aee4265fe1718..8a6c7a3e137ce 100644 --- a/client/web-sveltekit/src/lib/search/state.ts +++ b/client/web-sveltekit/src/lib/search/state.ts @@ -14,12 +14,12 @@ export enum SearchMode { type Update = T | ((value: T) => T) interface Options { - caseSensitive: boolean - regularExpression: boolean - patternType: SearchPatternType - searchMode: SearchMode - query: string - searchContext: string + readonly caseSensitive: boolean + readonly regularExpression: boolean + readonly patternType: SearchPatternType + readonly searchMode: SearchMode + readonly query: string + readonly searchContext: string } type QuerySettings = Pick< @@ -31,11 +31,11 @@ export type QueryOptions = Pick, public settings: QuerySettings) {} + private constructor(public readonly options: Partial, public settings: QuerySettings) {} public static init(options: Partial, settings: QuerySettings): QueryState { return new QueryState(options, settings) @@ -134,7 +134,7 @@ export function queryStateStore(initial: Partial = {}, settings: QueryS update(state => state.setMode(mode)) }, set(options: Partial) { - update(state => QueryState.init(options, state.settings)) + update(state => QueryState.init({ ...state.options, ...options }, state.settings)) }, } } diff --git a/client/web-sveltekit/src/lib/shared.ts b/client/web-sveltekit/src/lib/shared.ts index 7f8b0c3e0602d..8fb67bc7ec915 100644 --- a/client/web-sveltekit/src/lib/shared.ts +++ b/client/web-sveltekit/src/lib/shared.ts @@ -73,6 +73,7 @@ export { QueryChangeSource, type QueryState } from '@sourcegraph/shared/src/sear export { migrateLocalStorageToTemporarySettings } from '@sourcegraph/shared/src/settings/temporary/migrateLocalStorageToTemporarySettings' export type { TemporarySettings } from '@sourcegraph/shared/src/settings/temporary/TemporarySettings' export { SyntaxKind } from '@sourcegraph/shared/src/codeintel/scip' +export { shortcutDisplayName } from '@sourcegraph/shared/src/keyboardShortcuts' // Copies of non-reusable code diff --git a/client/web-sveltekit/src/lib/theme.ts b/client/web-sveltekit/src/lib/theme.ts index 49330674f9570..83ee26101a19d 100644 --- a/client/web-sveltekit/src/lib/theme.ts +++ b/client/web-sveltekit/src/lib/theme.ts @@ -51,7 +51,6 @@ export const humanTheme = createMappingStore( } }, value => { - console.log(value) switch (value) { case 'Light': { return Theme.Light diff --git a/client/web-sveltekit/src/lib/web.ts b/client/web-sveltekit/src/lib/web.ts index 4af0fd3102899..dc7d20c9d4548 100644 --- a/client/web-sveltekit/src/lib/web.ts +++ b/client/web-sveltekit/src/lib/web.ts @@ -2,6 +2,7 @@ /* eslint-disable no-restricted-imports */ export { parseSearchURL } from '@sourcegraph/web/src/search/index' +export { createSuggestionsSource } from '@sourcegraph/web/src/search/input/suggestions' export { replaceRevisionInURL } from '@sourcegraph/web/src/util/url' export { syntaxHighlight } from '@sourcegraph/web/src/repo/blob/codemirror/highlight' diff --git a/client/web-sveltekit/src/routes/[...repo=reporev]/RepoNotFoundError.svelte b/client/web-sveltekit/src/routes/[...repo=reporev]/RepoNotFoundError.svelte index 0e9eac996a237..84e768d90af1b 100644 --- a/client/web-sveltekit/src/routes/[...repo=reporev]/RepoNotFoundError.svelte +++ b/client/web-sveltekit/src/routes/[...repo=reporev]/RepoNotFoundError.svelte @@ -14,8 +14,8 @@ {#if viewerCanAdminister}

    - As a site admin, you can add {repo} to Sourcegraph to allow users to search and - view it by connecting an external service referencing it. + As a site admin, you can add {repo} to Sourcegraph to allow users to search and view it by + connecting an external service referencing it.

    {:else}

    To access this repository, contact the Sourcegraph admin.

    diff --git a/client/web-sveltekit/src/routes/search/+page.svelte b/client/web-sveltekit/src/routes/search/+page.svelte index bb3e56e6a04d5..dab81d922a9ff 100644 --- a/client/web-sveltekit/src/routes/search/+page.svelte +++ b/client/web-sveltekit/src/routes/search/+page.svelte @@ -1,10 +1,8 @@ - -{#if examples.length > 1} - - {#each examples as panel (panel.title)} - -
    - {#each panel.columns as groups} -
      - {#each groups as group (group.title)} -
    • -

      {group.title}

      -
        - {#each group.queryExamples as example} -
        • - {/each} -
      -
      • - {/each} -
    - {/each} -
    -     - {/each} -     -{:else} - {#each examples[0].columns as column} -
      - {#each column as group (group.title)} -
    • -

      {group.title}

      -
        - {#each group.queryExamples as example} -
        • - {/each} -
      -
      • - {/each} -
    - {/each} -{/if} - - diff --git a/client/web-sveltekit/src/routes/search/SearchHome.svelte b/client/web-sveltekit/src/routes/search/SearchHome.svelte index 75f0c162e4c74..207fa6ad4ad7e 100644 --- a/client/web-sveltekit/src/routes/search/SearchHome.svelte +++ b/client/web-sveltekit/src/routes/search/SearchHome.svelte @@ -2,7 +2,7 @@ import { setContext } from 'svelte' import { logoLight, logoDark } from '$lib/images' - import SearchBox from '$lib/search/SearchBox.svelte' + import SearchInput from '$lib/search/input/SearchInput.svelte' import type { QueryStateStore } from '$lib/search/state' import type { SearchPageContext } from '$lib/search/utils' import { isLightTheme } from '$lib/stores' @@ -20,9 +20,8 @@
    - +
    -
    @@ -43,7 +42,6 @@ align-items: center; width: 100%; max-width: 64rem; - overflow-x: hidden; :global(.search-box) { align-self: stretch; diff --git a/client/web-sveltekit/src/routes/search/SearchResults.svelte b/client/web-sveltekit/src/routes/search/SearchResults.svelte index 2bd22be3249c9..654b719b3f6e4 100644 --- a/client/web-sveltekit/src/routes/search/SearchResults.svelte +++ b/client/web-sveltekit/src/routes/search/SearchResults.svelte @@ -33,7 +33,7 @@ import { preserveScrollPosition } from '$lib/app' import { observeIntersection } from '$lib/intersection-observer' import LoadingSpinner from '$lib/LoadingSpinner.svelte' - import SearchBox from '$lib/search/SearchBox.svelte' + import SearchInput from '$lib/search/input/SearchInput.svelte' import { searchTypes } from '$lib/search/sidebar' import { submitSearch, type QueryStateStore } from '$lib/search/state' import type { SidebarFilter } from '$lib/search/utils' @@ -48,7 +48,7 @@ export let queryState: QueryStateStore let resultContainer: HTMLElement | null = null - let searchInput: SearchBox + let searchInput: SearchInput $: progress = $stream?.progress // NOTE: done is present but apparently not officially exposed. However @@ -127,7 +127,7 @@
    - +
    @@ -177,7 +177,7 @@ .search { border-bottom: 1px solid var(--border-color); align-self: stretch; - padding: 0.5rem 1rem; + padding: 0.25rem; } section { diff --git a/client/web/BUILD.bazel b/client/web/BUILD.bazel index 6872d43940349..61ff8a6d3c55a 100644 --- a/client/web/BUILD.bazel +++ b/client/web/BUILD.bazel @@ -207,6 +207,7 @@ ts_project( "src/codeintel/BrainDot.tsx", "src/codeintel/ReferencesPanel.tsx", "src/codeintel/ReferencesPanelQueries.ts", + "src/codeintel/SideBlob.tsx", "src/codeintel/index.ts", "src/codeintel/location.ts", "src/codeintel/promise.ts", @@ -238,6 +239,9 @@ ts_project( "src/cody/components/ScopeSelector/index.tsx", "src/cody/components/ScopeSelector/useRepoSuggestions.ts", "src/cody/isCodyEnabled.tsx", + "src/cody/management/CodyManagementPage.tsx", + "src/cody/onboarding/CodyOnboarding.tsx", + "src/cody/onboarding/instructions/VsCode.tsx", "src/cody/search/CodySearchPage.tsx", "src/cody/search/api.ts", "src/cody/search/translateToQuery.ts", @@ -245,6 +249,9 @@ ts_project( "src/cody/sidebar/Provider.tsx", "src/cody/sidebar/index.tsx", "src/cody/sidebar/useSidebarSize.tsx", + "src/cody/subscription/CodySubscriptionPage.tsx", + "src/cody/subscription/UpgradeToProModal.tsx", + "src/cody/subscription/queries.tsx", "src/cody/update/AboutPageUpdate.tsx", "src/cody/update/InstallModal.tsx", "src/cody/update/ReviewAndInstallModal.tsx", @@ -1017,7 +1024,6 @@ ts_project( "src/enterprise/repo/settings/RepoSettingsLogsPage.tsx", "src/enterprise/repo/settings/RepoSettingsPermissionsPage.tsx", "src/enterprise/repo/settings/backend.ts", - "src/enterprise/repo/settings/sidebaritems.ts", "src/enterprise/repo/settings/utils.ts", "src/enterprise/search-jobs/SearchJobBadge/SearchJobBadge.tsx", "src/enterprise/search-jobs/SearchJobCard/SearchJobCard.tsx", @@ -1100,9 +1106,6 @@ ts_project( "src/hooks/index.ts", "src/hooks/useHandleSubmitFeedback.ts", "src/hooks/useRoutesMatch.ts", - "src/hooks/useScrollManager/index.ts", - "src/hooks/useScrollManager/mutationObserverWithTimeout.ts", - "src/hooks/useScrollManager/useScrollManager.ts", "src/hooks/useUrlSyncedState.ts", "src/hooks/useUrlSyncedString.ts", "src/hooks/useUserExternalAccounts.ts", @@ -1112,6 +1115,7 @@ ts_project( "src/insights/utils/use-series-toggle.ts", "src/jscontext.ts", "src/marketing/backend.ts", + "src/marketing/components/HubSpotForm.tsx", "src/marketing/components/SurveyRatingRadio.tsx", "src/marketing/components/SurveyUseCaseForm.tsx", "src/marketing/components/TweetFeedback.tsx", @@ -1316,6 +1320,7 @@ ts_project( "src/repo/blob/codemirror/tooltips/HovercardView.tsx", "src/repo/blob/codemirror/tooltips/LoadingTooltip.ts", "src/repo/blob/codemirror/tooltips/TemporaryTooltip.tsx", + "src/repo/blob/codemirror/types.ts", "src/repo/blob/codemirror/utils.ts", "src/repo/blob/definitions.ts", "src/repo/blob/own/FileOwnershipEntry.tsx", @@ -1404,13 +1409,11 @@ ts_project( "src/search/input/V2SearchInput.tsx", "src/search/input/suggestions.ts", "src/search/input/useRecentSearches.ts", - "src/search/results/CreateActionsMenu.tsx", - "src/search/results/SearchActionsMenu.tsx", - "src/search/results/SearchAlert.tsx", "src/search/results/SearchResultsCacheProvider.tsx", - "src/search/results/SearchResultsInfoBar.tsx", "src/search/results/StreamingSearchResults.tsx", - "src/search/results/UnownedResultsAlert.tsx", + "src/search/results/components/SearchActionsMenu.tsx", + "src/search/results/components/SearchAlert.tsx", + "src/search/results/components/UnownedResultsAlert.tsx", "src/search/results/components/aggregation/SearchAggregationResult.tsx", "src/search/results/components/aggregation/components/AggregationLimitLabel.tsx", "src/search/results/components/aggregation/components/aggregation-chart-card/AggregationChartCard.tsx", @@ -1424,13 +1427,18 @@ ts_project( "src/search/results/components/aggregation/index.ts", "src/search/results/components/aggregation/pings.ts", "src/search/results/components/aggregation/types.ts", - "src/search/results/createActions.ts", + "src/search/results/components/new-search-content/NewSearchContent.tsx", + "src/search/results/components/search-content/SearchContent.tsx", + "src/search/results/components/search-results-info-bar/SearchResultsInfoBar.tsx", + "src/search/results/components/search-results-info-bar/createActions.ts", + "src/search/results/components/utils.ts", "src/search/results/export/SearchResultsCsvExportModal.tsx", "src/search/results/export/searchResultsExport.ts", "src/search/results/sidebar/Revisions.tsx", "src/search/results/sidebar/SearchAggregations.tsx", "src/search/results/sidebar/SearchFiltersSidebar.tsx", "src/search/results/sidebar/search-aggregation-types.ts", + "src/search/results/useStreamingSearchPings.ts", "src/search/suggestion/DidYouMean.tsx", "src/search/suggestion/SmartSearch.tsx", "src/search/useV2QueryInput.ts", @@ -1832,6 +1840,7 @@ ts_project( "//:node_modules/react-circular-progressbar", "//:node_modules/react-dom", "//:node_modules/react-grid-layout", + "//:node_modules/react-icons", "//:node_modules/react-router-dom", "//:node_modules/react-spring", "//:node_modules/react-sticky-box", @@ -1932,7 +1941,6 @@ ts_project( "src/fuzzyFinder/CaseInsensitiveFuzzySearch.test.ts", "src/fuzzyFinder/WordSensitiveFuzzySearch.test.ts", "src/global/Notices.test.tsx", - "src/hooks/useScrollManager/useScrollManager.test.tsx", "src/hooks/useUrlSyncedState.test.ts", "src/hooks/useUrlSyncedString.test.tsx", "src/insights/utils/use-series-toggle.test.tsx", @@ -1969,8 +1977,8 @@ ts_project( "src/search/helpers.test.tsx", "src/search/index.test.ts", "src/search/input/useRecentSearches.test.tsx", - "src/search/results/SearchResultsInfoBar.test.tsx", "src/search/results/StreamingSearchResults.test.tsx", + "src/search/results/components/search-results-info-bar/SearchResultsInfoBar.test.tsx", "src/search/results/export/searchResultsExport.test.ts", "src/search/results/sidebar/Revisions.mocks.ts", "src/search/results/sidebar/Revisions.test.tsx", @@ -2070,6 +2078,7 @@ vitest_test( size = "enormous", # make sure bazel reserves enough RAM for this. timeout = "moderate", data = [ + ":module_styles", ":snapshots", ":web_tests", ], @@ -2118,6 +2127,7 @@ esbuild( minify = True, sourcemap = "linked", splitting = True, + tags = ["exclusive"], visibility = ["//client/web/dist:__subpackages__"], deps = ESBUILD_CONFIG_DEPS, ) diff --git a/client/web/dev/esbuild/server.ts b/client/web/dev/esbuild/server.ts index b074f0ed92a7d..644e23aace287 100644 --- a/client/web/dev/esbuild/server.ts +++ b/client/web/dev/esbuild/server.ts @@ -68,7 +68,7 @@ export const esbuildDevelopmentServer = async ( return await new Promise((_resolve, reject) => { proxyServer.once('listening', () => { signale.success(`esbuild server is ready after ${Math.round(performance.now() - start)}ms`) - printSuccessBanner(['✱ Sourcegraph is really ready now!', `Click here: ${HTTPS_WEB_SERVER_URL}`]) + printSuccessBanner(['✱ Sourcegraph is really ready now!', `Click here: ${HTTPS_WEB_SERVER_URL}/search`]) }) proxyServer.once('error', error => reject(error)) }) diff --git a/client/web/src/auth/PostSignUpPage.tsx b/client/web/src/auth/PostSignUpPage.tsx index 87756cb736137..f21e198f631e7 100644 --- a/client/web/src/auth/PostSignUpPage.tsx +++ b/client/web/src/auth/PostSignUpPage.tsx @@ -19,9 +19,14 @@ interface PostSignUpPageProps { const PostSignUp: React.FunctionComponent = ({ authenticatedUser }) => { const location = useLocation() + const searchParameters = new URLSearchParams(location.search) + const isExperimentEnabled = searchParameters.get('experiment_flag')?.toLowerCase() === 'true' - // Redirect if user has already completed post signup flow - if (authenticatedUser.completedPostSignup) { + const containsExperimentFlagParam = searchParameters.has('experiment_flag') + const shouldRedirect = !containsExperimentFlagParam && authenticatedUser.completedPostSignup + + // Redirects if the experiment flag is not provided and if the user has completed the post-signup flow. + if (shouldRedirect) { const returnTo = getReturnTo(location) return } @@ -32,7 +37,11 @@ const PostSignUp: React.FunctionComponent = ({ authenticate Sourcegraph logo - +
    ) diff --git a/client/web/src/auth/UsernamePasswordSignInForm.tsx b/client/web/src/auth/UsernamePasswordSignInForm.tsx index 7ff3b9ab71e5b..af9dda79f5510 100644 --- a/client/web/src/auth/UsernamePasswordSignInForm.tsx +++ b/client/web/src/auth/UsernamePasswordSignInForm.tsx @@ -42,7 +42,7 @@ export const UsernamePasswordSignInForm: React.FunctionComponent): void => { + async (event: React.FormEvent): Promise => { event.preventDefault() if (loading) { return @@ -50,40 +50,40 @@ export const UsernamePasswordSignInForm: React.FunctionComponent { - if (response.status === 200) { - if (new URLSearchParams(location.search).get('close') === 'true') { - window.close() - } else { - const returnTo = getReturnTo(location) - window.location.replace(returnTo) - } - } else if (response.status === 401) { - throw new Error('User or password was incorrect') - } else if (response.status === 422) { - throw new Error('The account has been locked out') + try { + const response = await fetch('/-/sign-in', { + credentials: 'same-origin', + method: 'POST', + headers: { + ...context.xhrHeaders, + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + email: usernameOrEmail, + password, + }), + }) + if (response.status === 200) { + if (new URLSearchParams(location.search).get('close') === 'true') { + window.close() } else { - throw new Error('Unknown Error') + const returnTo = getReturnTo(location) + window.location.replace(returnTo) } - }) - .catch(error => { - logger.error('Auth error:', error) - setLoading(false) - onAuthError(asError(error)) - }) + } else if (response.status === 401) { + throw new Error('User or password was incorrect') + } else if (response.status === 422) { + throw new Error('The account has been locked out') + } else { + const text = await response.text() + throw new Error(text === '' ? 'Unknown error' : text) + } + } catch (error) { + logger.error('Auth error:', error) + setLoading(false) + onAuthError(asError(error)) + } }, [usernameOrEmail, loading, location, password, onAuthError, context] ) diff --git a/client/web/src/codeintel/ReferencesPanel.mocks.ts b/client/web/src/codeintel/ReferencesPanel.mocks.ts index 3526a38e01ff6..4cafe19c9db8c 100644 --- a/client/web/src/codeintel/ReferencesPanel.mocks.ts +++ b/client/web/src/codeintel/ReferencesPanel.mocks.ts @@ -19,7 +19,7 @@ import { type ResolveRepoAndRevisionVariables, } from '../graphql-operations' -import { buildPreciseLocation } from './location' +import { buildPreciseLocation, LocationsGroup } from './location' import type { ReferencesPanelProps } from './ReferencesPanel' import { USE_PRECISE_CODE_INTEL_FOR_POSITION_QUERY, @@ -701,10 +701,10 @@ export const defaultProps: ReferencesPanelProps = { useCodeIntel: ({ variables }: UseCodeIntelParameters): UseCodeIntelResult => { const [result, setResult] = useState({ data: { - implementations: { endCursor: '', nodes: [] }, - prototypes: { endCursor: '', nodes: [] }, - references: { endCursor: '', nodes: [] }, - definitions: { endCursor: '', nodes: [] }, + implementations: { endCursor: '', nodes: LocationsGroup.empty }, + prototypes: { endCursor: '', nodes: LocationsGroup.empty }, + references: { endCursor: '', nodes: LocationsGroup.empty }, + definitions: { endCursor: '', nodes: LocationsGroup.empty }, }, loading: true, referencesHasNextPage: false, @@ -737,20 +737,20 @@ export const defaultProps: ReferencesPanelProps = { data: { implementations: { endCursor: lsif.implementations.pageInfo.endCursor, - nodes: lsif.implementations.nodes.map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.implementations.nodes.map(buildPreciseLocation)), }, prototypes: { endCursor: lsif.prototypes.pageInfo.endCursor, - nodes: lsif.prototypes.nodes.map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.prototypes.nodes.map(buildPreciseLocation)), }, references: { endCursor: lsif.references.pageInfo.endCursor, - nodes: lsif.references.nodes.map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.references.nodes.map(buildPreciseLocation)), }, definitions: { endCursor: lsif.definitions.pageInfo.endCursor, - nodes: lsif.definitions.nodes.map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.definitions.nodes.map(buildPreciseLocation)), }, }, })) diff --git a/client/web/src/codeintel/ReferencesPanel.tsx b/client/web/src/codeintel/ReferencesPanel.tsx index 33905dc22c239..19cc7bb8f8208 100644 --- a/client/web/src/codeintel/ReferencesPanel.tsx +++ b/client/web/src/codeintel/ReferencesPanel.tsx @@ -3,7 +3,7 @@ import React, { type MouseEvent, useCallback, useEffect, useLayoutEffect, useMem import { mdiArrowCollapseRight, mdiChevronDown, mdiChevronRight, mdiFilterOutline, mdiOpenInNew } from '@mdi/js' import classNames from 'classnames' import type * as H from 'history' -import { capitalize, uniqBy } from 'lodash' +import { capitalize } from 'lodash' import { useNavigate, useLocation } from 'react-router-dom' import { type Observable, of } from 'rxjs' import { map } from 'rxjs/operators' @@ -12,7 +12,6 @@ import { CodeExcerpt } from '@sourcegraph/branded' import type { HoveredToken } from '@sourcegraph/codeintellify' import { type ErrorLike, logger, pluralize } from '@sourcegraph/common' import { Position } from '@sourcegraph/extension-api-classes' -import { useQuery } from '@sourcegraph/http-client' import type { FetchFileParameters } from '@sourcegraph/shared/src/backend/file' import type { LanguageSpec } from '@sourcegraph/shared/src/codeintel/legacy-extensions/language-specs/language-spec' import { findLanguageSpec } from '@sourcegraph/shared/src/codeintel/legacy-extensions/language-specs/languages' @@ -43,32 +42,20 @@ import { Collapse, CollapseHeader, CollapsePanel, - Code, H4, Text, Tooltip, useSessionStorage, } from '@sourcegraph/wildcard' -import type { - ReferencesPanelHighlightedBlobResult, - ReferencesPanelHighlightedBlobVariables, -} from '../graphql-operations' -import { CodeMirrorBlob } from '../repo/blob/CodeMirrorBlob' import * as BlobAPI from '../repo/blob/use-blob-store' import type { HoverThresholdProps } from '../repo/RepoContainer' import { parseBrowserRepoURL } from '../util/url' import type { CodeIntelligenceProps } from '.' -import { - type Location, - type LocationGroup, - locationGroupQuality, - buildRepoLocationGroups, - type RepoLocationGroup, -} from './location' -import { FETCH_HIGHLIGHTED_BLOB } from './ReferencesPanelQueries' +import { type Location, LocationsGroup, type LocationsGroupedByRepo, type LocationsGroupedByFile } from './location' import { newSettingsGetter } from './settings' +import { SideBlob, type SideBlobProps } from './SideBlob' import { findSearchToken } from './token' import { useRepoAndBlob } from './useRepoAndBlob' import { isDefined } from './util/helpers' @@ -269,20 +256,14 @@ const SearchTokenFindingReferencesList: React.FunctionComponent< // change. This way we avoid showing stale results. key={shouldMixPreciseAndSearchBasedReferences.toString()} {...props} - token={props.token} searchToken={tokenResult?.searchToken} spec={spec} - fileContent={props.fileContent} - isFork={props.isFork} - isArchived={props.isArchived} /> ) } const SHOW_SPINNER_DELAY_MS = 100 -const empty: any[] = [] - const ReferencesList: React.FunctionComponent< React.PropsWithChildren< ReferencesPanelPropsWithToken & { @@ -352,10 +333,10 @@ const ReferencesList: React.FunctionComponent< // Make sure this effect only runs once }, [loading]) - const references = data?.references.nodes ?? empty - const definitions = data?.definitions.nodes ?? empty - const implementations = data?.implementations.nodes ?? empty - const prototypes = data?.prototypes.nodes ?? empty + const references = data?.references.nodes ?? LocationsGroup.empty + const definitions = data?.definitions.nodes ?? LocationsGroup.empty + const implementations = data?.implementations.nodes ?? LocationsGroup.empty + const prototypes = data?.prototypes.nodes ?? LocationsGroup.empty // The "active URL" is the URL of the highlighted line number in SideBlob, // which also influences which item gets highlighted inside @@ -396,10 +377,13 @@ const ReferencesList: React.FunctionComponent< // definitions) we select the first definition. We set it as activeLocation // and push it to the blobMemoryHistory so the code blob is open. useEffect(() => { - if (props.jumpToFirst && definitions.length > 0) { - setActiveLocation(definitions[0]) + if (props.jumpToFirst) { + const firstDef = definitions.first + if (firstDef) { + setActiveLocation(firstDef) + } } - }, [setActiveLocation, props.jumpToFirst, definitions, setActiveURL]) + }, [setActiveLocation, props.jumpToFirst, definitions.first, setActiveURL]) const onBlobNav = (url: string): void => { // Store the URL that the user promoted even if no definition/reference @@ -462,7 +446,7 @@ const ReferencesList: React.FunctionComponent< void @@ -594,12 +578,12 @@ const CollapsibleLocationList: React.FunctionComponent< React.PropsWithChildren > = props => { const isOpen = props.isOpen(props.name) ?? true - const quantityLabel = useMemo(() => { - const repoNumber = uniqBy(props.locations, 'repo').length - return `(${props.locations.length} ${pluralize('item', props.locations.length)}${ - repoNumber > 1 ? ` from ${repoNumber} repositories` : '' - } displayed${props.hasMore ? ', more available' : ''})` - }, [props.locations, props.hasMore]) + + const repoCount = props.locationsGroup.repoCount + const locationsCount = props.locationsGroup.locationsCount + const quantityLabel = `(${locationsCount} ${pluralize('item', locationsCount)}${ + repoCount > 1 ? ` from ${repoCount} repositories` : '' + } displayed${props.hasMore ? ', more available' : ''})` return ( props.handleOpenChange(props.name, isOpen)}> @@ -624,19 +608,25 @@ const CollapsibleLocationList: React.FunctionComponent< - {props.locations.length > 0 ? ( - props.handleOpenChange(props.name + id, isOpen)} - isOpen={id => props.isOpen(props.name + id)} - fetchHighlightedFileLineRanges={props.fetchHighlightedFileLineRanges} - /> + {locationsCount > 0 ? ( + <> + {props.locationsGroup.map((locations, index) => ( + props.handleOpenChange(props.name + id, isOpen)} + isOpen={id => props.isOpen(props.name + id)} + fetchHighlightedFileLineRanges={props.fetchHighlightedFileLineRanges} + /> + ))} + ) : ( {props.filter ? ( @@ -669,15 +659,6 @@ const CollapsibleLocationList: React.FunctionComponent< ) } -interface SideBlobProps extends ReferencesPanelProps { - activeURL: string - repository: string - commitID: string - file: string - position?: Position - blobNav: (url: string) => void -} - function parseSideBlobProps( activeURL: string | undefined ): Pick | undefined { @@ -700,125 +681,7 @@ function parseSideBlobProps( } } -const SideBlob: React.FunctionComponent> = props => { - const { data, error, loading } = useQuery< - ReferencesPanelHighlightedBlobResult, - ReferencesPanelHighlightedBlobVariables - >(FETCH_HIGHLIGHTED_BLOB, { - variables: { - repository: props.repository, - commit: props.commitID, - path: props.file, - format: HighlightResponseFormat.JSON_SCIP, - }, - // Cache this data but always re-request it in the background when we revisit - // this page to pick up newer changes. - fetchPolicy: 'cache-and-network', - nextFetchPolicy: 'network-only', - }) - - // If we're loading and haven't received any data yet - if (loading && !data) { - return ( - <> - - - - Loading {props.file}... - - - - ) - } - - // If we received an error before we had received any data - if (error && !data) { - return ( -
    - - Loading {props.file} failed: - - 
    {error.message}
    -
    - ) - } - - // If there weren't any errors and we just didn't receive any data - if (!data?.repository?.commit?.blob?.highlight) { - return <>Nothing found - } - - const { lsif } = data?.repository?.commit?.blob?.highlight - - // TODO: display a helpful message if syntax highlighting aborted, see https://github.com/sourcegraph/sourcegraph/issues/40841 - - return ( - - ) -} - -interface LocationsListProps - extends ActiveLocationProps, - CollapseProps, - SearchTokenProps, - HighlightedFileLineRangesProps { - locations: Location[] - filter: string | undefined - navigateToUrl: (url: string) => void - activeURL: string -} - -const LocationsList: React.FunctionComponent> = ({ - locations, - isActiveLocation, - setActiveLocation, - filter, - navigateToUrl, - handleOpenChange, - isOpen, - searchToken, - fetchHighlightedFileLineRanges, - activeURL, -}) => { - const repoLocationGroups = useMemo(() => buildRepoLocationGroups(locations), [locations]) - - return ( - <> - {repoLocationGroups.map((group, index) => ( - - ))} - - ) -} - +/** Component to display the Locations for a single repo */ const CollapsibleRepoLocationGroup: React.FunctionComponent< React.PropsWithChildren< ActiveLocationProps & @@ -827,13 +690,13 @@ const CollapsibleRepoLocationGroup: React.FunctionComponent< HighlightedFileLineRangesProps & { filter: string | undefined navigateToUrl: (url: string) => void - repoLocationGroup: RepoLocationGroup + locations: LocationsGroupedByRepo openByDefault: boolean activeURL: string } > > = ({ - repoLocationGroup, + locations, isActiveLocation, setActiveLocation, navigateToUrl, @@ -845,38 +708,40 @@ const CollapsibleRepoLocationGroup: React.FunctionComponent< fetchHighlightedFileLineRanges, activeURL, }) => { - const open = isOpen(repoLocationGroup.repoName) ?? openByDefault + const repoName = locations.repoName + const open = isOpen(repoName) ?? openByDefault return ( - handleOpenChange(repoLocationGroup.repoName, isOpen)}> + handleOpenChange(repoName, isOpen)}>
    - - {repoLocationGroup.referenceGroups.map(group => ( + + {locations.perFileGroups.map(group => ( handleOpenChange(repoLocationGroup.repoName + id, isOpen)} - isOpen={id => isOpen(repoLocationGroup.repoName + id)} + handleOpenChange={(id, isOpen) => handleOpenChange(repoName + id, isOpen)} + isOpen={id => isOpen(repoName + id)} navigateToUrl={navigateToUrl} fetchHighlightedFileLineRanges={fetchHighlightedFileLineRanges} /> @@ -893,13 +758,15 @@ const CollapsibleLocationGroup: React.FunctionComponent< CollapseProps & SearchTokenProps & HighlightedFileLineRangesProps & { - group: LocationGroup + repoName: string + group: LocationsGroupedByFile filter: string | undefined navigateToUrl: (url: string) => void activeURL: string } > > = ({ + repoName, group, setActiveLocation, isActiveLocation, @@ -1007,12 +874,12 @@ const CollapsibleLocationGroup: React.FunctionComponent< - {locationGroupQuality(group)} + {group.quality} - +
      {group.locations.map((reference, index) => { diff --git a/client/web/src/codeintel/SideBlob.tsx b/client/web/src/codeintel/SideBlob.tsx new file mode 100644 index 0000000000000..fa343464a3e4b --- /dev/null +++ b/client/web/src/codeintel/SideBlob.tsx @@ -0,0 +1,133 @@ +import { FC } from 'react' + +import classNames from 'classnames' + +import { Position } from '@sourcegraph/extension-api-classes' +import { useQuery } from '@sourcegraph/http-client' +import { ExtensionsControllerProps } from '@sourcegraph/shared/src/extensions/controller' +import { PlatformContextProps } from '@sourcegraph/shared/src/platform/context' +import { SettingsCascadeProps } from '@sourcegraph/shared/src/settings/settings' +import { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' +import { Code, LoadingSpinner, Text } from '@sourcegraph/wildcard' + +import { + HighlightResponseFormat, + ReferencesPanelHighlightedBlobResult, + ReferencesPanelHighlightedBlobVariables, +} from '../graphql-operations' +import { SearchPanelConfig } from '../repo/blob/codemirror/search' +import { CodeMirrorBlob } from '../repo/blob/CodeMirrorBlob' + +import { FETCH_HIGHLIGHTED_BLOB } from './ReferencesPanelQueries' + +import styles from './ReferencesPanel.module.scss' + +export interface SideBlobProps + extends TelemetryProps, + SettingsCascadeProps, + PlatformContextProps, + ExtensionsControllerProps { + repository: string + commitID: string + file: string + activeURL?: string + position?: Position + blobNav?: (url: string) => void + wrapLines?: boolean + navigateToLineOnAnyClick?: boolean + searchPanelConfig?: SearchPanelConfig + className?: string +} + +export const SideBlob: FC = props => { + const { + activeURL, + repository, + commitID, + file, + blobNav, + wrapLines = true, + navigateToLineOnAnyClick = true, + searchPanelConfig, + extensionsController, + settingsCascade, + telemetryService, + platformContext, + className, + } = props + + const { data, error, loading } = useQuery< + ReferencesPanelHighlightedBlobResult, + ReferencesPanelHighlightedBlobVariables + >(FETCH_HIGHLIGHTED_BLOB, { + variables: { + repository: props.repository, + commit: props.commitID, + path: props.file, + format: HighlightResponseFormat.JSON_SCIP, + }, + // Cache this data but always re-request it in the background when we revisit + // this page to pick up newer changes. + fetchPolicy: 'cache-and-network', + nextFetchPolicy: 'network-only', + }) + + // If we're loading and haven't received any data yet + if (loading && !data) { + return ( + <> + + + + Loading {props.file}... + + + + ) + } + + // If we received an error before we had received any data + if (error && !data) { + return ( +
      + + Loading {props.file} failed: + + 
      {error.message}
      +
      + ) + } + + // If there weren't any errors and we just didn't receive any data + if (!data?.repository?.commit?.blob?.highlight) { + return <>Nothing found + } + + const { lsif } = data?.repository?.commit?.blob?.highlight + + // TODO: display a helpful message if syntax highlighting aborted, see https://github.com/sourcegraph/sourcegraph/issues/40841 + + return ( + + ) +} diff --git a/client/web/src/codeintel/location.ts b/client/web/src/codeintel/location.ts index 155f81a4b1444..aee990e0811ec 100644 --- a/client/web/src/codeintel/location.ts +++ b/client/web/src/codeintel/location.ts @@ -15,27 +15,178 @@ export interface Location { precise: boolean } -export interface RepoLocationGroup { +export interface LocationsGroupedByRepo { + /** Invariant: `repoName` matches the 'repo' key in all Locations in `perFileGroups` */ repoName: string - referenceGroups: LocationGroup[] + /** Invariant: This array is non-empty */ + perFileGroups: LocationsGroupedByFile[] } -export interface LocationGroup { - repoName: string - path: string - locations: Location[] +export type LocationGroupQuality = 'PRECISE' | 'SEARCH-BASED' + +export class LocationsGroupedByFile { + /** Invariant: `path` matches the 'file' key in all Locations in `locations` */ + public readonly path: string + /** Invariant: `precise` matches the 'precise' key in all Locations in `locations` */ + private readonly precise: boolean + /** Invariant: This array is non-empty */ + public readonly locations: Location[] + + /** + * Pre-condition: `locations` should be non-empty, and every entry + * should have the same value for 'file'. + */ + constructor(locations: Location[]) { + if (locations.length === 0) { + throw new Error('pre-condition failure') + } + this.path = locations[0].file + const out = LocationsGroupedByFile.preferPrecise(locations) + this.locations = out.locs + this.precise = out.precise + } + + /** + * Aggregate information about whether provided locations are search-based + * or precise. + * + * If one attempts to mix them, precise locations will be preferred, and + * search-based locations will be discarded. + */ + private static preferPrecise(locations: Location[]): { locs: Location[]; precise: boolean } { + const path: string = locations[0].file + let precise: boolean = locations[0].precise + let finalLocations: Location[] = [locations[0]] + for (const [i, loc] of locations.entries()) { + if (i === 0) { + continue + } + if (loc.file !== path) { + throw new Error('pre-condition failure') + } + if (precise && !loc.precise) { + continue + } + if (!precise && loc.precise) { + precise = true + finalLocations = [loc] + continue + } + if (loc.precise !== precise) { + throw new Error('already handled precise same-ness check earlier') + } + finalLocations.push(loc) + } + return { locs: finalLocations, precise } + } + + public get quality(): LocationGroupQuality { + return this.precise ? 'PRECISE' : 'SEARCH-BASED' + } } -export type LocationGroupQuality = 'PRECISE' | 'SEARCH-BASED' +/** + * Type to store locations grouped by (repo, file) pairs. + * + * This type is specialized for use in the reference panel code. + * So if a given (repo, file) pair contains both search-based Locations + * and precise Locations, the search-based Locations are discarded. + */ +export class LocationsGroup { + /** + * The total number of locations combined across all groups. + * + * This may be less than the number of Locations passed to the constructor, + * in case there are mixed search-based and precise Locations, + * or if there are duplicates. + */ + public readonly locationsCount: number + /** Invariant: Every Location stored in the group has a distinct URL. */ + private readonly groups: LocationsGroupedByRepo[] + + constructor(locations: Location[]) { + let locationsCount = 0 + const groups: LocationsGroupedByRepo[] = [] + + const urlsSeen = new Set() + const repoMap = new Map>() + for (const loc of locations) { + if (urlsSeen.has(loc.url)) { + continue + } + urlsSeen.add(loc.url) + let pathToLocMap = repoMap.get(loc.repo) + if (!pathToLocMap) { + pathToLocMap = new Map() + repoMap.set(loc.repo, pathToLocMap) + } + const fileLocs = pathToLocMap.get(loc.file) + if (fileLocs) { + fileLocs.push(loc) + } else { + pathToLocMap.set(loc.file, [loc]) + } + } + for (const [repoName, pathToLocMap] of repoMap) { + const perFileLocations: LocationsGroupedByFile[] = [] + for (const [path, locations] of pathToLocMap) { + if (locations.length === 0) { + throw new Error( + `bug in grouping logic created empty locations array for repo: ${repoName}, path: ${path}` + ) + } + const g = new LocationsGroupedByFile(locations) + if (g.locations.length > locations.length) { + throw new Error('materialized new locations out of thin air') + } + locationsCount += g.locations.length + perFileLocations.push(g) + } + groups.push({ repoName, perFileGroups: perFileLocations }) + } + + this.locationsCount = locationsCount + this.groups = groups + } -export const locationGroupQuality = (group: LocationGroup): LocationGroupQuality => { - if (group.locations.length === 0) { - throw new Error(`No locations in ${group.path}`) + public get first(): Location | undefined { + if (this.locationsCount > 0) { + return this.groups[0].perFileGroups[0].locations[0] + } + return undefined + } + + public get repoCount(): number { + return this.groups.length + } + + public map(callback: (arg0: LocationsGroupedByRepo, arg1: number) => T): T[] { + return this.groups.map(callback) } - // Since we don't mix precise & search-based in a single file, we know that in a - // single group all locations are either search-based or precise. - return group.locations[0].precise ? 'PRECISE' : 'SEARCH-BASED' + public static empty: LocationsGroup = new LocationsGroup([]) + + /** + * Attempt to combine the existing locations with the new set + * into a new LocationsGroup. + * + * Some of the Locations in `newLocations` may be dropped if they + * are search-based and we already had precise references for the + * same file. + */ + public combine(newLocations: Location[]): LocationsGroup { + return new LocationsGroup([...this.allLocations(), ...newLocations]) + } + + private allLocations(): Location[] { + const out: Location[] = [] + for (const group of this.groups) { + for (const locs of group.perFileGroups) { + out.push(...locs.locations) + } + } + return out + } } export const buildSearchBasedLocation = (node: Result): Location => ({ @@ -67,28 +218,3 @@ export const buildPreciseLocation = (node: LocationFields): Location => { location.lines = location.content.split(/\r?\n/) return location } - -export const buildRepoLocationGroups = (locations: Location[]): RepoLocationGroup[] => { - const byRepoAndFile: Record> = {} - for (const location of locations) { - if (byRepoAndFile[location.repo] === undefined) { - byRepoAndFile[location.repo] = {} - } - if (byRepoAndFile[location.repo][location.file] === undefined) { - byRepoAndFile[location.repo][location.file] = [] - } - byRepoAndFile[location.repo][location.file].push(location) - } - - return Object.keys(byRepoAndFile).map(repoName => { - const byFile = byRepoAndFile[repoName] - - const referenceGroups: LocationGroup[] = Object.keys(byFile).map(path => ({ - path, - locations: byFile[path], - repoName, - })) - - return { repoName, referenceGroups } - }) -} diff --git a/client/web/src/codeintel/useCodeIntel.ts b/client/web/src/codeintel/useCodeIntel.ts index 470fdae9dd410..f7c35bfff7afb 100644 --- a/client/web/src/codeintel/useCodeIntel.ts +++ b/client/web/src/codeintel/useCodeIntel.ts @@ -4,25 +4,25 @@ import type { LanguageSpec } from '@sourcegraph/shared/src/codeintel/legacy-exte import type { ConnectionQueryArguments } from '../components/FilteredConnection' import type { UsePreciseCodeIntelForPositionVariables } from '../graphql-operations' -import type { Location } from './location' +import type { LocationsGroup } from './location' import type { SettingsGetter } from './settings' export interface CodeIntelData { references: { endCursor: string | null - nodes: Location[] + nodes: LocationsGroup } implementations: { endCursor: string | null - nodes: Location[] + nodes: LocationsGroup } prototypes: { endCursor: string | null - nodes: Location[] + nodes: LocationsGroup } definitions: { endCursor: string | null - nodes: Location[] + nodes: LocationsGroup } } diff --git a/client/web/src/cody/chat/CodyChatPage.tsx b/client/web/src/cody/chat/CodyChatPage.tsx index 1a2bbfc179a43..acc75c96678aa 100644 --- a/client/web/src/cody/chat/CodyChatPage.tsx +++ b/client/web/src/cody/chat/CodyChatPage.tsx @@ -39,6 +39,7 @@ import { import { MarketingBlock } from '../../components/MarketingBlock' import { Page } from '../../components/Page' import { PageTitle } from '../../components/PageTitle' +import { useFeatureFlag } from '../../featureFlags/useFeatureFlag' import type { SourcegraphContext } from '../../jscontext' import { EventName } from '../../util/constants' import { ChatUI } from '../components/ChatUI' @@ -98,6 +99,9 @@ export const CodyChatPage: React.FunctionComponent = ({ const { pathname } = useLocation() const navigate = useNavigate() + // Evaluate a mock feature flag for the purpose of an A/A test. No functionality is affected by this flag. + const [_codyChatMockTestValue] = useFeatureFlag('cody-chat-mock-test') + const codyChatStore = useCodyChat({ userID: authenticatedUser?.id, onTranscriptHistoryLoad, @@ -142,6 +146,8 @@ export const CodyChatPage: React.FunctionComponent = ({ setShowMobileHistory(false) }, [transcript]) + const [isCodyProEnabled] = useFeatureFlag('cody-pro', false) + if (!loaded) { return null } @@ -218,6 +224,13 @@ export const CodyChatPage: React.FunctionComponent = ({ Beta )} + {!isCodyApp && isCodyProEnabled && ( + + + Manage + + + )}
    diff --git a/client/web/src/cody/management/CodyManagementPage.module.scss b/client/web/src/cody/management/CodyManagementPage.module.scss new file mode 100644 index 0000000000000..ef2861345a225 --- /dev/null +++ b/client/web/src/cody/management/CodyManagementPage.module.scss @@ -0,0 +1,30 @@ +@import 'wildcard/src/global-styles/breakpoints'; + +.responsive-container { + @media (--sm-breakpoint-down) { + flex-direction: column; + align-items: center; + + > div { + border: none !important; + align-items: center; + } + } +} + +.plan-name { + font-size: 1.5rem; + font-weight: 600; +} + +.counter { + font-size: 1.25rem; +} + +.ide-name { + font-size: 1rem; +} + +.modal { + width: 50rem; +} diff --git a/client/web/src/cody/management/CodyManagementPage.tsx b/client/web/src/cody/management/CodyManagementPage.tsx new file mode 100644 index 0000000000000..55139ef44e30a --- /dev/null +++ b/client/web/src/cody/management/CodyManagementPage.tsx @@ -0,0 +1,357 @@ +import React, { useEffect } from 'react' +import type { ReactElement } from 'react' + +import { mdiHelpCircleOutline, mdiTrendingUp, mdiDownload, mdiInformation } from '@mdi/js' +import classNames from 'classnames' + +import { useQuery } from '@sourcegraph/http-client' +import { + Icon, + PageHeader, + Link, + H4, + H2, + Text, + ButtonLink, + Modal, + useSearchParameters, + LoadingSpinner, +} from '@sourcegraph/wildcard' + +import { Page } from '../../components/Page' +import { PageTitle } from '../../components/PageTitle' +import { useFeatureFlag } from '../../featureFlags/useFeatureFlag' +import type { + UserCodyPlanResult, + UserCodyPlanVariables, + UserCodyUsageResult, + UserCodyUsageVariables, +} from '../../graphql-operations' +import { eventLogger } from '../../tracking/eventLogger' +import { EventName } from '../../util/constants' +import { CodyColorIcon } from '../chat/CodyPageIcon' +import { isCodyEnabled } from '../isCodyEnabled' +import { CodyOnboarding, editorGroups, type IEditor } from '../onboarding/CodyOnboarding' +import { ProTierIcon } from '../subscription/CodySubscriptionPage' +import { USER_CODY_PLAN, USER_CODY_USAGE } from '../subscription/queries' + +import styles from './CodyManagementPage.module.scss' + +interface CodyManagementPageProps { + isSourcegraphDotCom: boolean +} + +export const CodyManagementPage: React.FunctionComponent = ({ isSourcegraphDotCom }) => { + const parameters = useSearchParameters() + + const utm_source = parameters.get('utm_source') + + useEffect(() => { + eventLogger.log(EventName.CODY_MANAGEMENT_PAGE_VIEWED, { utm_source }) + }, [utm_source]) + + const { data } = useQuery(USER_CODY_PLAN, {}) + + const { data: usageData } = useQuery(USER_CODY_USAGE, {}) + + const [isEnabled] = useFeatureFlag('cody-pro', false) + + const [selectedEditor, setSelectedEditor] = React.useState(null) + const [selectedEditorStep, setSelectedEditorStep] = React.useState(null) + + if (!isCodyEnabled() || !isSourcegraphDotCom || !isEnabled || !data?.currentUser) { + return null + } + + const { codyProEnabled } = data.currentUser + + return ( + <> + + + + +
    + Dashboard +
    +     +     + +
    +
    +
    +

    My Subscription

    + + You are on a {codyProEnabled ? 'pro' : 'community'} tier. + +
    + {codyProEnabled ? ( +
    + + Manage Subscription + +
    + ) : ( +
    + + + Upgrade for free + +
    + )} +
    +
    +
    + {codyProEnabled ? ( + + ) : ( + Community + )} + + tier + +
    +
    + +
    + {codyProEnabled ? ( + + Unlimited + + ) : usageData?.currentUser ? ( + <> + + {Math.min( + usageData?.currentUser?.codyCurrentPeriodCodeUsage || 0, + usageData?.currentUser?.codyCurrentPeriodCodeLimit || 0 + )}{' '} + / + {' '} + + {usageData?.currentUser?.codyCurrentPeriodCodeLimit || 0} + + + ) : ( + + )} +
    +

    Autocompletes

    + {!codyProEnabled && ( + + this month + + )} +
    +
    + +
    + {codyProEnabled ? ( + + Unlimited + + ) : usageData?.currentUser ? ( + <> + + {Math.min( + usageData?.currentUser?.codyCurrentPeriodChatUsage || 0, + usageData?.currentUser?.codyCurrentPeriodChatLimit || 0 + )}{' '} + / + {' '} + + {usageData?.currentUser?.codyCurrentPeriodChatLimit || 0} + + + ) : ( + + )} +
    +

    Chat Messages

    + {!codyProEnabled && ( + + this month + + )} +
    + {codyProEnabled && ( +
    + +
    + + Free trial + +
    + + Until 14th of February 2023 + +
    + )} +
    +
    + +
    +
    +
    +

    Extensions & Plugins

    + Cody integrates with your workflow. +
    +
    + + + Missing an editor? + +
    +
    + {editorGroups.map((group, index) => ( +
    + {group.map((editor, index) => ( +
    +
    +
    + {editor.name} +
    +
    + + {editor.publisher} + + {editor.name} +
    +
    + { + setSelectedEditor(editor) + setSelectedEditorStep(0) + }} + > + + How to install + + + { + setSelectedEditor(editor) + setSelectedEditorStep(1) + }} + > + + How to use + + + {selectedEditor?.name === editor.name && + selectedEditorStep !== null && + editor.instructions && ( + + { + setSelectedEditor(null) + setSelectedEditorStep(null) + }} + /> + + )} +
    + ))} + {group.length < 4 + ? [...new Array(4 - group.length)].map((_, index) => ( +
    + )) + : null} +
    + ))} +
    + + + + ) +} + +const AutocompletesIcon = (): ReactElement => ( + + + + + + + + + + + +) + +const ChatMessagesIcon = (): ReactElement => ( + + + + + + + + + + + +) + +const TrialPeriodIcon = (): ReactElement => ( + + + + + + + + + + + +) diff --git a/client/web/src/cody/onboarding/CodyOnboarding.module.scss b/client/web/src/cody/onboarding/CodyOnboarding.module.scss new file mode 100644 index 0000000000000..460b1933aef3c --- /dev/null +++ b/client/web/src/cody/onboarding/CodyOnboarding.module.scss @@ -0,0 +1,26 @@ +.modal { + width: 50rem; +} + +.step { + background: #343a4d; + color: #ffffff; + padding: 0.25rem 0.675rem; + border-radius: 50%; +} + +.responsive-container { + @media (--sm-breakpoint-down) { + flex-direction: column; + align-items: center; + + > div { + border: none !important; + align-items: center; + } + } +} + +.ide-name { + font-size: 1rem; +} diff --git a/client/web/src/cody/onboarding/CodyOnboarding.tsx b/client/web/src/cody/onboarding/CodyOnboarding.tsx new file mode 100644 index 0000000000000..dbe8bd84ffbf1 --- /dev/null +++ b/client/web/src/cody/onboarding/CodyOnboarding.tsx @@ -0,0 +1,298 @@ +import React, { useState } from 'react' + +import classNames from 'classnames' + +import { useTemporarySetting } from '@sourcegraph/shared/src/settings/temporary' +import { Modal, H1, H2, H3, Text, Button } from '@sourcegraph/wildcard' + +import { eventLogger } from '../../tracking/eventLogger' +import { EventName } from '../../util/constants' +import { CodyColorIcon } from '../chat/CodyPageIcon' + +import { VSCodeInstructions } from './instructions/VsCode' + +import styles from './CodyOnboarding.module.scss' + +export interface IEditor { + icon: string + name: string + publisher: string + instructions?: React.FC<{ onBack?: () => void; onClose: () => void; showStep?: number }> +} + +export const editorGroups: IEditor[][] = [ + [ + { + icon: 'VSCode', + name: 'VS Code', + publisher: 'Microsoft', + instructions: VSCodeInstructions, + }, + { + icon: 'IntelliJ', + name: 'IntelliJ IDEA', + publisher: 'JetBrains', + }, + { + icon: 'Neovim', + name: 'Neovim', + publisher: 'Neovim Team', + }, + { + icon: 'AndroidStudio', + name: 'Android Studio', + publisher: 'Google', + }, + ], + [ + { + icon: 'PhpStorm', + name: 'PhpStorm ', + publisher: 'JetBrains', + }, + { + icon: 'PyCharm', + name: 'PyCharm', + publisher: 'Jetbrains', + }, + { + icon: 'WebStorm', + name: 'WebStorm', + publisher: 'JetBrains', + }, + { + icon: 'RubyMine', + name: 'RubyMine', + publisher: 'JetBrains', + }, + ], + [ + { + icon: 'GoLand', + name: 'GoLand', + publisher: 'JetBrains', + }, + { + icon: 'Emacs', + name: 'Emacs', + publisher: 'Free Software Foundation', + }, + ], +] + +export function CodyOnboarding(): JSX.Element | null { + const [completed = true, setOnboardingCompleted] = useTemporarySetting('cody.onboarding.completed', false) + // steps start from 0 + const [step = -1, setOnboardingStep] = useTemporarySetting('cody.onboarding.step', 0) + + const onNext = (): void => setOnboardingStep(currentsStep => (currentsStep || 0) + 1) + + if (completed || step === -1 || step > 2) { + return null + } + + return ( + + {step === 0 && } + {step === 1 && } + {step === 2 && setOnboardingCompleted(true)} />} + + ) +} + +function WelcomeStep({ onNext }: { onNext: () => void }): JSX.Element { + return ( +
    + +

    Hi

    + Let's walk through a few quick steps to get you started with Cody. + +
    + ) +} + +function PurposeStep({ onNext }: { onNext: () => void }): JSX.Element { + return ( + <> +
    +

    What are you using Cody for?

    + + This will allow us to understand our audience better and guide your journey + +
    +
    +
    { + eventLogger.log(EventName.CODY_ONBOARDING_PURPOSE_WORK) + onNext() + }} + className="border-right flex-1 d-flex flex-column justify-content-center cursor-pointer align-items-center py-3 px-2" + onClick={() => { + eventLogger.log(EventName.CODY_ONBOARDING_PURPOSE_WORK) + onNext() + }} + > + +

    Work

    +
    +
    { + eventLogger.log(EventName.CODY_ONBOARDING_PURPOSE_PERSONAL) + onNext() + }} + onClick={() => { + eventLogger.log(EventName.CODY_ONBOARDING_PURPOSE_PERSONAL) + onNext() + }} + > + +

    Personal

    +
    +
    + + Pick one to move forward + + + ) +} + +function EditorStep({ onNext, onCompleted }: { onNext: () => void; onCompleted: () => void }): JSX.Element { + const [editor, setEditor] = useState(null) + + const onBack = (): void => setEditor(null) + + if (editor?.instructions) { + const Instructions = editor.instructions + + return + } + + return ( + <> +
    +

    Choose your editor

    + + Most of Cody experience happens in the IDE. Let's get that set up. + +
    +
    + {editorGroups.map((group, index) => ( +
    + {group.map((editor, index) => ( +
    setEditor(editor)} + onClick={() => setEditor(editor)} + > +
    +
    + {editor.name} +
    +
    + + {editor.publisher} + + {editor.name} +
    +
    +
    + ))} + {group.length < 4 + ? [...new Array(4 - group.length)].map((_, index) => ( +
    + )) + : null} +
    + ))} +
    +
    + + Skip + + + Pick one to move forward + +
    + + ) +} + +const WorkIcon = (): JSX.Element => ( + + + + + + + + + + + + + +) + +const PersonalIcon = (): JSX.Element => ( + + + + + + + + + + + + + +) diff --git a/client/web/src/cody/onboarding/instructions/VsCode.tsx b/client/web/src/cody/onboarding/instructions/VsCode.tsx new file mode 100644 index 0000000000000..a9c00b3525d72 --- /dev/null +++ b/client/web/src/cody/onboarding/instructions/VsCode.tsx @@ -0,0 +1,166 @@ +import { useState } from 'react' + +import classNames from 'classnames' + +import { H2, Text, Button } from '@sourcegraph/wildcard' + +import styles from '../CodyOnboarding.module.scss' + +export function VSCodeInstructions({ + onBack, + onClose, + showStep, +}: { + onBack?: () => void + onClose: () => void + showStep?: number +}): JSX.Element { + const [step, setStep] = useState(showStep || 0) + + return ( + <> + {step === 0 && ( + <> +
    +

    Setup instructions for VS Code

    +
    +
    +
    +
    +
    1
    +
    +
    + + Install Cody + + + Alternatively, you can reach this page by clicking{' '} + View {'>'} Extensions and searching for Cody AI + +
    +
    +
    + + VS Code Marketplace +
    +
    +
    +
    +
    +
    2
    +
    +
    + + Open Cody from the Sidebar on the Left + + + Alternatively, you can reach this page by clicking{' '} + View {'>'} Extensions and searching for Cody AI + +
    +
    +
    + VS Code Marketplace +
    +
    +
    +
    +
    3
    +
    +
    + + Login + + + Choose the same login method you used when you created your account + +
    +
    + {showStep === undefined ? ( +
    + + +
    + ) : ( +
    + +
    + )} + + )} + {step === 1 && ( + <> +
    +

    Using Cody on VS Code

    +
    +
    +
    + + Autocomplete + + + Cody will autocomplete your code as you type + +
    +
    + + Chat + + + Cody will autocomplete your code as you type + +
    +
    +
    +
    + + Settings + + + Cody will autocomplete your code as you type + +
    +
    + + Feedback + + + Cody will autocomplete your code as you type + +
    +
    + {showStep === undefined ? ( +
    + + +
    + ) : ( +
    + +
    + )} + + )} + + ) +} diff --git a/client/web/src/cody/subscription/CodySubscriptionPage.module.scss b/client/web/src/cody/subscription/CodySubscriptionPage.module.scss new file mode 100644 index 0000000000000..d55c756c86e52 --- /dev/null +++ b/client/web/src/cody/subscription/CodySubscriptionPage.module.scss @@ -0,0 +1,66 @@ +@import 'wildcard/src/global-styles/breakpoints'; + +.responsive-container { + @media (--sm-breakpoint-down) { + flex-direction: column; + } +} + +.plan-name { + font-size: 1.5rem; + font-weight: 600; +} + +.counter { + font-size: 1.25rem; +} + +.ide-name { + font-size: 1rem; +} + +.pro-container { + margin-top: -1rem; + margin-bottom: -1rem; + margin-left: -0.25rem; + margin-right: -0.25rem; + z-index: 1; + + @media (--sm-breakpoint-down) { + margin-top: 1.5rem; + margin-bottom: 1.5rem; + margin-left: 0; + margin-right: 0; + } +} + +.pro-title { + font-size: 2.25rem; + color: #005bbb; +} + +.pro-description { + color: #0677ef; +} + +.pro-pricing { + text-decoration: line-through; +} + +.enterprise-color { + color: #dd5d35; +} + +.enterprise-color-light { + color: #f74f56; +} + +.upgrade-modal { + width: 50rem; +} + +.subscription-summary-container { + @media (--sm-breakpoint-down) { + flex-direction: column; + } +} diff --git a/client/web/src/cody/subscription/CodySubscriptionPage.tsx b/client/web/src/cody/subscription/CodySubscriptionPage.tsx new file mode 100644 index 0000000000000..6717d23c161ca --- /dev/null +++ b/client/web/src/cody/subscription/CodySubscriptionPage.tsx @@ -0,0 +1,341 @@ +import React, { useEffect, useState } from 'react' +import type { ReactElement } from 'react' + +import { mdiTrendingUp } from '@mdi/js' +import classNames from 'classnames' +import { useNavigate } from 'react-router-dom' + +import { useQuery, useMutation } from '@sourcegraph/http-client' +import { Icon, PageHeader, Button, H1, H2, H3, Text, ButtonLink, useSearchParameters } from '@sourcegraph/wildcard' + +import type { AuthenticatedUser } from '../../auth' +import { Page } from '../../components/Page' +import { PageTitle } from '../../components/PageTitle' +import { useFeatureFlag } from '../../featureFlags/useFeatureFlag' +import type { + UserCodyPlanResult, + UserCodyPlanVariables, + ChangeCodyPlanResult, + ChangeCodyPlanVariables, +} from '../../graphql-operations' +import { eventLogger } from '../../tracking/eventLogger' +import { EventName } from '../../util/constants' +import { CodyColorIcon } from '../chat/CodyPageIcon' +import { isCodyEnabled } from '../isCodyEnabled' + +import { USER_CODY_PLAN, CHANGE_CODY_PLAN } from './queries' +import { UpgradeToProModal } from './UpgradeToProModal' + +import styles from './CodySubscriptionPage.module.scss' + +interface CodySubscriptionPageProps { + isSourcegraphDotCom: boolean + authenticatedUser?: AuthenticatedUser | null +} + +export const CodySubscriptionPage: React.FunctionComponent = ({ + isSourcegraphDotCom, + authenticatedUser, +}) => { + const navigate = useNavigate() + const parameters = useSearchParameters() + + const utm_source = parameters.get('utm_source') + + useEffect(() => { + eventLogger.log(EventName.CODY_SUBSCRIPTION_PAGE_VIEWED, { utm_source }) + }, [utm_source]) + + const { data } = useQuery(USER_CODY_PLAN, {}) + const [changeCodyPlan] = useMutation(CHANGE_CODY_PLAN) + + const [isEnabled] = useFeatureFlag('cody-pro', false) + const [showUpgradeToPro, setShowUpgradeToPro] = useState(false) + + if (!isCodyEnabled() || !isSourcegraphDotCom || !isEnabled || !data?.currentUser || !authenticatedUser) { + return null + } + + const { codyProEnabled } = data.currentUser + + return ( + <> + + + + Dashboard + + } + > + +
    + Subscription Plans +
    +     +     + +
    +
    +
    +

    Community

    + + Best for hobbyists + +
    +
    +

    Free

    + + {!codyProEnabled && 'Your plan'} + +
    +
    + + 500 + {' '} + Autocompletions per month +
    +
    + + 20 + {' '} + Messages and Commands per month +
    +
    +
    + + Limited + {' '} + Private Code Embeddings +
    + Current project with keyword search + Embeddings on some public repo +
    +
    + + Code editor support + {' '} + All supported Code Editors +
    +
    + + Support + {' '} + Community support only +
    +
    +
    +
    +

    Pro

    + + Best for professional developers + +
    +
    +
    +

    22$

    + / month +
    + + Free until Feb 2024, no credit card needed + + {codyProEnabled ? ( +
    + + Your plan + {' '} + + changeCodyPlan({ variables: { pro: false, id: authenticatedUser.id } }) + } + > + | Cancel + +
    + ) : ( + + )} +
    +
    + + Unlimited + {' '} + Autocompletions per month +
    +
    + + Unlimited + {' '} + Messages and Commands per month +
    +
    +
    + + Unlimited + {' '} + Private Code Embeddings +
    + Current project with keyword search + Embeddings on some public repo +
    +
    + + Code editor support + {' '} + All supported Code Editors +
    +
    + + Support + {' '} + Community support only +
    +
    +
    +
    +

    Enterprise

    + + Best for teams + +
    +
    +

    + Custom pricing +

    + + Contact Sales + +
    +
    + + Unlimited + {' '} + Autocompletions per month +
    +
    + + Unlimited + {' '} + Messages and Commands per month +
    +
    +
    + + Unlimited + {' '} + Private Code Embeddings +
    + Current project with keyword search + Embeddings on some public repo +
    +
    + + Enterprise Features + + Bring your own LLM + Single Tenant + SAML / SSO + Guardrails +
    +
    + + Code editor support + {' '} + All supported Code Editors +
    +
    + + Support + {' '} + Community support only +
    +
    +
    +     + {showUpgradeToPro && ( + { + setShowUpgradeToPro(false) + navigate('/cody/manage?utm_source=upgrade_modal') + }} + authenticatedUser={authenticatedUser} + /> + )} + + ) +} + +export const ProTierIcon = ({ className }: { className?: string }): ReactElement => ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +) diff --git a/client/web/src/cody/subscription/UpgradeToProModal.tsx b/client/web/src/cody/subscription/UpgradeToProModal.tsx new file mode 100644 index 0000000000000..ec15b4af941b5 --- /dev/null +++ b/client/web/src/cody/subscription/UpgradeToProModal.tsx @@ -0,0 +1,168 @@ +import { mdiCalendarMonth, mdiClose, mdiCreditCardOff, mdiTag, mdiTrendingUp } from '@mdi/js' +import classNames from 'classnames' + +import { useMutation } from '@sourcegraph/http-client' +import { Modal, Icon, Button, H1, H2, Text } from '@sourcegraph/wildcard' + +import type { AuthenticatedUser } from '../../auth' +import type { ChangeCodyPlanResult, ChangeCodyPlanVariables } from '../../graphql-operations' +import { CodyColorIcon } from '../chat/CodyPageIcon' + +import { CHANGE_CODY_PLAN } from './queries' + +import styles from './CodySubscriptionPage.module.scss' + +export function UpgradeToProModal({ + authenticatedUser, + onClose, +}: { + authenticatedUser: AuthenticatedUser + onClose: () => void +}): JSX.Element { + const [changeCodyPlan, { data }] = useMutation(CHANGE_CODY_PLAN) + + return ( + + {data?.changeCodyPlan?.codyProEnabled ? ( +
    + +

    Pro Membership: Confirmed!

    + Welcome to the exclusive zone of coding + + +
    + ) : ( + <> +
    +

    Subscription Summary

    + +
    + +
    +
    +
    +
    +

    Pro

    + + Best for professional developers + +
    +
    +

    $22

    + / month +
    + + Free until Feb 2024, no credit card needed + + + Unlimited Autocompletes + + + Unlimited Messages and Commands + + + Unlimited Private Code Embeddings + + Context with keyword search + Embeddings on some public repos + All suppored Code Editors + Community Support +
    +
    +
    +

    About your trial

    +
    +
    + +
    +
    + + All Limits Lifted: + + + Enjoy unrestricted access right away. + +
    +
    +
    +
    + +
    +
    + + Trial Duration: + + + Your trial runs until February 14, 2024. + +
    +
    +
    +
    + +
    +
    + + No credit card required: + + + We'll reach out for billing details before your trial ends. + +
    +
    +
    +
    + +
    +
    + + No hidden fees, no surprises + + + We're eager to have you onboard and listen to your feedback + +
    +
    +
    + +
    +
    +
    + + )} +     + ) +} diff --git a/client/web/src/cody/subscription/queries.tsx b/client/web/src/cody/subscription/queries.tsx new file mode 100644 index 0000000000000..f0bcafb384442 --- /dev/null +++ b/client/web/src/cody/subscription/queries.tsx @@ -0,0 +1,33 @@ +import { gql } from '@sourcegraph/http-client' + +export const USER_CODY_PLAN = gql` + query UserCodyPlan { + currentUser { + id + codyProEnabled + codyProEnabledAt + } + } +` + +export const USER_CODY_USAGE = gql` + query UserCodyUsage { + currentUser { + id + codyCurrentPeriodChatUsage + codyCurrentPeriodCodeUsage + codyCurrentPeriodChatLimit + codyCurrentPeriodCodeLimit + } + } +` + +export const CHANGE_CODY_PLAN = gql` + mutation ChangeCodyPlan($id: ID!, $pro: Boolean!) { + changeCodyPlan(user: $id, pro: $pro) { + id + codyProEnabled + codyProEnabledAt + } + } +` diff --git a/client/web/src/components/AppRouterContainer/AppRouterContainer.tsx b/client/web/src/components/AppRouterContainer/AppRouterContainer.tsx index 7b0b3a3fd51f1..bf70f7cf1a73e 100644 --- a/client/web/src/components/AppRouterContainer/AppRouterContainer.tsx +++ b/client/web/src/components/AppRouterContainer/AppRouterContainer.tsx @@ -2,7 +2,7 @@ import React, { type HTMLAttributes, useRef } from 'react' import classNames from 'classnames' -import { useScrollManager } from '../../hooks' +import { useScrollManager } from '@sourcegraph/wildcard' import styles from './AppRouterContainer.module.scss' diff --git a/client/web/src/components/externalServices/ExternalServiceNode.tsx b/client/web/src/components/externalServices/ExternalServiceNode.tsx index 170ae714dea7f..4e5d637ac07c0 100644 --- a/client/web/src/components/externalServices/ExternalServiceNode.tsx +++ b/client/web/src/components/externalServices/ExternalServiceNode.tsx @@ -3,6 +3,7 @@ import { type FC, useCallback, useState } from 'react' import { useApolloClient } from '@apollo/client' import { mdiCircle, mdiCog, mdiDelete } from '@mdi/js' import classNames from 'classnames' +import { isBefore, parseISO } from 'date-fns' import { Timestamp } from '@sourcegraph/branded/src/components/Timestamp' import { asError, isErrorLike, pluralize } from '@sourcegraph/common' @@ -102,7 +103,13 @@ export const ExternalServiceNode: FC = ({ node, editin )}{' '} {node.nextSyncAt !== null && ( <> - Next sync scheduled . + Next sync scheduled{' '} + {isBefore(new Date(), parseISO(node.nextSyncAt)) ? ( + <>now + ) : ( + + )} + . )} {node.nextSyncAt === null && <>No next sync scheduled.} diff --git a/client/web/src/end-to-end/BUILD.bazel b/client/web/src/end-to-end/BUILD.bazel index 1c27b03869fbe..55799275f1b79 100644 --- a/client/web/src/end-to-end/BUILD.bazel +++ b/client/web/src/end-to-end/BUILD.bazel @@ -50,6 +50,7 @@ ts_project( "//:node_modules/expect", "//:node_modules/lodash", "//:node_modules/mocha", + "//client/shared/src/testing", # keep "//client/web:node_modules/@sourcegraph/shared", ], ) @@ -57,7 +58,9 @@ ts_project( mocha_test( name = "e2e", timeout = "moderate", - env = {"INCLUDE_ADMIN_ONBOARDING": "false"}, + env = { + "INCLUDE_ADMIN_ONBOARDING": "false", + }, node_toolchain = select({ "//:darwin_docker_e2e_go": "@nodejs_darwin_arm64//:node_toolchain", "//conditions:default": None, diff --git a/client/web/src/end-to-end/frontend-platform/site-admin.test.ts b/client/web/src/end-to-end/frontend-platform/site-admin.test.ts index db4a9565b5e84..fe77b7e8ae9ab 100644 --- a/client/web/src/end-to-end/frontend-platform/site-admin.test.ts +++ b/client/web/src/end-to-end/frontend-platform/site-admin.test.ts @@ -9,7 +9,9 @@ import { initEndToEndTest } from '../utils/initEndToEndTest' const { sourcegraphBaseUrl } = getConfig('gitHubDotComToken', 'sourcegraphBaseUrl') -describe('Site Admin', () => { +// Since the test inside the describe is skipped the after does not execute. Consequently the page does not get closed +// causing subsequent failures. This is a known bug in Mocha +describe.skip('Site Admin', () => { let driver: Driver before(async function () { diff --git a/client/web/src/end-to-end/frontend-platform/theme-switcher.test.ts b/client/web/src/end-to-end/frontend-platform/theme-switcher.test.ts index 8dece4ab28c44..e67ffc303f6c3 100644 --- a/client/web/src/end-to-end/frontend-platform/theme-switcher.test.ts +++ b/client/web/src/end-to-end/frontend-platform/theme-switcher.test.ts @@ -9,7 +9,9 @@ import { initEndToEndTest } from '../utils/initEndToEndTest' const { sourcegraphBaseUrl } = getConfig('gitHubDotComToken', 'sourcegraphBaseUrl') -describe('Theme switcher', () => { +// Since the test inside the describe is skipped the after does not execute. Consequently the page does not get closed +// causing subsequent failures. This is a known bug in Mocha +describe.skip('Theme switcher', () => { let driver: Driver before(async () => { diff --git a/client/web/src/enterprise/batches/DropdownButton.module.scss b/client/web/src/enterprise/batches/DropdownButton.module.scss index c57c795d01f22..77f2b9e0d1f58 100644 --- a/client/web/src/enterprise/batches/DropdownButton.module.scss +++ b/client/web/src/enterprise/batches/DropdownButton.module.scss @@ -12,8 +12,18 @@ .menu-list-item { padding: 0.5rem 1rem; + cursor: pointer; - &[data-reach-menu-item]:active { + &[data-reach-menu-item][aria-disabled='false']:active { --text-muted: var(--white); } + + &[data-reach-menu-item][aria-disabled='true']:hover { + background-color: transparent; + } + + &[data-reach-menu-item][aria-disabled='true'] { + cursor: not-allowed; + opacity: 0.7; + } } diff --git a/client/web/src/enterprise/batches/DropdownButton.tsx b/client/web/src/enterprise/batches/DropdownButton.tsx index fe81562b813eb..d5a1ed64b73d1 100644 --- a/client/web/src/enterprise/batches/DropdownButton.tsx +++ b/client/web/src/enterprise/batches/DropdownButton.tsx @@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react' import { mdiChevronDown } from '@mdi/js' import { VisuallyHidden } from '@reach/visually-hidden' +import classNames from 'classnames' import { ProductStatusBadge, @@ -179,7 +180,11 @@ const DropdownItem: React.FunctionComponent -

    +

    {action.dropdownTitle} {action.experimental && ( <> diff --git a/client/web/src/enterprise/batches/batch-spec/header/BatchChangeHeader.tsx b/client/web/src/enterprise/batches/batch-spec/header/BatchChangeHeader.tsx index d58928538f848..f13f1bb310946 100644 --- a/client/web/src/enterprise/batches/batch-spec/header/BatchChangeHeader.tsx +++ b/client/web/src/enterprise/batches/batch-spec/header/BatchChangeHeader.tsx @@ -21,9 +21,7 @@ interface BatchChangeHeaderProps { export const BatchChangeHeader: React.FC = ({ className, namespace, title, description }) => ( } > diff --git a/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx b/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx index 65869790a1868..8391e13397f28 100644 --- a/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx +++ b/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx @@ -171,7 +171,7 @@ export const BatchChangeListPage: React.FunctionComponent Batch Changes diff --git a/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx b/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx index 62b06c4df8c6b..b8d049d4db2a6 100644 --- a/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx +++ b/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx @@ -152,9 +152,6 @@ export const CodeMonitorList: React.FunctionComponent

    -
    - We want to hear your feedback! Share your thoughts -
    ) } diff --git a/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.tsx b/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.tsx index f405feaa263fb..4bfdbadf2b04f 100644 --- a/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.tsx +++ b/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.tsx @@ -3,7 +3,7 @@ import React, { useMemo } from 'react' import classNames from 'classnames' import { dataOrThrowErrors, gql } from '@sourcegraph/http-client' -import { Card, H2, Text } from '@sourcegraph/wildcard' +import { Card, Text } from '@sourcegraph/wildcard' import { useShowMorePagination } from '../../components/FilteredConnection/hooks/useShowMorePagination' import { @@ -137,13 +137,9 @@ export const CodeMonitoringLogs: React.FunctionComponent< return (
    -

    Code Monitoring Logs

    - {/* TODO: Text to change */} - You can use these logs to troubleshoot issues with code monitor notifications. Only the { - runPageSize - }{' '} - most recent runs are shown and old runs are deleted periodically. + Use these logs to troubleshoot issues with code monitor notifications. Only the {runPageSize} most + recent runs are shown. Old runs are deleted periodically. @@ -164,7 +160,9 @@ export const CodeMonitoringLogs: React.FunctionComponent< noun="monitor" pluralNoun="monitors" hasNextPage={hasNextPage} - emptyElement={
    You haven't created any monitors yet
    } + emptyElement={ +
    No code monitors have been created yet.
    + } /> {hasNextPage && } diff --git a/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx b/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx index a55de78f5fbc4..0d32eac9ef72d 100644 --- a/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx +++ b/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx @@ -15,7 +15,9 @@ import type { CreateCodeMonitorVariables } from '../../graphql-operations' import { CreateCodeMonitorPage } from './CreateCodeMonitorPage' import { mockCodeMonitor } from './testing/util' -describe('CreateCodeMonitorPage', () => { +// TODO: these tests trigger an error with CodeMirror, complaining about being +// loaded twice, see https://github.com/uiwjs/react-codemirror/issues/506 +describe.skip('CreateCodeMonitorPage', () => { const mockUser = { id: 'userID', username: 'username', diff --git a/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx b/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx index 50d75938e5116..3c5bdc15c6f7d 100644 --- a/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx +++ b/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx @@ -8,7 +8,9 @@ import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing' import { FormTriggerArea } from './FormTriggerArea' -describe('FormTriggerArea', () => { +// TODO: these tests trigger an error with CodeMirror, complaining about being +// loaded twice, see https://github.com/uiwjs/react-codemirror/issues/506 +describe.skip('FormTriggerArea', () => { let clock: sinon.SinonFakeTimers beforeAll(() => { diff --git a/client/web/src/enterprise/codeintel/searchBased.ts b/client/web/src/enterprise/codeintel/searchBased.ts index ee2d3c62272dd..070411ac3da4d 100644 --- a/client/web/src/enterprise/codeintel/searchBased.ts +++ b/client/web/src/enterprise/codeintel/searchBased.ts @@ -110,11 +110,11 @@ function makeRepositoryPattern(repo: string): string { /** The time in ms to delay between unindexed search request and the fallback indexed search request. */ const DEFAULT_UNINDEXED_SEARCH_TIMEOUT_MS = 5000 +export type RepoFilter = 'current-repo' | 'all-other-repos' + /** * Invoke the given search function by modifying the query with a term that will - * only look in the current git tree by appending a repo filter with the repo name - * and the current commit or, if `negateRepoFilter` is set, outside of current git - * tree. + * look in certain git trees (controlled by `repoFilter`). * * This is likely to timeout on large repos or organizations with monorepos if the * current commit is not an indexed commit. Instead of waiting for a timeout, we @@ -125,7 +125,6 @@ const DEFAULT_UNINDEXED_SEARCH_TIMEOUT_MS = 5000 * * @param search The search function. * @param args The arguments to the search function. - * @param negateRepoFilter Whether to look only inside or outside the given repo. */ export function searchWithFallback< P extends { @@ -136,14 +135,14 @@ export function searchWithFallback< queryTerms: string[] }, R ->(search: (args: P) => Promise, args: P, negateRepoFilter = false, getSetting: SettingsGetter): Promise { +>(search: (args: P) => Promise, args: P, repoFilter: RepoFilter, getSetting: SettingsGetter): Promise { if (getSetting('basicCodeIntel.indexOnly', false)) { - return searchIndexed(search, args, negateRepoFilter, getSetting) + return searchIndexed(search, args, repoFilter, getSetting) } return raceWithDelayOffset( - searchUnindexed(search, args, negateRepoFilter, getSetting), - () => searchIndexed(search, args, negateRepoFilter, getSetting), + searchUnindexed(search, args, repoFilter, getSetting), + () => searchIndexed(search, args, repoFilter, getSetting), getSetting('basicCodeIntel.unindexedSearchTimeout', DEFAULT_UNINDEXED_SEARCH_TIMEOUT_MS) ) } @@ -153,18 +152,16 @@ export function searchWithFallback< * * @param search The search function. * @param args The arguments to the search function. - * @param negateRepoFilter Whether to look only inside or outside the given repo. */ function searchIndexed< P extends { repo: string isFork: boolean isArchived: boolean - commit: string queryTerms: string[] }, R ->(search: (args: P) => Promise, args: P, negateRepoFilter = false, getSetting: SettingsGetter): Promise { +>(search: (args: P) => Promise, args: P, repoFilter: RepoFilter, getSetting: SettingsGetter): Promise { const { repo, isFork, isArchived, queryTerms } = args // Create a copy of the args so that concurrent calls to other @@ -175,14 +172,16 @@ function searchIndexed< // Unlike unindexed search, we can't supply a commit as that particular // commit may not be indexed. We force index and look inside/outside // the repo at _whatever_ commit happens to be indexed at the time. - queryTermsCopy.push((negateRepoFilter ? '-' : '') + `repo:${makeRepositoryPattern(repo)}`) + const isCurrentRepoSearch = repoFilter === 'current-repo' + const prefix = isCurrentRepoSearch ? '' : '-' + queryTermsCopy.push(prefix + `repo:${makeRepositoryPattern(repo)}`) queryTermsCopy.push('index:only') // If we're a fork, search in forks _for the same repo_. Otherwise, // search in forks only if it's set in the settings. This is also // symmetric for archived repositories. queryTermsCopy.push( - ...repositoryKindTerms(isFork && !negateRepoFilter, isArchived && !negateRepoFilter, getSetting) + ...repositoryKindTerms(isFork && isCurrentRepoSearch, isArchived && isCurrentRepoSearch, getSetting) ) return search({ ...args, queryTerms: queryTermsCopy }) @@ -193,7 +192,6 @@ function searchIndexed< * * @param search The search function. * @param args The arguments to the search function. - * @param negateRepoFilter Whether to look only inside or outside the given repo. */ function searchUnindexed< P extends { @@ -204,7 +202,7 @@ function searchUnindexed< queryTerms: string[] }, R ->(search: (args: P) => Promise, args: P, negateRepoFilter = false, getSetting: SettingsGetter): Promise { +>(search: (args: P) => Promise, args: P, repoFilter: RepoFilter, getSetting: SettingsGetter): Promise { const { repo, isFork, isArchived, commit, queryTerms } = args // Create a copy of the args so that concurrent calls to other @@ -212,7 +210,8 @@ function searchUnindexed< // modified. const queryTermsCopy = [...queryTerms] - if (!negateRepoFilter) { + const isCurrentRepoSearch = repoFilter === 'current-repo' + if (isCurrentRepoSearch) { // Look in this commit only queryTermsCopy.push(`repo:${makeRepositoryPattern(repo)}@${commit}`) } else { @@ -224,7 +223,7 @@ function searchUnindexed< // search in forks only if it's set in the settings. This is also // symmetric for archived repositories. queryTermsCopy.push( - ...repositoryKindTerms(isFork && !negateRepoFilter, isArchived && !negateRepoFilter, getSetting) + ...repositoryKindTerms(isFork && isCurrentRepoSearch, isArchived && isCurrentRepoSearch, getSetting) ) return search({ ...args, queryTerms: queryTermsCopy }) diff --git a/client/web/src/enterprise/codeintel/useCodeIntel.ts b/client/web/src/enterprise/codeintel/useCodeIntel.ts index f60ad3128daa0..774d1e31f5e1b 100644 --- a/client/web/src/enterprise/codeintel/useCodeIntel.ts +++ b/client/web/src/enterprise/codeintel/useCodeIntel.ts @@ -4,7 +4,7 @@ import type { QueryResult } from '@apollo/client' import { dataOrThrowErrors, useLazyQuery, useQuery } from '@sourcegraph/http-client' -import { type Location, buildPreciseLocation } from '../../codeintel/location' +import { type Location, buildPreciseLocation, LocationsGroup } from '../../codeintel/location' import { LOAD_ADDITIONAL_IMPLEMENTATIONS_QUERY, LOAD_ADDITIONAL_PROTOTYPES_QUERY, @@ -27,11 +27,11 @@ import type { import { useSearchBasedCodeIntel } from './useSearchBasedCodeIntel' -const EMPTY_CODE_INTEL_DATA = { - implementations: { endCursor: null, nodes: [] }, - prototypes: { endCursor: null, nodes: [] }, - definitions: { endCursor: null, nodes: [] }, - references: { endCursor: null, nodes: [] }, +const EMPTY_CODE_INTEL_DATA: CodeIntelData = { + implementations: { endCursor: null, nodes: LocationsGroup.empty }, + prototypes: { endCursor: null, nodes: LocationsGroup.empty }, + definitions: { endCursor: null, nodes: LocationsGroup.empty }, + references: { endCursor: null, nodes: LocationsGroup.empty }, } export const useCodeIntel = ({ @@ -48,50 +48,6 @@ export const useCodeIntel = ({ const [codeIntelData, setCodeIntelData] = useState() - const setReferences = (references: Location[]): void => { - setCodeIntelData(previousData => ({ - ...(previousData || EMPTY_CODE_INTEL_DATA), - references: { - endCursor: null, - nodes: references, - }, - })) - } - - const deduplicateAndAddReferences = (searchBasedReferences: Location[]): void => { - setCodeIntelData(previousData => { - const previous = previousData || EMPTY_CODE_INTEL_DATA - - const lsifFiles = new Set(previous.references.nodes.map(location => location.file)) - - // Filter out any search results that occur in the same file as LSIF results. These - // results are definitely incorrect and will pollute the ordering of precise and fuzzy - // results in the references pane. - const searchResults = searchBasedReferences.filter(location => !lsifFiles.has(location.file)) - if (searchResults.length === 0) { - return previous - } - - return { - ...previous, - references: { - endCursor: previous.references.endCursor, - nodes: [...previous.references.nodes, ...searchResults], - }, - } - }) - } - - const setDefinitions = (definitions: Location[]): void => { - setCodeIntelData(previousData => ({ - ...(previousData || EMPTY_CODE_INTEL_DATA), - definitions: { - endCursor: null, - nodes: definitions, - }, - })) - } - const fellBackToSearchBased = useRef(false) const shouldFetchPrecise = useRef(true) useEffect(() => { @@ -140,29 +96,42 @@ export const useCodeIntel = ({ notifyOnNetworkStatusChange: false, fetchPolicy: 'no-cache', onCompleted: result => { - if (shouldFetchPrecise.current) { - shouldFetchPrecise.current = false - - const lsifData = result ? getLsifData({ data: result }) : undefined - if (lsifData) { - setCodeIntelData(lsifData) - - // If we've exhausted LSIF data and the flag is enabled, we add search-based data. - if (lsifData.references.endCursor === null && shouldMixPreciseAndSearchBasedReferences()) { - fetchSearchBasedReferences(deduplicateAndAddReferences) - } - - // When no definitions are found, the hover tooltip falls back to a search based - // search, regardless of the mixPreciseAndSearchBasedReferences setting. - if (lsifData.definitions.nodes.length === 0) { - fetchSearchBasedDefinitions(setDefinitions) - } - } else { - fellBackToSearchBased.current = true - - fetchSearchBasedCodeIntel(setReferences, setDefinitions) + if (!shouldFetchPrecise.current) { + return + } + shouldFetchPrecise.current = false + + let refs: CodeIntelData['references'] = { endCursor: null, nodes: LocationsGroup.empty } + let defs: CodeIntelData['definitions'] = { endCursor: null, nodes: LocationsGroup.empty } + const addRefs = (newRefs: Location[]): void => { + refs.nodes = refs.nodes.combine(newRefs) + } + const addDefs = (newDefs: Location[]): void => { + defs.nodes = defs.nodes.combine(newDefs) + } + + const lsifData = result ? getLsifData({ data: result }) : undefined + if (lsifData) { + refs = lsifData.references + defs = lsifData.definitions + // If we've exhausted LSIF data and the flag is enabled, we add search-based data. + if (refs.endCursor === null && shouldMixPreciseAndSearchBasedReferences()) { + fetchSearchBasedReferences(addRefs) } + // When no definitions are found, the hover tooltip falls back to a search based + // search, regardless of the mixPreciseAndSearchBasedReferences setting. + if (defs.nodes.locationsCount === 0) { + fetchSearchBasedDefinitions(addDefs) + } + } else { + fellBackToSearchBased.current = true + fetchSearchBasedCodeIntel(addRefs, addDefs) } + setCodeIntelData({ + ...(lsifData || EMPTY_CODE_INTEL_DATA), + definitions: defs, + references: refs, + }) }, }) @@ -173,30 +142,27 @@ export const useCodeIntel = ({ fetchPolicy: 'no-cache', onCompleted: result => { const previousData = codeIntelData - const newReferenceData = result.repository?.commit?.blob?.lsif?.references - if (!previousData || !newReferenceData) { return } - + let references: LocationsGroup = previousData.references.nodes.combine( + newReferenceData.nodes.map(buildPreciseLocation) + ) + const endCursor = newReferenceData.pageInfo.endCursor + if (endCursor === null && shouldMixPreciseAndSearchBasedReferences()) { + // If we've exhausted LSIF data and the flag is enabled, we add search-based data. + fetchSearchBasedReferences((refs: Location[]) => { + references = references.combine(refs) + }) + } setCodeIntelData({ - implementations: previousData.implementations, - prototypes: previousData.prototypes, - definitions: previousData.definitions, + ...previousData, references: { - endCursor: newReferenceData.pageInfo.endCursor, - nodes: dedupeLocations([ - ...previousData.references.nodes, - ...newReferenceData.nodes.map(buildPreciseLocation), - ]), + endCursor, + nodes: references, }, }) - - // If we've exhausted LSIF data and the flag is enabled, we add search-based data. - if (newReferenceData.pageInfo.endCursor === null && shouldMixPreciseAndSearchBasedReferences()) { - fetchSearchBasedReferences(deduplicateAndAddReferences) - } }, }) @@ -207,23 +173,15 @@ export const useCodeIntel = ({ fetchPolicy: 'no-cache', onCompleted: result => { const previousData = codeIntelData - const newPrototypesData = result.repository?.commit?.blob?.lsif?.prototypes - if (!previousData || !newPrototypesData) { return } - setCodeIntelData({ - references: previousData.references, - definitions: previousData.definitions, - implementations: previousData.implementations, + ...previousData, prototypes: { endCursor: newPrototypesData.pageInfo.endCursor, - nodes: dedupeLocations([ - ...previousData.prototypes.nodes, - ...newPrototypesData.nodes.map(buildPreciseLocation), - ]), + nodes: previousData.prototypes.nodes.combine(newPrototypesData.nodes.map(buildPreciseLocation)), }, }) }, @@ -236,23 +194,17 @@ export const useCodeIntel = ({ fetchPolicy: 'no-cache', onCompleted: result => { const previousData = codeIntelData - const newImplementationsData = result.repository?.commit?.blob?.lsif?.implementations - if (!previousData || !newImplementationsData) { return } - setCodeIntelData({ - references: previousData.references, - definitions: previousData.definitions, - prototypes: previousData.prototypes, + ...previousData, implementations: { endCursor: newImplementationsData.pageInfo.endCursor, - nodes: dedupeLocations([ - ...previousData.implementations.nodes, - ...newImplementationsData.nodes.map(buildPreciseLocation), - ]), + nodes: previousData.implementations.nodes.combine( + newImplementationsData.nodes.map(buildPreciseLocation) + ), }, }) }, @@ -342,31 +294,19 @@ const getLsifData = ({ return { implementations: { endCursor: lsif.implementations.pageInfo.endCursor, - nodes: dedupeLocations(lsif.implementations.nodes).map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.implementations.nodes.map(buildPreciseLocation)), }, prototypes: { endCursor: lsif.prototypes.pageInfo.endCursor, - nodes: dedupeLocations(lsif.prototypes.nodes).map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.prototypes.nodes.map(buildPreciseLocation)), }, references: { endCursor: lsif.references.pageInfo.endCursor, - nodes: dedupeLocations(lsif.references.nodes).map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.references.nodes.map(buildPreciseLocation)), }, definitions: { endCursor: lsif.definitions.pageInfo.endCursor, - nodes: lsif.definitions.nodes.map(buildPreciseLocation), + nodes: new LocationsGroup(lsif.definitions.nodes.map(buildPreciseLocation)), }, } } - -const dedupeLocations = (locations: L[]): L[] => { - const deduped = [] - const seenURLs = new Set() - for (const location of locations) { - if (!seenURLs.has(location.url)) { - deduped.push(location) - seenURLs.add(location.url) - } - } - return deduped -} diff --git a/client/web/src/enterprise/codeintel/useSearchBasedCodeIntel.ts b/client/web/src/enterprise/codeintel/useSearchBasedCodeIntel.ts index 7c45907c51b18..25ac580464996 100644 --- a/client/web/src/enterprise/codeintel/useSearchBasedCodeIntel.ts +++ b/client/web/src/enterprise/codeintel/useSearchBasedCodeIntel.ts @@ -28,6 +28,7 @@ import { type SearchResult, searchResultToResults, searchWithFallback, + type RepoFilter, } from './searchBased' import { sortByProximity } from './sort' @@ -119,149 +120,139 @@ export const useSearchBasedCodeIntel = (options: UseSearchBasedCodeIntelOptions) } } -// searchBasedReferences is 90% copy&paste from code-intel-extension's -export async function searchBasedReferences({ - repo, - isFork, - isArchived, - commit, - searchToken, - path, - position, - fileContent, - spec, - getSetting, - filter, -}: UseSearchBasedCodeIntelOptions): Promise { +function searchBasedReferencesViaSCIPLocals(options: UseSearchBasedCodeIntelOptions): Location[] | undefined { const view = getBlobEditView() - if (view !== null) { - const occurrences = view.state.facet(syntaxHighlight).occurrences - for (const occurrence of occurrences) { - if ( - occurrence.symbol?.startsWith('local ') && - occurrence.range.contains(new ScipPosition(position.line, position.character)) - ) { - return occurrences - .filter(reference => reference.symbol === occurrence.symbol) - .map(reference => ({ - repo, - file: path, - content: fileContent, - commitID: commit, - range: reference.range, - url: toPrettyBlobURL({ - filePath: path, - revision: commit, - repoName: repo, - commitID: commit, - position: { - line: reference.range.start.line + 1, - character: reference.range.start.character + 1, - }, - }), - lines: split(fileContent), - precise: false, - })) - } + if (view === null) { + return + } + const occurrences = view.state.facet(syntaxHighlight).occurrences + const { path, repo, position, fileContent: content, commit: commitID } = options + const lines = split(content) + const scipPosition = new ScipPosition(position.line, position.character) + for (const occurrence of occurrences) { + const symbol = occurrence.symbol + if (!(symbol?.startsWith('local ') && occurrence.range.contains(scipPosition))) { + continue } + return occurrences + .filter(reference => reference.symbol === symbol) + .map(reference => ({ + repo, + file: path, + content, + commitID, + range: reference.range, + url: toPrettyBlobURL({ + filePath: path, + revision: commitID, + repoName: repo, + commitID, + position: { + line: reference.range.start.line + 1, + character: reference.range.start.character + 1, + }, + }), + lines, + precise: false, + })) } - const filterReferences = (results: Location[]): Location[] => - filter ? results.filter(location => location.file.includes(filter)) : results + return +} +async function searchBasedReferencesViaSquirrel( + options: UseSearchBasedCodeIntelOptions +): Promise { + const { repo, position, path, commit, fileContent } = options + const symbol = await findSymbol({ repository: repo, path, commit, row: position.line, column: position.character }) + if (!symbol?.refs) { + return + } + // HISTORICAL NOTE: Squirrel only support find refs for locals + // (the code below uses the same 'path' value for all references, + // and is based as-is on the original code written by Chris), + // so we can delete this code once we have SCIP locals support + // for all the same languages that Squirrel does. + const lines = split(fileContent) + return symbol.refs.map(reference => ({ + repo, + file: path, + content: fileContent, + commitID: commit, + range: rangeToExtensionRange(reference), + url: toPrettyBlobURL({ + filePath: path, + revision: commit, + repoName: repo, + commitID: commit, + position: { + line: reference.row + 1, + character: reference.column + 1, + }, + }), + lines, + precise: false, + })) +} + +async function searchBasedDefinitionsViaSquirrel( + options: UseSearchBasedCodeIntelOptions +): Promise { + const { repo, commit, path, position, fileContent } = options const symbol = await findSymbol({ repository: repo, commit, path, row: position.line, column: position.character }) - if (symbol?.refs) { - return symbol.refs.map(reference => ({ + if (!symbol?.def) { + return + } + return [ + { repo, file: path, content: fileContent, commitID: commit, - range: rangeToExtensionRange(reference), + range: rangeToExtensionRange(symbol.def), url: toPrettyBlobURL({ filePath: path, revision: commit, repoName: repo, commitID: commit, position: { - line: reference.row + 1, - character: reference.column + 1, + line: symbol.def.row + 1, + character: symbol.def.column + 1, }, }), lines: split(fileContent), precise: false, - })) - } + }, + ] +} +async function searchBasedReferencesViaSearchQueries(options: UseSearchBasedCodeIntelOptions): Promise { + const { searchToken, path, repo, isFork, isArchived, commit, spec, filter } = options const queryTerms = referencesQuery({ searchToken, path, fileExts: spec.fileExts }) - const queryArguments = { - repo, - isFork, - isArchived, - commit, - queryTerms, - filterReferences, - } + const filterReferences = (results: Location[]): Location[] => + filter ? results.filter(location => location.file.includes(filter)) : results - const doSearch = (negateRepoFilter: boolean): Promise => + const doSearch = (repoFilter: RepoFilter): Promise => searchWithFallback( args => searchAndFilterReferences({ queryTerms: args.queryTerms, filterReferences }), - queryArguments, - negateRepoFilter, - getSetting + { repo, isFork, isArchived, commit, queryTerms, filterReferences }, + repoFilter, + options.getSetting ) - // Perform a search in the current git tree - const sameRepoReferences = doSearch(false) + const sameRepoReferences = doSearch('current-repo') // Perform an indexed search over all _other_ repositories. This // query is ineffective on DotCom as we do not keep repositories // in the index permanently. - const remoteRepoReferences = isSourcegraphDotCom() ? Promise.resolve([]) : doSearch(true) + const remoteRepoReferences = isSourcegraphDotCom() ? Promise.resolve([]) : doSearch('all-other-repos') - // Resolve then merge all references and sort them by proximity - // to the current text document path. - const referenceChunk = [sameRepoReferences, remoteRepoReferences] - const mergedReferences = flatten(await Promise.all(referenceChunk)) - return sortByProximity(mergedReferences, location.pathname) + return flatten(await Promise.all([sameRepoReferences, remoteRepoReferences])) } -export async function searchBasedDefinitions({ - repo, - isFork, - isArchived, - commit, - searchToken, - fileContent, - path, - position, - spec, - getSetting, - filter, -}: UseSearchBasedCodeIntelOptions): Promise { - const symbol = await findSymbol({ repository: repo, commit, path, row: position.line, column: position.character }) - if (symbol?.def) { - return [ - { - repo, - file: path, - content: fileContent, - commitID: commit, - range: rangeToExtensionRange(symbol.def), - url: toPrettyBlobURL({ - filePath: path, - revision: commit, - repoName: repo, - commitID: commit, - position: { - line: symbol.def.row + 1, - character: symbol.def.column + 1, - }, - }), - lines: split(fileContent), - precise: false, - }, - ] - } - +async function searchBasedDefinitionsViaSearchQueries(options: UseSearchBasedCodeIntelOptions): Promise { + const { searchToken, path, repo, isFork, fileContent, isArchived, commit, spec, filter } = options + // Construct base definition query without scoping terms + const queryTerms = definitionQuery({ searchToken, path, fileExts: spec.fileExts }) const filterDefinitions = (results: Location[]): Location[] => { const filteredByName = filter ? results.filter(location => location.file.includes(filter)) : results return spec?.filterDefinitions @@ -273,29 +264,15 @@ export async function searchBasedDefinitions({ : filteredByName } - // Construct base definition query without scoping terms - const queryTerms = definitionQuery({ searchToken, path, fileExts: spec.fileExts }) - const queryArguments = { - repo, - isFork, - isArchived, - commit, - path, - fileContent, - filterDefinitions, - queryTerms, - } - - const doSearch = (negateRepoFilter: boolean): Promise => + const doSearch = (repoFilter: RepoFilter): Promise => searchWithFallback( args => searchAndFilterDefinitions({ spec, path, filterDefinitions, queryTerms: args.queryTerms }), - queryArguments, - negateRepoFilter, - getSetting + { repo, isFork, isArchived, commit, path, fileContent, filterDefinitions, queryTerms }, + repoFilter, + options.getSetting ) - // Perform a search in the current git tree - const sameRepoDefinitions = doSearch(false) + const sameRepoDefinitions = doSearch('current-repo') // Return any local location definitions first const results = await sameRepoDefinitions @@ -307,7 +284,32 @@ export async function searchBasedDefinitions({ // an indexed search over all repositories. Do not do this on the DotCom // instance as we are unlikely to have indexed the relevant definition // and we'd end up jumping to what would seem like a random line of code. - return isSourcegraphDotCom() ? Promise.resolve([]) : doSearch(true) + return isSourcegraphDotCom() ? Promise.resolve([]) : doSearch('all-other-repos') +} + +// Originally based on the code from code-intel-extension +export async function searchBasedReferences(options: UseSearchBasedCodeIntelOptions): Promise { + const refsViaSCIPLocals = searchBasedReferencesViaSCIPLocals(options) + if (refsViaSCIPLocals) { + return refsViaSCIPLocals + } + + const refsViaSquirrel = await searchBasedReferencesViaSquirrel(options) + if (refsViaSquirrel) { + return refsViaSquirrel + } + + const refsViaSearchQueries = await searchBasedReferencesViaSearchQueries(options) + return sortByProximity(refsViaSearchQueries, options.path) +} + +export async function searchBasedDefinitions(options: UseSearchBasedCodeIntelOptions): Promise { + const defsViaSquirrel = await searchBasedDefinitionsViaSquirrel(options) + if (defsViaSquirrel) { + return defsViaSquirrel + } + + return searchBasedDefinitionsViaSearchQueries(options) } /** diff --git a/client/web/src/enterprise/repo/settings/sidebaritems.ts b/client/web/src/enterprise/repo/settings/sidebaritems.ts deleted file mode 100644 index afb35c122d47f..0000000000000 --- a/client/web/src/enterprise/repo/settings/sidebaritems.ts +++ /dev/null @@ -1,30 +0,0 @@ -import type { RepoSettingsSideBarGroups } from '../../../repo/settings/RepoSettingsSidebar' -import { repoSettingsSideBarGroups, settingsGroup } from '../../../repo/settings/sidebaritems' - -export const enterpriseRepoSettingsSidebarGroups: RepoSettingsSideBarGroups = - repoSettingsSideBarGroups.reduce((enterpriseGroups, group) => { - if (group === settingsGroup) { - return [ - ...enterpriseGroups, - // Extend settings group items - { - ...group, - items: [ - ...group.items, - { - to: '/logs', - exact: true, - label: 'Logs', - }, - { - to: '/permissions', - exact: true, - label: 'Repo Permissions', - }, - ], - }, - ] - } - - return [...enterpriseGroups, group] - }, []) diff --git a/client/web/src/enterprise/search-jobs/SearchJobModal/SearchJobModal.tsx b/client/web/src/enterprise/search-jobs/SearchJobModal/SearchJobModal.tsx index d83fd427b7a3a..ce287fb44c0a1 100644 --- a/client/web/src/enterprise/search-jobs/SearchJobModal/SearchJobModal.tsx +++ b/client/web/src/enterprise/search-jobs/SearchJobModal/SearchJobModal.tsx @@ -177,8 +177,8 @@ export const CancelSearchJobModal: FC = props => { }) return ( - -

    Do you want to cancel this search job?

    + +

    Do you want to stop this search job?

    Note: All query runs across all repositories and revisions will be stopped. You can re-run this @@ -191,7 +191,7 @@ export const CancelSearchJobModal: FC = props => {
    diff --git a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/ModelBadges.tsx b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/ModelBadges.tsx index a008c0c09d57b..0f4280408080a 100644 --- a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/ModelBadges.tsx +++ b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/ModelBadges.tsx @@ -30,6 +30,8 @@ function modelBadgeVariant(model: string, mode: 'completions' | 'embeddings'): ' case 'anthropic/claude-v1.3': case 'anthropic/claude-v1.3-100k': case 'anthropic/claude-2': + case 'anthropic/claude-2.0': + case 'anthropic/claude-2.1': case 'anthropic/claude-instant-v1': case 'anthropic/claude-instant-1': case 'anthropic/claude-instant-v1-100k': diff --git a/client/web/src/featureFlags/featureFlags.ts b/client/web/src/featureFlags/featureFlags.ts index 8b91b4e0ae098..025fc32c4628b 100644 --- a/client/web/src/featureFlags/featureFlags.ts +++ b/client/web/src/featureFlags/featureFlags.ts @@ -12,7 +12,6 @@ export const FEATURE_FLAGS = [ 'admin-analytics-cache-disabled', 'search-input-show-history', 'search-results-keyboard-navigation', - 'enable-streaming-git-blame', 'plg-enable-add-codehost-widget', 'accessible-file-tree', 'accessible-symbol-tree', @@ -32,6 +31,9 @@ export const FEATURE_FLAGS = [ 'search-content-based-lang-detection', 'search-new-keyword', 'search-debug', + 'cody-chat-mock-test', + 'signup-survey-enabled', + 'cody-pro', ] as const export type FeatureFlagName = typeof FEATURE_FLAGS[number] diff --git a/client/web/src/get-cody/GetCodyPage.tsx b/client/web/src/get-cody/GetCodyPage.tsx index 864fe3251c523..0a2d6243580b1 100644 --- a/client/web/src/get-cody/GetCodyPage.tsx +++ b/client/web/src/get-cody/GetCodyPage.tsx @@ -1,7 +1,8 @@ -import { useEffect } from 'react' +import { useEffect, useState } from 'react' import { mdiMicrosoftVisualStudioCode, mdiChevronRight, mdiApple, mdiLinux, mdiMicrosoftWindows } from '@mdi/js' import classNames from 'classnames' +import { useNavigate, useLocation } from 'react-router-dom' import type { AuthenticatedUser } from '@sourcegraph/shared/src/auth' import { Badge, H2, Icon, Link, PageHeader, Text } from '@sourcegraph/wildcard' @@ -10,6 +11,7 @@ import { ExternalsAuth } from '../auth/components/ExternalsAuth' import { CodyLetsWorkIcon } from '../cody/chat/CodyPageIcon' import { Page } from '../components/Page' import { PageTitle } from '../components/PageTitle' +import { useFeatureFlag } from '../featureFlags/useFeatureFlag' import type { SourcegraphContext } from '../jscontext' import { eventLogger } from '../tracking/eventLogger' import { EventName } from '../util/constants' @@ -42,11 +44,28 @@ const onClickCTAButton = (type: string): void => const logEvent = (eventName: string, type?: string, source?: string): void => eventLogger.log(eventName, { type, source }) +const logPageView = (pageTitle: string): void => eventLogger.logPageView(pageTitle) + export const GetCodyPage: React.FunctionComponent = ({ authenticatedUser, context }) => { + const navigate = useNavigate() + const location = useLocation() + const [search] = useState(location.search) + const [isCodyProEnabled, ffStatus] = useFeatureFlag('cody-pro', false) + useEffect(() => { - logEvent(EventName.VIEW_GET_CODY) + if (authenticatedUser && isCodyProEnabled) { + navigate(`/cody/manage${search || ''}`) + } + }, [authenticatedUser, navigate, search, isCodyProEnabled]) + + useEffect(() => { + logPageView(EventName.VIEW_GET_CODY) }, []) + if (authenticatedUser && (ffStatus !== 'loaded' || isCodyProEnabled)) { + return null + } + return (
    diff --git a/client/web/src/hooks/index.ts b/client/web/src/hooks/index.ts index a68f083af54c9..eba0f4e311b45 100644 --- a/client/web/src/hooks/index.ts +++ b/client/web/src/hooks/index.ts @@ -1,4 +1,3 @@ export { useHandleSubmitFeedback } from './useHandleSubmitFeedback' export { useRoutesMatch } from './useRoutesMatch' export { useURLSyncedState } from './useUrlSyncedState' -export { useScrollManager } from './useScrollManager' diff --git a/client/web/src/integration/BUILD.bazel b/client/web/src/integration/BUILD.bazel index d99832d8e851e..3b5693571e826 100644 --- a/client/web/src/integration/BUILD.bazel +++ b/client/web/src/integration/BUILD.bazel @@ -96,6 +96,7 @@ ts_project( "//:node_modules/mocha", "//:node_modules/puppeteer", "//:node_modules/ts-key-enum", + "//client/shared/src/testing", # keep "//client/web:graphql_operations", "//client/web:node_modules/@sourcegraph/common", "//client/web:node_modules/@sourcegraph/shared", @@ -121,5 +122,7 @@ mocha_test( "requires-network", ], tests = [test.replace(".ts", ".js") for test in glob(["**/*.test.ts"])], - deps = [":integration_tests"], + deps = [ + ":integration_tests", + ], ) diff --git a/client/web/src/integration/codemirror-blob-view.test.ts b/client/web/src/integration/codemirror-blob-view.test.ts index 364a6bff9d5c5..ece99652335be 100644 --- a/client/web/src/integration/codemirror-blob-view.test.ts +++ b/client/web/src/integration/codemirror-blob-view.test.ts @@ -372,7 +372,7 @@ function createBlobPageData({ WebGraphQlOperations, 'ResolveRepoRev' | 'FileTreeEntries' | 'FileExternalLinks' | 'Blob' | 'FileNames' > & - Pick + Pick filePaths: { [k in keyof T]: string } } { const repositorySourcegraphUrl = `/${repoName}` @@ -401,21 +401,6 @@ function createBlobPageData({ }, }, }), - LegacyRepositoryIntrospection: () => ({ - __type: { - fields: [ - { - name: 'noFork', - }, - ], - }, - }), - LegacyResolveRepo2: () => ({ - repository: { - id: repoName, - name: repoName, - }, - }), }, } } diff --git a/client/web/src/integration/graphQlResponseHelpers.ts b/client/web/src/integration/graphQlResponseHelpers.ts index 1a940e3eee59f..8faf3825a647e 100644 --- a/client/web/src/integration/graphQlResponseHelpers.ts +++ b/client/web/src/integration/graphQlResponseHelpers.ts @@ -25,7 +25,6 @@ export const createTreeEntriesResult = (url: string, toplevelFiles: string[]): T isDirectory: false, url: `${url}/-/blob/${name}`, submodule: null, - isSingleChild: false, })), }, }, diff --git a/client/web/src/integration/notebook.test.ts b/client/web/src/integration/notebook.test.ts index bf1f1972622e7..f2ab377aff552 100644 --- a/client/web/src/integration/notebook.test.ts +++ b/client/web/src/integration/notebook.test.ts @@ -73,7 +73,7 @@ const viewerSettings: Partial = } const now = new Date() -const downloadPath = process.env.TEST_TMPDIR || __dirname +const downloadPath = process.env.TEST_TMPDIR || process.cwd() const notebookFixture = (id: string, title: string, blocks: NotebookFields['blocks']): NotebookFields => ({ __typename: 'Notebook', diff --git a/client/web/src/integration/repository.test.ts b/client/web/src/integration/repository.test.ts index 7323a6f8bb5fc..dfa3a5d8ae3c1 100644 --- a/client/web/src/integration/repository.test.ts +++ b/client/web/src/integration/repository.test.ts @@ -43,20 +43,6 @@ export const getCommonRepositoryGraphQlResults = ( FileExternalLinks: ({ filePath }) => createFileExternalLinksResult(filePath), TreeEntries: () => createTreeEntriesResult(repositoryUrl, fileEntries), FileTreeEntries: () => createFileTreeEntriesResult(repositoryUrl, fileEntries), - TreeCommits: () => ({ - node: { - __typename: 'Repository', - sourceType: RepositoryType.GIT_REPOSITORY, - externalURLs: [ - { - __typename: 'ExternalLink', - serviceKind: ExternalServiceKind.GITHUB, - url: 'https://' + repositoryName, - }, - ], - commit: { ancestors: { nodes: [], pageInfo: { hasNextPage: false, endCursor: null } } }, - }, - }), Blob: ({ filePath }) => createBlobContentResult(`content for: ${filePath}\nsecond line\nthird line`), }) @@ -101,196 +87,66 @@ describe('Repository', () => { testContext.overrideGraphQL({ ...commonWebGraphQlResults, ...getCommonRepositoryGraphQlResults(repositoryName, repositorySourcegraphUrl, fileEntries), - TreeCommits: () => ({ - node: { + FileCommits: () => ({ + repository: { __typename: 'Repository', - sourceType: RepositoryType.GIT_REPOSITORY, - externalURLs: [ - { - __typename: 'ExternalLink', - serviceKind: ExternalServiceKind.GITHUB, - url: 'https://' + repositoryName, - }, - ], + id: repositoryName, commit: { - ancestors: { - nodes: [ - { - __typename: 'GitCommit', - id: 'CommitID1', - oid: '15c2290dcb37731cc4ee5a2a1c1e5a25b4c28f81', - abbreviatedOID: '15c2290', - perforceChangelist: null, - message: 'update LSIF indexing CI workflow\n', - subject: 'update LSIF indexing CI workflow', - body: null, - author: { - __typename: 'Signature', - person: { - avatarURL: '', - name: 'garo (they/them)', - email: 'gbrik@users.noreply.github.com', - displayName: 'garo (they/them)', - user: null, - }, - date: '2020-04-29T18:40:54Z', - }, - committer: { - __typename: 'Signature', - person: { - avatarURL: '', - name: 'GitHub', - email: 'noreply@github.com', - displayName: 'GitHub', - user: null, - }, - date: '2020-04-29T18:40:54Z', - }, - parents: [ - { - oid: '96c4efab7ee28f3d1cf1d248a0139cea37368b18', - abbreviatedOID: '96c4efa', - perforceChangelist: null, - url: '/github.com/sourcegraph/jsonrpc2/-/commit/96c4efab7ee28f3d1cf1d248a0139cea37368b18', - }, - { - oid: '9e615b1c32cc519130575e8d10d0d0fee8a5eb6c', - abbreviatedOID: '9e615b1', - perforceChangelist: null, - url: '/github.com/sourcegraph/jsonrpc2/-/commit/9e615b1c32cc519130575e8d10d0d0fee8a5eb6c', - }, - ], - url: commitUrl, - canonicalURL: commitUrl, - externalURLs: [ - { - url: 'https://github.com/sourcegraph/jsonrpc2/commit/15c2290dcb37731cc4ee5a2a1c1e5a25b4c28f81', - serviceKind: ExternalServiceKind.GITHUB, - }, - ], - tree: { - canonicalURL: - '/github.com/sourcegraph/jsonrpc2@15c2290dcb37731cc4ee5a2a1c1e5a25b4c28f81', - }, - }, - { - __typename: 'GitCommit', - id: 'CommitID2', - oid: '9e615b1c32cc519130575e8d10d0d0fee8a5eb6c', - abbreviatedOID: '9e615b1', - perforceChangelist: null, - message: 'LSIF Indexing Campaign', - subject: 'LSIF Indexing Campaign', - body: null, - author: { - __typename: 'Signature', - person: { - avatarURL: '', - name: 'Sourcegraph Bot', - email: 'batch-changes@sourcegraph.com', - displayName: 'Sourcegraph Bot', - user: null, - }, - date: '2020-04-29T16:57:20Z', - }, - committer: { - __typename: 'Signature', - person: { - avatarURL: '', - name: 'Sourcegraph Bot', - email: 'batch-changes@sourcegraph.com', - displayName: 'Sourcegraph Bot', - user: null, - }, - date: '2020-04-29T16:57:20Z', - }, - parents: [ - { - oid: '96c4efab7ee28f3d1cf1d248a0139cea37368b18', - abbreviatedOID: '96c4efa', - perforceChangelist: null, - url: '/github.com/sourcegraph/jsonrpc2/-/commit/96c4efab7ee28f3d1cf1d248a0139cea37368b18', - }, - ], - url: '/github.com/sourcegraph/jsonrpc2/-/commit/9e615b1c32cc519130575e8d10d0d0fee8a5eb6c', - canonicalURL: - '/github.com/sourcegraph/jsonrpc2/-/commit/9e615b1c32cc519130575e8d10d0d0fee8a5eb6c', - externalURLs: [ + __typename: 'GitCommit', + id: '1', + tree: { + __typename: 'GitTree', + entries: fileEntries.map((fileName, index) => ({ + __typename: 'GitBlob', + path: fileName, + history: { + __typename: 'TreeEntryConnection', + nodes: [ { - url: 'https://github.com/sourcegraph/jsonrpc2/commit/9e615b1c32cc519130575e8d10d0d0fee8a5eb6c', - serviceKind: ExternalServiceKind.GITHUB, - }, - ], - tree: { - canonicalURL: - '/github.com/sourcegraph/jsonrpc2@9e615b1c32cc519130575e8d10d0d0fee8a5eb6c', - }, - }, - { - __typename: 'GitCommit', - id: 'CommitID3', - oid: '96c4efab7ee28f3d1cf1d248a0139cea37368b18', - abbreviatedOID: '96c4efa', - perforceChangelist: null, - message: - 'Produce LSIF data for each commit for fast/precise code nav (#35)\n\n* Produce LSIF data for each commit for fast/precise code nav\r\n\r\n* Update lsif.yml\r', - subject: 'Produce LSIF data for each commit for fast/precise code nav (#35)', - body: '* Produce LSIF data for each commit for fast/precise code nav\r\n\r\n* Update lsif.yml', - author: { - __typename: 'Signature', - person: { - avatarURL: '', - name: 'Quinn Slack', - email: 'qslack@qslack.com', - displayName: 'Quinn Slack', - user: { - id: 'VXNlcjo2', - username: 'sqs', - url: '/users/sqs', - displayName: 'sqs', + __typename: 'GitBlob', + commit: { + __typename: 'GitCommit', + id: '1', + author: { + __typename: 'Signature', + person: { + avatarURL: '', + name: 'Sourcegraph Bot', + email: 'batch-changes@sourcegraph.com', + displayName: 'Sourcegraph Bot', + user: null, + }, + date: '2020-04-29T16:57:20Z', + }, + committer: { + __typename: 'Signature', + person: { + avatarURL: '', + name: 'Sourcegraph Bot', + email: 'batch-changes@sourcegraph.com', + displayName: 'Sourcegraph Bot', + user: null, + }, + date: '2020-04-29T16:57:20Z', + }, + subject: 'update LSIF indexing CI workflow', + canonicalURL: commitUrl, + externalURLs: [ + { + url: 'https://github.com/sourcegraph/jsonrpc2/commit/15c2290dcb37731cc4ee5a2a1c1e5a25b4c28f81', + serviceKind: ExternalServiceKind.GITHUB, + }, + ], }, }, - date: '2019-12-22T04:34:38Z', - }, - committer: { - __typename: 'Signature', - person: { - avatarURL: '', - name: 'GitHub', - email: 'noreply@github.com', - displayName: 'GitHub', - user: null, - }, - date: '2019-12-22T04:34:38Z', - }, - parents: [ - { - oid: 'cee7209801bf50cee868f8e0696ba0b76ae21792', - abbreviatedOID: 'cee7209', - perforceChangelist: null, - url: '/github.com/sourcegraph/jsonrpc2/-/commit/cee7209801bf50cee868f8e0696ba0b76ae21792', - }, ], - url: '/github.com/sourcegraph/jsonrpc2/-/commit/96c4efab7ee28f3d1cf1d248a0139cea37368b18', - canonicalURL: - '/github.com/sourcegraph/jsonrpc2/-/commit/96c4efab7ee28f3d1cf1d248a0139cea37368b18', - externalURLs: [ - { - url: 'https://github.com/sourcegraph/jsonrpc2/commit/96c4efab7ee28f3d1cf1d248a0139cea37368b18', - serviceKind: ExternalServiceKind.GITHUB, - }, - ], - tree: { - canonicalURL: - '/github.com/sourcegraph/jsonrpc2@96c4efab7ee28f3d1cf1d248a0139cea37368b18', - }, }, - ], - pageInfo: { __typename: 'PageInfo', hasNextPage: false, endCursor: 'abc' }, + })), }, }, }, }), + RepositoryCommit: () => ({ node: { __typename: 'Repository', @@ -462,7 +318,7 @@ describe('Repository', () => { await driver.assertWindowLocation(repositorySourcegraphUrl) await driver.findElementWithText(clickedCommit, { - selector: '[data-testid="git-commit-node-oid"]', + selector: '[data-testid="git-commit-message-with-links"] a', action: 'click', }) await driver.page.waitForSelector('[data-testid="repository-commit-page"]') @@ -497,7 +353,6 @@ describe('Repository', () => { isDirectory: false, url: '/github.com/ggilmore/q-test/-/blob/Geoffrey%27s%20random%20queries.32r242442bf/%25%20token.4288249258.sql', submodule: null, - isSingleChild: false, }, ], }, diff --git a/client/web/src/integration/search.test.ts b/client/web/src/integration/search.test.ts index ef4bf4deafc16..ec54ba9870f85 100644 --- a/client/web/src/integration/search.test.ts +++ b/client/web/src/integration/search.test.ts @@ -74,16 +74,19 @@ const commonSearchGraphQLResults: Partial li { + display: block; + padding: 0; + width: 100%; + padding-top: 0; + } + + :global(.inputs-list) label { + float: none; + width: auto; + padding: 0; + line-height: 1.125rem; + white-space: normal; + font-weight: normal; + } + + :global(.inputs-list):first-child { + padding-top: 0.375rem; + } + + :global(.inputs-list) > li + li { + padding-top: 0.125rem; + } + + ul:global(.no-list) { + list-style: none; + } + + :global(.field) { + margin-bottom: 1.125rem; + } + + :global(.hs-field-desc) { + color: #7c98b6; + margin: 0 0 0.375rem; + font-size: 0.688rem; + } + + :global(.hs-form-required) { + color: var(--danger-text); + margin-left: 0.188rem; + } + + :global(.hs-custom-style) + :global(.hs-dependent-field) + > div + input:global(.hs-input):not([type='checkbox']):not([type='radio']) { + width: 90%; + } + + :global(.hs-button), + :global(.hs-form-field) input[type='text'], + :global(.hs-form-field) input[type='email'], + :global(.hs-form-field) input[type='phone'], + :global(.hs-form-field) input[type='number'], + :global(.hs-form-field) input[type='tel'], + :global(.hs-form-field) input[type='date'], + :global(.hs-form-field) textarea { + -webkit-appearance: none; + -moz-appearance: none; + } + + :global(.hs-fieldtype-intl-phone):global(.hs-input) { + padding: 0; + background: none; + border: none; + height: auto; + + &::after { + clear: both; + content: ' '; + display: table; + } + + &:global(.hs-input) { + margin-bottom: 0; + } + } + + :global(.hs-default-font-element), + :global(.hs-main-font-element) { + line-height: normal; + } + + // stylelint-disable-next-line selector-id-pattern + :global(#hsForm_85548efc-a879-4553-9ef0-a8da8fdcf541) :global(.hs-email) { + display: none; + } +} diff --git a/client/web/src/marketing/components/HubSpotForm.tsx b/client/web/src/marketing/components/HubSpotForm.tsx new file mode 100644 index 0000000000000..82701d0f72af2 --- /dev/null +++ b/client/web/src/marketing/components/HubSpotForm.tsx @@ -0,0 +1,265 @@ +import { FunctionComponent, useEffect, useState } from 'react' + +import classNames from 'classnames' + +import styles from './HubSpotForm.module.scss' + +declare global { + interface Window { + hbspt?: { + forms: { + create: ({ + region, + portalId, + formId, + target, + formInstanceId, + onFormSubmit, + onFormSubmitted, + onFormReady, + }: HubSpotAPIProps) => CreateHubSpotFormProps + } + } + jQuery: () => void + ClearbitForHubspot: { + forms: [] + addForm: () => void + } + } +} + +interface HubSpotAPIProps { + region?: string + portalId: string + formId: string + target: string + formInstanceId?: string + onFormSubmit?: (object: { data: { name: string; value: string }[] }) => void + onFormReady?: ($form: CreateHubSpotFormProps) => void + onFormSubmitted?: () => void + inlineMessage?: string +} + +interface CreateHubSpotFormProps { + [index: number]: HTMLFormElement + formId: string + onFormReady?: ($form: HTMLFormElement) => void + onFormSubmitted?: () => void + inlineMessage?: string +} + +export interface HubSpotFormProps { + formId?: string + masterFormName?: 'qualificationSurvey' + onFormSubmitted?: () => void + onFormReady?: ($form: HTMLFormElement) => void + inlineMessage?: string + overrideFormShorten?: boolean + userId?: string + userEmail?: string +} + +/** + * These are our Master Forms that are used throughout our codebase. Each + * masterFormName is used as an identifier to map to a specific master form id. + */ +const masterForms: { [key: string]: string } = { + // Customer qualification survey + qualificationSurvey: '85548efc-a879-4553-9ef0-a8da8fdcf541', +} + +// HubSpot script integration +const hubSpotScript = 'https://js.hsforms.net/forms/v2.js' + +// Third party script integrations +const jQueryScript = 'https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js' +const clearbitScript = + '!function(e){var o=document.getElementsByTagName("script")[0];if("object"==typeof e.ClearbitForHubspot)return console.log("Clearbit For HubSpot included more than once"),!1;e.ClearbitForHubspot={},e.ClearbitForHubspot.forms=[],e.ClearbitForHubspot.addForm=function(o){var t=o[0];"function"==typeof e.ClearbitForHubspot.onFormReady?e.ClearbitForHubspot.onFormReady(t):e.ClearbitForHubspot.forms.push(t)};var t=document.createElement("script");t.async=!0,t.src="https://hubspot.clearbit.com/v1/forms/pk_a66b9ed76e62c713c06aab39bfae7234/forms.js",o.parentNode.insertBefore(t,o),e.addEventListener("message",function(o){if("hsFormCallback"===o.data.type&&"onFormReady"===o.data.eventName)if(document.querySelectorAll(\'form[data-form-id="\'+o.data.id+\'"]\').length>0)e.ClearbitForHubspot.addForm(document.querySelectorAll(\'form[data-form-id="\'+o.data.id+\'"]\'));else if(document.querySelectorAll("iframe.hs-form-iframe").length>0){document.querySelectorAll("iframe.hs-form-iframe").forEach(function(t){t.contentWindow.document.querySelectorAll(\'form[data-form-id="\'+o.data.id+\'"]\').length>0&&e.ClearbitForHubspot.addForm(t.contentWindow.document.querySelectorAll(\'form[data-form-id="\'+o.data.id+\'"]\'))})}})}(window);' + +// Gets a script element by its id +const getScriptElement = (id: string): HTMLScriptElement | Element | null => document.querySelector(`#${id}`) + +/** + * This loads a script element and appends it to the document head + * + * @param id - a unique identifier for the script element + * @param script - the script src (whether it's used for the script tag's src or innerHTML) + * @param innerHTML - whether or not to assign the script to the script tag's src attribute or append to it's innerHTML + * @returns - an HTML Script Element + */ +const loadScriptElement = ( + id: string, + script: string, + innerHTML?: boolean +): Promise => + new Promise(resolve => { + const scriptElement = getScriptElement(id) + + if (!scriptElement) { + const newScriptElement = document.createElement('script') + newScriptElement.setAttribute('id', id) + newScriptElement.setAttribute('async', '') + if (innerHTML) { + newScriptElement.innerHTML = script + } else { + newScriptElement.src = script + } + document.head.append(newScriptElement) + resolve(newScriptElement) + } + + resolve(scriptElement) + }) + +/** + * This loads all necessary scripts and third party integrations + */ +const loadAllScripts = async (): Promise => { + const loadingScripts: Promise[] = [] + + if (!window.hbspt) { + loadingScripts.push(loadScriptElement('hubspot', hubSpotScript)) + } + if (!window.jQuery) { + loadingScripts.push(loadScriptElement('jquery', jQueryScript)) + } + if (!window.ClearbitForHubspot) { + loadingScripts.push(loadScriptElement('clearbit', clearbitScript, true)) + } + + try { + await Promise.all(loadingScripts) + } catch (error) { + // eslint-disable-next-line no-console + console.error('Error loading scripts:', error) + } +} + +/** + * This creates the HubSpot form with the configuration options. + * See: https://legacydocs.hubspot.com/docs/methods/forms/advanced_form_options + * + * @param CreateHubSpotFormProps - object props passed to createHubSpotForm + * @param CreateHubSpotFormProps.formId - the form's id + * @param CreateHubSpotFormProps.onFormReady - callback after form is built + * @param CreateHubSpotFormProps.onFormSubmitted - callback after data is sent + * @param CreateHubSpotFormProps.inlineMessage - form submission message + */ +function createHubSpotForm({ formId, onFormReady, onFormSubmitted, inlineMessage }: CreateHubSpotFormProps): void { + const hbsptCreateForm = (): void => { + window.hbspt?.forms.create({ + region: 'na1', + portalId: '2762526', + formId, + target: '#form-target', + onFormReady: (form: CreateHubSpotFormProps) => { + if (onFormReady) { + onFormReady(form[0]) + } + }, + onFormSubmitted, + inlineMessage, + }) + } + + if (window.hbspt) { + hbsptCreateForm() + + return + } + + // When the HubSpot script is loaded, create the form with the config + getScriptElement('hubspot')?.addEventListener('load', hbsptCreateForm) +} + +// This gets called when the HubSpot form is ready +const onHubsportFormReady = (form: HTMLFormElement, userId?: string, userEmail?: string): void => { + /** + * This allows you to populate hidden form fields with values + * + * @param formField - the form field name + * @param value - the value to populate + */ + const populateHiddenFormField = (formField: string, value: string): void => { + const input = form.querySelector(`input[name="${formField}"]`) as HTMLInputElement + if (input && !input.value) { + input.value = value || '' + } + } + + /** + * If the form is ready and visible in the DOM, gather all cookie and + * session data and populate hidden form fields. + */ + if (form) { + const getAllCookies: { [index: string]: string } = document.cookie + .split(';') + .reduce((key, string) => Object.assign(key, { [string.split('=')[0].trim()]: string.split('=')[1] }), {}) + const { sourcegraphAnonymousUid, sourcegraphSourceUrl } = getAllCookies + const landingSource: string = sessionStorage.getItem('landingSource') || '' + const firstSourceURL: string = + sourcegraphSourceUrl?.includes('redacted') || !sourcegraphSourceUrl ? landingSource : sourcegraphSourceUrl + + if (userId) { + populateHiddenFormField('user_id', userId) + } else { + populateHiddenFormField('anonymous_user_id', sourcegraphAnonymousUid) + } + if (userEmail) { + populateHiddenFormField('email', userEmail) + } + populateHiddenFormField('first_source_url', firstSourceURL) + populateHiddenFormField('form_submission_source', window.location.href) + } +} + +/** + * The HubSpot form component. + * + * @param options - option props + * @param options.formId - an optional form id + * @param options.onFormSubmitted - a callback that runs after a form submission + * @param options.inlineMessage - a message to display after a form submission + * @param options.userId - authenticated user's id + * @param options.userEmail - authenticated user's email + * @returns - a div element with an id where the HubSpot form renders + */ +export const HubSpotForm: FunctionComponent = ({ + formId, + masterFormName, + onFormSubmitted, + onFormReady, + inlineMessage = 'Thank you for your feedback!', + userEmail, + userId, +}) => { + const [formCreated, setFormCreated] = useState(false) + + useEffect(() => { + // Set the master form id if it's provided + let masterFormId = '' + if (masterFormName) { + masterFormId = masterForms[masterFormName] + } + + // Load all scripts + // eslint-disable-next-line @typescript-eslint/no-floating-promises + loadAllScripts() + + if (!formCreated) { + createHubSpotForm({ + formId: formId || masterFormId, + onFormReady: form => { + onFormReady?.(form) + onHubsportFormReady(form, userId, userEmail) + }, + onFormSubmitted, + inlineMessage, + }) + + setFormCreated(true) + } + }, [formId, onFormSubmitted, inlineMessage, formCreated, masterFormName, onFormReady, userId, userEmail]) + + return
    +} diff --git a/client/web/src/marketing/toast/CodySurveyToast.tsx b/client/web/src/marketing/toast/CodySurveyToast.tsx index 249f0b79373a1..7d080a0c0efda 100644 --- a/client/web/src/marketing/toast/CodySurveyToast.tsx +++ b/client/web/src/marketing/toast/CodySurveyToast.tsx @@ -13,6 +13,7 @@ import type { AuthenticatedUser } from '../../auth' import { getReturnTo } from '../../auth/SignInSignUpCommon' import { CodyColorIcon } from '../../cody/chat/CodyPageIcon' import { LoaderButton } from '../../components/LoaderButton' +import { useFeatureFlag } from '../../featureFlags/useFeatureFlag' import type { SubmitCodySurveyResult, SubmitCodySurveyVariables, @@ -21,6 +22,7 @@ import type { } from '../../graphql-operations' import { PageRoutes } from '../../routes.constants' import { resendVerificationEmail } from '../../user/settings/emails/UserEmail' +import { HubSpotForm } from '../components/HubSpotForm' import styles from './CodySurveyToast.module.scss' @@ -160,6 +162,91 @@ const CodySurveyToastInner: React.FC< ) } +const CodyQualificationSurveryToastInner: React.FC< + { onSubmitEnd: () => void; authenticatedUser: AuthenticatedUser } & TelemetryProps +> = ({ onSubmitEnd, telemetryService, authenticatedUser }) => { + const [updatePostSignupCompletion, { error: setPostSignupError }] = useMutation< + SetCompletedPostSignupResult, + SetCompletedPostSignupVariables + >(SET_COMPLETED_POST_SIGNUP, { + variables: { + userID: authenticatedUser.id, + }, + }) + + const handleFormReady = useCallback( + (form: HTMLFormElement) => { + const input = form.querySelector('input[name="using_cody_for_work"]') + + // Trigger telemetry event whenever the cody for work is selected. + const handleChange = (e: Event): void => { + const target = e.target as HTMLInputElement + const isChecked = target.checked + + if (isChecked) { + telemetryService.log('ViewCodyWorkQuestionnarie') + } + } + + input?.addEventListener('change', handleChange) + + return () => { + input?.removeEventListener('change', handleChange) + } + }, + [telemetryService] + ) + + const primaryEmail = authenticatedUser.emails.find(email => email.isPrimary)?.email + + const handleSubmit = useCallback(async () => { + try { + if (authenticatedUser.hasVerifiedEmail) { + await updatePostSignupCompletion() + } + + onSubmitEnd() + } catch (error) { + /* eslint-disable no-console */ + console.error(error) + } + }, [authenticatedUser.hasVerifiedEmail, onSubmitEnd, updatePostSignupCompletion]) + + useEffect(() => { + telemetryService.log('ViewCodyforWorkorPersonalForm') + }, [telemetryService]) + + return ( + +

    + + Quick question... +

    + How will you be using Cody, our AI assistant? + + + {!!setPostSignupError && ( + + An error occurred. Please reload the page and try again. If this persists, contact support at + support@sourcegraph.com + + )} +     + ) +} + const CodyVerifyEmailToast: React.FC<{ onNext: () => void; authenticatedUser: AuthenticatedUser } & TelemetryProps> = ({ onNext, authenticatedUser, @@ -238,8 +325,10 @@ const CodyVerifyEmailToast: React.FC<{ onNext: () => void; authenticatedUser: Au export const CodySurveyToast: React.FC< { authenticatedUser: AuthenticatedUser + isExperimentEnabled?: boolean } & TelemetryProps -> = ({ authenticatedUser, telemetryService }) => { +> = ({ authenticatedUser, telemetryService, isExperimentEnabled }) => { + const [showQualificationSurvey] = useFeatureFlag('signup-survey-enabled', false) const [showVerifyEmail, setShowVerifyEmail] = useState(!authenticatedUser.hasVerifiedEmail) const location = useLocation() @@ -255,6 +344,10 @@ export const CodySurveyToast: React.FC< setShowVerifyEmail(false) }, [telemetryService]) + useEffect(() => { + telemetryService.log('CustomerQualificationSurveyExperiment001Enrolled') + }, [telemetryService]) + if (showVerifyEmail) { return ( + ) + } + return ( = props => { )} {isSourcegraphDotCom && ( - + About Sourcegraph diff --git a/client/web/src/nav/NavBar/NavDropdown.tsx b/client/web/src/nav/NavBar/NavDropdown.tsx index 63ae809079737..e7991f7e09f63 100644 --- a/client/web/src/nav/NavBar/NavDropdown.tsx +++ b/client/web/src/nav/NavBar/NavDropdown.tsx @@ -26,8 +26,10 @@ interface NavDropdownProps { /** Alternative path to match against if item is active */ altPath?: string } & Pick - /** The first item in the dropdown menu that serves as the "home" item. - It uses the path from the toggleItem. */ + /** + * The first item in the dropdown menu that serves as the "home" item. It uses the path from the + * toggleItem. + */ homeItem?: Omit /** Items to display in the dropdown */ items: NavDropdownItem[] diff --git a/client/web/src/nav/UserNavItem.tsx b/client/web/src/nav/UserNavItem.tsx index d62a67cbc553b..9a3c4f2306e38 100644 --- a/client/web/src/nav/UserNavItem.tsx +++ b/client/web/src/nav/UserNavItem.tsx @@ -252,12 +252,7 @@ export const UserNavItem: FC = props => { {isSourcegraphDotCom && } {isSourcegraphDotCom && ( - + About Sourcegraph )} diff --git a/client/web/src/nav/new-global-navigation/NewGlobalNavigationBar.tsx b/client/web/src/nav/new-global-navigation/NewGlobalNavigationBar.tsx index 0516125d73f08..bc8606d0f8808 100644 --- a/client/web/src/nav/new-global-navigation/NewGlobalNavigationBar.tsx +++ b/client/web/src/nav/new-global-navigation/NewGlobalNavigationBar.tsx @@ -8,7 +8,7 @@ import MagnifyIcon from 'mdi-react/MagnifyIcon' import { NavLink, useLocation, useNavigate } from 'react-router-dom' import shallow from 'zustand/shallow' -import { Toggles } from '@sourcegraph/branded/src' +import { Toggles } from '@sourcegraph/branded' import { SearchQueryState, SubmitSearchParameters } from '@sourcegraph/shared/src/search' import { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' import { useIsLightTheme } from '@sourcegraph/shared/src/theme' diff --git a/client/web/src/notebooks/blocks/query/NotebookQueryBlock.tsx b/client/web/src/notebooks/blocks/query/NotebookQueryBlock.tsx index a9fff999d5f7c..06ded49af3660 100644 --- a/client/web/src/notebooks/blocks/query/NotebookQueryBlock.tsx +++ b/client/web/src/notebooks/blocks/query/NotebookQueryBlock.tsx @@ -203,6 +203,7 @@ export const NotebookQueryBlock: React.FunctionComponent
    )} diff --git a/client/web/src/repo/RepoRevisionContainer.tsx b/client/web/src/repo/RepoRevisionContainer.tsx index ec2b6fdaaecc6..025cd61a8845e 100644 --- a/client/web/src/repo/RepoRevisionContainer.tsx +++ b/client/web/src/repo/RepoRevisionContainer.tsx @@ -219,9 +219,9 @@ export const RepoRevisionContainer: FC = props => { {resolvedRevision && !isPackage && ( {context => ( diff --git a/client/web/src/repo/RepoRevisionSidebar.tsx b/client/web/src/repo/RepoRevisionSidebar.tsx index 2bc2bd0c23916..0b0a7cddbdfa3 100644 --- a/client/web/src/repo/RepoRevisionSidebar.tsx +++ b/client/web/src/repo/RepoRevisionSidebar.tsx @@ -6,7 +6,7 @@ import classNames from 'classnames' import type { Scalars } from '@sourcegraph/shared/src/graphql-operations' import { useKeyboardShortcut } from '@sourcegraph/shared/src/keyboardShortcuts/useKeyboardShortcut' import { Shortcut } from '@sourcegraph/shared/src/react-shortcuts' -import type { SettingsCascadeProps } from '@sourcegraph/shared/src/settings/settings' +import { type SettingsCascadeProps, useExperimentalFeatures } from '@sourcegraph/shared/src/settings/settings' import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' import type { RepoFile } from '@sourcegraph/shared/src/util/url' import { @@ -63,7 +63,8 @@ export const RepoRevisionSidebar: FC = props => { const isWideScreen = useMatchMedia('(min-width: 768px)', false) const [isVisible, setIsVisible] = useState(persistedIsVisible && isWideScreen) - const [initialFilePath, setInitialFilePath] = useState(props.filePath) + const showFullTreeContextEnabled = useExperimentalFeatures(features => features.showFullTreeContext) + const [initialFilePath, setInitialFilePath] = useState(showFullTreeContextEnabled ? '' : props.filePath) const [initialFilePathIsDir, setInitialFilePathIsDir] = useState(props.isDir) const onExpandParent = useCallback((parent: string) => { setInitialFilePath(parent) diff --git a/client/web/src/repo/RepoRevisionSidebarFileTree.module.scss b/client/web/src/repo/RepoRevisionSidebarFileTree.module.scss index 6fcc4c1e7fc14..984d8177c9cdd 100644 --- a/client/web/src/repo/RepoRevisionSidebarFileTree.module.scss +++ b/client/web/src/repo/RepoRevisionSidebarFileTree.module.scss @@ -1,5 +1,58 @@ +.file-container { + display: flex; + flex-direction: row; + align-items: center; +} + +.icon-container { + display: flex; + flex-direction: row; +} + +.test-indicator { + border-radius: 100%; + width: 0.5rem; + height: 0.5rem; + margin-left: -0.75rem; + margin-right: 0.15rem; + background-color: var(--gray-05); + align-self: end; +} + .icon { flex-shrink: 0; width: 1rem; height: 1rem; } + +.blue { + color: var(--blue); +} + +.pink { + color: var(--pink); +} + +.yellow { + color: var(--yellow); +} + +.red { + color: var(--red); +} + +.gray { + color: var(--gray-05); +} + +.green { + color: var(--green); +} + +.cyan { + color: var(--cyan); +} + +.default-icon { + color: var(--gray-07); +} diff --git a/client/web/src/repo/RepoRevisionSidebarFileTree.tsx b/client/web/src/repo/RepoRevisionSidebarFileTree.tsx index 298c30528652d..703e3e70abae9 100644 --- a/client/web/src/repo/RepoRevisionSidebarFileTree.tsx +++ b/client/web/src/repo/RepoRevisionSidebarFileTree.tsx @@ -27,7 +27,9 @@ import { import type { FileTreeEntriesResult, FileTreeEntriesVariables } from '../graphql-operations' +import { FILE_ICONS, FileExtension } from './constants' import { FocusableTree, type FocusableTreeProps } from './RepoRevisionSidebarFocusableTree' +import { getFileInfo } from './utils' import styles from './RepoRevisionSidebarFileTree.module.scss' @@ -48,7 +50,7 @@ const QUERY = gql` tree(path: $filePath) { isRoot url - entries(first: $first, ancestors: $ancestors, recursiveSingleChild: true) { + entries(first: $first, ancestors: $ancestors) { name path isDirectory @@ -57,7 +59,6 @@ const QUERY = gql` url commit } - isSingleChild } } } @@ -390,6 +391,8 @@ function renderNode({ const { entry, error, dotdot, name } = element const submodule = entry?.submodule const url = entry?.url + const fileInfo = getFileInfo(name, isBranch) + const fileIcon = FILE_ICONS.get(fileInfo.extension) if (error) { return @@ -471,12 +474,31 @@ function renderNode({ } }} > - - {name} +
    +
    + {fileInfo.extension !== FileExtension.DEFAULT ? ( + + ) : ( + + )} + {fileInfo.isTest &&
    } +
    + {name} +
    ) } @@ -486,11 +508,8 @@ type TreeNode = WildcardTreeNode & { entry: FileTreeEntry | null error: string | null dotdot: string | null - - // In case of a single child expansion, this is the path that should be used - // when finding the right parent - singleChildParentPath: string | null } + interface TreeData { // The flat nodes list used by react-accessible-treeview nodes: TreeNode[] @@ -524,23 +543,6 @@ function appendTreeData(tree: TreeData, entries: FileTreeEntry[], rootTreeUrl: s insertRootNode(tree, rootTreeUrl) } - // Bookkeeping for single child expansion: - // - // - `singleChildFolderPath`: This is a list of all folder names that are - // to be combined into the single child. This is needed to update the - // parent name properly. - // - `singleChildParentPathForPath`: When set, this tuple is used to find - // the parent for a single child substitution. - let singleChildFolderPath: string[] = [] - let singleChildParentPathForPath: - | null - | [ - // parent path to use for the next entries - string, - // entry parent path for which the substitution is valid - string - ] = null - let siblingCount = 0 for (let idx = 0; idx < entries.length; idx++) { const entry = entries[idx] @@ -556,61 +558,9 @@ function appendTreeData(tree: TreeData, entries: FileTreeEntry[], rootTreeUrl: s siblingCount = 0 } - // When entry.isSingleChild is true, it means that the entry is the only - // child of its parents. - // - // When we encounter such entries, we skip over them and instead update - // the respective parent when we finish the list. Since this child - // is already entered before, we need to update it. - // - // If we start the tree on a single child, we add the first entry to - // have a visible parent to append things to. - if (entry.isSingleChild && !(isNewTree && idx === 0)) { - if (singleChildParentPathForPath === null) { - singleChildParentPathForPath = [getParentPath(entry.path), entry.path] - } else { - singleChildParentPathForPath = [singleChildParentPathForPath[0], entry.path] - } - singleChildFolderPath.push(entry.name) - - // Store the path id in our lookup map and point to the single child - // parent (where this path name will be appended to) - const parentId = tree.pathToId.get(singleChildParentPathForPath[0]) - if (parentId) { - tree.pathToId.set(entry.path, parentId) - } - - // Single child entries are not rendered, so we're skipping over - // them. - continue - } - - // If we skipped over various single child entries, we need to find the - // parent and update it. - // - // This is only done for the first entry after a series of single child - // entries are skipped over. - if (singleChildFolderPath.length > 0 && singleChildParentPathForPath) { - const parentId = tree.pathToId.get(singleChildParentPathForPath[0]) - if (parentId) { - const parent = tree.nodes[parentId] - tree.nodes[parentId] = { - ...parent, - name: parent.name + '/' + singleChildFolderPath.join('/'), - entry: entries[idx - 1], - } - } - singleChildFolderPath = [] - } - - // Unset singleChildParentPathForPath when the parent path no longer matches - if (singleChildParentPathForPath !== null && singleChildParentPathForPath[1] !== getParentPath(entry.path)) { - singleChildParentPathForPath = null - } - const id = tree.nodes.length const node: TreeNode = { - name: singleChildFolderPath.length > 0 ? `${singleChildFolderPath.join('/')}/${entry.name}` : entry.name, + name: entry.name, id, isBranch: entry.isDirectory, parent: 0, @@ -619,7 +569,6 @@ function appendTreeData(tree: TreeData, entries: FileTreeEntry[], rootTreeUrl: s entry, error: null, dotdot: null, - singleChildParentPath: singleChildParentPathForPath ? singleChildParentPathForPath[0] : null, } appendNode(tree, node) @@ -648,7 +597,6 @@ function appendTreeData(tree: TreeData, entries: FileTreeEntry[], rootTreeUrl: s entry: null, error: errorMessage, dotdot: null, - singleChildParentPath: singleChildParentPathForPath ? singleChildParentPathForPath[0] : null, } appendNode(tree, node) } @@ -668,7 +616,6 @@ function insertRootNode(tree: TreeData, rootTreeUrl: string): void { entry: null, error: null, dotdot: null, - singleChildParentPath: null, } tree.nodes.push(root) tree.pathToId.set(tree.rootPath, 0) @@ -688,7 +635,6 @@ function insertRootNode(tree: TreeData, rootTreeUrl: string): void { entry: null, error: null, dotdot: dirname(rootTreeUrl), - singleChildParentPath: null, } appendNode(tree, node) } @@ -733,11 +679,7 @@ function nodeIsImmediateParentOf(nodeA: TreeNode, nodeB: TreeNode): boolean { if (nodeB.path === '') { return false } - let bParentPath = getParentPath(nodeB.path) - if (nodeB.singleChildParentPath !== null) { - bParentPath = nodeB.singleChildParentPath - } - return nodeA.path === bParentPath + return nodeA.path === getParentPath(nodeB.path) } function isImmediateParentOf(fullPathA: string, fullPathB: string): boolean { diff --git a/client/web/src/repo/blame/useBlameHunks.ts b/client/web/src/repo/blame/useBlameHunks.ts index dba1ae8572ff0..1fa71d30f0378 100644 --- a/client/web/src/repo/blame/useBlameHunks.ts +++ b/client/web/src/repo/blame/useBlameHunks.ts @@ -12,14 +12,7 @@ import { makeRepoURI } from '@sourcegraph/shared/src/util/url' import { useObservable } from '@sourcegraph/wildcard' import { requestGraphQL } from '../../backend/graphql' -import { useFeatureFlag } from '../../featureFlags/useFeatureFlag' -import type { - ExternalServiceKind, - FirstCommitDateResult, - FirstCommitDateVariables, - GitBlameResult, - GitBlameVariables, -} from '../../graphql-operations' +import type { ExternalServiceKind, FirstCommitDateResult, FirstCommitDateVariables } from '../../graphql-operations' import { useBlameVisibility } from './useBlameVisibility' @@ -69,84 +62,6 @@ export interface BlameHunkData { firstCommitDate: Date | undefined } -const fetchBlameViaGraphQL = memoizeObservable( - ({ - repoName, - revision, - filePath, - sourcegraphURL, - }: { - repoName: string - revision: string - filePath: string - sourcegraphURL: string - }): Observable => - requestGraphQL( - gql` - query GitBlame($repo: String!, $rev: String!, $path: String!) { - repository(name: $repo) { - externalURLs { - url - serviceKind - } - firstEverCommit { - author { - date - } - } - commit(rev: $rev) { - blob(path: $path) { - blame(startLine: 0, endLine: 0) { - startLine - endLine - author { - person { - email - displayName - avatarURL - user { - username - displayName - avatarURL - } - } - date - } - message - rev - commit { - url - parents { - oid - } - } - } - } - } - } - } - `, - { repo: repoName, rev: revision, path: filePath } - ).pipe( - map(dataOrThrowErrors), - map(({ repository }) => { - const hunks = repository?.commit?.blob?.blame - const firstCommitDate = repository?.firstEverCommit?.author?.date - const externalURLs = repository?.externalURLs - if (hunks) { - return { - current: hunks.map(blame => addDisplayInfoForHunk(blame, sourcegraphURL)), - externalURLs, - firstCommitDate: firstCommitDate ? new Date(firstCommitDate) : undefined, - } - } - - return { current: undefined, externalURLs: undefined, firstCommitDate: undefined } - }) - ), - makeRepoURI -) - interface RawStreamHunk { author: { Name: string @@ -176,9 +91,6 @@ interface RawStreamHunk { * To reduce the backend pressure and improve the experience, this fetch * implementation uses a SSE stream to load the blame hunks in chunks. * - * It is controlled via the `enable-streaming-git-blame` feature flag and is - * currently not enabled by default. - * * Since we also need the first commit date for the blame recency calculations, * this implementation uses Promise.all() to load both data sources in parallel. */ @@ -347,8 +259,6 @@ export const useBlameHunks = ( }, sourcegraphURL: string ): BlameHunkData => { - const [enableStreamingGitBlame, status] = useFeatureFlag('enable-streaming-git-blame') - const [isBlameVisible] = useBlameVisibility(isPackage) const shouldFetchBlame = isBlameVisible && status !== 'initial' @@ -356,11 +266,9 @@ export const useBlameHunks = ( useMemo( () => shouldFetchBlame - ? enableStreamingGitBlame - ? fetchBlameViaStreaming({ revision, repoName, filePath, sourcegraphURL }) - : fetchBlameViaGraphQL({ revision, repoName, filePath, sourcegraphURL }) + ? fetchBlameViaStreaming({ revision, repoName, filePath, sourcegraphURL }) : of({ current: undefined, externalURLs: undefined, firstCommitDate: undefined }), - [shouldFetchBlame, enableStreamingGitBlame, revision, repoName, filePath, sourcegraphURL] + [shouldFetchBlame, revision, repoName, filePath, sourcegraphURL] ) ) diff --git a/client/web/src/repo/blob/CodeMirrorBlob.tsx b/client/web/src/repo/blob/CodeMirrorBlob.tsx index ce144d73c85fa..7efce76288b95 100644 --- a/client/web/src/repo/blob/CodeMirrorBlob.tsx +++ b/client/web/src/repo/blob/CodeMirrorBlob.tsx @@ -56,7 +56,7 @@ import { linkify } from './codemirror/links' import { lockFirstVisibleLine } from './codemirror/lock-line' import { navigateToLineOnAnyClickExtension } from './codemirror/navigate-to-any-line-on-click' import { scipSnapshot } from './codemirror/scip-snapshot' -import { search } from './codemirror/search' +import { search, SearchPanelConfig } from './codemirror/search' import { sourcegraphExtensions } from './codemirror/sourcegraph-extensions' import { codyWidgetExtension } from './codemirror/tooltips/CodyTooltip' import { HovercardView } from './codemirror/tooltips/HovercardView' @@ -112,6 +112,7 @@ export interface BlobProps blameHunks?: BlameHunkData activeURL?: string + searchPanelConfig?: SearchPanelConfig } export interface BlobPropsFacet extends BlobProps { @@ -185,6 +186,9 @@ const staticExtensions: Extension = [ '.highlighted-line': { backgroundColor: 'var(--code-selection-bg)', }, + '.cm-panels-top': { + borderBottom: '1px solid var(--border-color)', + }, }), hideEmptyLastLine, linkify, @@ -204,6 +208,7 @@ export const CodeMirrorBlob: React.FunctionComponent = props => { navigateToLineOnAnyClick, overrideBrowserSearchKeybinding, + searchPanelConfig, 'data-testid': dataTestId, } = props @@ -343,14 +348,6 @@ export const CodeMirrorBlob: React.FunctionComponent = props => { : undefined ) : [], - search({ - // useFileSearch is not a dependency because the search - // extension manages its own state. This is just the initial - // value - overrideBrowserFindInPageShortcut: useFileSearch, - onOverrideBrowserFindInPageToggle: setUseFileSearch, - navigate, - }), pinnedTooltip, navigateToLineOnAnyClick ? navigateToLineOnAnyClickExtension(navigate) : codeIntelExtension, syntaxHighlight.of(blobInfo), @@ -370,6 +367,7 @@ export const CodeMirrorBlob: React.FunctionComponent = props => { // value overrideBrowserFindInPageShortcut: useFileSearch, onOverrideBrowserFindInPageToggle: setUseFileSearch, + initialState: searchPanelConfig, navigate, }), ], diff --git a/client/web/src/repo/blob/codemirror/codeintel/README.md b/client/web/src/repo/blob/codemirror/codeintel/README.md index 1e2ca625ac663..a197d8471d122 100644 --- a/client/web/src/repo/blob/codemirror/codeintel/README.md +++ b/client/web/src/repo/blob/codemirror/codeintel/README.md @@ -9,7 +9,7 @@ The code intel extensions provide the following functionality: keyboard - Code intel tooltips: Information about a specific token (if available) - Document highlights: Highlight all occurrences of a specific token -- Got to definition: The ability to navigate to the definition for a specific +- Go to definition: The ability to navigate to the definition for a specific token The main entry point for the whole set of extensions is the diff --git a/client/web/src/repo/blob/codemirror/codeintel/decorations.ts b/client/web/src/repo/blob/codemirror/codeintel/decorations.ts index 6b86dc2a5edd0..4c13a747dc5e4 100644 --- a/client/web/src/repo/blob/codemirror/codeintel/decorations.ts +++ b/client/web/src/repo/blob/codemirror/codeintel/decorations.ts @@ -17,7 +17,7 @@ export const ignoreDecorations = Facet.define<{ from: number; to: number } | nul /** * We can't add/remove any decorations inside the selected token, because - * that causes the node to be recreated and loosing focus, which breaks + * that causes the node to be recreated and lose focus, which breaks * token keyboard navigation. * This facet should be used by all codeIntel extensions to ensure that any * conflicting decoration is removed. diff --git a/client/web/src/repo/blob/codemirror/linenumbers.ts b/client/web/src/repo/blob/codemirror/linenumbers.ts index 513f06d070394..ad8ef420bf129 100644 --- a/client/web/src/repo/blob/codemirror/linenumbers.ts +++ b/client/web/src/repo/blob/codemirror/linenumbers.ts @@ -21,6 +21,8 @@ import { type ViewUpdate, } from '@codemirror/view' +import { isFirefox } from '@sourcegraph/common' + import { isValidLineRange, MOUSE_MAIN_BUTTON } from './utils' const selectedLinesTheme = EditorView.theme({ @@ -30,14 +32,21 @@ const selectedLinesTheme = EditorView.theme({ * are visible) more in its `top` value breaking alignment wih the line. * We compensate this spacing by setting negative margin-top. * + * Line highlighting breaks (highlights two lines instead of 1) in firefox if minHeight is set, so we + * add a conditional to check for the current browser, and set the css accordingly. + * * todo(fkling): Revisit this, styling is not correct for empty lines */ - '.selected-lines-layer .selected-line': { - marginTop: '-1px', + '.selected-lines-layer .selected-line': isFirefox() + ? { + marginTop: '-1px', + } + : { + marginTop: '-1px', + // Ensure selection marker height matches line height. + minHeight: '1.0rem', + }, - // Ensure selection marker height matches line height. - minHeight: '1rem', - }, '.selected-lines-layer .selected-line.blame-visible': { marginTop: '-5px', @@ -326,11 +335,8 @@ export function selectableLineNumbers(config: SelectableLineNumbersConfig): Exte } const line = view.state.doc.lineAt(block.from).number - const range = view.state.field(selectedLines) view.dispatch({ - effects: mouseEvent.shiftKey - ? setEndLine.of(line) - : setSelectedLines.of(isSingleLine(range) && range?.line === line ? null : { line }), + effects: mouseEvent.shiftKey ? setEndLine.of(line) : setSelectedLines.of({ line }), annotations: lineSelectionSource.of('gutter'), // Collapse/reset text selection selection: { anchor: view.state.selection.main.anchor }, @@ -426,7 +432,3 @@ export function shouldScrollIntoView(view: EditorView, range: SelectedLineRange) to.top <= view.scrollDOM.scrollTop ) } - -function isSingleLine(range: SelectedLineRange): boolean { - return !!range && (!range.endLine || range.line === range.endLine) -} diff --git a/client/web/src/repo/blob/codemirror/search.module.scss b/client/web/src/repo/blob/codemirror/search.module.scss new file mode 100644 index 0000000000000..710978e1bdf79 --- /dev/null +++ b/client/web/src/repo/blob/codemirror/search.module.scss @@ -0,0 +1,23 @@ +.bgroup-left { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.bgroup-right { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-left: none; +} + +.close-button { + border-radius: 100%; + padding: 0.2rem; +} + +.close-button:hover { + background-color: var(--subtle-bg); +} + +.x { + color: var(--text-muted); +} diff --git a/client/web/src/repo/blob/codemirror/search.tsx b/client/web/src/repo/blob/codemirror/search.tsx index cbae9b4bed6b5..ec5986690baca 100644 --- a/client/web/src/repo/blob/codemirror/search.tsx +++ b/client/web/src/repo/blob/codemirror/search.tsx @@ -8,6 +8,7 @@ import { findPrevious, getSearchQuery, openSearchPanel, + closeSearchPanel, search as codemirrorSearch, searchKeymap, SearchQuery, @@ -30,7 +31,15 @@ import { ViewPlugin, type ViewUpdate, } from '@codemirror/view' -import { mdiChevronDown, mdiChevronUp, mdiFormatLetterCase, mdiInformationOutline, mdiRegex } from '@mdi/js' +import { + mdiChevronLeft, + mdiChevronRight, + mdiClose, + mdiFormatLetterCase, + mdiInformationOutline, + mdiRegex, +} from '@mdi/js' +import classNames from 'classnames' import { createRoot, type Root } from 'react-dom/client' import type { NavigateFunction } from 'react-router-dom' import { Subject, Subscription } from 'rxjs' @@ -47,6 +56,9 @@ import { Keybindings } from '../../../components/KeyboardShortcutsHelp/KeyboardS import { createElement } from '../../../util/dom' import { CodeMirrorContainer } from './react-interop' +import { SearchPanelViewMode } from './types' + +import styles from './search.module.scss' const searchKeybinding = @@ -69,6 +81,13 @@ export const BLOB_SEARCH_CONTAINER_ID = 'blob-search-container' const focusSearchInput = StateEffect.define() +export interface SearchPanelConfig { + searchValue: string + regexp: boolean + caseSensitive: boolean + mode: SearchPanelViewMode +} + interface SearchPanelState { searchQuery: SearchQuery // The input value is usually derived from searchQuery. But we are @@ -79,6 +98,7 @@ interface SearchPanelState { matches: SearchMatches // Currently selected 1-based match index. currentMatchIndex: number | null + mode: SearchPanelViewMode } class SearchPanel implements Panel { @@ -91,7 +111,7 @@ class SearchPanel implements Panel { private searchTerm = new Subject() private subscriptions = new Subscription() - constructor(private view: EditorView, private navigate: NavigateFunction) { + constructor(private view: EditorView, private navigate: NavigateFunction, config?: SearchPanelConfig) { this.dom = createElement('div', { className: 'cm-sg-search-container d-flex align-items-center', id: BLOB_SEARCH_CONTAINER_ID, @@ -101,11 +121,17 @@ class SearchPanel implements Panel { const searchQuery = getSearchQuery(this.view.state) const matches = calculateMatches(searchQuery, view.state.doc) this.state = { - searchQuery, - inputValue: searchQuery.search, + searchQuery: new SearchQuery({ + ...searchQuery, + caseSensitive: config?.caseSensitive ?? searchQuery.caseSensitive, + regexp: config?.regexp ?? searchQuery.regexp, + search: config?.searchValue ?? searchQuery.search, + }), + inputValue: config?.searchValue ?? searchQuery.search, overrideBrowserSearch: this.view.state.field(overrideBrowserFindInPageShortcut), matches, currentMatchIndex: getMatchIndexForSelection(matches, view.state.selection.main), + mode: config?.mode ?? SearchPanelViewMode.FullSearch, } this.subscriptions.add( @@ -180,12 +206,14 @@ class SearchPanel implements Panel { overrideBrowserSearch, currentMatchIndex, matches, + mode, }: SearchPanelState): void { if (!this.root) { this.root = createRoot(this.dom) } const totalMatches = matches.size + const isFullMode = mode === SearchPanelViewMode.FullSearch this.root.render(
    {totalMatches > 1 && ( - <> +
    - +
    )} {searchQuery.search ? ( @@ -262,17 +290,29 @@ class SearchPanel implements Panel {
    ) : null} -
    - - {searchKeybindingTooltip} -
    + {isFullMode && ( +
    + + {searchKeybindingTooltip} + + closeSearchPanel(this.view)} + size="sm" + svgPath={mdiClose} + aria-hidden={false} + aria-label="close search" + /> + +
    + )} ) } @@ -485,6 +525,7 @@ interface SearchConfig { overrideBrowserFindInPageShortcut: boolean onOverrideBrowserFindInPageToggle: (enabled: boolean) => void navigate: NavigateFunction + initialState?: SearchPanelConfig } const [overrideBrowserFindInPageShortcut, , setOverrideBrowserFindInPageShortcut] = createUpdateableField(true) @@ -529,10 +570,12 @@ export function search(config: SearchConfig): Extension { theme, keymapCompartment.of(keymap.of(getKeyBindings(config.overrideBrowserFindInPageShortcut))), codemirrorSearch({ - createPanel: view => new SearchPanel(view, config.navigate), + createPanel: view => new SearchPanel(view, config.navigate, config.initialState), }), ViewPlugin.define(view => { - if (!config.overrideBrowserFindInPageShortcut) { + // If we have some initial state for the search bar this means we want + // to render it by default + if (!config.overrideBrowserFindInPageShortcut || config.initialState) { window.requestAnimationFrame(() => openSearchPanel(view)) } return {} diff --git a/client/web/src/repo/blob/codemirror/types.ts b/client/web/src/repo/blob/codemirror/types.ts new file mode 100644 index 0000000000000..3f6a9c7693a45 --- /dev/null +++ b/client/web/src/repo/blob/codemirror/types.ts @@ -0,0 +1,21 @@ +/** + * Blob UI search panels mode variations. The code mirror blob UI has + * inline search UI (you can open it with cmd + F), with which you can + * found any arbitrary matches based on this search value. + */ +export enum SearchPanelViewMode { + /** + * Plain inline search mode, + * renders search input, matches count and its controls, + * command F controls and info tooltip. + */ + FullSearch = 'full-search', + + /** + * This mode is experimental and was added only for blob UI + * file preview case. In file preview we shouldn't have UI like + * command F controls and info tooltip. In matches-only mode we + * render only search input and matches UI. + */ + MatchesOnly = 'matches-only', +} diff --git a/client/web/src/repo/constants.ts b/client/web/src/repo/constants.ts index 7644b985eefef..26712599f25ed 100644 --- a/client/web/src/repo/constants.ts +++ b/client/web/src/repo/constants.ts @@ -1,3 +1,54 @@ +import { ComponentType } from 'react' + +import { CiSettings, CiTextAlignLeft, CiWarning } from 'react-icons/ci' +import { FaCss3Alt, FaJava, FaSass } from 'react-icons/fa' +import { GoDatabase, GoTerminal } from 'react-icons/go' +import { PiFilePngLight } from 'react-icons/pi' +import { + SiApachegroovy, + SiAssemblyscript, + SiC, + SiClojure, + SiCoffeescript, + SiCplusplus, + SiCsharp, + SiDart, + SiDocker, + SiFortran, + SiFsharp, + SiGit, + SiGo, + SiGraphql, + SiHaskell, + SiHtml5, + SiJavascript, + SiJpeg, + SiJulia, + SiKotlin, + SiLua, + SiMarkdown, + SiNixos, + SiNpm, + SiOcaml, + SiPerl, + SiPhp, + SiPython, + SiR, + SiReact, + SiRuby, + SiRust, + SiScala, + SiSvelte, + SiSvg, + SiSwift, + SiTypescript, + SiVisualbasic, + SiZig, +} from 'react-icons/si' +import { VscJson } from 'react-icons/vsc' + +import styles from './RepoRevisionSidebarFileTree.module.scss' + export const LogsPageTabs = { COMMANDS: 0, SYNCLOGS: 1, @@ -13,3 +64,160 @@ export enum CodeHostType { AZUREDEVOPS = 'azureDevOps', OTHER = 'other', } + +export enum FileExtension { + ASSEMBLY = 'asm', + BASH = 'sh', + BASIC = 'vb', + C = 'c', + CLOJURE_CLJ = 'clj', + CLOJURE_CLJS = 'cljs', + CLOJURE_CLJR = 'cljr', + CLOJURE_CLJC = 'cljc', + CLOJURE_EDN = 'edn', + COFFEE = 'coffee', + CPP = 'cc', + CSHARP = 'cs', + CSS = 'css', + DART = 'dart', + DEFAULT = 'default', + DOCKERFILE = 'Dockerfile', + DOCKERIGNORE = 'dockerignore', + FORTRAN_F = 'f', + FORTRAN_FOR = 'for', + FORTRAN_FTN = 'ftn', + FSHARP = 'fs', + FSI = 'fsi', + FSX = 'fsx', + GITIGNORE = 'gitignore', + GITATTRIBUTES = 'gitattributes', + GO = 'go', + GOMOD = 'mod', + GOSUM = 'sum', + GRAPHQL = 'graphql', + GROOVY = 'groovy', + HASKELL = 'hs', + HTML = 'html', + JAVA = 'java', + JAVASCRIPT = 'js', + JPG = 'jpg', + JPEG = 'jpeg', + JSON = 'json', + JSX = 'jsx', + JULIA = 'jl', + KOTLIN = 'kt', + LOCKFILE = 'lock', + LUA = 'lua', + MARKDOWN = 'md', + NCL = 'ncl', + NIX = 'nix', + NPM = 'npmrc', + OCAML = 'ml', + PHP = 'php', + PERL = 'pl', + PERL_PM = 'pm', + PNG = 'png', + POWERSHELL_PS1 = 'ps1', + POWERSHELL_PSM1 = 'psm1', + PYTHON = 'py', + R = 'r', + R_CAP = 'R', + RUBY = 'rb', + RUST = 'rs', + SCALA = 'scala', + SASS = 'scss', + SQL = 'sql', + SVELTE = 'svelte', + SVG = 'svg', + SWIFT = 'swift', + TEST = 'test', + TYPESCRIPT = 'ts', + TSX = 'tsx', + TEXT = 'txt', + YAML = 'yaml', + YML = 'yml', + ZIG = 'zig', +} + +type CustomIcon = ComponentType<{ className?: string }> +interface IconInfo { + icon: CustomIcon + iconClass: string +} +/* + * We use the react-icons package instead of material design icons for two reasons: + * 1) Many of mdi's programming language icons will be deprecated soon. + * 2) They are missing quite a few icons that are needed when displaying file types. + */ +export const FILE_ICONS: Map = new Map([ + [FileExtension.ASSEMBLY, { icon: SiAssemblyscript, iconClass: styles.defaultIcon }], + [FileExtension.BASH, { icon: GoTerminal, iconClass: styles.defaultIcon }], + [FileExtension.BASIC, { icon: SiVisualbasic, iconClass: styles.defaultIcon }], + [FileExtension.C, { icon: SiC, iconClass: styles.blue }], + [FileExtension.CLOJURE_CLJ, { icon: SiClojure, iconClass: styles.blue }], + [FileExtension.CLOJURE_CLJC, { icon: SiClojure, iconClass: styles.blue }], + [FileExtension.CLOJURE_CLJR, { icon: SiClojure, iconClass: styles.blue }], + [FileExtension.CLOJURE_CLJS, { icon: SiClojure, iconClass: styles.blue }], + [FileExtension.CLOJURE_EDN, { icon: SiClojure, iconClass: styles.blue }], + [FileExtension.COFFEE, { icon: SiCoffeescript, iconClass: styles.defaultIcon }], + [FileExtension.CPP, { icon: SiCplusplus, iconClass: styles.blue }], + [FileExtension.CSHARP, { icon: SiCsharp, iconClass: styles.blue }], + [FileExtension.CSS, { icon: FaCss3Alt, iconClass: styles.blue }], + [FileExtension.DART, { icon: SiDart, iconClass: styles.blue }], + [FileExtension.DEFAULT, { icon: CiWarning, iconClass: styles.red }], + [FileExtension.DOCKERFILE, { icon: SiDocker, iconClass: styles.blue }], + [FileExtension.DOCKERIGNORE, { icon: SiDocker, iconClass: styles.blue }], + [FileExtension.FORTRAN_F, { icon: SiFortran, iconClass: styles.defaultIcon }], + [FileExtension.FORTRAN_FOR, { icon: SiFortran, iconClass: styles.defaultIcon }], + [FileExtension.FORTRAN_FTN, { icon: SiFortran, iconClass: styles.defaultIcon }], + [FileExtension.FSHARP, { icon: SiFsharp, iconClass: styles.blue }], + [FileExtension.FSI, { icon: SiFsharp, iconClass: styles.blue }], + [FileExtension.FSX, { icon: SiFsharp, iconClass: styles.blue }], + [FileExtension.GITIGNORE, { icon: SiGit, iconClass: styles.red }], + [FileExtension.GITATTRIBUTES, { icon: SiGit, iconClass: styles.red }], + [FileExtension.GO, { icon: SiGo, iconClass: styles.blue }], + [FileExtension.GOMOD, { icon: SiGo, iconClass: styles.pink }], + [FileExtension.GOSUM, { icon: SiGo, iconClass: styles.pink }], + [FileExtension.GROOVY, { icon: SiApachegroovy, iconClass: styles.blue }], + [FileExtension.GRAPHQL, { icon: SiGraphql, iconClass: styles.pink }], + [FileExtension.HASKELL, { icon: SiHaskell, iconClass: styles.blue }], + [FileExtension.HTML, { icon: SiHtml5, iconClass: styles.blue }], + [FileExtension.JAVA, { icon: FaJava, iconClass: styles.defaultIcon }], + [FileExtension.JAVASCRIPT, { icon: SiJavascript, iconClass: styles.yellow }], + [FileExtension.JPG, { icon: SiJpeg, iconClass: styles.yellow }], + [FileExtension.JPEG, { icon: SiJpeg, iconClass: styles.yellow }], + [FileExtension.JSX, { icon: SiReact, iconClass: styles.yellow }], + [FileExtension.JSON, { icon: VscJson, iconClass: styles.defaultIcon }], + [FileExtension.JULIA, { icon: SiJulia, iconClass: styles.defaultIcon }], + [FileExtension.KOTLIN, { icon: SiKotlin, iconClass: styles.green }], + [FileExtension.LOCKFILE, { icon: VscJson, iconClass: styles.defaultIcon }], + [FileExtension.LUA, { icon: SiLua, iconClass: styles.blue }], + [FileExtension.MARKDOWN, { icon: SiMarkdown, iconClass: styles.blue }], + [FileExtension.NCL, { icon: CiSettings, iconClass: styles.defaultIcon }], + [FileExtension.NIX, { icon: SiNixos, iconClass: styles.gray }], + [FileExtension.NPM, { icon: SiNpm, iconClass: styles.red }], + [FileExtension.OCAML, { icon: SiOcaml, iconClass: styles.yellow }], + [FileExtension.PHP, { icon: SiPhp, iconClass: styles.cyan }], + [FileExtension.PERL, { icon: SiPerl, iconClass: styles.defaultIcon }], + [FileExtension.PERL_PM, { icon: SiPerl, iconClass: styles.defaultIcon }], + [FileExtension.PNG, { icon: PiFilePngLight, iconClass: styles.defaultIcon }], + [FileExtension.POWERSHELL_PS1, { icon: GoTerminal, iconClass: styles.defaultIcon }], + [FileExtension.POWERSHELL_PSM1, { icon: GoTerminal, iconClass: styles.defaultIcon }], + [FileExtension.PYTHON, { icon: SiPython, iconClass: styles.blue }], + [FileExtension.R, { icon: SiR, iconClass: styles.red }], + [FileExtension.R_CAP, { icon: SiR, iconClass: styles.red }], + [FileExtension.RUBY, { icon: SiRuby, iconClass: styles.red }], + [FileExtension.RUST, { icon: SiRust, iconClass: styles.defaultIcon }], + [FileExtension.SCALA, { icon: SiScala, iconClass: styles.red }], + [FileExtension.SASS, { icon: FaSass, iconClass: styles.pink }], + [FileExtension.SQL, { icon: GoDatabase, iconClass: styles.blue }], + [FileExtension.SVELTE, { icon: SiSvelte, iconClass: styles.red }], + [FileExtension.SVG, { icon: SiSvg, iconClass: styles.blue }], + [FileExtension.SWIFT, { icon: SiSwift, iconClass: styles.blue }], + [FileExtension.TYPESCRIPT, { icon: SiTypescript, iconClass: styles.blue }], + [FileExtension.TSX, { icon: SiReact, iconClass: styles.blue }], + [FileExtension.TEXT, { icon: CiTextAlignLeft, iconClass: styles.defaultIcon }], + [FileExtension.YAML, { icon: CiSettings, iconClass: styles.defaultIcon }], + [FileExtension.YML, { icon: CiSettings, iconClass: styles.defaultIcon }], + [FileExtension.ZIG, { icon: SiZig, iconClass: styles.yellow }], +]) diff --git a/client/web/src/repo/settings/sidebaritems.ts b/client/web/src/repo/settings/sidebaritems.ts index 19121dfb389b5..b8dea44faa872 100644 --- a/client/web/src/repo/settings/sidebaritems.ts +++ b/client/web/src/repo/settings/sidebaritems.ts @@ -15,6 +15,16 @@ export const settingsGroup = { exact: true, label: 'Search Indexing', }, + { + to: '/logs', + exact: true, + label: 'Logs', + }, + { + to: '/permissions', + exact: true, + label: 'Repo Permissions', + }, ], } diff --git a/client/web/src/repo/tree/TreePage.tsx b/client/web/src/repo/tree/TreePage.tsx index 0a48653e2cd0c..c4c32d6b5f68f 100644 --- a/client/web/src/repo/tree/TreePage.tsx +++ b/client/web/src/repo/tree/TreePage.tsx @@ -18,7 +18,7 @@ import { Navigate } from 'react-router-dom' import { catchError } from 'rxjs/operators' import { asError, encodeURIPathComponent, type ErrorLike, isErrorLike, logger, basename } from '@sourcegraph/common' -import { gql } from '@sourcegraph/http-client' +import { gql, useQuery } from '@sourcegraph/http-client' import { fetchTreeEntries } from '@sourcegraph/shared/src/backend/repo' import { displayRepoName } from '@sourcegraph/shared/src/components/RepoLink' import type { ExtensionsControllerProps } from '@sourcegraph/shared/src/extensions/controller' @@ -49,7 +49,7 @@ import type { CodeIntelligenceProps } from '../../codeintel' import { isCodyEnabled } from '../../cody/isCodyEnabled' import type { BreadcrumbSetters } from '../../components/Breadcrumbs' import { PageTitle } from '../../components/PageTitle' -import type { RepositoryFields } from '../../graphql-operations' +import type { FileCommitsResult, FileCommitsVariables, RepositoryFields } from '../../graphql-operations' import type { SourcegraphContext } from '../../jscontext' import type { OwnConfigProps } from '../../own/OwnConfigProps' import { TryCodyWidget } from '../components/TryCodyWidget/TryCodyWidget' @@ -57,9 +57,26 @@ import { FilePathBreadcrumbs } from '../FilePathBreadcrumbs' import { isPackageServiceType } from '../packages/isPackageServiceType' import { TreePageContent } from './TreePageContent' +import { treeHistoryFragment } from './TreePagePanels' import styles from './TreePage.module.scss' +const FILE_COMMITS_QUERY = gql` + ${treeHistoryFragment} + query FileCommits($repoName: String!, $revision: String!, $filePath: String!, $first: Int) { + repository(name: $repoName) { + id + commit(rev: $revision) { + id + tree(path: $filePath) { + entries(first: $first) { + ...TreeHistoryFields + } + } + } + } + } +` export interface Props extends SettingsCascadeProps, ExtensionsControllerProps, @@ -119,7 +136,6 @@ export const TreePage: FC = ({ () => isPackageServiceType(repo?.externalRepository.serviceType), [repo?.externalRepository.serviceType] ) - useEffect(() => { if (isRoot) { props.telemetryService.logViewEvent('Repository') @@ -166,6 +182,16 @@ export const TreePage: FC = ({ ) ) + const { data: fileCommitData } = useQuery(FILE_COMMITS_QUERY, { + variables: { + repoName, + revision, + filePath, + first: 2500, + }, + }) + const treeWithHistory = fileCommitData?.repository?.commit?.tree?.entries + const showCodeInsights = !isErrorLike(settingsCascade.final) && !!settingsCascade.final?.experimentalFeatures?.codeInsights && @@ -402,6 +428,7 @@ export const TreePage: FC = ({ ['commit']>['ancestors'] - externalURLs: Extract['externalURLs'] -} - -export const fetchCommit = (args: { - repo: Scalars['String'] - revspec: Scalars['String'] - beforespec: Scalars['String'] | null -}): Observable => - requestGraphQL( - gql` - query CommitAtTime($repo: String!, $revspec: String!, $beforespec: String) { - repository(name: $repo) { - commit(rev: $revspec) { - ancestors(first: 1, before: $beforespec) { - nodes { - ...GitCommitFields - } - } - } - } - } - ${gitCommitFragment} - `, - args - ).pipe( - map(dataOrThrowErrors), - map(data => { - const nodes = data.repository?.commit?.ancestors.nodes - if (!nodes || nodes.length === 0) { - throw new Error(`no commit found before ${args.beforespec} from revspec ${args.revspec}`) - } - return nodes[0] - }) - ) - -export const fetchDiffStats = (args: { - repo: Scalars['String'] - revspec: Scalars['String'] - beforespec: Scalars['String'] - filePath: Scalars['String'] -}): Observable => - fetchCommit({ - repo: args.repo, - revspec: args.revspec, - beforespec: null, - }).pipe( - switchMap(headCommit => { - const headDate = new Date(Date.parse(headCommit.author.date)) - const absBeforespec = `${headDate.getUTCFullYear()}-${ - headDate.getUTCMonth() + 1 - }-${headDate.getUTCDate()} ${args.beforespec}` - return fetchCommit({ - repo: args.repo, - revspec: args.revspec, - beforespec: absBeforespec, - }) - }), - switchMap((base: GitCommitFields) => - requestGraphQL( - gql` - query DiffSince($repo: String!, $basespec: String!, $headspec: String!, $filePath: String!) { - repository(name: $repo) { - comparison(base: $basespec, head: $headspec) { - fileDiffs(paths: [$filePath]) { - nodes { - newPath - stat { - added - deleted - } - } - } - } - } - } - `, - { - repo: args.repo, - basespec: base.oid, - headspec: args.revspec, - filePath: args.filePath, - } - ) - ), - map(dataOrThrowErrors), - map( - (data): DiffStat[] => - data.repository?.comparison.fileDiffs.nodes - ?.filter(node => node.newPath) - .map(node => ({ - path: node.newPath!, - ...node.stat, - })) || [] - ), - map((fileDiffStats: DiffStat[]) => { - const aggregatedDiffStats: { [path: string]: DiffStat } = {} - for (const diffStat of fileDiffStats) { - // strip filePath prefix from fileDiffStat.path - const strippedPath = - args.filePath === '.' ? diffStat.path : diffStat.path.slice(args.filePath.length + 1) - let subdirName = strippedPath - if (subdirName.includes('/')) { - subdirName = subdirName.slice(0, subdirName.indexOf('/')) - } - if (!aggregatedDiffStats[subdirName]) { - aggregatedDiffStats[subdirName] = { path: subdirName, added: 0, deleted: 0 } - } - aggregatedDiffStats[subdirName].added += diffStat.added - aggregatedDiffStats[subdirName].deleted += diffStat.deleted - } - return Array.from(Object.values(aggregatedDiffStats)) - }), - catchError(() => []) // ignore errors - ) - const ExtraInfoSectionItem: React.FunctionComponent> = ({ children }) => (
    {children}
    ) @@ -271,6 +141,7 @@ const ExtraInfoSection: React.FC<{ interface TreePageContentProps extends ExtensionsControllerProps, TelemetryProps, PlatformContextProps { filePath: string tree: TreeFields + treeWithHistory?: TreeHistoryFields[] repo: TreePageRepositoryFields commitID: string revision: string @@ -279,7 +150,7 @@ interface TreePageContentProps extends ExtensionsControllerProps, TelemetryProps } export const TreePageContent: React.FunctionComponent> = props => { - const { filePath, tree, repo, revision, isPackage } = props + const { filePath, tree, treeWithHistory, repo, revision, isPackage } = props const isRoot = filePath === '' @@ -293,19 +164,6 @@ export const TreePageContent: React.FunctionComponent() - useEffect(() => { - const subscription = fetchDiffStats({ - repo: repo.name, - revspec: revision, - beforespec: '1 month', - filePath: filePath || '.', - }).subscribe(results => { - setDiffStats(results) - }) - return () => subscription.unsubscribe() - }, [repo.name, revision, filePath]) - const [enableOwnershipPanels] = useFeatureFlag('enable-ownership-panels', true) const hasRepoMetaWritePermissions = canWriteRepoMetadata(props.authenticatedUser) @@ -331,16 +189,7 @@ export const TreePageContent: React.FunctionComponent )}
    - - - {!isPackage && ( - - - {capitalize(pluralize(getRefType(repo.sourceType), 0))} - - - - )} + {!isPackage && (
    @@ -702,108 +551,3 @@ const RepositoryContributorNode: React.FC = ({ ) } - -const COMMITS_QUERY = gql` - query TreeCommits($repo: ID!, $revspec: String!, $first: Int, $filePath: String, $after: String) { - node(id: $repo) { - __typename - ... on Repository { - sourceType - externalURLs { - url - serviceKind - } - commit(rev: $revspec) { - ancestors(first: $first, path: $filePath, after: $after) { - nodes { - ...GitCommitFields - } - pageInfo { - hasNextPage - } - } - } - } - } - } - ${gitCommitFragment} -` - -interface CommitsProps extends TreePageContentProps {} - -const Commits: React.FC = ({ repo, revision, filePath, tree }) => { - const after: string = useMemo(() => formatISO(subYears(Date.now(), 1)), []) - const { data, error, loading } = useQuery(COMMITS_QUERY, { - variables: { - first: COUNT, - repo: repo.id, - revspec: revision || '', - after, - filePath, - }, - errorPolicy: 'all', - }) - - const node = data?.node && data?.node.__typename === 'Repository' ? data.node : null - const connection = node?.commit?.ancestors - - const revisionType = - isPerforceChangelistMappingEnabled() && node?.sourceType === RepositoryType.PERFORCE_DEPOT - ? '/-/changelists' - : '/-/commits' - - let revisionURL = tree.url - if (tree.url.includes('/-/tree')) { - revisionURL = revisionURL.replace('/-/tree', revisionType) - } else { - revisionURL = revisionURL + revisionType - } - - return ( - - {error && } - {connection && connection.nodes.length > 0 && ( - - - {connection.nodes.map(node => ( - - ))} - - - )} - {loading && ( -
    - -
    - )} - - {connection && ( - <> - - - {connection.nodes.length > 0 ? ( - <> - Showing last {connection.nodes.length}{' '} - {pluralize(getRefType(node.sourceType), connection.nodes.length)} of the past - year - - ) : ( - <>No {pluralize(getRefType(node.sourceType), 0)} in the past year - )} - - - - Show {connection.pageInfo.hasNextPage ? 'more' : 'all'} - - - )} - -     - ) -} diff --git a/client/web/src/repo/tree/TreePagePanels.module.scss b/client/web/src/repo/tree/TreePagePanels.module.scss index 51ed930ef1364..30240b5f504e2 100644 --- a/client/web/src/repo/tree/TreePagePanels.module.scss +++ b/client/web/src/repo/tree/TreePagePanels.module.scss @@ -48,69 +48,51 @@ } } -.file-item { - border-bottom: 1px solid var(--border-color); - - &:last-child { - border-bottom: none; +table.files { + width: 100%; + table-layout: fixed; + border-collapse: separate; + border-spacing: 0; + margin-bottom: 0; + // This is necessary to override the 'display:' property set by + // the Card component. + display: table; + + th { + padding: 0.5rem; + font-weight: normal; + box-sizing: content-box; } -} - -.card-col-header { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} - -.bar-svg { - border-radius: 5px; -} - -.diff-stat-added { - fill: var(--diff-add-fg); -} -.diff-stat-deleted { - fill: var(--diff-remove-fg); -} - -.meter-container { - padding-top: 0.125rem; -} - -.tree-entry { - display: block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - margin-left: -0.25rem; - margin-right: -0.25rem; - padding: 0.125rem 0.25rem; - - break-inside: avoid-column; + td { + padding: 0.5rem; + } - &:hover { - background-color: var(--color-bg-1); + .file-name-column { + width: 30%; } - &--no-columns { - max-width: 18rem; + .commit-date-column { + /* stylelint-disable-next-line declaration-property-unit-allowed-list */ + width: 120px; } -} -.sort-dsc-icon { - padding: 0; - margin: -0.125rem 0 0 0; - color: var(--icon-muted); -} + th, + .file-name, + .commit-message, + .commit-date { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + max-width: 100%; + } -.sort-asc-icon { - padding: 0; - margin: -0.625rem 0 0 0; - color: var(--icon-muted); -} + .commit-date, + .commit-date-column { + text-align: right; + } -.sort-selected-icon { - color: var(--icon-color); + tbody td { + border-top: 1px solid var(--border-color); + } } diff --git a/client/web/src/repo/tree/TreePagePanels.tsx b/client/web/src/repo/tree/TreePagePanels.tsx index b4ce755669d15..d93c97a47ece1 100644 --- a/client/web/src/repo/tree/TreePagePanels.tsx +++ b/client/web/src/repo/tree/TreePagePanels.tsx @@ -1,10 +1,12 @@ -import React, { type FC, useCallback, useRef, useState, useMemo, useEffect } from 'react' +import React, { type FC, useRef, useState, useEffect, useMemo } from 'react' -import { mdiFileDocumentOutline, mdiFolderOutline, mdiMenuDown, mdiMenuUp } from '@mdi/js' +import { mdiFileDocumentOutline, mdiFolderOutline } from '@mdi/js' import classNames from 'classnames' +import { Timestamp } from '@sourcegraph/branded/src/components/Timestamp' import { NoopEditor } from '@sourcegraph/cody-shared/dist/editor' -import { basename, dirname } from '@sourcegraph/common' +import { basename } from '@sourcegraph/common' +import { gql } from '@sourcegraph/http-client' import type { TreeFields } from '@sourcegraph/shared/src/graphql-operations' import { Card, @@ -14,20 +16,45 @@ import { Link, LinkOrSpan, LoadingSpinner, - ParentSize, - StackedMeter, - Tooltip, useElementObscuredArea, } from '@sourcegraph/wildcard' import { FileContentEditor } from '../../cody/components/FileContentEditor' import { useCodySidebar } from '../../cody/sidebar/Provider' -import type { BlobFileFields } from '../../graphql-operations' +import type { BlobFileFields, TreeHistoryFields } from '../../graphql-operations' import { fetchBlob } from '../blob/backend' import { RenderedFile } from '../blob/RenderedFile' +import { CommitMessageWithLinks } from '../commit/CommitMessageWithLinks' +import { FILE_ICONS, FileExtension } from '../constants' +import { getFileInfo } from '../utils' import styles from './TreePagePanels.module.scss' +export const treeHistoryFragment = gql` + fragment TreeHistoryFields on TreeEntry { + path + history(first: 1) { + nodes { + commit { + id + canonicalURL + subject + author { + date + } + committer { + date + } + externalURLs { + url + serviceKind + } + } + } + } + } +` + interface ReadmePreviewCardProps { entry: TreeFields['entries'][number] repoName: string @@ -122,284 +149,101 @@ export interface DiffStat { } export interface FilePanelProps { - entries: Pick[] - diffStats?: DiffStat[] + entries: Pick[] + historyEntries?: TreeHistoryFields[] className?: string - filePath: string } -export const FilesCard: FC = props => { - const { entries, diffStats, className, filePath } = props - - const entriesWithSingleChildExpanded = useMemo( - () => - entries.flatMap((entry, index) => { - // The GraphQL query with "recurse single child" will return entries - // that are not in the current directory. We filter them out for the - // view here. - let parentDir = dirname(entry.path) - if (parentDir === '.') { - parentDir = '' - } - if (parentDir !== filePath) { - return [] - } - - // Single child nodes may be expanded so we can skip over them more - // efficiently. - if (entry.isSingleChild) { - // Find the entry before the one that is no longer a single child - // and add this to the list of entries to render instead of the - // entry. - let idx - for (idx = index; idx < entries.length && entries[idx].isSingleChild; idx++) { - // Do nothing - } - if (idx > index && idx < entries.length && idx > 1) { - const lastSingleChild = entries[idx - 1] - return [lastSingleChild] - } - } - - return [entry] - }), - [entries, filePath] - ) - - const [sortColumn, setSortColumn] = useState<{ - column: 'Files' | 'Activity' - direction: 'asc' | 'desc' - }>({ column: 'Files', direction: 'asc' }) - - const diffStatsByPath: { [path: string]: DiffStat } = {} - let maxLinesChanged = 1 - if (diffStats) { - for (const diffStat of diffStats) { - if (diffStat.added + diffStat.deleted > maxLinesChanged) { - maxLinesChanged = diffStat.added + diffStat.deleted - } - diffStatsByPath[diffStat.path] = diffStat - } - } - - let sortedEntries = [...entriesWithSingleChildExpanded] - const { column, direction } = sortColumn - switch (column) { - case 'Files': { - if (direction === 'desc') { - sortedEntries.reverse() - } - break +export const FilesCard: FC = ({ entries, historyEntries, className }) => { + const hasHistoryEntries = historyEntries && historyEntries.length > 0 + const fileHistoryByPath = useMemo(() => { + const fileHistoryByPath: Record = {} + for (const entry of historyEntries || []) { + fileHistoryByPath[entry.path] = entry.history.nodes[0].commit } - case 'Activity': { - sortedEntries = [...entriesWithSingleChildExpanded] - if (diffStats) { - sortedEntries.sort((entry1, entry2) => { - const stats1: DiffStat = diffStatsByPath[entry1.name] - const stats2: DiffStat = diffStatsByPath[entry2.name] - let difference = - (stats2 ? stats2.added + stats2.deleted : 0) - (stats1 ? stats1.added + stats1.deleted : 0) - if (direction === 'desc') { - difference *= -1 - } - return difference - }) - } - break - } - } - - const sortCallback = useCallback( - (column: 'Files' | 'Activity'): void => { - if (sortColumn.column === column && sortColumn.direction === 'asc') { - setSortColumn({ column, direction: 'desc' }) - } else { - setSortColumn({ column, direction: 'asc' }) - } - }, - [sortColumn] - ) - const clickFiles = useCallback(() => sortCallback('Files'), [sortCallback]) - const keydownFiles = useCallback( - ({ key }: React.KeyboardEvent) => key === 'Enter' && sortCallback('Files'), - [sortCallback] - ) - const clickActivity = useCallback(() => sortCallback('Activity'), [sortCallback]) - const keydownActivity = useCallback( - ({ key }: React.KeyboardEvent) => key === 'Enter' && sortCallback('Activity'), - [sortCallback] - ) - - interface Datum { - name: 'deleted' | 'added' - value: number - className: string - } - - const getDatumValue = useCallback((datum: Datum) => datum.value, []) - const getDatumName = useCallback((datum: Datum) => datum.name, []) - const getDatumClassName = useCallback((datum: Datum) => datum.className, []) + return fileHistoryByPath + }, [historyEntries]) return ( - - -
    -
    -
    - Files -
    - - -
    -
    -
    -
    - + + + File + {hasHistoryEntries && ( + <> + Last commit message + Last commit date + + )} + + + + {entries.map(entry => { + const fileInfo = getFileInfo(entry.name, entry.isDirectory) + const fileIcon = FILE_ICONS.get(fileInfo.extension) + + return ( + + + - -
    - Recent activity -
    -
    -
    -     -
    - {sortedEntries.map(entry => ( -
    -
    - -
    - + {fileInfo.extension !== FileExtension.DEFAULT ? ( + + ) : ( - { - // In case of single child expansion, we need to get the name relative to - // the start of the directory (to include subdirectories) - } - {entry.isSingleChild && filePath !== '' - ? entry.path.slice(filePath.length + 1) - : entry.name} - {entry.isDirectory && '/'} - -
    -     -
    -
    - {diffStatsByPath[entry.name] && ( - -
    - - {({ width }) => ( - - )} - -
    -     + )} + {entry.name} + {entry.isDirectory && '/'} + + + {fileHistoryByPath[entry.path] && ( + <> + + + + + + + + + )} -
    -
    - ))} -
    + + ) + })} +     ) } + +function getCommitDate(commit: { author: { date: string }; committer?: { date: string } | null }): string { + return commit.committer ? commit.committer.date : commit.author.date +} diff --git a/client/web/src/repo/utils.test.ts b/client/web/src/repo/utils.test.ts index e8b3cc77ae74e..dff6675d4b99f 100644 --- a/client/web/src/repo/utils.test.ts +++ b/client/web/src/repo/utils.test.ts @@ -1,6 +1,99 @@ import { describe, expect, it } from 'vitest' -import { getInitialSearchTerm } from './utils' +import { FileExtension } from './constants' +import { containsTest, getFileInfo, getInitialSearchTerm } from './utils' + +describe('containsTest', () => { + const tests: { + name: string + file: string + expected: boolean + }[] = [ + { + name: 'returns true if "test_" exists in file name', + file: 'test_myfile.go', + expected: true, + }, + { + name: 'returns true if "_test" exists in file name', + file: 'myfile_test.go', + expected: true, + }, + { + name: 'returns true if "_spec" exists in file name', + file: 'myfile_spec.go', + expected: true, + }, + { + name: 'returns true if "spec_" exists in file name', + file: 'spec_myfile.go', + expected: true, + }, + { + name: 'works with sub-extensions', + file: 'myreactcomponent.test.tsx', + expected: true, + }, + { + name: 'returns false if not a test file', + file: 'mytestcomponent.java', + expected: false, + }, + ] + + for (const t of tests) { + it(t.name, () => { + expect(containsTest(t.file)).toBe(t.expected) + }) + } +}) + +describe('getFileInfo', () => { + const tests: { + name: string + file: string + isDirectory: boolean + expectedExtension: FileExtension + expectedIsTest: boolean + }[] = [ + { + name: 'works with simple file name', + file: 'my-file.js', + isDirectory: false, + expectedExtension: 'js' as FileExtension, + expectedIsTest: false, + }, + { + name: 'works with complex file name', + file: 'my-file.module.scss', + isDirectory: false, + expectedExtension: 'scss' as FileExtension, + expectedIsTest: false, + }, + { + name: 'returns isTest as true if file name contains test', + file: 'my-file.test.tsx', + isDirectory: false, + expectedExtension: 'tsx' as FileExtension, + expectedIsTest: true, + }, + { + name: 'returns isTest as true if file name contains test', + file: '.eslintrc', + isDirectory: false, + expectedExtension: 'default' as FileExtension, + expectedIsTest: false, + }, + ] + + for (const t of tests) { + it(t.name, () => { + const fileInfo = getFileInfo(t.file, t.isDirectory) + expect(fileInfo.extension).toBe(t.expectedExtension) + expect(fileInfo.isTest).toBe(t.expectedIsTest) + }) + } +}) describe('getInitialSearchTerm', () => { const tests: { diff --git a/client/web/src/repo/utils.tsx b/client/web/src/repo/utils.tsx index 3d9eff23687b6..3f8a773027306 100644 --- a/client/web/src/repo/utils.tsx +++ b/client/web/src/repo/utils.tsx @@ -1,6 +1,6 @@ import { type GitCommitFields, RepositoryType } from '../graphql-operations' -import { CodeHostType } from './constants' +import { CodeHostType, FileExtension } from './constants' export const isPerforceChangelistMappingEnabled = (): boolean => window.context.experimentalFeatures.perforceChangelistMapping === 'enabled' @@ -45,3 +45,49 @@ export const stringToCodeHostType = (codeHostType: string): CodeHostType => { } } } + +export interface FileInfo { + extension: FileExtension + isTest: boolean +} + +export const getFileInfo = (file: string, isDirectory: boolean): FileInfo => { + if (isDirectory) { + return { + extension: 'default' as FileExtension, + isTest: false, + } + } + + const extension = file.split('.').at(-1) + const isValidExtension = Object.values(FileExtension).includes(extension as FileExtension) + + if (extension && isValidExtension) { + return { + extension: extension as FileExtension, + isTest: containsTest(file), + } + } + + return { + extension: 'default' as FileExtension, + isTest: false, + } +} + +export const containsTest = (file: string): boolean => { + const f = file.split('.') + // To account for other test file path structures + // adjust this regular expression. + const isTest = /^(test|spec|tests)(\b|_)|(\b|_)(test|spec|tests)$/ + + for (const i of f) { + if (i === 'test') { + return true + } + if (isTest.test(i)) { + return true + } + } + return false +} diff --git a/client/web/src/routes.constants.ts b/client/web/src/routes.constants.ts index 909d20e80b951..5917c05778ef9 100644 --- a/client/web/src/routes.constants.ts +++ b/client/web/src/routes.constants.ts @@ -38,6 +38,8 @@ export enum PageRoutes { SearchNotebook = '/search/notebook', CodySearch = '/search/cody', Cody = '/cody/chat', + CodyManagement = '/cody/manage', + CodySubscription = '/cody/subscription', Own = '/own', AppAuthCallback = '/app/auth/callback', AppSetup = '/app-setup', diff --git a/client/web/src/routes.tsx b/client/web/src/routes.tsx index 78a94fccf5b77..feef0f9757dd6 100644 --- a/client/web/src/routes.tsx +++ b/client/web/src/routes.tsx @@ -62,6 +62,11 @@ const SearchContextPage = lazyComponent( ) const CodySearchPage = lazyComponent(() => import('./cody/search/CodySearchPage'), 'CodySearchPage') const CodyChatPage = lazyComponent(() => import('./cody/chat/CodyChatPage'), 'CodyChatPage') +const CodyManagementPage = lazyComponent(() => import('./cody/management/CodyManagementPage'), 'CodyManagementPage') +const CodySubscriptionPage = lazyComponent( + () => import('./cody/subscription/CodySubscriptionPage'), + 'CodySubscriptionPage' +) const OwnPage = lazyComponent(() => import('./enterprise/own/OwnPage'), 'OwnPage') const AppAuthCallbackPage = lazyComponent(() => import('./enterprise/app/AppAuthCallbackPage'), 'AppAuthCallbackPage') const AppSetup = lazyComponent(() => import('./enterprise/app/setup/AppSetupWizard'), 'AppSetupWizard') @@ -190,6 +195,14 @@ export const routes: RouteObject[] = [ path: PageRoutes.Cody + '/*', element: } />, }, + { + path: PageRoutes.CodyManagement, + element: } />, + }, + { + path: PageRoutes.CodySubscription, + element: } />, + }, { path: PageRoutes.Own, element: , diff --git a/client/web/src/savedSearches/SavedSearchModal.tsx b/client/web/src/savedSearches/SavedSearchModal.tsx index e40fca2845dc9..cf1c384d3b4d9 100644 --- a/client/web/src/savedSearches/SavedSearchModal.tsx +++ b/client/web/src/savedSearches/SavedSearchModal.tsx @@ -11,7 +11,7 @@ import type { AuthenticatedUser } from '../auth' import styles from './SavedSearchModal.module.scss' interface Props extends SearchPatternTypeProps { - authenticatedUser: AuthenticatedUser | null + authenticatedUser: Pick | null query?: string onDidCancel: () => void navigate: NavigateFunction diff --git a/client/web/src/search/SearchConsolePage.tsx b/client/web/src/search/SearchConsolePage.tsx index 114fb0d64f495..6fcab1e6f0a8d 100644 --- a/client/web/src/search/SearchConsolePage.tsx +++ b/client/web/src/search/SearchConsolePage.tsx @@ -132,6 +132,7 @@ export const SearchConsolePage: React.FunctionComponent ))}
    diff --git a/client/web/src/search/autocompletion/sources.ts b/client/web/src/search/autocompletion/sources.ts index 0cfe9a1894856..2a4fa05321a33 100644 --- a/client/web/src/search/autocompletion/sources.ts +++ b/client/web/src/search/autocompletion/sources.ts @@ -2,7 +2,7 @@ import { Fzf, type FzfOptions, type FzfResultItem } from 'fzf' import { gql } from '@sourcegraph/http-client' -import type { SuggestionsRepoResult, SuggestionsRepoVariables } from '../../graphql-operations' +import type { AutocompleteRepoResult, AutocompleteRepoVariables } from '../../graphql-operations' import { CachedAsyncCompletionSource } from './source' @@ -12,7 +12,7 @@ interface Repo { } const REPOS_QUERY = gql` - query SuggestionsRepo($query: String!) { + query AutocompleteRepo($query: String!) { search(patternType: regexp, query: $query) { results { repositories { @@ -39,7 +39,7 @@ const repoFzfOptions: FzfOptions = { const cleanRegex = (value: string): string => value.replaceAll(/^\^|\\\.|\$$/g, '') export function createRepositoryCompletionSource( - request: RequestGraphQL, + request: RequestGraphQL, dataCacheKey?: (...args: ExtraArgs) => string ): CachedAsyncCompletionSource, ExtraArgs> { return new CachedAsyncCompletionSource({ diff --git a/client/web/src/search/index.ts b/client/web/src/search/index.ts index fe1bb615a948c..7ff6b8d4d4550 100644 --- a/client/web/src/search/index.ts +++ b/client/web/src/search/index.ts @@ -42,6 +42,7 @@ export function parseSearchURLPatternType(query: string): SearchPatternType | un case SearchPatternType.regexp: case SearchPatternType.structural: case SearchPatternType.lucky: + case SearchPatternType.newStandardRC1: case SearchPatternType.keyword: { return patternType } diff --git a/client/web/src/search/input/SearchNavbarItem.tsx b/client/web/src/search/input/SearchNavbarItem.tsx index d72dd742b37d9..24d931d9d84fb 100644 --- a/client/web/src/search/input/SearchNavbarItem.tsx +++ b/client/web/src/search/input/SearchNavbarItem.tsx @@ -11,6 +11,7 @@ import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetry import { Form } from '@sourcegraph/wildcard' import type { AuthenticatedUser } from '../../auth' +import { useFeatureFlag } from '../../featureFlags/useFeatureFlag' import { useNavbarQueryState, setSearchCaseSensitivity } from '../../stores' import { type NavbarQueryState, setSearchMode, setSearchPatternType } from '../../stores/navbarSearchQueryState' import { useV2QueryInput } from '../useV2QueryInput' @@ -77,6 +78,12 @@ export const SearchNavbarItem: React.FunctionComponent diff --git a/client/web/src/search/input/suggestions.ts b/client/web/src/search/input/suggestions.ts index ef861ccc76144..a19191311c521 100644 --- a/client/web/src/search/input/suggestions.ts +++ b/client/web/src/search/input/suggestions.ts @@ -83,11 +83,13 @@ function contextTiebraker(a: { item: Context }, b: { item: Context }): number { return (b.item.starred || b.item.default ? 1 : 0) - (a.item.starred || a.item.default ? 1 : 0) } +// `id` is used as cache key const REPOS_QUERY = gql` query SuggestionsRepo($query: String!) { search(patternType: regexp, query: $query) { results { repositories { + id name stars } @@ -96,6 +98,7 @@ const REPOS_QUERY = gql` } ` +// `canonicalURL` is used as cache key const FILE_QUERY = gql` query SuggestionsFile($query: String!) { search(patternType: regexp, query: $query) { @@ -106,6 +109,7 @@ const FILE_QUERY = gql` file { path url + canonicalURL repository { name stars @@ -118,6 +122,7 @@ const FILE_QUERY = gql` } ` +// `canonicalURL` is used as cache key const SYMBOL_QUERY = gql` query SuggestionsSymbol($query: String!) { search(patternType: regexp, query: $query) { @@ -127,10 +132,12 @@ const SYMBOL_QUERY = gql` __typename file { path + canonicalURL } symbols { kind url + canonicalURL name } } @@ -163,6 +170,7 @@ const SEARCH_CONTEXT_QUERY = gql` ` interface Repo { + id: string name: string stars: number } diff --git a/client/web/src/search/results/CreateActions.module.scss b/client/web/src/search/results/CreateActions.module.scss deleted file mode 100644 index 716f997747502..0000000000000 --- a/client/web/src/search/results/CreateActions.module.scss +++ /dev/null @@ -1,14 +0,0 @@ -$collapse-breakpoint: 1400px; - -.button { - // Adapted from client/wildcard/src/global-styles/breakpoints.scss. - @media (max-width: #{$collapse-breakpoint - .02}) { - display: none; - } -} - -.menu { - @media (min-width: $collapse-breakpoint) { - display: none; - } -} diff --git a/client/web/src/search/results/CreateActionsMenu.tsx b/client/web/src/search/results/CreateActionsMenu.tsx deleted file mode 100644 index 9560e4d79439b..0000000000000 --- a/client/web/src/search/results/CreateActionsMenu.tsx +++ /dev/null @@ -1,84 +0,0 @@ -import React from 'react' - -import { mdiPlus } from '@mdi/js' -import classNames from 'classnames' - -import { Position, Menu, MenuButton, MenuList, MenuLink, Icon, Link, Tooltip } from '@sourcegraph/wildcard' - -import type { AuthenticatedUser } from '../../auth' - -import type { CreateAction } from './createActions' - -import createActionsStyles from './CreateActions.module.scss' -import navStyles from './SearchResultsInfoBar.module.scss' - -export interface CreateActionsMenuProps { - createActions: CreateAction[] - createCodeMonitorAction: CreateAction | null - canCreateMonitor: boolean - authenticatedUser: Pick | null -} - -export const CreateActionsMenu: React.FunctionComponent = ({ - createActions, - createCodeMonitorAction, - canCreateMonitor, - authenticatedUser, -}) => ( - - {({ isExpanded }) => ( - <> -
  • - - - Create … - -
    • - - {createActions.map(createAction => ( - - - ))} - {createCodeMonitorAction && ( - - - - Create Monitor - - - )} - - - )} -     -) diff --git a/client/web/src/search/results/StreamingSearchResults.story.tsx b/client/web/src/search/results/StreamingSearchResults.story.tsx index aec9c2652c63d..b84344a06e612 100644 --- a/client/web/src/search/results/StreamingSearchResults.story.tsx +++ b/client/web/src/search/results/StreamingSearchResults.story.tsx @@ -45,7 +45,7 @@ const defaultProps: StreamingSearchResultsProps = { subjects: null, final: null, }, - platformContext: { settings: NEVER, requestGraphQL: () => EMPTY, sourcegraphURL: 'https://sourcegraph.com' }, + platformContext: { settings: NEVER, requestGraphQL: () => EMPTY, sourcegraphURL: 'https://sourcegraph.com' } as any, streamSearch: () => of(streamingSearchResult), @@ -55,6 +55,7 @@ const defaultProps: StreamingSearchResultsProps = { searchAggregationEnabled: true, codeMonitoringEnabled: true, ownEnabled: true, + extensionsController: {} as any, } const decorator: Decorator = Story => { diff --git a/client/web/src/search/results/StreamingSearchResults.test.tsx b/client/web/src/search/results/StreamingSearchResults.test.tsx index 68e49b4689fdf..2e8b2535219fe 100644 --- a/client/web/src/search/results/StreamingSearchResults.test.tsx +++ b/client/web/src/search/results/StreamingSearchResults.test.tsx @@ -42,7 +42,11 @@ describe('StreamingSearchResults', () => { subjects: null, final: null, }, - platformContext: { settings: NEVER, requestGraphQL: () => EMPTY, sourcegraphURL: 'https://sourcegraph.com' }, + platformContext: { + settings: NEVER, + requestGraphQL: () => EMPTY, + sourcegraphURL: 'https://sourcegraph.com', + } as any, streamSearch: () => of(MULTIPLE_SEARCH_RESULT), @@ -52,6 +56,7 @@ describe('StreamingSearchResults', () => { searchAggregationEnabled: false, codeMonitoringEnabled: true, ownEnabled: true, + extensionsController: {} as any, } const revisionsMockResponses = generateMockedResponses(GitRefType.GIT_BRANCH, 5, 'github.com/golang/oauth2') diff --git a/client/web/src/search/results/StreamingSearchResults.tsx b/client/web/src/search/results/StreamingSearchResults.tsx index 462a09cd01db9..db04554b438a6 100644 --- a/client/web/src/search/results/StreamingSearchResults.tsx +++ b/client/web/src/search/results/StreamingSearchResults.tsx @@ -1,73 +1,48 @@ import { type FC, useCallback, useEffect, useMemo, useState } from 'react' -import classNames from 'classnames' import { useLocation, useNavigate } from 'react-router-dom' import type { Observable } from 'rxjs' -import { limitHit, StreamingProgress, StreamingSearchResultsList } from '@sourcegraph/branded' -import { asError } from '@sourcegraph/common' +import { limitHit } from '@sourcegraph/branded' import type { FetchFileParameters } from '@sourcegraph/shared/src/backend/file' -import type { FilePrefetcher } from '@sourcegraph/shared/src/components/PrefetchableFile' -import { HighlightResponseFormat, SearchPatternType } from '@sourcegraph/shared/src/graphql-operations' +import { ExtensionsControllerProps } from '@sourcegraph/shared/src/extensions/controller' +import { SearchPatternType } from '@sourcegraph/shared/src/graphql-operations' import type { PlatformContextProps } from '@sourcegraph/shared/src/platform/context' import type { QueryUpdate, SearchContextProps } from '@sourcegraph/shared/src/search' -import { collectMetrics } from '@sourcegraph/shared/src/search/query/metrics' -import { sanitizeQueryForTelemetry, updateFilters } from '@sourcegraph/shared/src/search/query/transformer' -import { - type AlertKind, - LATEST_VERSION, - type SmartSearchAlertKind, - type StreamSearchOptions, -} from '@sourcegraph/shared/src/search/stream' +import { updateFilters } from '@sourcegraph/shared/src/search/query/transformer' +import { LATEST_VERSION, type StreamSearchOptions } from '@sourcegraph/shared/src/search/stream' import { type SettingsCascadeProps, useExperimentalFeatures } from '@sourcegraph/shared/src/settings/settings' -import { useTemporarySetting } from '@sourcegraph/shared/src/settings/temporary/useTemporarySetting' import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' import type { SearchAggregationProps, SearchStreamingProps } from '..' import type { AuthenticatedUser } from '../../auth' import type { CodeMonitoringProps } from '../../codeMonitoring' -import { PageTitle } from '../../components/PageTitle' import { formatUrlOverrideFeatureFlags } from '../../featureFlags/lib/parseUrlOverrideFeatureFlags' import { useFeatureFlag } from '../../featureFlags/useFeatureFlag' import { useFeatureFlagOverrides } from '../../featureFlags/useFeatureFlagOverrides' import type { CodeInsightsProps } from '../../insights/types' import type { OwnConfigProps } from '../../own/OwnConfigProps' -import { fetchBlob } from '../../repo/blob/backend' -import { SavedSearchModal } from '../../savedSearches/SavedSearchModal' -import { isSearchJobsEnabled } from '../../search-jobs/utility' -import { - buildSearchURLQueryFromQueryState, - setSearchMode, - useDeveloperSettings, - useNavbarQueryState, -} from '../../stores' -import { GettingStartedTour } from '../../tour/GettingStartedTour' -import { useShowOnboardingTour } from '../../tour/hooks' +import { useDeveloperSettings, useNavbarQueryState } from '../../stores' import { submitSearch } from '../helpers' import { useRecentSearches } from '../input/useRecentSearches' -import { DidYouMean } from '../suggestion/DidYouMean' -import { SmartSearch, smartSearchEvent } from '../suggestion/SmartSearch' -import { AggregationUIMode, SearchAggregationResult, useAggregationUIMode } from './components/aggregation' -import { SearchResultsCsvExportModal } from './export/SearchResultsCsvExportModal' -import { SearchAlert } from './SearchAlert' +import { useAggregationUIMode } from './components/aggregation' +import { NewSearchContent } from './components/new-search-content/NewSearchContent' +import { SearchContent } from './components/search-content/SearchContent' import { useCachedSearchResults } from './SearchResultsCacheProvider' -import { SearchResultsInfoBar } from './SearchResultsInfoBar' -import { SearchFiltersSidebar } from './sidebar/SearchFiltersSidebar' -import { UnownedResultsAlert } from './UnownedResultsAlert' - -import styles from './StreamingSearchResults.module.scss' +import { useStreamingSearchPings } from './useStreamingSearchPings' export interface StreamingSearchResultsProps extends SearchStreamingProps, Pick, SettingsCascadeProps, - PlatformContextProps<'settings' | 'requestGraphQL' | 'sourcegraphURL'>, + PlatformContextProps, TelemetryProps, CodeInsightsProps, SearchAggregationProps, CodeMonitoringProps, - OwnConfigProps { + OwnConfigProps, + ExtensionsControllerProps { authenticatedUser: AuthenticatedUser | null isSourcegraphDotCom: boolean fetchHighlightedFileLineRanges: (parameters: FetchFileParameters, force?: boolean) => Observable @@ -82,18 +57,17 @@ export const StreamingSearchResults: FC = props => searchAggregationEnabled, codeMonitoringEnabled, platformContext, + extensionsController, } = props const location = useLocation() const navigate = useNavigate() + const { addRecentSearch } = useRecentSearches() + const featureOverrides = useFeatureFlagOverrides() // Feature flags - const prefetchFileEnabled = useExperimentalFeatures(features => features.enableSearchFilePrefetch ?? false) - const [enableSearchResultsKeyboardNavigation] = useFeatureFlag('search-results-keyboard-navigation', true) const [enableRepositoryMetadata] = useFeatureFlag('repository-metadata', true) - const [sidebarCollapsed, setSidebarCollapsed] = useTemporarySetting('search.sidebar.collapsed', false) - - const showOnboardingTour = useShowOnboardingTour({ authenticatedUser, isSourcegraphDotCom }) + const newSearchNavigation = useExperimentalFeatures(features => features.newSearchNavigationUI ?? false) // Global state const caseSensitive = useNavbarQueryState(state => state.searchCaseSensitivity) @@ -106,14 +80,9 @@ export const StreamingSearchResults: FC = props => const submitQuerySearch = useNavbarQueryState(state => state.submitSearch) const [aggregationUIMode] = useAggregationUIMode() - // Local state - const [showMobileSidebar, setShowMobileSidebar] = useState(false) - // Derived state const trace = useMemo(() => new URLSearchParams(location.search).get('trace') ?? undefined, [location.search]) const { searchOptions } = useDeveloperSettings(settings => settings.zoekt) - const featureOverrides = useFeatureFlagOverrides() - const { addRecentSearch } = useRecentSearches() const options: StreamSearchOptions = useMemo( () => ({ @@ -128,97 +97,14 @@ export const StreamingSearchResults: FC = props => }), [patternType, caseSensitive, trace, featureOverrides, searchMode, searchOptions] ) - const results = useCachedSearchResults(streamSearch, submittedURLQuery, options, telemetryService) - const resultsLength = results?.results.length || 0 - const logSearchResultClicked = useCallback( - (index: number, type: string) => { - telemetryService.log('SearchResultClicked') - // This data ends up in Prometheus and is not part of the ping payload. - telemetryService.log('search.ranking.result-clicked', { - index, - type, - resultsLength, - }) - }, - [telemetryService, resultsLength] - ) - - // Log view event on first load - useEffect( - () => { - telemetryService.logViewEvent('SearchResults') - }, - // Only log view on initial load - // eslint-disable-next-line react-hooks/exhaustive-deps - [] - ) - - // Log search query event when URL changes - useEffect(() => { - const metrics = submittedURLQuery ? collectMetrics(submittedURLQuery) : undefined - - telemetryService.log( - 'SearchResultsQueried', - { - code_search: { - query_data: { - query: metrics, - combined: submittedURLQuery, - empty: !submittedURLQuery, - }, - }, - }, - { - code_search: { - query_data: { - // 🚨 PRIVACY: never provide any private query data in the - // { code_search: query_data: query } property, - // which is also potentially exported in pings data. - query: metrics, - - // 🚨 PRIVACY: Only collect the full query string for unauthenticated users - // on Sourcegraph.com, and only after sanitizing to remove certain filters. - combined: - !authenticatedUser && isSourcegraphDotCom - ? sanitizeQueryForTelemetry(submittedURLQuery) - : undefined, - empty: !submittedURLQuery, - }, - }, - } - ) - // Only log when the query changes - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [submittedURLQuery]) - - // Log events when search completes or fails - useEffect(() => { - if (results?.state === 'complete') { - telemetryService.log('SearchResultsFetched', { - code_search: { - // 🚨 PRIVACY: never provide any private data in { code_search: { results } }. - query_data: { - combined: submittedURLQuery, - }, - results: { - results_count: results.progress.matchCount, - limit_hit: limitHit(results.progress), - any_cloning: results.progress.skipped.some(skipped => skipped.reason === 'repository-cloning'), - alert: results.alert ? results.alert.title : null, - }, - }, - }) - if (results.results.length > 0) { - telemetryService.log('SearchResultsNonEmpty') - } - } else if (results?.state === 'error') { - telemetryService.log('SearchResultsFetchFailed', { - code_search: { error_message: asError(results.error).message }, - }) - } - }, [results, submittedURLQuery, telemetryService]) + const { logSearchResultClicked } = useStreamingSearchPings({ + telemetryService, + isSourcegraphDotCom, + results, + isAuauthenticated: !!authenticatedUser, + }) useEffect(() => { if (results?.state === 'complete') { @@ -230,51 +116,18 @@ export const StreamingSearchResults: FC = props => } }, [addRecentSearch, results, submittedURLQuery]) - useEffect(() => { - if ( - (results?.alert?.kind === 'smart-search-additional-results' || - results?.alert?.kind === 'smart-search-pure-results') && - results?.alert?.title && - results.alert.proposedQueries - ) { - const events = smartSearchEvent( - results.alert.kind, - results.alert.title, - results.alert.proposedQueries.map(entry => entry.description || '') - ) - for (const event of events) { - telemetryService.log(event) - } - } - }, [results, telemetryService]) - - // Reset expanded state when new search is started - useEffect(() => { - setAllExpanded(false) - }, [location.search]) - // Expand/contract all results const [allExpanded, setAllExpanded] = useState(false) + const onExpandAllResultsToggle = useCallback(() => { setAllExpanded(oldValue => !oldValue) telemetryService.log(allExpanded ? 'allResultsExpanded' : 'allResultsCollapsed') }, [allExpanded, telemetryService]) + useEffect(() => { setAllExpanded(false) // Reset expanded state when new search is started }, [location.search]) - // Save search - const [showSavedSearchModal, setShowSavedSearchModal] = useState(false) - const onSaveQueryClick = useCallback(() => setShowSavedSearchModal(true), []) - const onSaveQueryModalClose = useCallback(() => { - setShowSavedSearchModal(false) - telemetryService.log('SavedQueriesToggleCreating', { queries: { creating: false } }) - }, [telemetryService]) - - // Export results to CSV - const [showCsvExportModal, setShowCsvExportModal] = useState(false) - const onExportCsvClick = useCallback(() => setShowCsvExportModal(true), []) - const handleSidebarSearchSubmit = useCallback( /** * The `updatedSearchQuery` is required in case we synchronously update the search @@ -341,10 +194,6 @@ export const StreamingSearchResults: FC = props => }) } - const hasResultsToAggregate = results?.state === 'complete' ? (results?.results.length ?? 0) > 0 : true - - const showAggregationPanel = searchAggregationEnabled && hasResultsToAggregate - const onDisableSmartSearch = useCallback(() => { const { selectedSearchContextSpec } = props submitSearch({ @@ -358,171 +207,74 @@ export const StreamingSearchResults: FC = props => }) }, [caseSensitive, location, navigate, props, submittedURLQuery]) - const prefetchFile: FilePrefetcher = useCallback( - params => - fetchBlob({ - ...params, - format: HighlightResponseFormat.JSON_SCIP, - }), - [] - ) - - return ( -
    - - - - {showOnboardingTour && ( - - )} - - - {aggregationUIMode === AggregationUIMode.SearchPage && ( - - )} - - {aggregationUIMode !== AggregationUIMode.SearchPage && ( - <> - setShowMobileSidebar(show)} - sidebarCollapsed={!!sidebarCollapsed} - setSidebarCollapsed={setSidebarCollapsed} - stats={ - - } - /> - -
    - - - {results?.alert?.kind && isSmartSearchAlert(results.alert.kind) && ( - - )} - - - - {showSavedSearchModal && ( - - )} - {showCsvExportModal && ( - setShowCsvExportModal(false)} - /> - )} - {results?.alert && (!results?.alert.kind || !isSmartSearchAlert(results.alert.kind)) && ( -
    - {results?.alert?.kind === 'unowned-results' ? ( - - ) : ( - - )} -
    - )} + const hasResultsToAggregate = results?.state === 'complete' ? (results?.results.length ?? 0) > 0 : true + const showAggregationPanel = searchAggregationEnabled && hasResultsToAggregate - -
    - - )} -
    + return !newSearchNavigation ? ( + + ) : ( + ) } @@ -534,13 +286,3 @@ const applyAdditionalFilters = (query: string, additionalFilters: string[]): str } return newQuery } - -function isSmartSearchAlert(kind: AlertKind): kind is SmartSearchAlertKind { - switch (kind) { - case 'smart-search-additional-results': - case 'smart-search-pure-results': { - return true - } - } - return false -} diff --git a/client/web/src/search/results/SearchActionsMenu.tsx b/client/web/src/search/results/components/SearchActionsMenu.tsx similarity index 96% rename from client/web/src/search/results/SearchActionsMenu.tsx rename to client/web/src/search/results/components/SearchActionsMenu.tsx index c0e2d9bfeb909..175f537b615f1 100644 --- a/client/web/src/search/results/SearchActionsMenu.tsx +++ b/client/web/src/search/results/components/SearchActionsMenu.tsx @@ -17,11 +17,11 @@ import { Tooltip, } from '@sourcegraph/wildcard' -import type { AuthenticatedUser } from '../../auth' +import type { AuthenticatedUser } from '../../../auth' -import type { CreateAction } from './createActions' +import type { CreateAction } from './search-results-info-bar/createActions' -import navStyles from './SearchResultsInfoBar.module.scss' +import navStyles from './search-results-info-bar/SearchResultsInfoBar.module.scss' interface SearchActionsMenuProps { results?: AggregateStreamingSearchResults diff --git a/client/web/src/search/results/SearchAlert.tsx b/client/web/src/search/results/components/SearchAlert.tsx similarity index 97% rename from client/web/src/search/results/SearchAlert.tsx rename to client/web/src/search/results/components/SearchAlert.tsx index eff7ca7e795ff..acf22f7a9efb0 100644 --- a/client/web/src/search/results/SearchAlert.tsx +++ b/client/web/src/search/results/components/SearchAlert.tsx @@ -5,7 +5,7 @@ import type { AggregateStreamingSearchResults } from '@sourcegraph/shared/src/se import { buildSearchURLQuery } from '@sourcegraph/shared/src/util/url' import { Button, Link, Alert, H3, H4, Markdown } from '@sourcegraph/wildcard' -import { SearchPatternType } from '../../graphql-operations' +import { SearchPatternType } from '../../../graphql-operations' interface SearchAlertProps { alert: Required['alert'] diff --git a/client/web/src/search/results/UnownedResultsAlert.tsx b/client/web/src/search/results/components/UnownedResultsAlert.tsx similarity index 97% rename from client/web/src/search/results/UnownedResultsAlert.tsx rename to client/web/src/search/results/components/UnownedResultsAlert.tsx index 9a2ba5f8b04a1..6baf46410c5f7 100644 --- a/client/web/src/search/results/UnownedResultsAlert.tsx +++ b/client/web/src/search/results/components/UnownedResultsAlert.tsx @@ -26,8 +26,8 @@ import { Link, } from '@sourcegraph/wildcard' -import { SearchPatternType } from '../../graphql-operations' -import { buildSearchURLQueryFromQueryState } from '../../stores' +import { SearchPatternType } from '../../../graphql-operations' +import { buildSearchURLQueryFromQueryState } from '../../../stores' export interface UnownedResultsAlertProps extends SearchPatternTypeProps, diff --git a/client/web/src/search/results/components/new-search-content/NewSearchContent.module.scss b/client/web/src/search/results/components/new-search-content/NewSearchContent.module.scss new file mode 100644 index 0000000000000..8640e6156ce44 --- /dev/null +++ b/client/web/src/search/results/components/new-search-content/NewSearchContent.module.scss @@ -0,0 +1,221 @@ +@import 'wildcard/src/global-styles/breakpoints'; + +.root { + width: 100%; + height: 100%; + // Since this container is rendered as flex child we + // use flex-grow to stretch it by all available height + flex-grow: 1; + + display: grid; + grid-template-rows: auto 1fr; + grid-template-columns: minmax(0, 1fr) auto auto; + grid-template-areas: + 'infobar preview sidebar-header ' + 'contents preview filters'; + + @media (--md-breakpoint-down) { + grid-template-columns: minmax(0, 1fr); + grid-template-rows: auto auto 1fr; + grid-template-areas: + 'infobar' + 'filters' + 'contents'; + + overflow: auto; + height: min-content; + } +} + +.filters { + display: contents; + + &-header { + grid-area: sidebar-header; + display: flex; + justify-content: space-between; + align-items: center; + padding: 0.5rem; + border-bottom: 1px solid var(--border-color-2); + background: var(--color-bg-1); + border-left: 1px solid var(--border-color-2); + + @media (--md-breakpoint-down) { + display: none; + } + } + + &-content { + grid-area: filters; + background: var(--color-bg-1); + border-left: 1px solid var(--border-color-2); + overflow: auto; + width: 17.5rem; + padding: 0.5rem; + + &::-webkit-scrollbar { + width: 0.5rem; + height: 0.5rem; + } + + &::-webkit-scrollbar-thumb { + background-color: var(--oc-gray-4); + } + + &::-webkit-scrollbar-track { + background-color: var(--oc-gray-1); + } + + @-moz-document url-prefix('') { + scrollbar-width: thin; + scrollbar-color: var(--oc-gray-1); + } + + :global(.theme-dark) & { + &::-webkit-scrollbar-thumb { + background-color: var(--oc-gray-8); + } + + &::-webkit-scrollbar-track { + background-color: var(--oc-gray-7); + } + + @-moz-document url-prefix('') { + scrollbar-width: thin; + scrollbar-color: var(--oc-gray-6); + } + } + + @media (--md-breakpoint-down) { + display: flex; + width: 100%; + flex-direction: row; + flex-wrap: wrap; + column-gap: 1.5rem; + overflow: unset; + } + } +} + +.infobar { + grid-area: infobar; + padding: 0.3rem 0.5rem; + background: var(--color-bg-1); + border-bottom: 1px solid var(--border-color-2); + min-height: 41px; +} + +.content { + grid-area: contents; + overflow: auto; + padding: 0 0.5rem 0.5rem 0.5rem; + + &::-webkit-scrollbar { + width: 0.5rem; + height: 0.5rem; + } + + &::-webkit-scrollbar-thumb { + background-color: var(--oc-gray-4); + } + + &::-webkit-scrollbar-track { + background-color: var(--oc-gray-1); + } + + @-moz-document url-prefix('') { + scrollbar-width: thin; + scrollbar-color: var(--oc-gray-2); + } + + :global(.theme-dark) & { + &::-webkit-scrollbar-thumb { + background-color: var(--oc-gray-9); + } + + &::-webkit-scrollbar-track { + background-color: var(--oc-gray-8); + } + + @-moz-document url-prefix('') { + scrollbar-width: thin; + scrollbar-color: var(--oc-gray-6); + } + } +} + +.alert-area { + max-width: 65rem; + margin: auto; +} + +.preview { + display: flex; + flex-direction: column; + grid-area: preview; + height: 100%; + background-color: var(--color-bg-1); + border-left: 1px solid var(--border-color-2); + + &-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.71rem 0.5rem; + border-bottom: 1px solid var(--border-color-2); + min-height: 41px; + } + + &-file-link { + padding: 0.25rem 0.5rem; + background: var(--oc-gray-1); + overflow: hidden; + flex-shrink: 0; + width: 100%; + text-overflow: ellipsis; + + :global(.theme-dark) & { + background: var(--oc-gray-9); + } + } + + &-content { + height: auto; + flex-grow: 1; + + :global(.cm-scroller) { + &::-webkit-scrollbar { + width: 0.5rem; + height: 0.5rem; + } + + &::-webkit-scrollbar-thumb { + background-color: var(--oc-gray-4); + } + + &::-webkit-scrollbar-track { + background-color: var(--oc-gray-1); + } + + @-moz-document url-prefix('') { + scrollbar-width: thin; + scrollbar-color: var(--oc-gray-2); + } + + :global(.theme-dark) & { + &::-webkit-scrollbar-thumb { + background-color: var(--oc-gray-9); + } + + &::-webkit-scrollbar-track { + background-color: var(--oc-gray-8); + } + + @-moz-document url-prefix('') { + scrollbar-width: thin; + scrollbar-color: var(--oc-gray-6); + } + } + } + } +} diff --git a/client/web/src/search/results/components/new-search-content/NewSearchContent.tsx b/client/web/src/search/results/components/new-search-content/NewSearchContent.tsx new file mode 100644 index 0000000000000..f371c02b121f6 --- /dev/null +++ b/client/web/src/search/results/components/new-search-content/NewSearchContent.tsx @@ -0,0 +1,414 @@ +import { + FC, + HTMLAttributes, + PropsWithChildren, + Suspense, + useCallback, + useEffect, + useLayoutEffect, + useMemo, + useRef, +} from 'react' + +import { mdiClose } from '@mdi/js' +import classNames from 'classnames' +import { Observable } from 'rxjs' + +import { StreamingProgress, StreamingSearchResultsList, useSearchResultState } from '@sourcegraph/branded' +import { FetchFileParameters } from '@sourcegraph/shared/src/backend/file' +import { FilePrefetcher } from '@sourcegraph/shared/src/components/PrefetchableFile' +import { ExtensionsControllerProps } from '@sourcegraph/shared/src/extensions/controller' +import { HighlightResponseFormat, SearchPatternType } from '@sourcegraph/shared/src/graphql-operations' +import { PlatformContextProps } from '@sourcegraph/shared/src/platform/context' +import { QueryState, QueryStateUpdate, QueryUpdate, SearchMode } from '@sourcegraph/shared/src/search' +import { stringHuman } from '@sourcegraph/shared/src/search/query/printer' +import { scanSearchQuery } from '@sourcegraph/shared/src/search/query/scanner' +import { + AggregateStreamingSearchResults, + ContentMatch, + getFileMatchUrl, + PathMatch, + StreamSearchOptions, +} from '@sourcegraph/shared/src/search/stream' +import { SettingsCascadeProps } from '@sourcegraph/shared/src/settings/settings' +import { NOOP_TELEMETRY_SERVICE, TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' +import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent' +import { Button, Icon, H2, H4, useScrollManager, Panel, useLocalStorage, Link } from '@sourcegraph/wildcard' + +import { AuthenticatedUser } from '../../../../auth' +import { fetchBlob } from '../../../../repo/blob/backend' +import type { SearchPanelConfig } from '../../../../repo/blob/codemirror/search' +import { SearchPanelViewMode } from '../../../../repo/blob/codemirror/types' +import { isSearchJobsEnabled } from '../../../../search-jobs/utility' +import { buildSearchURLQueryFromQueryState, setSearchMode } from '../../../../stores' +import { GettingStartedTour } from '../../../../tour/GettingStartedTour' +import { submitSearch } from '../../../helpers' +import { DidYouMean } from '../../../suggestion/DidYouMean' +import { SmartSearch } from '../../../suggestion/SmartSearch' +import { SearchFiltersSidebar } from '../../sidebar/SearchFiltersSidebar' +import { AggregationUIMode, SearchAggregationResult } from '../aggregation' +import { SearchResultsInfoBar } from '../search-results-info-bar/SearchResultsInfoBar' +import { SearchAlert } from '../SearchAlert' +import { UnownedResultsAlert } from '../UnownedResultsAlert' +import { isSmartSearchAlert } from '../utils' + +import styles from './NewSearchContent.module.scss' + +const LazySideBlob = lazyComponent(() => import('../../../../codeintel/SideBlob'), 'SideBlob') + +/** + * At the moment search result preview panel supports only + * blob-like type of search results to preview. + */ +type SearchResultPreview = ContentMatch | PathMatch + +interface NewSearchContentProps + extends TelemetryProps, + SettingsCascadeProps, + PlatformContextProps, + ExtensionsControllerProps { + submittedURLQuery: string + queryState: QueryState + liveQuery: string + allExpanded: boolean + searchMode: SearchMode + trace: boolean + searchContextsEnabled: boolean + patternType: SearchPatternType + results: AggregateStreamingSearchResults | undefined + showAggregationPanel: boolean + selectedSearchContextSpec: string | undefined + aggregationUIMode: AggregationUIMode + caseSensitive: boolean + authenticatedUser: AuthenticatedUser | null + isSourcegraphDotCom: boolean + enableRepositoryMetadata: boolean + options: StreamSearchOptions + codeMonitoringEnabled: boolean + fetchHighlightedFileLineRanges: (parameters: FetchFileParameters, force?: boolean) => Observable + onNavbarQueryChange: (queryState: QueryStateUpdate) => void + onSearchSubmit: (updates: QueryUpdate[], updatedSearchQuery?: string) => void + onQuerySubmit: (newQuery: string, updatedQuerySearch: string) => void + onExpandAllResultsToggle: () => void + onSearchAgain: (additionalFilters: string[]) => void + onDisableSmartSearch: () => void + onLogSearchResultClick: (index: number, type: string, resultsLength: number) => void +} + +export const NewSearchContent: FC = props => { + const { + searchMode, + submittedURLQuery, + liveQuery, + queryState, + allExpanded, + trace, + patternType, + searchContextsEnabled, + results, + showAggregationPanel, + selectedSearchContextSpec, + aggregationUIMode, + settingsCascade, + telemetryService, + fetchHighlightedFileLineRanges, + caseSensitive, + authenticatedUser, + isSourcegraphDotCom, + enableRepositoryMetadata, + codeMonitoringEnabled, + options, + platformContext, + extensionsController, + onNavbarQueryChange, + onSearchSubmit, + onQuerySubmit, + onExpandAllResultsToggle, + onSearchAgain, + onDisableSmartSearch, + onLogSearchResultClick, + } = props + + const submittedURLQueryRef = useRef(submittedURLQuery) + const containerRef = useRef(null) + const { previewBlob, clearPreview } = useSearchResultState() + const [sidebarCollapsed, setSidebarCollapsed] = useLocalStorage('search.sidebar.collapsed', true) + + useScrollManager('SearchResultsContainer', containerRef) + + // Clean up hook, close the preview panel if search result page + // have been closed/unmount + useEffect(() => clearPreview, [clearPreview]) + + // File preview clean up hook, close the preview panel every time when we + // re-search / re-submit the query. + useLayoutEffect(() => { + if (submittedURLQuery !== submittedURLQueryRef.current) { + submittedURLQueryRef.current = submittedURLQuery + clearPreview() + } + }, [submittedURLQuery, clearPreview]) + + const prefetchFile: FilePrefetcher = useCallback( + params => + fetchBlob({ + ...params, + format: HighlightResponseFormat.JSON_SCIP, + }), + [] + ) + + return ( +
    + {!sidebarCollapsed && ( + + )} + + + } + /> + +
    + {aggregationUIMode === AggregationUIMode.SearchPage && ( + + )} + + {aggregationUIMode !== AggregationUIMode.SearchPage && ( + <> + + + {results?.alert?.kind && isSmartSearchAlert(results.alert.kind) && ( + + )} + + + + {results?.alert && (!results?.alert.kind || !isSmartSearchAlert(results.alert.kind)) && ( +
    + {results?.alert?.kind === 'unowned-results' ? ( + + ) : ( + + )} +
    + )} + + + + )} +
    + + {previewBlob && ( + + )} +
    + ) +} + +interface NewSearchSidebarWrapper extends HTMLAttributes { + onClose: () => void +} + +const NewSearchSidebarWrapper: FC> = props => { + const { children, className, onClose, ...attributes } = props + + return ( + + ) +} + +interface FilePreviewPanelProps extends PlatformContextProps, SettingsCascadeProps, ExtensionsControllerProps { + blobInfo: SearchResultPreview + submittedURLQuery: string + patternType: SearchPatternType + caseSensitive: boolean + onClose: () => void +} + +const FilePreviewPanel: FC = props => { + const { + blobInfo, + submittedURLQuery, + patternType, + caseSensitive, + onClose, + platformContext, + settingsCascade, + extensionsController, + } = props + + const searchPanelConfig = useMemo( + () => ({ + caseSensitive, + regexp: patternType === SearchPatternType.regexp, + searchValue: getLiteralQueryPart(submittedURLQuery), + mode: SearchPanelViewMode.MatchesOnly, + }), + [caseSensitive, patternType, submittedURLQuery] + ) + + return ( + +
    +

    + File preview +

    + +
    + + + {blobInfo.path} + + + + + +     + ) +} + +function getLiteralQueryPart(searchQuery: string): string { + const tokens = scanSearchQuery(searchQuery) + + if (tokens.type === 'success') { + const literals = tokens.term.filter(token => token.type !== 'filter' && token.type !== 'comment') + + return stringHuman(literals).trim() + } + + return searchQuery.trim() +} diff --git a/client/web/src/search/results/StreamingSearchResults.module.scss b/client/web/src/search/results/components/search-content/SearchContent.module.scss similarity index 100% rename from client/web/src/search/results/StreamingSearchResults.module.scss rename to client/web/src/search/results/components/search-content/SearchContent.module.scss diff --git a/client/web/src/search/results/components/search-content/SearchContent.tsx b/client/web/src/search/results/components/search-content/SearchContent.tsx new file mode 100644 index 0000000000000..71a0fe8d0f785 --- /dev/null +++ b/client/web/src/search/results/components/search-content/SearchContent.tsx @@ -0,0 +1,262 @@ +import { FC, useCallback, useState } from 'react' + +import classNames from 'classnames' +import { useLocation } from 'react-router-dom' +import { Observable } from 'rxjs' + +import { StreamingProgress, StreamingSearchResultsList } from '@sourcegraph/branded' +import { FetchFileParameters } from '@sourcegraph/shared/src/backend/file' +import { FilePrefetcher } from '@sourcegraph/shared/src/components/PrefetchableFile' +import { HighlightResponseFormat, SearchPatternType } from '@sourcegraph/shared/src/graphql-operations' +import { PlatformContextProps } from '@sourcegraph/shared/src/platform/context' +import { QueryState, QueryStateUpdate, QueryUpdate, SearchMode } from '@sourcegraph/shared/src/search' +import { AggregateStreamingSearchResults, StreamSearchOptions } from '@sourcegraph/shared/src/search/stream' +import { SettingsCascadeProps, useExperimentalFeatures } from '@sourcegraph/shared/src/settings/settings' +import { useTemporarySetting } from '@sourcegraph/shared/src/settings/temporary' +import { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' + +import { AuthenticatedUser } from '../../../../auth' +import { PageTitle } from '../../../../components/PageTitle' +import { useFeatureFlag } from '../../../../featureFlags/useFeatureFlag' +import { fetchBlob } from '../../../../repo/blob/backend' +import { isSearchJobsEnabled } from '../../../../search-jobs/utility' +import { buildSearchURLQueryFromQueryState, setSearchMode } from '../../../../stores' +import { GettingStartedTour } from '../../../../tour/GettingStartedTour' +import { useShowOnboardingTour } from '../../../../tour/hooks' +import { submitSearch } from '../../../helpers' +import { DidYouMean } from '../../../suggestion/DidYouMean' +import { SmartSearch } from '../../../suggestion/SmartSearch' +import { SearchFiltersSidebar } from '../../sidebar/SearchFiltersSidebar' +import { AggregationUIMode, SearchAggregationResult } from '../aggregation' +import { SearchResultsInfoBar } from '../search-results-info-bar/SearchResultsInfoBar' +import { SearchAlert } from '../SearchAlert' +import { UnownedResultsAlert } from '../UnownedResultsAlert' +import { isSmartSearchAlert } from '../utils' + +import styles from './SearchContent.module.scss' + +interface SearchContentProps + extends SettingsCascadeProps, + TelemetryProps, + PlatformContextProps<'settings' | 'requestGraphQL' | 'sourcegraphURL'> { + submittedURLQuery: string + queryState: QueryState + liveQuery: string + allExpanded: boolean + searchMode: SearchMode + trace: boolean + searchContextsEnabled: boolean + patternType: SearchPatternType + results: AggregateStreamingSearchResults | undefined + showAggregationPanel: boolean + selectedSearchContextSpec: string | undefined + aggregationUIMode: AggregationUIMode + caseSensitive: boolean + authenticatedUser: AuthenticatedUser | null + isSourcegraphDotCom: boolean + enableRepositoryMetadata: boolean + options: StreamSearchOptions + codeMonitoringEnabled: boolean + fetchHighlightedFileLineRanges: (parameters: FetchFileParameters, force?: boolean) => Observable + onNavbarQueryChange: (queryState: QueryStateUpdate) => void + onSearchSubmit: (updates: QueryUpdate[], updatedSearchQuery?: string) => void + onQuerySubmit: (newQuery: string, updatedQuerySearch: string) => void + onExpandAllResultsToggle: () => void + onSearchAgain: (additionalFilters: string[]) => void + onDisableSmartSearch: () => void + onLogSearchResultClick: (index: number, type: string, resultsLength: number) => void +} + +export const SearchContent: FC = props => { + const { + searchMode, + submittedURLQuery, + liveQuery, + queryState, + allExpanded, + trace, + patternType, + searchContextsEnabled, + results, + showAggregationPanel, + selectedSearchContextSpec, + aggregationUIMode, + settingsCascade, + telemetryService, + fetchHighlightedFileLineRanges, + caseSensitive, + authenticatedUser, + isSourcegraphDotCom, + enableRepositoryMetadata, + codeMonitoringEnabled, + options, + platformContext, + onNavbarQueryChange, + onSearchSubmit, + onQuerySubmit, + onExpandAllResultsToggle, + onSearchAgain, + onDisableSmartSearch, + onLogSearchResultClick, + } = props + + const location = useLocation() + const prefetchFileEnabled = useExperimentalFeatures(features => features.enableSearchFilePrefetch ?? false) + const [enableSearchResultsKeyboardNavigation] = useFeatureFlag('search-results-keyboard-navigation', true) + const [sidebarCollapsed, setSidebarCollapsed] = useTemporarySetting('search.sidebar.collapsed', false) + const showOnboardingTour = useShowOnboardingTour({ authenticatedUser, isSourcegraphDotCom }) + + const [showMobileSidebar, setShowMobileSidebar] = useState(false) + + const prefetchFile: FilePrefetcher = useCallback( + params => + fetchBlob({ + ...params, + format: HighlightResponseFormat.JSON_SCIP, + }), + [] + ) + + return ( +
    + + + + {showOnboardingTour && ( + + )} + + + {aggregationUIMode === AggregationUIMode.SearchPage && ( + + )} + + {aggregationUIMode !== AggregationUIMode.SearchPage && ( + <> + setShowMobileSidebar(show)} + sidebarCollapsed={!!sidebarCollapsed} + setSidebarCollapsed={setSidebarCollapsed} + stats={ + + } + /> + +
    + + + {results?.alert?.kind && isSmartSearchAlert(results.alert.kind) && ( + + )} + + + + {results?.alert && (!results?.alert.kind || !isSmartSearchAlert(results.alert.kind)) && ( +
    + {results?.alert?.kind === 'unowned-results' ? ( + + ) : ( + + )} +
    + )} + + +
    + + )} +
    + ) +} diff --git a/client/web/src/search/results/SearchResultsInfoBar.module.scss b/client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.module.scss similarity index 100% rename from client/web/src/search/results/SearchResultsInfoBar.module.scss rename to client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.module.scss diff --git a/client/web/src/search/results/SearchResultsInfoBar.test.tsx b/client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.test.tsx similarity index 92% rename from client/web/src/search/results/SearchResultsInfoBar.test.tsx rename to client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.test.tsx index 3787024dc8d4b..7912c21e47af6 100644 --- a/client/web/src/search/results/SearchResultsInfoBar.test.tsx +++ b/client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.test.tsx @@ -1,27 +1,26 @@ import { noop } from 'lodash' -import { NEVER } from 'rxjs' import { describe, expect, test } from 'vitest' import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService' import { MockedTestProvider } from '@sourcegraph/shared/src/testing/apollo' import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing' -import { SearchPatternType } from '../../graphql-operations' +import { SearchPatternType } from '../../../../graphql-operations' import { SearchResultsInfoBar, type SearchResultsInfoBarProps } from './SearchResultsInfoBar' const COMMON_PROPS: Omit = { - platformContext: { settings: NEVER, sourcegraphURL: 'https://sourcegraph.com' }, authenticatedUser: { id: 'userID', + username: 'chuckcheese', displayName: 'Chuck Cheese', emails: [{ email: 'chuck@chuckeecheese.com', isPrimary: true, verified: true }], permissions: { nodes: [] }, + organizations: { nodes: [] }, }, + sourcegraphURL: '', allExpanded: true, onExpandAllResultsToggle: noop, - onSaveQueryClick: noop, - onExportCsvClick: noop, stats:
    , telemetryService: NOOP_TELEMETRY_SERVICE, patternType: SearchPatternType.standard, diff --git a/client/web/src/search/results/SearchResultsInfoBar.tsx b/client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.tsx similarity index 80% rename from client/web/src/search/results/SearchResultsInfoBar.tsx rename to client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.tsx index b9f6e8ff14408..b5fb18c1e7305 100644 --- a/client/web/src/search/results/SearchResultsInfoBar.tsx +++ b/client/web/src/search/results/components/search-results-info-bar/SearchResultsInfoBar.tsx @@ -1,20 +1,27 @@ -import React, { useMemo, useState } from 'react' +import { useMemo, useState, FC, useCallback } from 'react' import { mdiChevronDoubleDown, mdiChevronDoubleUp, mdiThumbUp, mdiThumbDown, mdiOpenInNew } from '@mdi/js' import classNames from 'classnames' -import { useLocation } from 'react-router-dom' +import { useLocation, useNavigate } from 'react-router-dom' -import type { PlatformContextProps } from '@sourcegraph/shared/src/platform/context' +import { SearchPatternType } from '@sourcegraph/shared/src/graphql-operations' import type { CaseSensitivityProps, SearchPatternTypeProps } from '@sourcegraph/shared/src/search' import { FilterKind, findFilter } from '@sourcegraph/shared/src/search/query/query' import type { AggregateStreamingSearchResults, StreamSearchOptions } from '@sourcegraph/shared/src/search/stream' import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' import { Button, Icon, Alert, useSessionStorage, Link, Text } from '@sourcegraph/wildcard' -import type { AuthenticatedUser } from '../../auth' -import { canWriteBatchChanges, NO_ACCESS_BATCH_CHANGES_WRITE, NO_ACCESS_SOURCEGRAPH_COM } from '../../batches/utils' -import { eventLogger } from '../../tracking/eventLogger' -import { DOTCOM_URL } from '../../tracking/util' +import type { AuthenticatedUser } from '../../../../auth' +import { + canWriteBatchChanges, + NO_ACCESS_BATCH_CHANGES_WRITE, + NO_ACCESS_SOURCEGRAPH_COM, +} from '../../../../batches/utils' +import { SavedSearchModal } from '../../../../savedSearches/SavedSearchModal' +import { eventLogger } from '../../../../tracking/eventLogger' +import { DOTCOM_URL } from '../../../../tracking/util' +import { SearchResultsCsvExportModal } from '../../export/SearchResultsCsvExportModal' +import { SearchActionsMenu } from '../SearchActionsMenu' import { type CreateAction, @@ -23,17 +30,18 @@ import { getInsightsCreateAction, getSearchContextCreateAction, } from './createActions' -import { SearchActionsMenu } from './SearchActionsMenu' import styles from './SearchResultsInfoBar.module.scss' export interface SearchResultsInfoBarProps extends TelemetryProps, - PlatformContextProps<'settings' | 'sourcegraphURL'>, SearchPatternTypeProps, Pick { /** The currently authenticated user or null */ - authenticatedUser: Pick | null + authenticatedUser: Pick< + AuthenticatedUser, + 'id' | 'displayName' | 'emails' | 'permissions' | 'organizations' | 'username' + > | null enableCodeInsights?: boolean enableCodeMonitoring: boolean @@ -51,12 +59,6 @@ export interface SearchResultsInfoBarProps allExpanded: boolean onExpandAllResultsToggle: () => void - // Saved queries - onSaveQueryClick: () => void - - // Download CSV of search results - onExportCsvClick: () => void - className?: string stats: JSX.Element @@ -67,15 +69,22 @@ export interface SearchResultsInfoBarProps setSidebarCollapsed: (collapsed: boolean) => void isSourcegraphDotCom: boolean + patternType: SearchPatternType + sourcegraphURL: string } /** * The info bar shown over the search results list that displays metadata * and a few actions like expand all and save query */ -export const SearchResultsInfoBar: React.FunctionComponent< - React.PropsWithChildren -> = props => { +export const SearchResultsInfoBar: FC = props => { + const { query, patternType, authenticatedUser, results, options, sourcegraphURL, telemetryService } = props + + const navigate = useNavigate() + + const [showSavedSearchModal, setShowSavedSearchModal] = useState(false) + const [showCsvExportModal, setShowCsvExportModal] = useState(false) + const globalTypeFilter = useMemo( () => (props.query ? findFilter(props.query, 'type', FilterKind.Global)?.value?.value : undefined), [props.query] @@ -136,8 +145,7 @@ export const SearchResultsInfoBar: React.FunctionComponent< } const location = useLocation() - const dotcomHost = DOTCOM_URL.href - const isPrivateInstance = window.location.host !== dotcomHost + const isPrivateInstance = window.location.host !== DOTCOM_URL.href const refFromCodySearch = new URLSearchParams(location.search).get('ref') === 'cody-search' const [codySearchInputString] = useSessionStorage('cody-search-input', '') const codySearchInput: { input?: string; translatedQuery?: string } = JSON.parse(codySearchInputString || '{}') @@ -156,6 +164,11 @@ export const SearchResultsInfoBar: React.FunctionComponent< setCodyFeedback(positive) } + const onSaveQueryModalClose = useCallback(() => { + setShowSavedSearchModal(false) + telemetryService.log('SavedQueriesToggleCreating', { queries: { creating: false } }) + }, [telemetryService]) + return (
    + + {showSavedSearchModal && ( + + )} + {showCsvExportModal && ( + setShowCsvExportModal(false)} + /> + )} ) } diff --git a/client/web/src/search/results/components/search-results-info-bar/__snapshots__/SearchResultsInfoBar.test.tsx.snap b/client/web/src/search/results/components/search-results-info-bar/__snapshots__/SearchResultsInfoBar.test.tsx.snap new file mode 100644 index 0000000000000..0973404dfa12b --- /dev/null +++ b/client/web/src/search/results/components/search-results-info-bar/__snapshots__/SearchResultsInfoBar.test.tsx.snap @@ -0,0 +1,371 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`SearchResultsInfoBar > code monitoring feature flag disabled 1`] = ` + + + +`; + +exports[`SearchResultsInfoBar > code monitoring feature flag enabled, can create monitor from query 1`] = ` + + + +`; + +exports[`SearchResultsInfoBar > code monitoring feature flag enabled, can create monitor from query, user not logged in 1`] = ` + + + +`; + +exports[`SearchResultsInfoBar > code monitoring feature flag enabled, cannot create monitor from query 1`] = ` + + + +`; + +exports[`SearchResultsInfoBar > unauthenticated user 1`] = ` + + + +`; diff --git a/client/web/src/search/results/createActions.ts b/client/web/src/search/results/components/search-results-info-bar/createActions.ts similarity index 90% rename from client/web/src/search/results/createActions.ts rename to client/web/src/search/results/components/search-results-info-bar/createActions.ts index dfd238252d5db..fcfd2bf58e085 100644 --- a/client/web/src/search/results/createActions.ts +++ b/client/web/src/search/results/components/search-results-info-bar/createActions.ts @@ -5,11 +5,11 @@ import { FilterKind, findFilter } from '@sourcegraph/shared/src/search/query/que import { omitFilter } from '@sourcegraph/shared/src/search/query/transformer' import type { IconType } from '@sourcegraph/wildcard' -import type { AuthenticatedUser } from '../../auth' -import { BatchChangesIcon } from '../../batches/icons' -import { CodeMonitoringLogo } from '../../code-monitoring/CodeMonitoringLogo' -import type { SearchPatternType } from '../../graphql-operations' -import { CodeInsightsIcon } from '../../insights/Icons' +import type { AuthenticatedUser } from '../../../../auth' +import { BatchChangesIcon } from '../../../../batches/icons' +import { CodeMonitoringLogo } from '../../../../code-monitoring/CodeMonitoringLogo' +import type { SearchPatternType } from '../../../../graphql-operations' +import { CodeInsightsIcon } from '../../../../insights/Icons' export interface CreateAction { url: string diff --git a/client/web/src/search/results/components/utils.ts b/client/web/src/search/results/components/utils.ts new file mode 100644 index 0000000000000..e0f68a3ccb89e --- /dev/null +++ b/client/web/src/search/results/components/utils.ts @@ -0,0 +1,11 @@ +import { AlertKind, SmartSearchAlertKind } from '@sourcegraph/shared/src/search/stream' + +export function isSmartSearchAlert(kind: AlertKind): kind is SmartSearchAlertKind { + switch (kind) { + case 'smart-search-additional-results': + case 'smart-search-pure-results': { + return true + } + } + return false +} diff --git a/client/web/src/search/results/export/searchResultsExport.test.ts b/client/web/src/search/results/export/searchResultsExport.test.ts index 0334e475368d9..ef13c4dbcf85a 100644 --- a/client/web/src/search/results/export/searchResultsExport.test.ts +++ b/client/web/src/search/results/export/searchResultsExport.test.ts @@ -465,8 +465,7 @@ describe('searchResultsToFileContent', () => { ], }, ], - - 'Match type,Repository,Repository external URL,File path,File URL,Path matches [path [start end]],Chunk matches [line [start end]]\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,jssource/src_files/include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM/-/blob/jssource/src_files/include/javascript/sugar_3.js,,"[191, [[4, 10] [27, 33]]]; [233, [[6, 12] [59, 65]]]; [209, [[23, 29] [36, 42]]]; [210, [[37, 43]]]; [3496, [[24, 30]]]; [3515, [[38, 44]]]; [3516, [[86, 92]]]"\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM/-/blob/include/javascript/sugar_3.js,,"[44, [[79, 85]]]; [53, [[33, 39] [84, 90]]]; [47, [[18, 24] [55, 61]]]"\ncontent,github.com/pokeclicker/pokeclicker,http://localhost:3443/github.com/pokeclicker/pokeclicker,src/scripts/safari/Safari.ts,http://localhost:3443/github.com/pokeclicker/pokeclicker/-/blob/src/scripts/safari/Safari.ts,"[src/scripts/safari/Safari.ts, [[12, 18] [19, 25]]]","[0, [[6, 12]]]; [2, [[48, 54]]]; [17, [[51, 57]]]; [25, [[8, 14]]]; [26, [[8, 14]]]"', + 'Match type,Repository,Repository external URL,File path,File URL,Path matches [path [start end]],Chunk matches [line [start end]]\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,jssource/src_files/include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM@cea3e00eb4990d143c91935013058488c0964ee6/-/blob/jssource/src_files/include/javascript/sugar_3.js,,"[191, [[4, 10] [27, 33]]]; [233, [[6, 12] [59, 65]]]; [209, [[23, 29] [36, 42]]]; [210, [[37, 43]]]; [3496, [[24, 30]]]; [3515, [[38, 44]]]; [3516, [[86, 92]]]"\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM@cea3e00eb4990d143c91935013058488c0964ee6/-/blob/include/javascript/sugar_3.js,,"[44, [[79, 85]]]; [53, [[33, 39] [84, 90]]]; [47, [[18, 24] [55, 61]]]"\ncontent,github.com/pokeclicker/pokeclicker,http://localhost:3443/github.com/pokeclicker/pokeclicker,src/scripts/safari/Safari.ts,http://localhost:3443/github.com/pokeclicker/pokeclicker@8cd76ead3182b39647ae1c7af2dc9b912f7d6e9e/-/blob/src/scripts/safari/Safari.ts,"[src/scripts/safari/Safari.ts, [[12, 18] [19, 25]]]","[0, [[6, 12]]]; [2, [[48, 54]]]; [17, [[51, 57]]]; [25, [[8, 14]]]; [26, [[8, 14]]]"', ], [ 'file', @@ -899,7 +898,7 @@ describe('searchResultsToFileContent', () => { }, ], - 'Match type,Repository,Repository external URL,File path,File URL,Path matches [path [start end]],Chunk matches [line [start end]]\ncontent,github.com/servo/servo,http://localhost:3443/github.com/servo/servo,tests/wpt/web-platform-tests/tools/wpt/run.py,http://localhost:3443/github.com/servo/servo/-/blob/tests/wpt/web-platform-tests/tools/wpt/run.py,,"[623, [[6, 12]]]; [624, [[12, 18]]]; [625, [[26, 32]]]; [751, [[5, 11] [14, 20]]]; [635, [[52, 58]]]"\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,jssource/src_files/include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM/-/blob/jssource/src_files/include/javascript/sugar_3.js,,"[191, [[4, 10] [27, 33]]]; [233, [[6, 12] [59, 65]]]; [209, [[23, 29] [36, 42]]]; [210, [[37, 43]]]; [3496, [[24, 30]]]; [3515, [[38, 44]]]; [3516, [[86, 92]]]"\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM/-/blob/include/javascript/sugar_3.js,,"[44, [[79, 85]]]; [53, [[33, 39] [84, 90]]]; [47, [[18, 24]]]"', + 'Match type,Repository,Repository external URL,File path,File URL,Path matches [path [start end]],Chunk matches [line [start end]]\ncontent,github.com/servo/servo,http://localhost:3443/github.com/servo/servo,tests/wpt/web-platform-tests/tools/wpt/run.py,http://localhost:3443/github.com/servo/servo@2a45f247c44117e4a13603a87a3b6304905f8d1f/-/blob/tests/wpt/web-platform-tests/tools/wpt/run.py,,"[623, [[6, 12]]]; [624, [[12, 18]]]; [625, [[26, 32]]]; [751, [[5, 11] [14, 20]]]; [635, [[52, 58]]]"\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,jssource/src_files/include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM@cea3e00eb4990d143c91935013058488c0964ee6/-/blob/jssource/src_files/include/javascript/sugar_3.js,,"[191, [[4, 10] [27, 33]]]; [233, [[6, 12] [59, 65]]]; [209, [[23, 29] [36, 42]]]; [210, [[37, 43]]]; [3496, [[24, 30]]]; [3515, [[38, 44]]]; [3516, [[86, 92]]]"\ncontent,github.com/salesagility/SuiteCRM,http://localhost:3443/github.com/salesagility/SuiteCRM,include/javascript/sugar_3.js,http://localhost:3443/github.com/salesagility/SuiteCRM@cea3e00eb4990d143c91935013058488c0964ee6/-/blob/include/javascript/sugar_3.js,,"[44, [[79, 85]]]; [53, [[33, 39] [84, 90]]]; [47, [[18, 24]]]"', ], [ 'repo', @@ -1141,7 +1140,7 @@ describe('searchResultsToFileContent', () => { }, ], - 'Match type,Repository,Repository external URL,File path,File URL,Path matches [path [start end]],Chunk matches [line [start end]]\npath,github.com/zzzeyez/dots,http://localhost:3443/github.com/zzzeyez/dots,bin/safari,http://localhost:3443/github.com/zzzeyez/dots/-/blob/bin/safari,"[bin/safari, [[4, 10]]]",\npath,github.com/rockyzhang24/dotfiles,http://localhost:3443/github.com/rockyzhang24/dotfiles,.config/bin/safari,http://localhost:3443/github.com/rockyzhang24/dotfiles/-/blob/.config/bin/safari,"[.config/bin/safari, [[12, 18]]]",\npath,github.com/DavidsFiddle/Sonic-Pi-Code-Bits,http://localhost:3443/github.com/DavidsFiddle/Sonic-Pi-Code-Bits,Beats/Safari,http://localhost:3443/github.com/DavidsFiddle/Sonic-Pi-Code-Bits/-/blob/Beats/Safari,"[Beats/Safari, [[6, 12]]]",\npath,github.com/unixorn/tumult.plugin.zsh,http://localhost:3443/github.com/unixorn/tumult.plugin.zsh,bin/safari,http://localhost:3443/github.com/unixorn/tumult.plugin.zsh/-/blob/bin/safari,"[bin/safari, [[4, 10]]]",\npath,github.com/jaymcgavren/dotfiles,http://localhost:3443/github.com/jaymcgavren/dotfiles,bin/osx/safari,http://localhost:3443/github.com/jaymcgavren/dotfiles/-/blob/bin/osx/safari,"[bin/osx/safari, [[8, 14]]]",', + 'Match type,Repository,Repository external URL,File path,File URL,Path matches [path [start end]],Chunk matches [line [start end]]\npath,github.com/zzzeyez/dots,http://localhost:3443/github.com/zzzeyez/dots,bin/safari,http://localhost:3443/github.com/zzzeyez/dots@b69d3d3e6fb0473d6d25d28bd3446772904ff579/-/blob/bin/safari,"[bin/safari, [[4, 10]]]",\npath,github.com/rockyzhang24/dotfiles,http://localhost:3443/github.com/rockyzhang24/dotfiles,.config/bin/safari,http://localhost:3443/github.com/rockyzhang24/dotfiles@58517770e9fcdd08ba6a2971aaf33a2fcec1b49c/-/blob/.config/bin/safari,"[.config/bin/safari, [[12, 18]]]",\npath,github.com/DavidsFiddle/Sonic-Pi-Code-Bits,http://localhost:3443/github.com/DavidsFiddle/Sonic-Pi-Code-Bits,Beats/Safari,http://localhost:3443/github.com/DavidsFiddle/Sonic-Pi-Code-Bits@6a1adbe8a5a556042dd20b7c064635b0b5475d0e/-/blob/Beats/Safari,"[Beats/Safari, [[6, 12]]]",\npath,github.com/unixorn/tumult.plugin.zsh,http://localhost:3443/github.com/unixorn/tumult.plugin.zsh,bin/safari,http://localhost:3443/github.com/unixorn/tumult.plugin.zsh@cd1ac844ba533c463d105330cc2ffaf4421ab42e/-/blob/bin/safari,"[bin/safari, [[4, 10]]]",\npath,github.com/jaymcgavren/dotfiles,http://localhost:3443/github.com/jaymcgavren/dotfiles,bin/osx/safari,http://localhost:3443/github.com/jaymcgavren/dotfiles@67beb23333f82d3d35a1698a13f7ee574a7b2c43/-/blob/bin/osx/safari,"[bin/osx/safari, [[8, 14]]]",', ], [ 'symbol', @@ -1228,7 +1227,7 @@ describe('searchResultsToFileContent', () => { }, ] as SymbolMatch[], - 'Match type,Repository,Repository external URL,File path,File URL,Symbols [kind name url]\nsymbol,github.com/sourcegraph/sourcegraph,http://localhost:3443/github.com/sourcegraph/sourcegraph,enterprise/internal/batches/types/code_host.go,http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/enterprise/internal/batches/types/code_host.go,"[STRUCT, CodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/enterprise/internal/batches/types/code_host.go?L6:6-6:14]"\nsymbol,github.com/sourcegraph/sourcegraph,http://localhost:3443/github.com/sourcegraph/sourcegraph,internal/database/external_services.go,http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/database/external_services.go,"[FIELD, CodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/database/external_services.go?L225:2-225:10]"\nsymbol,github.com/koderover/zadig,http://localhost:3443/github.com/koderover/zadig,pkg/cli/upgradeassistant/internal/repository/models/codehost.go,http://localhost:3443/github.com/koderover/zadig/-/blob/pkg/cli/upgradeassistant/internal/repository/models/codehost.go,"[STRUCT, CodeHost, http://localhost:3443/github.com/koderover/zadig/-/blob/pkg/cli/upgradeassistant/internal/repository/models/codehost.go?L19:6-19:14]"\nsymbol,github.com/sourcegraph/sourcegraph,http://localhost:3443/github.com/sourcegraph/sourcegraph,internal/extsvc/codehost.go,http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/extsvc/codehost.go,"[STRUCT, CodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/extsvc/codehost.go?L10:6-10:14]; [FUNCTION, NewCodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/extsvc/codehost.go?L64:9-64:20]"', + 'Match type,Repository,Repository external URL,File path,File URL,Symbols [kind name url]\nsymbol,github.com/sourcegraph/sourcegraph,http://localhost:3443/github.com/sourcegraph/sourcegraph,enterprise/internal/batches/types/code_host.go,http://localhost:3443/github.com/sourcegraph/sourcegraph@6c09a2246d9c9ddf6efa2d0cdf095ea8b86b0c9a/-/blob/enterprise/internal/batches/types/code_host.go,"[STRUCT, CodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/enterprise/internal/batches/types/code_host.go?L6:6-6:14]"\nsymbol,github.com/sourcegraph/sourcegraph,http://localhost:3443/github.com/sourcegraph/sourcegraph,internal/database/external_services.go,http://localhost:3443/github.com/sourcegraph/sourcegraph@6c09a2246d9c9ddf6efa2d0cdf095ea8b86b0c9a/-/blob/internal/database/external_services.go,"[FIELD, CodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/database/external_services.go?L225:2-225:10]"\nsymbol,github.com/koderover/zadig,http://localhost:3443/github.com/koderover/zadig,pkg/cli/upgradeassistant/internal/repository/models/codehost.go,http://localhost:3443/github.com/koderover/zadig@039158ab468a062c9f36dcb1d1b9d259083fba0a/-/blob/pkg/cli/upgradeassistant/internal/repository/models/codehost.go,"[STRUCT, CodeHost, http://localhost:3443/github.com/koderover/zadig/-/blob/pkg/cli/upgradeassistant/internal/repository/models/codehost.go?L19:6-19:14]"\nsymbol,github.com/sourcegraph/sourcegraph,http://localhost:3443/github.com/sourcegraph/sourcegraph,internal/extsvc/codehost.go,http://localhost:3443/github.com/sourcegraph/sourcegraph@6c09a2246d9c9ddf6efa2d0cdf095ea8b86b0c9a/-/blob/internal/extsvc/codehost.go,"[STRUCT, CodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/extsvc/codehost.go?L10:6-10:14]; [FUNCTION, NewCodeHost, http://localhost:3443/github.com/sourcegraph/sourcegraph/-/blob/internal/extsvc/codehost.go?L64:9-64:20]"', ], [ 'diff', diff --git a/client/web/src/search/results/sidebar/SearchFiltersSidebar.tsx b/client/web/src/search/results/sidebar/SearchFiltersSidebar.tsx index 1e2cd73373f01..75934aaa83448 100644 --- a/client/web/src/search/results/sidebar/SearchFiltersSidebar.tsx +++ b/client/web/src/search/results/sidebar/SearchFiltersSidebar.tsx @@ -4,15 +4,16 @@ import { type ReactElement, useCallback, useMemo, - type HTMLAttributes, - memo, - type PropsWithChildren, + forwardRef, + HTMLAttributes, + ComponentType, + PropsWithChildren, } from 'react' import { mdiInformationOutline } from '@mdi/js' import { - SearchSidebar, + StickySearchSidebar, SearchSidebarSection, getDynamicFilterLinks, getRepoFilterLinks, @@ -21,6 +22,7 @@ import { getSearchTypeLinks, getFiltersOfKind, useLastRepoName, + PersistSidebarStoreProvider, } from '@sourcegraph/branded' import type { QueryStateUpdate, QueryUpdate } from '@sourcegraph/shared/src/search' import { FilterType } from '@sourcegraph/shared/src/search/query/filters' @@ -37,7 +39,12 @@ import { AggregationUIMode, GroupResultsPing } from '../components/aggregation' import { getRevisions } from './Revisions' import { SearchAggregations } from './SearchAggregations' +interface GenericSidebarProps extends HTMLAttributes { + onClose: () => void +} + export interface SearchFiltersSidebarProps extends TelemetryProps, SettingsCascadeProps, HTMLAttributes { + as?: ComponentType> liveQuery: string submittedURLQuery: string patternType: SearchPatternType @@ -51,8 +58,9 @@ export interface SearchFiltersSidebarProps extends TelemetryProps, SettingsCasca setSidebarCollapsed: (collapsed: boolean) => void } -export const SearchFiltersSidebar: FC> = memo(props => { +export const SearchFiltersSidebar = forwardRef>(props => { const { + as: Component = StickySearchSidebar, liveQuery, submittedURLQuery, caseSensitive, @@ -111,96 +119,98 @@ export const SearchFiltersSidebar: FC setSidebarCollapsed(true)}> - {children} + setSidebarCollapsed(true)}> + + {children} + + {showAggregationPanel && + enableSearchAggregations && + aggregationUIMode === AggregationUIMode.Sidebar && ( + } + // SearchAggregations content contains component that makes a few API network requests + // in order to prevent these calls if this section is collapsed we turn off force render + // for collapse section component + forcedRender={false} + onToggle={handleGroupedByToggle} + > + + + )} + + + {getSearchTypeLinks({ + query: liveQuery, + onNavbarQueryChange, + selectedSearchContextSpec, + buildSearchURLQueryFromQueryState, + forceButton: false, + })} + + + + {getDynamicFilterLinks(filters, ['lang'], onDynamicFilterClicked, label => `Search ${label} files`)} + - {showAggregationPanel && enableSearchAggregations && aggregationUIMode === AggregationUIMode.Sidebar && ( } - // SearchAggregations content contains component that makes a few API network requests - // in order to prevent these calls if this section is collapsed we turn off force render - // for collapse section component - forcedRender={false} - onToggle={handleGroupedByToggle} + sectionId={SectionID.REPOSITORIES} + header="Repositories" + searchOptions={{ ariaLabel: 'Find repositories', noResultText: getRepoFilterNoResultText }} + minItems={2} > - + {getRepoFilterLinks(repoFilters, onDynamicFilterClicked)} + + + + {getDynamicFilterLinks(filters, ['file'], onDynamicFilterClicked)} - )} - - - {getSearchTypeLinks({ - query: liveQuery, - onNavbarQueryChange, - selectedSearchContextSpec, - buildSearchURLQueryFromQueryState, - forceButton: false, - })} - - - - {getDynamicFilterLinks(filters, ['lang'], onDynamicFilterClicked, label => `Search ${label} files`)} - - - - {getRepoFilterLinks(repoFilters, onDynamicFilterClicked)} - - - - {getDynamicFilterLinks(filters, ['file'], onDynamicFilterClicked)} - - - {getDynamicFilterLinks(filters, ['utility'], onDynamicFilterClicked)} - - - {repoName && ( + + {getDynamicFilterLinks(filters, ['utility'], onDynamicFilterClicked)} + + + {repoName && ( + + {getRevisions({ repoName, onFilterClick: onSearchSubmit })} + + )} + - {getRevisions({ repoName, onFilterClick: onSearchSubmit })} + {getSearchReferenceFactory({ telemetryService, setQueryState: onNavbarQueryChange })} - )} - - - {getSearchReferenceFactory({ telemetryService, setQueryState: onNavbarQueryChange })} - - - - {getSearchSnippetLinks(settingsCascade, onSnippetClicked)} - - + + + {getSearchSnippetLinks(settingsCascade, onSnippetClicked)} + + + ) }) -SearchFiltersSidebar.displayName = 'SearchFiltersSidebar' - const getRepoFilterNoResultText = (repoFilterLinks: ReactElement[]): ReactNode => ( None of the top {repoFilterLinks.length} repositories in your results match this filter. Try a{' '} diff --git a/client/web/src/search/results/useStreamingSearchPings.ts b/client/web/src/search/results/useStreamingSearchPings.ts new file mode 100644 index 0000000000000..c1ac6780d88c7 --- /dev/null +++ b/client/web/src/search/results/useStreamingSearchPings.ts @@ -0,0 +1,135 @@ +import { useCallback, useEffect } from 'react' + +import { limitHit } from '@sourcegraph/branded' +import { asError } from '@sourcegraph/common' +import { collectMetrics } from '@sourcegraph/shared/src/search/query/metrics' +import { sanitizeQueryForTelemetry } from '@sourcegraph/shared/src/search/query/transformer' +import { AggregateStreamingSearchResults } from '@sourcegraph/shared/src/search/stream' +import { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' + +import { useNavbarQueryState } from '../../stores' +import { smartSearchEvent } from '../suggestion/SmartSearch' + +interface useStreamingSearchPingsProps extends TelemetryProps { + isAuauthenticated: boolean + isSourcegraphDotCom: boolean + results: AggregateStreamingSearchResults | undefined +} + +interface StreamingSearchPingsAPI { + logSearchResultClicked: (index: number, type: string, resultsLength: number) => void +} + +export function useStreamingSearchPings(props: useStreamingSearchPingsProps): StreamingSearchPingsAPI { + const { isAuauthenticated, isSourcegraphDotCom, results, telemetryService } = props + + const submittedURLQuery = useNavbarQueryState(state => state.searchQueryFromURL) + + // Log view event on first load + useEffect( + () => { + telemetryService.logViewEvent('SearchResults') + }, + // Only log view on initial load + // eslint-disable-next-line react-hooks/exhaustive-deps + [] + ) + + // Log search query event when URL changes + useEffect(() => { + const metrics = submittedURLQuery ? collectMetrics(submittedURLQuery) : undefined + + telemetryService.log( + 'SearchResultsQueried', + { + code_search: { + query_data: { + query: metrics, + combined: submittedURLQuery, + empty: !submittedURLQuery, + }, + }, + }, + { + code_search: { + query_data: { + // 🚨 PRIVACY: never provide any private query data in the + // { code_search: query_data: query } property, + // which is also potentially exported in pings data. + query: metrics, + + // 🚨 PRIVACY: Only collect the full query string for unauthenticated users + // on Sourcegraph.com, and only after sanitizing to remove certain filters. + combined: + !isAuauthenticated && isSourcegraphDotCom + ? sanitizeQueryForTelemetry(submittedURLQuery) + : undefined, + empty: !submittedURLQuery, + }, + }, + } + ) + // Only log when the query changes + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [submittedURLQuery]) + + // Log events when search completes or fails + useEffect(() => { + if (results?.state === 'complete') { + telemetryService.log('SearchResultsFetched', { + code_search: { + // 🚨 PRIVACY: never provide any private data in { code_search: { results } }. + query_data: { + combined: submittedURLQuery, + }, + results: { + results_count: results.progress.matchCount, + limit_hit: limitHit(results.progress), + any_cloning: results.progress.skipped.some(skipped => skipped.reason === 'repository-cloning'), + alert: results.alert ? results.alert.title : null, + }, + }, + }) + if (results.results.length > 0) { + telemetryService.log('SearchResultsNonEmpty') + } + } else if (results?.state === 'error') { + telemetryService.log('SearchResultsFetchFailed', { + code_search: { error_message: asError(results.error).message }, + }) + } + }, [results, submittedURLQuery, telemetryService]) + + useEffect(() => { + if ( + (results?.alert?.kind === 'smart-search-additional-results' || + results?.alert?.kind === 'smart-search-pure-results') && + results?.alert?.title && + results.alert.proposedQueries + ) { + const events = smartSearchEvent( + results.alert.kind, + results.alert.title, + results.alert.proposedQueries.map(entry => entry.description || '') + ) + for (const event of events) { + telemetryService.log(event) + } + } + }, [results, telemetryService]) + + const logSearchResultClicked = useCallback( + (index: number, type: string, resultsLength: number) => { + telemetryService.log('SearchResultClicked') + // This data ends up in Prometheus and is not part of the ping payload. + telemetryService.log('search.ranking.result-clicked', { + index, + type, + resultsLength, + }) + }, + [telemetryService] + ) + + return { logSearchResultClicked } +} diff --git a/client/web/src/site-admin/RepositoryNode.tsx b/client/web/src/site-admin/RepositoryNode.tsx index 8d6cdca079ccb..215adabbb8bc6 100644 --- a/client/web/src/site-admin/RepositoryNode.tsx +++ b/client/web/src/site-admin/RepositoryNode.tsx @@ -12,6 +12,7 @@ import { mdiSecurity, mdiVectorPolyline, mdiListStatus, + mdiSearchWeb, } from '@mdi/js' import classNames from 'classnames' import { useNavigate } from 'react-router-dom' @@ -227,7 +228,7 @@ export const RepositoryNode: React.FunctionComponent navigate(`/${node.name}/-/settings/index`)} className="p-2" > - + Search indexing { name: 'Docs', href: 'https://docs.sourcegraph.com/', }, - { name: 'About', href: 'https://about.sourcegraph.com' }, + { name: 'About', href: 'https://sourcegraph.com' }, { name: 'Cody', - href: 'https://about.sourcegraph.com/cody', + href: 'https://sourcegraph.com/cody', }, { name: 'Enterprise', - href: 'https://about.sourcegraph.com/get-started?t=enterprise', + href: 'https://sourcegraph.com/get-started?t=enterprise', }, { name: 'Security', - href: 'https://about.sourcegraph.com/security', + href: 'https://sourcegraph.com/security', }, { name: 'Discord', href: 'https://srcgr.ph/discord-server' }, ] diff --git a/client/web/src/storm/pages/SearchPage/SearchPageInput.tsx b/client/web/src/storm/pages/SearchPage/SearchPageInput.tsx index 8efc35277d980..7412234e9afd4 100644 --- a/client/web/src/storm/pages/SearchPage/SearchPageInput.tsx +++ b/client/web/src/storm/pages/SearchPage/SearchPageInput.tsx @@ -150,6 +150,7 @@ export const SearchPageInput: FC = props => { setSearchMode={setSearchMode} navbarSearchQuery={queryState.query} showSmartSearchButton={false} + showExtendedPicker={false} structuralSearchDisabled={window.context?.experimentalFeatures?.structuralSearch === 'disabled'} /> diff --git a/client/web/src/util/constants.ts b/client/web/src/util/constants.ts index e6e180fac9656..ee043244b7800 100644 --- a/client/web/src/util/constants.ts +++ b/client/web/src/util/constants.ts @@ -15,7 +15,7 @@ export const enum EventName { CODY_CHAT_SCOPE_INFERRED_REPO_DISABLED = 'web:codyChat:inferredRepoDisabled', CODY_CHAT_SCOPE_INFERRED_FILE_ENABLED = 'web:codyChat:inferredFileEnabled', CODY_CHAT_SCOPE_INFERRED_FILE_DISABLED = 'web:codyChat:inferredFileDisabled', - VIEW_GET_CODY = 'ViewGetCody', + VIEW_GET_CODY = 'GetCody', CODY_EDITOR_WIDGET_VIEWED = 'web:codyEditorWidget:viewed', CODY_SIDEBAR_CHAT_OPENED = 'web:codySidebar:chatOpened', @@ -36,6 +36,11 @@ export const enum EventName { JOIN_IDE_WAITLIST = 'JoinIDEWaitlist', DOWNLOAD_IDE = 'DownloadIDE', DOWNLOAD_APP = 'DownloadApp', + + CODY_MANAGEMENT_PAGE_VIEWED = 'web:codyManagement:pageViewed', + CODY_SUBSCRIPTION_PAGE_VIEWED = 'web:codySubscription:pageViewed', + CODY_ONBOARDING_PURPOSE_WORK = 'web:codyOnboarding:purpose:work', + CODY_ONBOARDING_PURPOSE_PERSONAL = 'web:codyOnboarding:purpose:personal', } export const enum EventLocation { diff --git a/client/web/vitest.config.ts b/client/web/vitest.config.ts index a63483899d231..8bb22e887a236 100644 --- a/client/web/vitest.config.ts +++ b/client/web/vitest.config.ts @@ -6,6 +6,7 @@ export default defineProjectWithDefaults(__dirname, { environmentMatchGlobs: [ ['src/enterprise/code-monitoring/ManageCodeMonitorPage.test.tsx', 'jsdom'], // needs window.confirm, Request ['src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx', 'jsdom'], // 'Error: Should not already be working.' + ['src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx', 'jsdom'], // 'Error: Should not already be working.' ['src/hooks/useScrollManager/useScrollManager.test.tsx', 'jsdom'], // for correct scroll counting ['src/components/KeyboardShortcutsHelp/KeyboardShortcutsHelp.test.tsx', 'jsdom'], // event.getModifierState ], diff --git a/client/wildcard/BUILD.bazel b/client/wildcard/BUILD.bazel index 75589b5bd516c..9468c1e20db4e 100644 --- a/client/wildcard/BUILD.bazel +++ b/client/wildcard/BUILD.bazel @@ -396,6 +396,9 @@ ts_project( "src/hooks/useOffsetPagination.ts", "src/hooks/useOnClickOutside.ts", "src/hooks/usePrompt.tsx", + "src/hooks/useScrollManager/index.ts", + "src/hooks/useScrollManager/mutationObserverWithTimeout.ts", + "src/hooks/useScrollManager/useScrollManager.ts", "src/hooks/useSearchParameters.ts", "src/hooks/useSessionStorage.ts", "src/hooks/useStopwatch.ts", @@ -540,6 +543,7 @@ ts_project( "src/components/Typography/Text/Text.test.tsx", "src/hooks/useCookieStorage.test.ts", "src/hooks/useObservable.test.ts", + "src/hooks/useScrollManager/useScrollManager.test.tsx", "src/hooks/useTimeoutManager.test.ts", "src/testing/testSetup.test.ts", "src/utils/linkClickHandler.test.tsx", @@ -562,6 +566,7 @@ ts_project( "//:node_modules/js-cookie", "//:node_modules/mdi-react", "//:node_modules/react", + "//:node_modules/react-router-dom", "//:node_modules/rxjs", "//:node_modules/sinon", "//:node_modules/vitest", @@ -585,6 +590,7 @@ filegroup( vitest_test( name = "test", data = [ + ":module_styles", ":snapshots", ":wildcard_tests", ], diff --git a/client/wildcard/src/components/Panel/useResizablePanel.ts b/client/wildcard/src/components/Panel/useResizablePanel.ts index 0a71e15f28507..9b6001b8a00a6 100644 --- a/client/wildcard/src/components/Panel/useResizablePanel.ts +++ b/client/wildcard/src/components/Panel/useResizablePanel.ts @@ -1,5 +1,5 @@ import type React from 'react' -import { useEffect, useRef, useState } from 'react' +import { useEffect, useLayoutEffect, useRef, useState } from 'react' import { Subject, Subscription } from 'rxjs' import { debounceTime, distinctUntilChanged } from 'rxjs/operators' @@ -114,7 +114,7 @@ export const useResizablePanel = ({ const [isResizing, setResizing] = useState(false) const [panelSize, setPanelSize] = useState(defaultSize) - useEffect(() => { + useLayoutEffect(() => { const size = getCachedPanelSize(storageKey, defaultSize, maxSize, minSize) onResize?.(size) setPanelSize(size) diff --git a/client/wildcard/src/global-styles/highlight.scss b/client/wildcard/src/global-styles/highlight.scss index 9480a319d38bc..fdfd8892e0b0f 100644 --- a/client/wildcard/src/global-styles/highlight.scss +++ b/client/wildcard/src/global-styles/highlight.scss @@ -556,6 +556,21 @@ color: var(--hl-pink); } + // The following hl-typed-* that have associated tooltips. + // This ensures that tokens highlight before tooltip is available. + .hl-typed-Identifier:hover, + .hl-typed-IdentifierParameter:hover, + .hl-typed-IdentifierAttribute:hover, + .hl-typed-IdentifierType:hover, + .hl-typed-IdentifierFunction:hover, + .hl-typed-IdentifierModule:hover, + .hl-typed-IdentifierFunctionDefinition:hover, + .hl-typed-IdentifierNamespace:hover, + .hl-typed-IdentifierConstant:hover, + .hl-typed-IdentifierBuiltin:hover { + background-color: var(--mark-bg); + } + // TODO: Followup for https://github.com/sourcegraph/sourcegraph/issues/30995 // .hl-typed-RegexEscape { // } @@ -978,6 +993,21 @@ color: var(--hl-purple); } + // The following hl-typed-* that have associated tooltips. + // This ensures that tokens highlight before tooltip is available. + .hl-typed-Identifier:hover, + .hl-typed-IdentifierAttribute:hover, + .hl-typed-IdentifierBuiltin:hover, + .hl-typed-IdentifierConstant:hover, + .hl-typed-IdentifierFunction:hover, + .hl-typed-IdentifierFunctionDefinition:hover, + .hl-typed-IdentifierModule:hover, + .hl-typed-IdentifierNamespace:hover, + .hl-typed-IdentifierParameter:hover, + .hl-typed-IdentifierType:hover { + background-color: var(--mark-bg); + } + // TODO: Followup for https://github.com/sourcegraph/sourcegraph/issues/30995 // .hl-typed-RegexEscape { // } diff --git a/client/wildcard/src/hooks/index.ts b/client/wildcard/src/hooks/index.ts index 1a8c5853ec16a..07448d752f010 100644 --- a/client/wildcard/src/hooks/index.ts +++ b/client/wildcard/src/hooks/index.ts @@ -25,3 +25,4 @@ export { useUpdateEffect } from './useUpdateEffect' export { useFocusOnLoadedMore } from './useFocusOnLoadedMore' export { useBeforeUnloadPrompt } from './usePrompt' export { useCookieStorage } from './useCookieStorage' +export { useScrollManager } from './useScrollManager' diff --git a/client/web/src/hooks/useScrollManager/index.ts b/client/wildcard/src/hooks/useScrollManager/index.ts similarity index 100% rename from client/web/src/hooks/useScrollManager/index.ts rename to client/wildcard/src/hooks/useScrollManager/index.ts diff --git a/client/web/src/hooks/useScrollManager/mutationObserverWithTimeout.ts b/client/wildcard/src/hooks/useScrollManager/mutationObserverWithTimeout.ts similarity index 100% rename from client/web/src/hooks/useScrollManager/mutationObserverWithTimeout.ts rename to client/wildcard/src/hooks/useScrollManager/mutationObserverWithTimeout.ts diff --git a/client/web/src/hooks/useScrollManager/useScrollManager.test.tsx b/client/wildcard/src/hooks/useScrollManager/useScrollManager.test.tsx similarity index 97% rename from client/web/src/hooks/useScrollManager/useScrollManager.test.tsx rename to client/wildcard/src/hooks/useScrollManager/useScrollManager.test.tsx index 3aad3cbc39ae2..0148dcd82cf7c 100644 --- a/client/web/src/hooks/useScrollManager/useScrollManager.test.tsx +++ b/client/wildcard/src/hooks/useScrollManager/useScrollManager.test.tsx @@ -5,7 +5,7 @@ import { Routes, Route } from 'react-router-dom' import { spy, assert } from 'sinon' import { vi, afterAll, beforeAll, describe, it } from 'vitest' -import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing' +import { renderWithBrandedContext } from '../../testing' import { useScrollManager } from './useScrollManager' diff --git a/client/web/src/hooks/useScrollManager/useScrollManager.ts b/client/wildcard/src/hooks/useScrollManager/useScrollManager.ts similarity index 98% rename from client/web/src/hooks/useScrollManager/useScrollManager.ts rename to client/wildcard/src/hooks/useScrollManager/useScrollManager.ts index 56a3395980677..7d022fc0b93e4 100644 --- a/client/web/src/hooks/useScrollManager/useScrollManager.ts +++ b/client/wildcard/src/hooks/useScrollManager/useScrollManager.ts @@ -1,4 +1,4 @@ -import { useEffect } from 'react' +import { useEffect, RefObject } from 'react' import { debounce } from 'lodash' import { useLocation, useNavigationType } from 'react-router-dom' @@ -32,7 +32,7 @@ const SCROLL_RETRY_TIMEOUT = 3000 * @param containerKey A unique key to identify the container where scrolling will be managed. Usually the component name. * @param containerRef A React ref object of the container where scrolling will be managed. */ -export function useScrollManager(containerKey: string, containerRef: React.RefObject): void { +export function useScrollManager(containerKey: string, containerRef: RefObject): void { const location = useLocation() const navigationType = useNavigationType() diff --git a/cmd/blobstore/internal/blobstore/BUILD.bazel b/cmd/blobstore/internal/blobstore/BUILD.bazel index 66c803d7f8ffb..2f2975c583194 100644 --- a/cmd/blobstore/internal/blobstore/BUILD.bazel +++ b/cmd/blobstore/internal/blobstore/BUILD.bazel @@ -25,7 +25,7 @@ go_library( go_test( name = "blobstore_test", - timeout = "short", + timeout = "moderate", srcs = ["blobstore_test.go"], data = glob(["testdata/**"]), deps = [ diff --git a/cmd/cody-gateway/internal/actor/anonymous/anonymous.go b/cmd/cody-gateway/internal/actor/anonymous/anonymous.go index 6df175d8a612a..cb523d12d41e2 100644 --- a/cmd/cody-gateway/internal/actor/anonymous/anonymous.go +++ b/cmd/cody-gateway/internal/actor/anonymous/anonymous.go @@ -37,7 +37,7 @@ func (s *Source) Get(ctx context.Context, token string) (*actor.Actor, error) { codygateway.FeatureChatCompletions: actor.NewRateLimitWithPercentageConcurrency( 50, 24*time.Hour, - []string{"anthropic/claude-v1", "anthropic/claude-2"}, + []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-2.0", "anthropic/claude-2.1"}, s.concurrencyConfig, ), codygateway.FeatureCodeCompletions: actor.NewRateLimitWithPercentageConcurrency( diff --git a/cmd/cody-gateway/internal/events/BUILD.bazel b/cmd/cody-gateway/internal/events/BUILD.bazel index 96dd93163368f..e4d1769d75673 100644 --- a/cmd/cody-gateway/internal/events/BUILD.bazel +++ b/cmd/cody-gateway/internal/events/BUILD.bazel @@ -16,13 +16,13 @@ go_library( "//internal/codygateway", "//internal/goroutine", "//internal/trace", - "//internal/xcontext", "//lib/errors", "@com_github_sourcegraph_log//:log", "@com_google_cloud_go_bigquery//:bigquery", "@io_opentelemetry_go_otel//:otel", "@io_opentelemetry_go_otel//attribute", "@io_opentelemetry_go_otel//codes", + "@io_opentelemetry_go_otel_metric//:metric", "@io_opentelemetry_go_otel_trace//:trace", ], ) diff --git a/cmd/cody-gateway/internal/events/buffered.go b/cmd/cody-gateway/internal/events/buffered.go index 9230aaa0adea3..534c0abdfe755 100644 --- a/cmd/cody-gateway/internal/events/buffered.go +++ b/cmd/cody-gateway/internal/events/buffered.go @@ -7,6 +7,9 @@ import ( "time" "github.com/sourcegraph/log" + otelmetric "go.opentelemetry.io/otel/metric" + + "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" @@ -60,11 +63,13 @@ func defaultWorkers(bufferSize, workerCount int) int { return bufferSize / 10 } +var meter = otel.GetMeterProvider().Meter("cody-gateway/internal/events") + // NewBufferedLogger wraps handler with a buffered logger that submits events // in the background instead of in the hot-path of a request. It implements // goroutine.BackgroundRoutine that must be started. -func NewBufferedLogger(logger log.Logger, handler Logger, bufferSize, workerCount int) *BufferedLogger { - return &BufferedLogger{ +func NewBufferedLogger(logger log.Logger, handler Logger, bufferSize, workerCount int) (*BufferedLogger, error) { + res := BufferedLogger{ log: logger.Scoped("bufferedLogger"), handler: handler, @@ -76,6 +81,15 @@ func NewBufferedLogger(logger log.Logger, handler Logger, bufferSize, workerCoun bufferClosed: &atomic.Bool{}, flushedC: make(chan struct{}), } + _, err := meter.Int64ObservableGauge("cody-gateway.buffered_logger_buffer_size", + otelmetric.WithDescription("number of events in buffered logger buffer"), otelmetric.WithInt64Callback(func(ctx context.Context, observer otelmetric.Int64Observer) error { + observer.Observe(int64(len(res.bufferC))) + return nil + })) + if err != nil { + return nil, err + } + return &res, nil } // LogEvent implements event.Logger by submitting the event to a buffer for processing. diff --git a/cmd/cody-gateway/internal/events/buffered_test.go b/cmd/cody-gateway/internal/events/buffered_test.go index 231427ec7b012..ff76bc9230bb3 100644 --- a/cmd/cody-gateway/internal/events/buffered_test.go +++ b/cmd/cody-gateway/internal/events/buffered_test.go @@ -33,7 +33,7 @@ func TestBufferedLogger(t *testing.T) { handler := &mockLogger{} // Test with a buffer size of 0, which should immediately submit events - b := events.NewBufferedLogger(logtest.Scoped(t), handler, 0, 3) + b, _ := events.NewBufferedLogger(logtest.Scoped(t), handler, 0, 3) wg := conc.NewWaitGroup() wg.Go(b.Start) @@ -79,7 +79,7 @@ func TestBufferedLogger(t *testing.T) { // Set up a buffered logger we can fill up bufferSize := 3 workerCount := 3 - b := events.NewBufferedLogger(l, handler, bufferSize, workerCount) + b, _ := events.NewBufferedLogger(l, handler, bufferSize, workerCount) wg := conc.NewWaitGroup() wg.Go(b.Start) @@ -126,7 +126,7 @@ func TestBufferedLogger(t *testing.T) { handler := &mockLogger{} l, exportLogs := logtest.Captured(t) - b := events.NewBufferedLogger(l, handler, 10, 3) + b, _ := events.NewBufferedLogger(l, handler, 10, 3) wg := conc.NewWaitGroup() wg.Go(b.Start) diff --git a/cmd/cody-gateway/internal/events/events.go b/cmd/cody-gateway/internal/events/events.go index 779d768b26006..30e943e9029c8 100644 --- a/cmd/cody-gateway/internal/events/events.go +++ b/cmd/cody-gateway/internal/events/events.go @@ -13,7 +13,6 @@ import ( sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/codygateway" "github.com/sourcegraph/sourcegraph/internal/trace" - "github.com/sourcegraph/sourcegraph/internal/xcontext" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -114,7 +113,7 @@ func (l *bigQueryLogger) LogEvent(spanCtx context.Context, event Event) (err err if err := l.tableInserter.Put( // Create a cancel-free context to avoid interrupting the log when // the parent context is cancelled. - xcontext.Detach(spanCtx), + context.WithoutCancel(spanCtx), bigQueryEvent{ Name: string(event.Name), Source: event.Source, diff --git a/cmd/cody-gateway/internal/httpapi/completions/anthropic.go b/cmd/cody-gateway/internal/httpapi/completions/anthropic.go index d2ed288c31f50..8e865a51a84ab 100644 --- a/cmd/cody-gateway/internal/httpapi/completions/anthropic.go +++ b/cmd/cody-gateway/internal/httpapi/completions/anthropic.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "github.com/sourcegraph/sourcegraph/cmd/cody-gateway/internal/actor" "io" "net/http" @@ -37,7 +38,7 @@ const ( func isFlaggedAnthropicRequest(tk *tokenizer.Tokenizer, ar anthropicRequest, promptRegexps []*regexp.Regexp) (*flaggingResult, error) { // Only usage of chat models us currently flagged, so if the request // is using another model, we skip other checks. - if ar.Model != "claude-2" && ar.Model != "claude-v1" { + if ar.Model != "claude-2" && ar.Model != "claude-2.0" && ar.Model != "claude-2.1" && ar.Model != "claude-v1" { return nil, nil } reasons := []string{} @@ -157,7 +158,7 @@ func NewAnthropicHandler( UserID: identifier, } }, - getRequestMetadata: func(body anthropicRequest) (model string, additionalMetadata map[string]any) { + getRequestMetadata: func(_ context.Context, _ log.Logger, _ *actor.Actor, body anthropicRequest) (model string, additionalMetadata map[string]any) { return body.Model, map[string]any{ "stream": body.Stream, "max_tokens_to_sample": body.MaxTokensToSample, diff --git a/cmd/cody-gateway/internal/httpapi/completions/fireworks.go b/cmd/cody-gateway/internal/httpapi/completions/fireworks.go index 1332d5b7b5120..ddfac29b50095 100644 --- a/cmd/cody-gateway/internal/httpapi/completions/fireworks.go +++ b/cmd/cody-gateway/internal/httpapi/completions/fireworks.go @@ -4,11 +4,11 @@ import ( "bytes" "context" "encoding/json" + "github.com/sourcegraph/log" + "github.com/sourcegraph/sourcegraph/cmd/cody-gateway/internal/actor" "io" "net/http" - "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/cmd/cody-gateway/internal/events" "github.com/sourcegraph/sourcegraph/cmd/cody-gateway/internal/limiter" "github.com/sourcegraph/sourcegraph/cmd/cody-gateway/internal/notify" @@ -29,6 +29,7 @@ func NewFireworksHandler( httpClient httpcli.Doer, accessToken string, allowedModels []string, + logSelfServeCodeCompletionRequests bool, ) http.Handler { return makeUpstreamHandler( baseLogger, @@ -55,7 +56,34 @@ func NewFireworksHandler( body.N = 1 } }, - getRequestMetadata: func(body fireworksRequest) (model string, additionalMetadata map[string]any) { + getRequestMetadata: func(ctx context.Context, logger log.Logger, act *actor.Actor, body fireworksRequest) (model string, additionalMetadata map[string]any) { + // we checked this is a code completion request in validateRequest + // check that actor is a PLG user + if logSelfServeCodeCompletionRequests && act.IsDotComActor() { + // LogEvent is a channel send (not an external request), so should be ok here + if err := eventLogger.LogEvent( + ctx, + events.Event{ + Name: codygateway.EventNameCodeCompletionLogged, + Source: act.Source.Name(), + Identifier: act.ID, + Metadata: map[string]any{ + "request": map[string]any{ + "prompt": body.Prompt, + "model": body.Model, + "max_tokens": body.MaxTokens, + "temperature": body.Temperature, + "top_p": body.TopP, + "n": body.N, + "stream": body.Stream, + "echo": body.Echo, + "stop": body.Stop, + }, + }, + }); err != nil { + logger.Error("failed to log event", log.Error(err)) + } + } return body.Model, map[string]any{"stream": body.Stream} }, transformRequest: func(r *http.Request) { diff --git a/cmd/cody-gateway/internal/httpapi/completions/openai.go b/cmd/cody-gateway/internal/httpapi/completions/openai.go index 2f64f0c3c4164..d52bfeb420c55 100644 --- a/cmd/cody-gateway/internal/httpapi/completions/openai.go +++ b/cmd/cody-gateway/internal/httpapi/completions/openai.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "github.com/sourcegraph/sourcegraph/cmd/cody-gateway/internal/actor" "io" "net/http" @@ -58,7 +59,7 @@ func NewOpenAIHandler( // We forward the actor ID to support tracking. body.User = identifier }, - getRequestMetadata: func(body openaiRequest) (model string, additionalMetadata map[string]any) { + getRequestMetadata: func(_ context.Context, _ log.Logger, _ *actor.Actor, body openaiRequest) (model string, additionalMetadata map[string]any) { return body.Model, map[string]any{"stream": body.Stream} }, transformRequest: func(r *http.Request) { diff --git a/cmd/cody-gateway/internal/httpapi/completions/upstream.go b/cmd/cody-gateway/internal/httpapi/completions/upstream.go index c6e181ea2d2c0..13ebc6d8b8c4f 100644 --- a/cmd/cody-gateway/internal/httpapi/completions/upstream.go +++ b/cmd/cody-gateway/internal/httpapi/completions/upstream.go @@ -64,7 +64,7 @@ type upstreamHandlerMethods[ReqT UpstreamRequest] struct { // to be reported here - instead, use parseResponseAndUsage to extract usage, // which for some providers we can only know after the fact based on what // upstream tells us. - getRequestMetadata func(ReqT) (model string, additionalMetadata map[string]any) + getRequestMetadata func(context.Context, log.Logger, *actor.Actor, ReqT) (model string, additionalMetadata map[string]any) // parseResponseAndUsage should extract details from the response we get back from // upstream as well as overall usage for tracking purposes. // @@ -229,7 +229,7 @@ func makeUpstreamHandler[ReqT UpstreamRequest]( methods.transformRequest(req) // Retrieve metadata from the initial request. - model, requestMetadata := methods.getRequestMetadata(body) + model, requestMetadata := methods.getRequestMetadata(r.Context(), logger, act, body) // Match the model against the allowlist of models, which are configured // with the Cody Gateway model format "$PROVIDER/$MODEL_NAME". Models @@ -352,6 +352,11 @@ func makeUpstreamHandler[ReqT UpstreamRequest]( log.Error(errors.New(resp.Status)), // real error needed for Sentry reporting log.String("resp.headers", headers.String())) resolvedStatusCode = http.StatusServiceUnavailable + } + + // This handles upstream 429 responses as well, since they get + // resolved to http.StatusServiceUnavailable. + if resolvedStatusCode == http.StatusServiceUnavailable { // Propagate retry-after in case it is handle-able by the client, // or write our default. 503 errors can have retry-after as well. if upstreamRetryAfter := resp.Header.Get("retry-after"); upstreamRetryAfter != "" { diff --git a/cmd/cody-gateway/internal/httpapi/handler.go b/cmd/cody-gateway/internal/httpapi/handler.go index 63ef56873f0e7..8f19b7f259d38 100644 --- a/cmd/cody-gateway/internal/httpapi/handler.go +++ b/cmd/cody-gateway/internal/httpapi/handler.go @@ -25,18 +25,19 @@ import ( ) type Config struct { - RateLimitNotifier notify.RateLimitNotifier - AnthropicAccessToken string - AnthropicAllowedModels []string - AnthropicAllowedPromptPatterns []string - AnthropicRequestBlockingEnabled bool - AnthropicMaxTokensToSample int - OpenAIAccessToken string - OpenAIOrgID string - OpenAIAllowedModels []string - FireworksAccessToken string - FireworksAllowedModels []string - EmbeddingsAllowedModels []string + RateLimitNotifier notify.RateLimitNotifier + AnthropicAccessToken string + AnthropicAllowedModels []string + AnthropicAllowedPromptPatterns []string + AnthropicRequestBlockingEnabled bool + AnthropicMaxTokensToSample int + OpenAIAccessToken string + OpenAIOrgID string + OpenAIAllowedModels []string + FireworksAccessToken string + FireworksAllowedModels []string + FireworksLogSelfServeCodeCompletionRequests bool + EmbeddingsAllowedModels []string } var meter = otel.GetMeterProvider().Meter("cody-gateway/internal/httpapi") @@ -189,6 +190,7 @@ func NewHandler( httpClient, config.FireworksAccessToken, config.FireworksAllowedModels, + config.FireworksLogSelfServeCodeCompletionRequests, ), ), ), diff --git a/cmd/cody-gateway/internal/limiter/BUILD.bazel b/cmd/cody-gateway/internal/limiter/BUILD.bazel index ad5ba8d04afbc..06959012f6950 100644 --- a/cmd/cody-gateway/internal/limiter/BUILD.bazel +++ b/cmd/cody-gateway/internal/limiter/BUILD.bazel @@ -12,7 +12,6 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/cmd/cody-gateway/internal/limiter", visibility = ["//cmd/cody-gateway:__subpackages__"], deps = [ - "//internal/xcontext", "//lib/errors", "@io_opentelemetry_go_otel//:otel", "@io_opentelemetry_go_otel//attribute", diff --git a/cmd/cody-gateway/internal/limiter/limiter.go b/cmd/cody-gateway/internal/limiter/limiter.go index 3e93f8b6c8a41..7a9977d89c966 100644 --- a/cmd/cody-gateway/internal/limiter/limiter.go +++ b/cmd/cody-gateway/internal/limiter/limiter.go @@ -2,7 +2,6 @@ package limiter import ( "context" - "github.com/sourcegraph/sourcegraph/internal/xcontext" "time" "go.opentelemetry.io/otel" @@ -104,7 +103,7 @@ func (l StaticLimiter) TryAcquire(ctx context.Context) (_ func(context.Context, if l.RateLimitAlerter != nil { // Call with usage 1 for 100% (rate limit exceeded) - go l.RateLimitAlerter(xcontext.Detach(ctx), 1, retryAfter.Sub(l.NowFunc())) + go l.RateLimitAlerter(context.WithoutCancel(ctx), 1, retryAfter.Sub(l.NowFunc())) } return nil, RateLimitExceededError{ @@ -132,7 +131,7 @@ func (l StaticLimiter) TryAcquire(ctx context.Context) (_ func(context.Context, // same time block since the TTL would have been set. return func(ctx context.Context, usage int) (err error) { // NOTE: This is to make sure we still commit usage even if the context was canceled. - ctx = xcontext.Detach(ctx) + ctx = context.WithoutCancel(ctx) var incrementedTo, ttlSeconds int // We need to start a new span because the previous one has ended diff --git a/cmd/cody-gateway/shared/BUILD.bazel b/cmd/cody-gateway/shared/BUILD.bazel index db238427a38ed..c9d80750534be 100644 --- a/cmd/cody-gateway/shared/BUILD.bazel +++ b/cmd/cody-gateway/shared/BUILD.bazel @@ -1,4 +1,3 @@ -load("//dev:go_defs.bzl", "go_test") load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( @@ -34,6 +33,7 @@ go_library( "//internal/rcache", "//internal/redispool", "//internal/requestclient", + "//internal/requestinteraction", "//internal/service", "//internal/trace", "//internal/trace/policy", diff --git a/cmd/cody-gateway/shared/config.go b/cmd/cody-gateway/shared/config.go index 3cec715d131a3..8ef1fb8b39971 100644 --- a/cmd/cody-gateway/shared/config.go +++ b/cmd/cody-gateway/shared/config.go @@ -42,8 +42,9 @@ type Config struct { } Fireworks struct { - AllowedModels []string - AccessToken string + AllowedModels []string + AccessToken string + LogSelfServeCodeCompletionRequests bool } AllowedEmbeddingsModels []string @@ -99,6 +100,8 @@ func (c *Config) Load() { "claude-v1.3", "claude-v1.3-100k", "claude-2", + "claude-2.0", + "claude-2.1", "claude-2-100k", "claude-instant-v1", "claude-instant-1", @@ -144,6 +147,7 @@ func (c *Config) Load() { "accounts/fireworks/models/wizardcoder-15b", }, ","), "Fireworks models that can be used.")) + c.Fireworks.LogSelfServeCodeCompletionRequests = c.GetBool("CODY_GATEWAY_FIREWORKS_LOG_SELF_SERVE_COMPLETION_REQUESTS", "false", "Whether we should log self-serve code completion requests.") if c.Fireworks.AccessToken != "" && len(c.Fireworks.AllowedModels) == 0 { c.AddError(errors.New("must provide allowed models for Fireworks")) } diff --git a/cmd/cody-gateway/shared/main.go b/cmd/cody-gateway/shared/main.go index cc7095fc273c4..2d42470d1b580 100644 --- a/cmd/cody-gateway/shared/main.go +++ b/cmd/cody-gateway/shared/main.go @@ -32,6 +32,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/rcache" "github.com/sourcegraph/sourcegraph/internal/redispool" "github.com/sourcegraph/sourcegraph/internal/requestclient" + "github.com/sourcegraph/sourcegraph/internal/requestinteraction" "github.com/sourcegraph/sourcegraph/internal/service" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/version" @@ -61,8 +62,11 @@ func Main(ctx context.Context, obctx *observation.Context, ready service.ReadyFu // If a buffer is configured, wrap in events.BufferedLogger if config.BigQuery.EventBufferSize > 0 { - eventLogger = events.NewBufferedLogger(obctx.Logger, eventLogger, + eventLogger, err = events.NewBufferedLogger(obctx.Logger, eventLogger, config.BigQuery.EventBufferSize, config.BigQuery.EventBufferWorkers) + if err != nil { + return errors.Wrap(err, "create buffered logger") + } } } else { eventLogger = events.NewStdoutLogger(obctx.Logger) @@ -70,11 +74,14 @@ func Main(ctx context.Context, obctx *observation.Context, ready service.ReadyFu // Useful for testing event logging in a way that has latency that is // somewhat similar to BigQuery. if os.Getenv("CODY_GATEWAY_BUFFERED_LAGGY_EVENT_LOGGING_FUN_TIMES_MODE") == "true" { - eventLogger = events.NewBufferedLogger( + eventLogger, err = events.NewBufferedLogger( obctx.Logger, events.NewDelayedLogger(eventLogger), config.BigQuery.EventBufferSize, config.BigQuery.EventBufferWorkers) + if err != nil { + return errors.Wrap(err, "create buffered logger") + } } } @@ -149,18 +156,19 @@ func Main(ctx context.Context, obctx *observation.Context, ready service.ReadyFu redis: redispool.Cache, }, &httpapi.Config{ - RateLimitNotifier: rateLimitNotifier, - AnthropicAccessToken: config.Anthropic.AccessToken, - AnthropicAllowedModels: config.Anthropic.AllowedModels, - AnthropicMaxTokensToSample: config.Anthropic.MaxTokensToSample, - AnthropicAllowedPromptPatterns: config.Anthropic.AllowedPromptPatterns, - AnthropicRequestBlockingEnabled: config.Anthropic.RequestBlockingEnabled, - OpenAIAccessToken: config.OpenAI.AccessToken, - OpenAIOrgID: config.OpenAI.OrgID, - OpenAIAllowedModels: config.OpenAI.AllowedModels, - FireworksAccessToken: config.Fireworks.AccessToken, - FireworksAllowedModels: config.Fireworks.AllowedModels, - EmbeddingsAllowedModels: config.AllowedEmbeddingsModels, + RateLimitNotifier: rateLimitNotifier, + AnthropicAccessToken: config.Anthropic.AccessToken, + AnthropicAllowedModels: config.Anthropic.AllowedModels, + AnthropicMaxTokensToSample: config.Anthropic.MaxTokensToSample, + AnthropicAllowedPromptPatterns: config.Anthropic.AllowedPromptPatterns, + AnthropicRequestBlockingEnabled: config.Anthropic.RequestBlockingEnabled, + OpenAIAccessToken: config.OpenAI.AccessToken, + OpenAIOrgID: config.OpenAI.OrgID, + OpenAIAllowedModels: config.OpenAI.AllowedModels, + FireworksAccessToken: config.Fireworks.AccessToken, + FireworksAllowedModels: config.Fireworks.AllowedModels, + FireworksLogSelfServeCodeCompletionRequests: config.Fireworks.LogSelfServeCodeCompletionRequests, + EmbeddingsAllowedModels: config.AllowedEmbeddingsModels, }) if err != nil { return errors.Wrap(err, "httpapi.NewHandler") @@ -173,6 +181,7 @@ func Main(ctx context.Context, obctx *observation.Context, ready service.ReadyFu // Cloudflare in from of Cody Gateway. This comes first. hasCloudflare := !config.InsecureDev handler = requestclient.ExternalHTTPMiddleware(handler, hasCloudflare) + handler = requestinteraction.HTTPMiddleware(handler) // Initialize our server address := fmt.Sprintf(":%d", config.Port) diff --git a/cmd/embeddings/shared/BUILD.bazel b/cmd/embeddings/shared/BUILD.bazel index d25f63875795d..e665d8b0570fa 100644 --- a/cmd/embeddings/shared/BUILD.bazel +++ b/cmd/embeddings/shared/BUILD.bazel @@ -1,6 +1,6 @@ -load("//dev:go_defs.bzl", "go_test") +load("@aspect_bazel_lib//lib:copy_file.bzl", "copy_file") load("@io_bazel_rules_go//go:def.bzl", "go_library") -load("@bazel_skylib//rules:copy_file.bzl", "copy_file") +load("//dev:go_defs.bzl", "go_test") go_library( name = "shared", @@ -38,7 +38,6 @@ go_library( "//internal/observation", "//internal/service", "//internal/trace", - "//internal/xcontext", "//lib/errors", "@com_github_hashicorp_golang_lru_v2//:golang-lru", "@com_github_prometheus_client_golang//prometheus", @@ -49,47 +48,21 @@ go_library( ], ) -# The filename specified by the out field needs to include the sha for the test to find it. -# See //cmd/embeddings/shared:assets.bzl for the macro fetching those external dependencies. -copy_file( - name = "ln_test_data_embeddings_index", - src = "@github_com_sourcegraph_sourcegraph_embeddingindex//file:downloaded", - out = "testdata/github_com_sourcegraph_sourcegraph_cf360e12ff91b2fc199e75aef4ff6744.embeddingindex", - allow_symlink = True, -) - -# See //cmd/embeddings/shared:assets.bzl for the macro fetching those external dependencies. -copy_file( - name = "ln_test_data_query_embeddings_gob", - src = "@query_embeddings_gob//file:downloaded", - out = "testdata/query_embeddings.gob", - allow_symlink = True, -) - -# gazelle:exclude testdata go_test( name = "shared_test", - timeout = "moderate", srcs = [ - "context_qa_test.go", "main_test.go", "repo_embedding_index_cache_test.go", ], + data = glob(["testdata/**"]), embed = [":shared"], - embedsrcs = [ - ":ln_test_data_embeddings_index", - ":ln_test_data_query_embeddings_gob", - ], # keep deps = [ - "//cmd/embeddings/qa", "//internal/api", "//internal/database/dbmocks", "//internal/embeddings", "//internal/embeddings/background/repo", "//internal/endpoint", "//internal/types", - "//internal/uploadstore/mocks", - "//lib/errors", "@com_github_sourcegraph_log//logtest", "@com_github_stretchr_testify//require", ], diff --git a/cmd/embeddings/shared/assets.bzl b/cmd/embeddings/shared/assets.bzl deleted file mode 100644 index 9fef3521ee81d..0000000000000 --- a/cmd/embeddings/shared/assets.bzl +++ /dev/null @@ -1,15 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") - -def embbedings_assets_deps(): - http_file( - name = "github_com_sourcegraph_sourcegraph_embeddingindex", - url = "https://storage.googleapis.com/buildkite_public_assets/github_com_sourcegraph_sourcegraph_cf360e12ff91b2fc199e75aef4ff6744.embeddingindex", - sha256 = "830a3b4b05f889e442d1da0e97950136db907ffd395f5fef404d9b4a9aac84a7", - ) - - http_file( - name = "query_embeddings_gob", - url = "https://storage.googleapis.com/buildkite_public_assets/query_embeddings.gob", - sha256 = "48e816d9ad033d2661a5c2999232ceccb430427ed4ce6330824f7c123db05a03", - ) - diff --git a/cmd/embeddings/shared/context_qa_test.go b/cmd/embeddings/shared/context_qa_test.go deleted file mode 100644 index 75325646e1d2a..0000000000000 --- a/cmd/embeddings/shared/context_qa_test.go +++ /dev/null @@ -1,113 +0,0 @@ -// This test should only be run with bazel test. It relies on large index files -// that are not committed to the repository. - -package shared - -import ( - "bytes" - "context" - "embed" - "encoding/gob" - "io" - "os" - "path/filepath" - "testing" - - "github.com/sourcegraph/sourcegraph/cmd/embeddings/qa" - "github.com/sourcegraph/sourcegraph/internal/api" - "github.com/sourcegraph/sourcegraph/internal/embeddings" - uploadstoremocks "github.com/sourcegraph/sourcegraph/internal/uploadstore/mocks" - "github.com/sourcegraph/sourcegraph/lib/errors" -) - -// This embed is handled by Bazel, and using the traditional go test command will fail. -// See //cmd/embeddings/shared:assets.bzl -// -//go:embed testdata/* -var fs embed.FS - -func TestRecall(t *testing.T) { - if os.Getenv("BAZEL_TEST") != "1" { - t.Skip("Cannot run this test outside of Bazel") - } - - ctx := context.Background() - - // Set up mock functions - queryEmbeddings, err := loadQueryEmbeddings(t) - if err != nil { - t.Fatal(err) - } - - lookupQueryEmbedding := func(ctx context.Context, query string) ([]float32, string, error) { - return queryEmbeddings[query], "openai/text-embedding-ada-002", nil - } - - mockStore := uploadstoremocks.NewMockStore() - mockStore.GetFunc.SetDefaultHook(func(ctx context.Context, key string) (io.ReadCloser, error) { - b, err := fs.ReadFile(filepath.Join("testdata", key)) - if err != nil { - return nil, err - } - - return io.NopCloser(bytes.NewReader(b)), nil - }) - getRepoEmbeddingIndex := func(ctx context.Context, repoID api.RepoID, repoName api.RepoName) (*embeddings.RepoEmbeddingIndex, error) { - return embeddings.DownloadRepoEmbeddingIndex(context.Background(), mockStore, repoID, repoName) - } - - searcher := func(args embeddings.EmbeddingsSearchParameters) (*embeddings.EmbeddingCombinedSearchResults, error) { - return searchRepoEmbeddingIndexes( - ctx, - args, - getRepoEmbeddingIndex, - lookupQueryEmbedding, - ) - } - - recall, err := qa.Run(embeddingsSearcherFunc(searcher)) - if err != nil { - t.Fatal(err) - } - - epsilon := 0.0001 - wantMinRecall := 0.4285 - - if d := wantMinRecall - recall; d > epsilon { - t.Fatalf("Recall decreased: want %f, got %f", wantMinRecall, recall) - } -} - -// loadQueryEmbeddings loads the query embeddings from the -// testdata/query_embeddings.gob file into a map. -func loadQueryEmbeddings(t *testing.T) (map[string][]float32, error) { - t.Helper() - - m := make(map[string][]float32) - - f, err := fs.Open("testdata/query_embeddings.gob") - if err != nil { - return nil, err - } - - dec := gob.NewDecoder(f) - for { - a := struct { - Query string - Embedding []float32 - }{} - err := dec.Decode(&a) - if errors.Is(err, io.EOF) { - break - } - m[a.Query] = a.Embedding - } - - return m, nil -} - -type embeddingsSearcherFunc func(args embeddings.EmbeddingsSearchParameters) (*embeddings.EmbeddingCombinedSearchResults, error) - -func (f embeddingsSearcherFunc) Search(args embeddings.EmbeddingsSearchParameters) (*embeddings.EmbeddingCombinedSearchResults, error) { - return f(args) -} diff --git a/cmd/embeddings/shared/repo_embedding_index_cache.go b/cmd/embeddings/shared/repo_embedding_index_cache.go index cb8552c32946b..28422bd554548 100644 --- a/cmd/embeddings/shared/repo_embedding_index_cache.go +++ b/cmd/embeddings/shared/repo_embedding_index_cache.go @@ -19,7 +19,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/trace" - "github.com/sourcegraph/sourcegraph/internal/xcontext" ) type downloadRepoEmbeddingIndexFn func(ctx context.Context, repoID api.RepoID, repoName api.RepoName) (*embeddings.RepoEmbeddingIndex, error) @@ -159,7 +158,7 @@ func (c *CachedEmbeddingIndexGetter) Get(ctx context.Context, repoID api.RepoID, // Run the fetch in the background, but outside the singleflight so context // errors are not shared. go func() { - detachedCtx := xcontext.Detach(ctx) + detachedCtx := context.WithoutCancel(ctx) // Run the fetch request through a singleflight to keep from fetching the // same index multiple times concurrently v, err, _ = c.sf.Do(fmt.Sprintf("%d", repoID), func() (interface{}, error) { diff --git a/cmd/executor/internal/apiclient/baseclient.go b/cmd/executor/internal/apiclient/baseclient.go index a1bb1f1473990..3b86f7d2613a4 100644 --- a/cmd/executor/internal/apiclient/baseclient.go +++ b/cmd/executor/internal/apiclient/baseclient.go @@ -158,16 +158,6 @@ func (c *BaseClient) DoAndDrop(ctx context.Context, req *http.Request) error { return err } -// NewRequest creates a new http.Request with the provided URL and path. -func NewRequest(method string, baseURL, urlPath string, payload any) (*http.Request, error) { - u, err := url.Parse(baseURL) - if err != nil { - return nil, err - } - u.Path = path.Join(u.Path, urlPath) - return newJSONRequest(method, u, payload) -} - // NewRequest creates a new http.Request where only the Authorization HTTP header is set. func (c *BaseClient) NewRequest(jobId int, token, method, path string, payload io.Reader) (*http.Request, error) { u := c.newRelativeURL(path) diff --git a/cmd/frontend/BUILD.bazel b/cmd/frontend/BUILD.bazel index 9048e8fbd84e9..c594c1e1dd3e8 100644 --- a/cmd/frontend/BUILD.bazel +++ b/cmd/frontend/BUILD.bazel @@ -56,7 +56,6 @@ oci_image( "CODEINTEL_PGPORT": "5432", "CODEINTEL_PGSSLMODE": "disable", "CODEINTEL_PGUSER": "sg", - "PUBLIC_REPO_REDIRECTS": "true", }, tars = [":tar_frontend"], user = "sourcegraph", diff --git a/cmd/frontend/backend/external_services_test.go b/cmd/frontend/backend/external_services_test.go index bdb989e7b2358..845701091fc74 100644 --- a/cmd/frontend/backend/external_services_test.go +++ b/cmd/frontend/backend/external_services_test.go @@ -49,7 +49,7 @@ func TestAddRepoToExclude(t *testing.T) { kind: extsvc.KindBitbucketCloud, repo: makeBitbucketCloudRepo(), initialConfig: `{"appPassword":"","url":"https://bitbucket.org","username":""}`, - expectedConfig: `{"appPassword":"","exclude":[{"name":"sg/sourcegraph"}],"url":"https://bitbucket.org","username":""}`, + expectedConfig: `{"exclude":[{"name":"sg/sourcegraph"}],"url":"https://bitbucket.org"}`, }, { name: "second attempt of excluding same repo is ignored for BitbucketServer schema", diff --git a/cmd/frontend/external/session/session.go b/cmd/frontend/external/session/session.go index 37da50b18bc33..8d3560994cff9 100644 --- a/cmd/frontend/external/session/session.go +++ b/cmd/frontend/external/session/session.go @@ -7,6 +7,7 @@ import "github.com/sourcegraph/sourcegraph/internal/session" var ( ResetMockSessionStore = session.ResetMockSessionStore SetActor = session.SetActor + SetActorFromUser = session.SetActorFromUser SetData = session.SetData GetData = session.GetData InvalidateSessionsByIDs = session.InvalidateSessionsByIDs diff --git a/cmd/frontend/graphqlbackend/BUILD.bazel b/cmd/frontend/graphqlbackend/BUILD.bazel index 99952c4223c68..c422002b87939 100644 --- a/cmd/frontend/graphqlbackend/BUILD.bazel +++ b/cmd/frontend/graphqlbackend/BUILD.bazel @@ -326,7 +326,6 @@ go_library( "//internal/src-prometheus", "//internal/suspiciousnames", "//internal/symbols", - "//internal/syncx", "//internal/temporarysettings", "//internal/trace", "//internal/txemail", @@ -386,7 +385,7 @@ go_library( go_test( name = "graphqlbackend_test", - timeout = "moderate", + timeout = "long", srcs = [ "access_requests_test.go", "access_tokens_test.go", diff --git a/cmd/frontend/graphqlbackend/external_accounts.go b/cmd/frontend/graphqlbackend/external_accounts.go index 877cf0d0a5dfc..e81d84efa956f 100644 --- a/cmd/frontend/graphqlbackend/external_accounts.go +++ b/cmd/frontend/graphqlbackend/external_accounts.go @@ -2,7 +2,6 @@ package graphqlbackend import ( "context" - "database/sql" "sync" "github.com/graph-gophers/graphql-go" @@ -14,6 +13,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" gext "github.com/sourcegraph/sourcegraph/internal/extsvc/gerrit/externalaccount" + "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/sourcegraphoperator" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -126,11 +126,11 @@ func (r *schemaResolver) DeleteExternalAccount(ctx context.Context, args *struct ExternalAccount graphql.ID }, ) (*EmptyResponse, error) { - ff, err := r.db.FeatureFlags().GetFeatureFlag(ctx, "disallow-user-external-account-deletion") - if err != nil && err != sql.ErrNoRows { - return nil, err - } else if ff != nil && ff.Bool != nil && ff.Bool.Value { - return nil, errors.New("unlinking external account is not allowed") + disallow := featureflag.FromContext(ctx).GetBoolOr("disallow-user-external-account-deletion", false) + if disallow { + // NOTE: The error message will be directly shown to the user, so we need to make + // it read like a sentence. + return nil, errors.New("Self-serve unlinking external account is not allowed, please contact Sourcegraph support.") } id, err := unmarshalExternalAccountID(args.ExternalAccount) diff --git a/cmd/frontend/graphqlbackend/git_commits.go b/cmd/frontend/graphqlbackend/git_commits.go index 45db449ce7fa4..d0bc88428b168 100644 --- a/cmd/frontend/graphqlbackend/git_commits.go +++ b/cmd/frontend/graphqlbackend/git_commits.go @@ -39,19 +39,10 @@ type gitCommitConnectionResolver struct { err error } -func toValue[T any](v *T) any { - var result T - if v != nil { - return *v - } - - return result -} - // afterCursorAsInt will parse the afterCursor field and return it as an int. If no value is set, it // will return 0. It returns a non-nil error if there are any errors in parsing the input string. func (r *gitCommitConnectionResolver) afterCursorAsInt() (int, error) { - v := toValue(r.afterCursor).(string) + v := pointers.DerefZero(r.afterCursor) if v == "" { return 0, nil } @@ -88,12 +79,12 @@ func (r *gitCommitConnectionResolver) compute(ctx context.Context) ([]*gitdomain return r.gitserverClient.Commits(ctx, r.repo.RepoName(), gitserver.CommitsOptions{ Range: r.revisionRange, N: uint(n), - MessageQuery: toValue(r.query).(string), - Author: toValue(r.author).(string), - After: toValue(r.after).(string), + MessageQuery: pointers.DerefZero(r.query), + Author: pointers.DerefZero(r.author), + After: pointers.DerefZero(r.after), Skip: uint(afterCursor), - Before: toValue(r.before).(string), - Path: toValue(r.path).(string), + Before: pointers.DerefZero(r.before), + Path: pointers.DerefZero(r.path), Follow: r.follow, }) } diff --git a/cmd/frontend/graphqlbackend/git_tree.go b/cmd/frontend/graphqlbackend/git_tree.go index 2a697c1cfeedf..2c1c249e93231 100644 --- a/cmd/frontend/graphqlbackend/git_tree.go +++ b/cmd/frontend/graphqlbackend/git_tree.go @@ -22,16 +22,6 @@ func (r *GitTreeEntryResolver) IsRoot() bool { type gitTreeEntryConnectionArgs struct { graphqlutil.ConnectionArgs Recursive bool - // If recurseSingleChild is true, and the requested path only has a single child - // that is a directory, we recurse into that directory. - // Only respected when Recursive is false. - // Example: - // FS structure: - // /folder/subfolder/file - // Request for entries of /folder - // We don't return only /folder/subfolder, and instead also travserse into subfolder - // until we hit something with more than 1 child that's not a dir. - RecursiveSingleChild bool // If Ancestors is true and the tree is loaded from a subdirectory, we will // return a flat list of all entries in all parent directories. Ancestors bool @@ -57,14 +47,6 @@ func (r *GitTreeEntryResolver) entries(ctx context.Context, args *gitTreeEntryCo return nil, errors.Newf("invalid argument for first, must be non-negative") } - if args.Recursive && args.RecursiveSingleChild { - // No extra work needed, recursive includes all these. - args.RecursiveSingleChild = false - } - - // If RecursiveSingleChild is true, we also get all files recursively. Otherwise, we would - // have to do a readdir for every single directory to see if it has only one child (and nested) - // dirs, too. entries, err := r.gitserverClient.ReadDir(ctx, r.commit.repoResolver.RepoName(), api.CommitID(r.commit.OID()), r.Path(), args.Recursive) if err != nil { if strings.Contains(err.Error(), "file does not exist") { // TODO proper error value @@ -88,24 +70,6 @@ func (r *GitTreeEntryResolver) entries(ctx context.Context, args *gitTreeEntryCo entries = entries[len(strings.Split(strings.Trim(r.Path(), "/"), "/")):] } - if !args.Recursive && args.RecursiveSingleChild && len(entries) == 1 && entries[0].IsDir() { - opts := GitTreeEntryResolverOpts{ - Commit: r.Commit(), - Stat: entries[0], - } - r := NewGitTreeEntryResolver(r.db, r.gitserverClient, opts) - - subEntries, err := r.entries(ctx, &gitTreeEntryConnectionArgs{ - RecursiveSingleChild: true, - }, nil) - if err != nil { - return nil, err - } - for _, e := range subEntries { - entries = append(entries, e.stat) - } - } - maxResolvers := len(entries) if args.First != nil && int(*args.First) < maxResolvers { maxResolvers = int(*args.First) @@ -114,15 +78,13 @@ func (r *GitTreeEntryResolver) entries(ctx context.Context, args *gitTreeEntryCo sort.Sort(byDirectory(entries)) resolvers := make([]*GitTreeEntryResolver, 0, maxResolvers) - seen := 0 for _, entry := range entries { - if seen == maxResolvers { + if len(resolvers) >= maxResolvers { break } // Apply any additional filtering if filter == nil || filter(entry) { - seen++ opts := GitTreeEntryResolverOpts{ Commit: r.Commit(), Stat: entry, diff --git a/cmd/frontend/graphqlbackend/git_tree_test.go b/cmd/frontend/graphqlbackend/git_tree_test.go index c0ad6cea0d197..2a4890ffe7a10 100644 --- a/cmd/frontend/graphqlbackend/git_tree_test.go +++ b/cmd/frontend/graphqlbackend/git_tree_test.go @@ -370,55 +370,6 @@ func TestGitTree_Entries(t *testing.T) { }, entries) }) - t.Run("RecursiveSingleChild", func(t *testing.T) { - opts := GitTreeEntryResolverOpts{ - Commit: &GitCommitResolver{ - repoResolver: NewRepositoryResolver(db, gitserverClient, &types.Repo{Name: "my/repo"}), - }, - Stat: CreateFileInfo(".aspect/", true), - } - gitTree := NewGitTreeEntryResolver(db, gitserverClient, opts) - - entries, err := gitTree.Entries(context.Background(), &gitTreeEntryConnectionArgs{RecursiveSingleChild: true}) - require.NoError(t, err) - assertEntries(t, []fs.FileInfo{ - CreateFileInfo(".aspect/cli/", true), - CreateFileInfo(".aspect/rules/", true), - }, entries) - - opts = GitTreeEntryResolverOpts{ - Commit: &GitCommitResolver{ - repoResolver: NewRepositoryResolver(db, gitserverClient, &types.Repo{Name: "my/repo"}), - }, - Stat: CreateFileInfo(".aspect/rules/", true), - } - gitTree = NewGitTreeEntryResolver(db, gitserverClient, opts) - - entries, err = gitTree.Entries(context.Background(), &gitTreeEntryConnectionArgs{RecursiveSingleChild: true}) - require.NoError(t, err) - assertEntries(t, []fs.FileInfo{ - CreateFileInfo(".aspect/rules/external_repository_action_cache/", true), - CreateFileInfo(".aspect/rules/external_repository_action_cache/file", false), - }, entries) - - opts = GitTreeEntryResolverOpts{ - Commit: &GitCommitResolver{ - repoResolver: NewRepositoryResolver(db, gitserverClient, &types.Repo{Name: "my/repo"}), - }, - Stat: CreateFileInfo(wantPath, true), - } - gitTree = NewGitTreeEntryResolver(db, gitserverClient, opts) - - entries, err = gitTree.Entries(context.Background(), &gitTreeEntryConnectionArgs{RecursiveSingleChild: true}) - require.NoError(t, err) - assertEntries(t, []fs.FileInfo{ - CreateFileInfo(".aspect/", true), - CreateFileInfo("folder/", true), - CreateFileInfo("folder2/", true), - CreateFileInfo("file", false), - }, entries) - }) - t.Run("Ancestors", func(t *testing.T) { opts := GitTreeEntryResolverOpts{ Commit: &GitCommitResolver{ diff --git a/cmd/frontend/graphqlbackend/graphqlbackend.go b/cmd/frontend/graphqlbackend/graphqlbackend.go index b74d0906c1406..f7378b8c7bc86 100644 --- a/cmd/frontend/graphqlbackend/graphqlbackend.go +++ b/cmd/frontend/graphqlbackend/graphqlbackend.go @@ -633,7 +633,7 @@ func NewSchema( opts := []graphql.SchemaOpt{ graphql.Tracer(newRequestTracer(log.Scoped("GraphQL"), db)), graphql.UseStringDescriptions(), - graphql.MaxDepth(maxDepth), + graphql.MaxDepth(conf.RateLimits().GraphQLMaxDepth), } opts = append(opts, graphqlOpts...) return graphql.ParseSchema( diff --git a/cmd/frontend/graphqlbackend/outbound_webhook_logs.go b/cmd/frontend/graphqlbackend/outbound_webhook_logs.go index a9fc1c0b8c208..c6b8bebd9f9b5 100644 --- a/cmd/frontend/graphqlbackend/outbound_webhook_logs.go +++ b/cmd/frontend/graphqlbackend/outbound_webhook_logs.go @@ -3,6 +3,7 @@ package graphqlbackend import ( "context" "strconv" + "sync" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" @@ -10,7 +11,6 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/gqlutil" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/internal/types" ) @@ -74,14 +74,14 @@ func newOutboundWebhookLogConnectionResolver( limit := opts.Limit logStore := store.ToLogStore() - nodes := syncx.OnceValues(func() ([]*types.OutboundWebhookLog, error) { + nodes := sync.OnceValues(func() ([]*types.OutboundWebhookLog, error) { opts.Limit += 1 return logStore.ListForOutboundWebhook(ctx, opts) }) return &outboundWebhookLogConnectionResolver{ nodes: nodes, - resolvers: syncx.OnceValues(func() ([]OutboundWebhookLogResolver, error) { + resolvers: sync.OnceValues(func() ([]OutboundWebhookLogResolver, error) { logs, err := nodes() if err != nil { return nil, err @@ -101,7 +101,7 @@ func newOutboundWebhookLogConnectionResolver( return resolvers, nil }), - totalCount: syncx.OnceValues(func() (int32, error) { + totalCount: sync.OnceValues(func() (int32, error) { total, errored, err := logStore.CountsForOutboundWebhook(ctx, opts.OutboundWebhookID) if opts.OnlyErrors { return int32(errored), err @@ -199,7 +199,7 @@ func newOutboundWebhookJobResolver( id int64, ) OutboundWebhookJobResolver { return &outboundWebhookJobResolver{ - job: syncx.OnceValues(func() (*types.OutboundWebhookJob, error) { + job: sync.OnceValues(func() (*types.OutboundWebhookJob, error) { return store.GetByID(ctx, id) }), } diff --git a/cmd/frontend/graphqlbackend/outbound_webhooks.go b/cmd/frontend/graphqlbackend/outbound_webhooks.go index 5bf174823de45..6bbc2a321cd9f 100644 --- a/cmd/frontend/graphqlbackend/outbound_webhooks.go +++ b/cmd/frontend/graphqlbackend/outbound_webhooks.go @@ -4,6 +4,7 @@ import ( "context" "sort" "strconv" + "sync" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" @@ -13,7 +14,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/encryption" "github.com/sourcegraph/sourcegraph/internal/encryption/keyring" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/internal/webhooks/outbound" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -137,7 +137,7 @@ func (r *schemaResolver) CreateOutboundWebhook(ctx context.Context, args CreateO } // Validate the URL - err = outbound.CheckAddress(args.Input.URL) + err = outbound.CheckURL(args.Input.URL) if err != nil { return nil, errors.Wrap(err, "invalid webhook address") } @@ -252,14 +252,14 @@ func newOutboundWebhookConnectionResolver( ) OutboundWebhookConnectionResolver { limit := opts.Limit - nodes := syncx.OnceValues(func() ([]*types.OutboundWebhook, error) { + nodes := sync.OnceValues(func() ([]*types.OutboundWebhook, error) { opts.Limit += 1 return store.List(ctx, opts) }) return &outboundWebhookConnectionResolver{ nodes: nodes, - resolvers: syncx.OnceValues(func() ([]OutboundWebhookResolver, error) { + resolvers: sync.OnceValues(func() ([]OutboundWebhookResolver, error) { webhooks, err := nodes() if err != nil { return nil, err @@ -276,7 +276,7 @@ func newOutboundWebhookConnectionResolver( return resolvers, nil }), - totalCount: syncx.OnceValues(func() (int32, error) { + totalCount: sync.OnceValues(func() (int32, error) { count, err := store.Count(ctx, opts.OutboundWebhookCountOpts) return int32(count), err }), @@ -327,7 +327,7 @@ func newOutboundWebhookResolverFromDatabase(ctx context.Context, store database. return &outboundWebhookResolver{ store: store, id: marshalOutboundWebhookID(id), - webhook: syncx.OnceValues(func() (*types.OutboundWebhook, error) { + webhook: sync.OnceValues(func() (*types.OutboundWebhook, error) { return store.GetByID(ctx, id) }), } diff --git a/cmd/frontend/graphqlbackend/package_repos.go b/cmd/frontend/graphqlbackend/package_repos.go index 21091c8fbbf3f..f028415c280b0 100644 --- a/cmd/frontend/graphqlbackend/package_repos.go +++ b/cmd/frontend/graphqlbackend/package_repos.go @@ -2,6 +2,7 @@ package graphqlbackend import ( "context" + "sync" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" @@ -14,7 +15,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/observation" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -87,7 +87,7 @@ type packageRepoReferenceConnectionResolver struct { } func (r *packageRepoReferenceConnectionResolver) Nodes(ctx context.Context) ([]*packageRepoReferenceResolver, error) { - once := syncx.OnceValues(func() (map[api.RepoName]*types.Repo, error) { + once := sync.OnceValues(func() (map[api.RepoName]*types.Repo, error) { allNames := make([]string, 0, len(r.deps)) for _, dep := range r.deps { name, err := dependencyRepoToRepoName(dep) diff --git a/cmd/frontend/graphqlbackend/rate_limit.go b/cmd/frontend/graphqlbackend/rate_limit.go index 70f7c7c1e2fd8..529e71d7db10d 100644 --- a/cmd/frontend/graphqlbackend/rate_limit.go +++ b/cmd/frontend/graphqlbackend/rate_limit.go @@ -22,10 +22,6 @@ import ( // the algorithm const costEstimateVersion = 2 -const MaxAliasCount = 500 // SECURITY: prevent too many aliased queries -const MaxFieldCount = 500 * 1000 // SECURITY: prevent deeply nested or overly broad queries -const maxDepth = 30 // SECURITY: prevent deep queries that consume too many resources - type QueryCost struct { FieldCount int MaxDepth int diff --git a/cmd/frontend/graphqlbackend/repository_stats.go b/cmd/frontend/graphqlbackend/repository_stats.go index 87af91518874c..92deae52e6109 100644 --- a/cmd/frontend/graphqlbackend/repository_stats.go +++ b/cmd/frontend/graphqlbackend/repository_stats.go @@ -54,13 +54,6 @@ func (r *repositoryStatsResolver) Indexed(ctx context.Context) (int32, error) { return min(indexedRepos, total), nil } -func min(a, b int32) int32 { - if a < b { - return a - } - return b -} - func (r *repositoryStatsResolver) IndexedLinesCount(ctx context.Context) (BigInt, error) { _, indexedLinesCount, err := r.computeIndexedStats(ctx) if err != nil { diff --git a/cmd/frontend/graphqlbackend/schema.graphql b/cmd/frontend/graphqlbackend/schema.graphql index 10b1e648aa289..9e81393ba48ef 100755 --- a/cmd/frontend/graphqlbackend/schema.graphql +++ b/cmd/frontend/graphqlbackend/schema.graphql @@ -90,11 +90,11 @@ type Mutation { """ updateUser(user: ID!, username: String, displayName: String, avatarURL: String): User! """ - Upgrades the user to Cody Pro. + Updates the user's Cody plan to Pro or Community. Only the user may perform this mutation. """ - upgradeToCodyPro(user: ID!): User! + changeCodyPlan(user: ID!, pro: Boolean!): User! """ Creates an organization. The caller is added as a member of the newly created organization. @@ -2676,6 +2676,7 @@ enum SearchPatternType { structural lucky keyword + newStandardRC1 } """ @@ -5645,22 +5646,10 @@ type GitTree implements TreeEntry { """ first: Int """ - Recurse into sub-trees. If true, implies recursiveSingleChild. + Recurse into sub-trees. """ recursive: Boolean = false """ - If recurseSingleChild is true, and the requested path only has a single child - that is a directory, recurse into that directory. - Only respected when recursive is false. - Example: - FS structure: - /folder/subfolder/file - Request for entries of /folder: - Instead of returning just /folder/subfolder, this API also travserse into subfolder - until it hits something with more than 1 child that's not a dir. - """ - recursiveSingleChild: Boolean = false - """ Includes all parent directories and their entries. For example, if the path is `/client/web/something`, it will return the following entries in this order: @@ -6550,6 +6539,30 @@ type User implements Node & SettingsSubject & Namespace { The date when the user enrolled for Cody Pro. """ codyProEnabledAt: DateTime + """ + The start date of current billing period of Cody. + """ + codyCurrentPeriodStartDate: DateTime + """ + The end date of current billing period of Cody. + """ + codyCurrentPeriodEndDate: DateTime + """ + The count of Cody chats in the current billing period. + """ + codyCurrentPeriodChatUsage: Int + """ + The count of Cody code completions in the current billing period. + """ + codyCurrentPeriodCodeUsage: Int + """ + The limit of Cody chats for the current billing period. + """ + codyCurrentPeriodChatLimit: Int + """ + The limit of Cody code completions for the current billing period. + """ + codyCurrentPeriodCodeLimit: Int } """ diff --git a/cmd/frontend/graphqlbackend/search_test.go b/cmd/frontend/graphqlbackend/search_test.go index 5580c2d832695..278a29cc93cbf 100644 --- a/cmd/frontend/graphqlbackend/search_test.go +++ b/cmd/frontend/graphqlbackend/search_test.go @@ -122,7 +122,7 @@ func TestSearch(t *testing.T) { sr := newSchemaResolver(db, gsClient) gqlSchema, err := graphql.ParseSchema(mainSchema, sr, graphql.Tracer(newRequestTracer(logtest.Scoped(t), db)), - graphql.MaxDepth(maxDepth)) + graphql.MaxDepth(conf.RateLimits().GraphQLMaxDepth)) if err != nil { t.Fatal(err) } diff --git a/cmd/frontend/graphqlbackend/telemetry.go b/cmd/frontend/graphqlbackend/telemetry.go index da0c692883172..cb7273852514e 100644 --- a/cmd/frontend/graphqlbackend/telemetry.go +++ b/cmd/frontend/graphqlbackend/telemetry.go @@ -36,11 +36,12 @@ type TelemetryEventParametersInput struct { Metadata *[]TelemetryEventMetadataInput `json:"metadata,omitempty"` PrivateMetadata *JSONValue `json:"privateMetadata,omitempty"` BillingMetadata *TelemetryEventBillingMetadataInput `json:"billingMetadata,omitempty"` + InteractionID *string `json:"interactionID,omitempty"` } type TelemetryEventMetadataInput struct { - Key string `json:"key"` - Value int32 `json:"value"` + Key string `json:"key"` + Value JSONValue `json:"value"` } type TelemetryEventBillingMetadataInput struct { diff --git a/cmd/frontend/graphqlbackend/telemetry.graphql b/cmd/frontend/graphqlbackend/telemetry.graphql index 3233efa6bb3c2..2e9c4b2151c28 100644 --- a/cmd/frontend/graphqlbackend/telemetry.graphql +++ b/cmd/frontend/graphqlbackend/telemetry.graphql @@ -98,6 +98,14 @@ input TelemetryEventParametersInput { Billing-related metadata. """ billingMetadata: TelemetryEventBillingMetadataInput + """ + Optional interaction ID that can be provided to indicate the interaction + this event belongs to. It overrides the X-Sourcegraph-Interaction-ID header + if one is set on the request recording the event. + + This parameter is only available in Sourcegraph 5.2.4 and later. + """ + interactionID: String } """ @@ -111,8 +119,12 @@ input TelemetryEventMetadataInput { """ Numeric value associated with the key. Enforcing numeric values eliminates risks of accidentally shipping sensitive or private data. + + The value type in the schema is JSONValue for flexibility, but we ONLY + accept numeric values (integers and floats) - any other value will be + rejected. """ - value: Int! + value: JSONValue! } """ diff --git a/cmd/frontend/graphqlbackend/telemetry_test.go b/cmd/frontend/graphqlbackend/telemetry_test.go index 4a2fcdc3c6ad7..a6edeba71b773 100644 --- a/cmd/frontend/graphqlbackend/telemetry_test.go +++ b/cmd/frontend/graphqlbackend/telemetry_test.go @@ -7,6 +7,7 @@ import ( "github.com/graph-gophers/graphql-go" gqlerrors "github.com/graph-gophers/graphql-go/errors" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/structpb" @@ -34,7 +35,31 @@ func TestTelemetryRecordEvents(t *testing.T) { assert func(t *testing.T, gotEvents []TelemetryEventInput) }{ { - name: "object privateMetadata", + name: "simple event with interaction ID", + gqlEventsInput: ` + { + feature: "cody.fixup" + action: "applied" + source: { + client: "VSCode.Cody" + clientVersion: "0.14.1" + } + parameters: { + version: 0 + interactionID: "f1d1b784-c69b-4ca4-802a-4dcbca7d660f" + } + } + `, + assert: func(t *testing.T, gotEvents []TelemetryEventInput) { + require.Len(t, gotEvents, 1) + assert.NotNil(t, gotEvents[0].Parameters) + assert.NotNil(t, gotEvents[0].Parameters.InteractionID) + assert.Equal(t, "f1d1b784-c69b-4ca4-802a-4dcbca7d660f", + *gotEvents[0].Parameters.InteractionID) + }, + }, + { + name: "metadata with standard object privateMetadata", gqlEventsInput: ` { feature: "cody.fixup" @@ -71,6 +96,11 @@ func TestTelemetryRecordEvents(t *testing.T) { // Sanity check strucpb marshalling used in cmd/frontend/internal/telemetry/resolvers _, err := structpb.NewStruct(v) require.NoError(t, err) + + md := *gotEvents[0].Parameters.Metadata + require.Len(t, md, 2) + assert.Equal(t, int32(1), md[0].Value.Value) + assert.Equal(t, int32(0), md[1].Value.Value) }, }, { @@ -85,16 +115,6 @@ func TestTelemetryRecordEvents(t *testing.T) { } parameters: { version: 0 - metadata: [ - { - key: "contextSelection", - value: 1 - }, - { - key: "chatPredictions", - value: 0 - }, - ] privateMetadata: "some value" } } @@ -125,16 +145,6 @@ func TestTelemetryRecordEvents(t *testing.T) { } parameters: { version: 0 - metadata: [ - { - key: "contextSelection", - value: 1 - }, - { - key: "chatPredictions", - value: 0 - }, - ] privateMetadata: 12 } } @@ -153,6 +163,45 @@ func TestTelemetryRecordEvents(t *testing.T) { require.NoError(t, err) }, }, + { + name: "different numeric values in metadata", + gqlEventsInput: ` + { + feature: "cody.fixup" + action: "applied" + source: { + client: "VSCode.Cody", + clientVersion: "0.14.1" + } + parameters: { + version: 0 + metadata: [ + { + key: "contextSelection", + value: 1 + }, + { + key: "chatPredictions", + value: 0 + }, + { + key: "fooBar", + value: 3.14 + }, + ] + } + } + `, + assert: func(t *testing.T, gotEvents []TelemetryEventInput) { + // Check PrivateMetadata + require.Len(t, gotEvents, 1) + md := *gotEvents[0].Parameters.Metadata + require.Len(t, md, 3) + assert.Equal(t, int32(1), md[0].Value.Value) + assert.Equal(t, int32(0), md[1].Value.Value) + assert.Equal(t, 3.14, md[2].Value.Value) + }, + }, } { t.Run(tc.name, func(t *testing.T) { mockResolver := &mockTelemetryResolver{} diff --git a/cmd/frontend/graphqlbackend/testing.go b/cmd/frontend/graphqlbackend/testing.go index c32465631b562..b42e96bf6e099 100644 --- a/cmd/frontend/graphqlbackend/testing.go +++ b/cmd/frontend/graphqlbackend/testing.go @@ -15,6 +15,7 @@ import ( gqlerrors "github.com/graph-gophers/graphql-go/errors" "github.com/stretchr/testify/require" + "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/gitserver" ) @@ -31,7 +32,7 @@ func mustParseGraphQLSchemaWithClient(t *testing.T, db database.DB, gitserverCli gitserverClient, []OptionalResolver{}, graphql.PanicHandler(printStackTrace{&gqlerrors.DefaultPanicHandler{}}), - graphql.MaxDepth(maxDepth), + graphql.MaxDepth(conf.RateLimits().GraphQLMaxDepth), ) if parseSchemaErr != nil { t.Fatal(parseSchemaErr) @@ -129,6 +130,13 @@ func checkErrors(t *testing.T, want, got []*gqlerrors.QueryError) { // Compare without caring about the concrete type of the error returned if diff := cmp.Diff(want, got, cmpopts.IgnoreFields(gqlerrors.QueryError{}, "ResolverError", "Err")); diff != "" { + // diff truncates the error messages, so dump the full error messages + // in t.Log for inspection with 'go test -v'. + t.Log("Full errors:\n") + for _, e := range got { + t.Logf("- %+v\n", e) + } + // Fail the test with the diff as a summary t.Fatal(diff) } } diff --git a/cmd/frontend/graphqlbackend/user.go b/cmd/frontend/graphqlbackend/user.go index 4eb616c4dc192..12c62e7e2d99b 100644 --- a/cmd/frontend/graphqlbackend/user.go +++ b/cmd/frontend/graphqlbackend/user.go @@ -3,10 +3,12 @@ package graphqlbackend import ( "context" "net/url" + "time" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" + "github.com/keegancsmith/sqlf" "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" @@ -175,7 +177,7 @@ func (r *UserResolver) CodyProEnabledAt(ctx context.Context) *gqlutil.DateTime { return nil } - if !featureflag.FromContext(ctx).GetBoolOr("cody_pro_dec_ga", false) { + if !featureflag.FromContext(ctx).GetBoolOr("cody-pro", false) { return nil } @@ -190,6 +192,152 @@ func (r *UserResolver) CodyProEnabled(ctx context.Context) bool { return r.CodyProEnabledAt(ctx) != nil } +func (r *UserResolver) CodyCurrentPeriodChatLimit(ctx context.Context) (*int32, error) { + if !envvar.SourcegraphDotComMode() { + return nil, errors.New("this feature is only available on sourcegraph.com") + } + + if r.user.CodyProEnabledAt != nil { + return nil, nil + } + + cfg := conf.GetCompletionsConfig(conf.Get().SiteConfig()) + + limit := int32(cfg.PerCommunityUserChatMonthlyInteractionLimit) + + return &limit, nil +} + +func (r *UserResolver) CodyCurrentPeriodCodeLimit(ctx context.Context) (*int32, error) { + if !envvar.SourcegraphDotComMode() { + return nil, errors.New("this feature is only available on sourcegraph.com") + } + + if r.user.CodyProEnabledAt != nil { + return nil, nil + } + + cfg := conf.GetCompletionsConfig(conf.Get().SiteConfig()) + + limit := int32(cfg.PerCommunityUserCodeCompletionsMonthlyInteractionLimit) + + return &limit, nil +} + +func (r *UserResolver) CodyCurrentPeriodChatUsage(ctx context.Context) (*int32, error) { + if !envvar.SourcegraphDotComMode() { + return nil, errors.New("this feature is only available on sourcegraph.com") + } + + currentPeriodStartDate, err := r.CodyCurrentPeriodStartDate(ctx) + if err != nil { + return nil, err + } + + query := sqlf.Sprintf(`WHERE user_id = %s AND timestamp >= %s AND timestamp <= NOW() AND (name LIKE '%%recipe%%' OR name LIKE '%%command%%' OR name LIKE '%%chat%%')`, r.user.ID, currentPeriodStartDate.Time) + + count, err := r.db.EventLogs().CountBySQL(ctx, query) + + intCount := int32(count) + + return &intCount, err +} + +func (r *UserResolver) CodyCurrentPeriodCodeUsage(ctx context.Context) (*int32, error) { + if !envvar.SourcegraphDotComMode() { + return nil, errors.New("this feature is only available on sourcegraph.com") + } + + currentPeriodStartDate, err := r.CodyCurrentPeriodStartDate(ctx) + if err != nil { + return nil, err + } + + query := sqlf.Sprintf(`WHERE user_id = %s AND timestamp >= %s AND timestamp <= NOW() AND name LIKE '%%completion:suggested%%'`, r.user.ID, currentPeriodStartDate.Time) + + count, err := r.db.EventLogs().CountBySQL(ctx, query) + + intCount := int32(count) + + return &intCount, err +} + +func (r *UserResolver) CodyCurrentPeriodStartDate(ctx context.Context) (*gqlutil.DateTime, error) { + startDate, _, err := r.codyCurrentPeriodDateRange(ctx) + + return startDate, err +} + +func (r *UserResolver) CodyCurrentPeriodEndDate(ctx context.Context) (*gqlutil.DateTime, error) { + _, endDate, err := r.codyCurrentPeriodDateRange(ctx) + + return endDate, err +} + +type currentTimeCtxKey int + +const mockCurrentTimeKey currentTimeCtxKey = iota + +func currentTimeFromCtx(ctx context.Context) time.Time { + t, ok := ctx.Value(mockCurrentTimeKey).(*time.Time) + if !ok || t == nil { + return time.Now() + } + return *t +} + +func withCurrentTimeMock(ctx context.Context, t time.Time) context.Context { + return context.WithValue(ctx, mockCurrentTimeKey, &t) +} + +func (r *UserResolver) codyCurrentPeriodDateRange(ctx context.Context) (*gqlutil.DateTime, *gqlutil.DateTime, error) { + if !envvar.SourcegraphDotComMode() { + return nil, nil, errors.New("this feature is only available on sourcegraph.com") + } + + // 🚨 SECURITY: Only the user and admins are allowed to access the user's + // settings because they may contain secrets or other sensitive data. + if err := auth.CheckSiteAdminOrSameUserFromActor(r.actor, r.db, r.user.ID); err != nil { + return nil, nil, err + } + + subscriptionStartDate := r.user.CreatedAt + if r.user.CodyProEnabledAt != nil { + subscriptionStartDate = *r.user.CodyProEnabledAt + } + + // to allow mocking current time during tests + currentDate := currentTimeFromCtx(ctx) + targetDay := subscriptionStartDate.Day() + startDayOfTheMonth := targetDay + endDayOfTheMonth := targetDay - 1 + startMonth := currentDate + endMonth := currentDate + + if currentDate.Day() < targetDay { + // Set to target day of the previous month + startMonth = currentDate.AddDate(0, -1, 0) + } else { + // Set to target day of the next month + endMonth = currentDate.AddDate(0, 1, 0) + } + + daysInStartingMonth := time.Date(startMonth.Year(), startMonth.Month()+1, 0, 0, 0, 0, 0, startMonth.Location()).Day() + if startDayOfTheMonth > daysInStartingMonth { + startDayOfTheMonth = daysInStartingMonth + } + + daysInEndingMonth := time.Date(endMonth.Year(), endMonth.Month()+1, 0, 0, 0, 0, 0, endMonth.Location()).Day() + if endDayOfTheMonth > daysInEndingMonth { + endDayOfTheMonth = daysInEndingMonth + } + + startDate := &gqlutil.DateTime{Time: time.Date(startMonth.Year(), startMonth.Month(), startDayOfTheMonth, 0, 0, 0, 0, startMonth.Location())} + endDate := &gqlutil.DateTime{Time: time.Date(endMonth.Year(), endMonth.Month(), endDayOfTheMonth, 23, 59, 59, 59, endMonth.Location())} + + return startDate, endDate, nil +} + func (r *UserResolver) UpdatedAt() *gqlutil.DateTime { return &gqlutil.DateTime{Time: r.user.UpdatedAt} } @@ -320,16 +468,17 @@ func (r *schemaResolver) UpdateUser(ctx context.Context, args *updateUserArgs) ( return UserByIDInt32(ctx, r.db, userID) } -type upgradeToCodyProArgs struct { +type changeCodyPlanArgs struct { User graphql.ID + Pro bool } -func (r *schemaResolver) UpgradeToCodyPro(ctx context.Context, args *upgradeToCodyProArgs) (*UserResolver, error) { +func (r *schemaResolver) ChangeCodyPlan(ctx context.Context, args *changeCodyPlanArgs) (*UserResolver, error) { if !envvar.SourcegraphDotComMode() { return nil, errors.New("this feature is only available on sourcegraph.com") } - if !featureflag.FromContext(ctx).GetBoolOr("cody_pro_dec_ga", false) { + if !featureflag.FromContext(ctx).GetBoolOr("cody-pro", false) { return nil, errors.New("this feature is not enabled") } @@ -343,7 +492,7 @@ func (r *schemaResolver) UpgradeToCodyPro(ctx context.Context, args *upgradeToCo return nil, err } - if err := r.db.Users().UpgradeToCodyPro(ctx, userID); err != nil { + if err := r.db.Users().ChangeCodyPlan(ctx, userID, args.Pro); err != nil { return nil, err } diff --git a/cmd/frontend/graphqlbackend/user_test.go b/cmd/frontend/graphqlbackend/user_test.go index d89906aa26f65..cbfa680fe3f30 100644 --- a/cmd/frontend/graphqlbackend/user_test.go +++ b/cmd/frontend/graphqlbackend/user_test.go @@ -6,6 +6,7 @@ import ( "strconv" "strings" "testing" + "time" gqlerrors "github.com/graph-gophers/graphql-go/errors" "github.com/stretchr/testify/assert" @@ -17,6 +18,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/gitserver" + "github.com/sourcegraph/sourcegraph/internal/gqlutil" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" @@ -229,6 +231,137 @@ func TestUser_LatestSettings(t *testing.T) { }) } +func TestUser_CodyCurrentPeriod(t *testing.T) { + db := dbmocks.NewMockDB() + + orig := envvar.SourcegraphDotComMode() + envvar.MockSourcegraphDotComMode(true) + t.Cleanup(func() { + envvar.MockSourcegraphDotComMode(orig) + }) + + t.Run("allowed by same user or site admin", func(t *testing.T) { + users := dbmocks.NewMockUserStore() + db.UsersFunc.SetDefaultReturn(users) + now := time.Now() + + tests := []struct { + name string + ctx context.Context + success bool + }{ + { + name: "same user", + ctx: actor.WithActor(context.Background(), &actor.Actor{UID: 1}), + success: true, + }, + { + name: "another user", + ctx: actor.WithActor(context.Background(), &actor.Actor{UID: 2}), + success: false, + }, + { + name: "another user, but site admin", + ctx: actor.WithActor(context.Background(), actor.FromActualUser(&types.User{ID: 2, SiteAdmin: true})), + success: true, + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + user := &types.User{ID: 1, CreatedAt: now} + users.GetByIDFunc.SetDefaultReturn(user, nil) + + date, _ := NewUserResolver(test.ctx, db, user).CodyCurrentPeriodStartDate(test.ctx) + + assert.Equal(t, test.success, date != nil, "CodyCurrentPeriodStartDate") + }) + } + }) + + t.Run("success", func(t *testing.T) { + users := dbmocks.NewMockUserStore() + db.UsersFunc.SetDefaultReturn(users) + now := time.Now() + + tests := []struct { + name string + user *types.User + today time.Time + createdAt time.Time + pro bool + start time.Time + end time.Time + }{ + { + name: "community user created before current day", + createdAt: time.Date(2022, 9, 5, 0, 0, 0, 0, now.Location()), + today: time.Date(2023, 1, 15, 0, 0, 0, 0, now.Location()), + start: time.Date(2023, 1, 5, 0, 0, 0, 0, now.Location()), + end: time.Date(2023, 2, 4, 23, 59, 59, 59, now.Location()), + }, + { + name: "community user created after current day", + createdAt: time.Date(2022, 9, 25, 0, 0, 0, 0, now.Location()), + today: time.Date(2023, 1, 15, 0, 0, 0, 0, now.Location()), + start: time.Date(2022, 12, 25, 0, 0, 0, 0, now.Location()), + end: time.Date(2023, 1, 24, 23, 59, 59, 59, now.Location()), + }, + { + name: "community user created on 31st Jan", + createdAt: time.Date(2023, 1, 31, 0, 0, 0, 0, now.Location()), + today: time.Date(2023, 2, 15, 0, 0, 0, 0, now.Location()), + start: time.Date(2023, 1, 31, 0, 0, 0, 0, now.Location()), + end: time.Date(2023, 2, 28, 23, 59, 59, 59, now.Location()), + }, + { + name: "pro user created before current day", + createdAt: time.Date(2022, 9, 5, 0, 0, 0, 0, now.Location()), + today: time.Date(2023, 1, 15, 0, 0, 0, 0, now.Location()), + start: time.Date(2023, 1, 5, 0, 0, 0, 0, now.Location()), + end: time.Date(2023, 2, 4, 23, 59, 59, 59, now.Location()), + pro: true, + }, + { + name: "pro user created after current day", + createdAt: time.Date(2022, 9, 25, 0, 0, 0, 0, now.Location()), + today: time.Date(2023, 1, 15, 0, 0, 0, 0, now.Location()), + start: time.Date(2022, 12, 25, 0, 0, 0, 0, now.Location()), + end: time.Date(2023, 1, 24, 23, 59, 59, 59, now.Location()), + pro: true, + }, + { + name: "pro user created on 31st Jan", + createdAt: time.Date(2023, 1, 31, 0, 0, 0, 0, now.Location()), + today: time.Date(2023, 2, 15, 0, 0, 0, 0, now.Location()), + start: time.Date(2023, 1, 31, 0, 0, 0, 0, now.Location()), + end: time.Date(2023, 2, 28, 23, 59, 59, 59, now.Location()), + pro: true, + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + user := &types.User{ID: 1} + if test.pro { + user.CodyProEnabledAt = &test.createdAt + } else { + user.CreatedAt = test.createdAt + } + + users.GetByIDFunc.SetDefaultReturn(test.user, nil) + + ctx := actor.WithActor(context.Background(), &actor.Actor{UID: user.ID}) + ctx = withCurrentTimeMock(ctx, test.today) + + startDate, _ := NewUserResolver(ctx, db, user).CodyCurrentPeriodStartDate(ctx) + assert.Equal(t, &gqlutil.DateTime{Time: test.start}, startDate, "CodyCurrentPeriodStartDate") + + endDate, _ := NewUserResolver(ctx, db, user).CodyCurrentPeriodEndDate(ctx) + assert.Equal(t, &gqlutil.DateTime{Time: test.end}, endDate, "CodyCurrentPeriodEndDate") + }) + } + }) +} + func TestUser_ViewerCanAdminister(t *testing.T) { db := dbmocks.NewMockDB() t.Run("settings edit only allowed by authenticated user on Sourcegraph.com", func(t *testing.T) { diff --git a/cmd/frontend/graphqlbackend/user_usage_stats.go b/cmd/frontend/graphqlbackend/user_usage_stats.go index ac3d237bea769..9b84533cf99dc 100644 --- a/cmd/frontend/graphqlbackend/user_usage_stats.go +++ b/cmd/frontend/graphqlbackend/user_usage_stats.go @@ -165,7 +165,7 @@ func (r *schemaResolver) LogEvents(ctx context.Context, args *EventBatch) (*Empt ide := getIdeFromEvent(&args) - if ide == "vscode" { + if strings.ToLower(ide) == "vscode" { if ffs := featureflag.FromContext(ctx); ffs != nil { emailsEnabled = ffs.GetBoolOr("vscodeCodyEmailsEnabled", false) } diff --git a/cmd/frontend/internal/app/ui/router.go b/cmd/frontend/internal/app/ui/router.go index 75581362cc9d3..d2c725e6d77b3 100644 --- a/cmd/frontend/internal/app/ui/router.go +++ b/cmd/frontend/internal/app/ui/router.go @@ -141,6 +141,8 @@ func InitRouter(db database.DB) { {path: "/search/cody", name: "cody-search", title: "Search (Cody)", index: false}, {path: "/app/coming-soon", name: "app-coming-soon", title: "Coming soon", index: false}, {path: "/app/auth/callback", name: "app-auth-callback", title: "Auth callback", index: false}, + {path: "/cody/manage", name: "cody", title: "Cody Manage", index: false}, + {path: "/cody/subscription", name: "cody", title: "Cody Pricing", index: false}, {path: "/cody/chat", name: "cody", title: "Cody", index: false}, {path: "/cody/chat/{chatID}", name: "cody-chat", title: "Cody", index: false}, // TODO: [TEMPORARY] remove this redirect route when the marketing page is added. @@ -428,15 +430,25 @@ func serveErrorNoDebug(w http.ResponseWriter, r *http.Request, db database.DB, e tr.SetAttributes(attribute.String("error-id", errorID)) traceURL = trace.URL(trace.ID(r.Context()), conf.DefaultClient()) } - logger.Error( - "ui HTTP handler error response", + logFields := []log.Field{ log.String("method", r.Method), log.String("request_uri", r.URL.RequestURI()), log.Int("status_code", statusCode), log.Error(err), log.String("error_id", errorID), log.String("trace", traceURL), - ) + } + if statusCode >= 400 && statusCode < 500 { + logger.Warn( + "ui HTTP handler error response", + logFields..., + ) + } else { + logger.Error( + "ui HTTP handler error response", + logFields..., + ) + } // In the case of recovering from a panic, we nicely include the stack // trace in the error that is shown on the page. Additionally, we log it diff --git a/cmd/frontend/internal/auth/azureoauth/BUILD.bazel b/cmd/frontend/internal/auth/azureoauth/BUILD.bazel index a45e61f328588..713a82c8b5572 100644 --- a/cmd/frontend/internal/auth/azureoauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/azureoauth/BUILD.bazel @@ -23,6 +23,7 @@ go_library( "//internal/extsvc", "//internal/extsvc/auth", "//internal/extsvc/azuredevops", + "//internal/httpcli", "//internal/licensing", "//lib/errors", "//schema", @@ -52,10 +53,12 @@ go_test( "//internal/database/dbtest", "//internal/extsvc", "//internal/extsvc/azuredevops", + "//internal/httpcli", "//internal/ratelimit", "//internal/rcache", "//schema", "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", "@com_github_sourcegraph_log//logtest", "@com_github_stretchr_testify//require", "@org_golang_x_oauth2//:oauth2", diff --git a/cmd/frontend/internal/auth/azureoauth/provider_test.go b/cmd/frontend/internal/auth/azureoauth/provider_test.go index 6e06f01a62037..b244ef2a06120 100644 --- a/cmd/frontend/internal/auth/azureoauth/provider_test.go +++ b/cmd/frontend/internal/auth/azureoauth/provider_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/sourcegraph/log/logtest" "golang.org/x/oauth2" @@ -266,7 +267,7 @@ func TestParseConfig(t *testing.T) { if diff := cmp.Diff(tc.wantProblems, gotProblems.Messages()); diff != "" { t.Errorf("mismatched problems (-want,+got):\n%s", diff) } - if diff := cmp.Diff(wantConfigs, gotConfigs); diff != "" { + if diff := cmp.Diff(wantConfigs, gotConfigs, cmpopts.IgnoreUnexported(oauth2.Config{})); diff != "" { t.Errorf("mismatched configs (-want,+got):\n%s", diff) } }) diff --git a/cmd/frontend/internal/auth/azureoauth/session.go b/cmd/frontend/internal/auth/azureoauth/session.go index d93917f648616..769a6786d459f 100644 --- a/cmd/frontend/internal/auth/azureoauth/session.go +++ b/cmd/frontend/internal/auth/azureoauth/session.go @@ -15,6 +15,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc" extsvcauth "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" "github.com/sourcegraph/sourcegraph/internal/extsvc/azuredevops" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -37,7 +38,7 @@ func (s *sessionIssuerHelper) GetOrCreateUser(ctx context.Context, token *oauth2 return false, nil, "failed to read Azure DevOps Profile from oauth2 callback request", errors.Wrap(err, "azureoauth.GetOrCreateUser: failed to read user from context of callback request") } - if allow, err := s.verifyAllowOrgs(ctx, user, token); err != nil { + if allow, err := s.verifyAllowOrgs(ctx, user, token, httpcli.ExternalDoer); err != nil { return false, nil, "error in verifying authorized user organizations", err } else if !allow { msg := "User does not belong to any org from the allowed list of organizations. Please contact your site admin." @@ -113,7 +114,7 @@ func (s *sessionIssuerHelper) GetServiceID() string { return s.ServiceID } -func (s *sessionIssuerHelper) verifyAllowOrgs(ctx context.Context, profile *azuredevops.Profile, token *oauth2.Token) (bool, error) { +func (s *sessionIssuerHelper) verifyAllowOrgs(ctx context.Context, profile *azuredevops.Profile, token *oauth2.Token, doer httpcli.Doer) (bool, error) { if len(s.allowOrgs) == 0 { return true, nil } @@ -124,7 +125,7 @@ func (s *sessionIssuerHelper) verifyAllowOrgs(ctx context.Context, profile *azur &extsvcauth.OAuthBearerToken{ Token: token.AccessToken, }, - nil, + doer, ) if err != nil { return false, errors.Wrap(err, "failed to create client for listing organizations of user") diff --git a/cmd/frontend/internal/auth/azureoauth/session_test.go b/cmd/frontend/internal/auth/azureoauth/session_test.go index f361c42a5214e..cd619be2614d1 100644 --- a/cmd/frontend/internal/auth/azureoauth/session_test.go +++ b/cmd/frontend/internal/auth/azureoauth/session_test.go @@ -13,6 +13,7 @@ import ( "golang.org/x/oauth2" "github.com/sourcegraph/sourcegraph/internal/extsvc/azuredevops" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/internal/rcache" ) @@ -101,7 +102,7 @@ func Test_verifyAllowOrgs(t *testing.T) { s := &sessionIssuerHelper{allowOrgs: tc.allowOrgs} ctx := context.Background() - allow, err := s.verifyAllowOrgs(ctx, &profile, &oauth2.Token{AccessToken: "foo"}) + allow, err := s.verifyAllowOrgs(ctx, &profile, &oauth2.Token{AccessToken: "foo"}, httpcli.TestExternalDoer) require.NoError(t, err, "unexpected error") if allow != tc.expectedAllow { t.Fatalf("expected allow to be %v, but got %v", tc.expectedAllow, allow) diff --git a/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel b/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel index 54cc22cdf55f4..e37f71b803c7a 100644 --- a/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel @@ -64,11 +64,13 @@ go_test( "//internal/database/dbtest", "//internal/extsvc", "//internal/extsvc/bitbucketcloud", + "//internal/httpcli", "//internal/ratelimit", "//lib/errors", "//schema", "@com_github_dghubble_gologin_v2//bitbucket", "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", "@com_github_sourcegraph_log//logtest", "@org_golang_x_oauth2//:oauth2", ], diff --git a/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go index 972622903d946..183cbd721de2a 100644 --- a/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "golang.org/x/oauth2" "github.com/sourcegraph/log/logtest" @@ -210,7 +211,7 @@ func TestParseConfig(t *testing.T) { if diff := cmp.Diff(tt.wantProblems, gotProblems.Messages()); diff != "" { t.Errorf("problems: %s", diff) } - if diff := cmp.Diff(wantConfigs, gotConfigs); diff != "" { + if diff := cmp.Diff(wantConfigs, gotConfigs, cmpopts.IgnoreUnexported(oauth2.Config{})); diff != "" { t.Errorf("problems: %s", diff) } }) diff --git a/cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go index acb922d67c79f..eb38563032e9b 100644 --- a/cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go @@ -19,6 +19,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/extsvc/bitbucketcloud" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" @@ -191,7 +192,7 @@ func TestSessionIssuerHelper_GetOrCreateUser(t *testing.T) { Url: server.URL, ApiURL: server.URL, } - bbClient, err := bitbucketcloud.NewClient(server.URL, conf, nil) + bbClient, err := bitbucketcloud.NewClient(server.URL, conf, httpcli.TestExternalDoer) if err != nil { t.Fatal(err) } @@ -272,7 +273,7 @@ func TestSessionIssuerHelper_SignupMatchesSecondaryAccount(t *testing.T) { Url: server.URL, ApiURL: server.URL, } - bbClient, err := bitbucketcloud.NewClient(server.URL, conf, nil) + bbClient, err := bitbucketcloud.NewClient(server.URL, conf, httpcli.TestExternalDoer) if err != nil { t.Fatal(err) } diff --git a/cmd/frontend/internal/auth/githubappauth/BUILD.bazel b/cmd/frontend/internal/auth/githubappauth/BUILD.bazel index e582305364c9b..006d832b96236 100644 --- a/cmd/frontend/internal/auth/githubappauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/githubappauth/BUILD.bazel @@ -62,6 +62,7 @@ go_test( "//internal/github_apps/store", "//internal/github_apps/types", "//internal/gitserver", + "//internal/httpcli", "//internal/rcache", "//internal/types", "//lib/errors", diff --git a/cmd/frontend/internal/auth/githubappauth/middleware.go b/cmd/frontend/internal/auth/githubappauth/middleware.go index ef75cd347b475..0abd072e4cb18 100644 --- a/cmd/frontend/internal/auth/githubappauth/middleware.go +++ b/cmd/frontend/internal/auth/githubappauth/middleware.go @@ -284,7 +284,7 @@ func newServeMux(db database.DB, prefix string, cache *rcache.Cache) http.Handle return } - app, err := createGitHubApp(u, *domain) + app, err := createGitHubApp(u, *domain, httpcli.UncachedExternalClient) if err != nil { http.Error(w, fmt.Sprintf("Unexpected error while converting github app: %s", err.Error()), http.StatusInternalServerError) return @@ -494,7 +494,7 @@ func generateRedirectURL(domain *string, installationID, appID *int, appName *st var MockCreateGitHubApp func(conversionURL string, domain types.GitHubAppDomain) (*ghtypes.GitHubApp, error) -func createGitHubApp(conversionURL string, domain types.GitHubAppDomain) (*ghtypes.GitHubApp, error) { +func createGitHubApp(conversionURL string, domain types.GitHubAppDomain, httpClient *http.Client) (*ghtypes.GitHubApp, error) { if MockCreateGitHubApp != nil { return MockCreateGitHubApp(conversionURL, domain) } @@ -503,13 +503,7 @@ func createGitHubApp(conversionURL string, domain types.GitHubAppDomain) (*ghtyp return nil, err } - cf := httpcli.UncachedExternalClientFactory - client, err := cf.Doer() - if err != nil { - return nil, errors.Wrap(err, "failed to create GitHub client") - } - - resp, err := client.Do(r) + resp, err := httpClient.Do(r) if err != nil { return nil, err } diff --git a/cmd/frontend/internal/auth/githubappauth/middleware_test.go b/cmd/frontend/internal/auth/githubappauth/middleware_test.go index 3ada7d933eeb1..5683607b7d555 100644 --- a/cmd/frontend/internal/auth/githubappauth/middleware_test.go +++ b/cmd/frontend/internal/auth/githubappauth/middleware_test.go @@ -19,6 +19,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/encryption" "github.com/sourcegraph/sourcegraph/internal/github_apps/store" ghtypes "github.com/sourcegraph/sourcegraph/internal/github_apps/types" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/rcache" "github.com/sourcegraph/sourcegraph/internal/types" ) @@ -512,7 +513,7 @@ func TestCreateGitHubApp(t *testing.T) { srv := httptest.NewServer(test.handlerAssert(t)) defer srv.Close() - app, err := createGitHubApp(srv.URL, test.domain) + app, err := createGitHubApp(srv.URL, test.domain, httpcli.TestExternalClient) if test.expectedErr != nil { require.Error(t, err) assert.EqualError(t, err, test.expectedErr.Error()) diff --git a/cmd/frontend/internal/auth/githuboauth/BUILD.bazel b/cmd/frontend/internal/auth/githuboauth/BUILD.bazel index 350c8a946ec51..56d35f793ca7d 100644 --- a/cmd/frontend/internal/auth/githuboauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/githuboauth/BUILD.bazel @@ -73,6 +73,7 @@ go_test( "@com_github_davecgh_go_spew//spew", "@com_github_dghubble_gologin_v2//github", "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", "@com_github_google_go_github_v55//github", "@com_github_inconshreveable_log15//:log15", "@com_github_sourcegraph_log//logtest", diff --git a/cmd/frontend/internal/auth/githuboauth/config_test.go b/cmd/frontend/internal/auth/githuboauth/config_test.go index 8e781503a4aa8..9a5a8ab5219c7 100644 --- a/cmd/frontend/internal/auth/githuboauth/config_test.go +++ b/cmd/frontend/internal/auth/githuboauth/config_test.go @@ -5,6 +5,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "golang.org/x/oauth2" "github.com/sourcegraph/log/logtest" @@ -274,7 +275,7 @@ func TestParseConfig(t *testing.T) { if diff := cmp.Diff(tt.wantProblems, gotProblems.Messages()); diff != "" { t.Errorf("problems: %s", diff) } - if diff := cmp.Diff(wantConfigs, gotConfigs); diff != "" { + if diff := cmp.Diff(wantConfigs, gotConfigs, cmpopts.IgnoreUnexported(oauth2.Config{})); diff != "" { t.Errorf("problems: %s", diff) } }) diff --git a/cmd/frontend/internal/auth/oauth/session.go b/cmd/frontend/internal/auth/oauth/session.go index 7d2e7fc60495a..7a751b621f52d 100644 --- a/cmd/frontend/internal/auth/oauth/session.go +++ b/cmd/frontend/internal/auth/oauth/session.go @@ -2,6 +2,7 @@ package oauth import ( "context" + "fmt" "net/http" "time" @@ -123,7 +124,14 @@ func SessionIssuer(logger log.Logger, db database.DB, s SessionIssuerHelper, ses } // Since we obtained a valid user from the OAuth token, we consider the GitHub login successful at this point - ctx = actor.WithActor(ctx, actr) + ctx, err = session.SetActorFromUser(ctx, w, r, user, expiryDuration) + if err != nil { + span.SetError(err) + logger.Error("OAuth failed: could not initiate session.", log.Error(err)) + http.Error(w, fmt.Sprintf("Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: %s", err.Error()), http.StatusInternalServerError) + return + } + db.SecurityEventLogs().LogEvent(ctx, &database.SecurityEvent{ Name: s.AuthSucceededEventName(), URL: r.URL.Path, // don't log query params w/ OAuth data @@ -132,20 +140,6 @@ func SessionIssuer(logger log.Logger, db database.DB, s SessionIssuerHelper, ses Timestamp: time.Now(), }) - if err := session.SetActor(w, r, actr, expiryDuration, user.CreatedAt); err != nil { // TODO: test session expiration - span.SetError(err) - logger.Error("OAuth failed: could not initiate session.", log.Error(err)) - http.Error(w, "Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: could not initiate session.", http.StatusInternalServerError) - return - } - - if err := session.SetData(w, r, sessionKey, s.SessionData(token)); err != nil { - // It's not fatal if this fails. It just means we won't be able to sign the user out of - // the OP. - span.AddEvent(err.Error()) // do not set error - logger.Warn("Failed to set OAuth session data. The session is still secure, but Sourcegraph will be unable to revoke the user's token or redirect the user to the end-session endpoint after the user signs out of Sourcegraph.", log.Error(err)) - } - redirectURL := auth.AddPostAuthRedirectParametersToString(state.Redirect, newUserCreated, "OAuth::"+s.GetServiceID()) http.Redirect(w, r, auth.SafeRedirectURL(redirectURL), http.StatusFound) }) diff --git a/cmd/frontend/internal/auth/openidconnect/BUILD.bazel b/cmd/frontend/internal/auth/openidconnect/BUILD.bazel index bf60a3cdfa2c3..fd79b169f8bcd 100644 --- a/cmd/frontend/internal/auth/openidconnect/BUILD.bazel +++ b/cmd/frontend/internal/auth/openidconnect/BUILD.bazel @@ -58,6 +58,7 @@ go_test( "//internal/database/dbmocks", "//internal/encryption", "//internal/extsvc", + "//internal/httpcli", "//internal/licensing", "//internal/types", "//lib/errors", diff --git a/cmd/frontend/internal/auth/openidconnect/config.go b/cmd/frontend/internal/auth/openidconnect/config.go index 0904b0079a51f..882e62f76ea04 100644 --- a/cmd/frontend/internal/auth/openidconnect/config.go +++ b/cmd/frontend/internal/auth/openidconnect/config.go @@ -14,6 +14,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" @@ -103,7 +104,7 @@ func getProviders() []providers.Provider { } ps := make([]providers.Provider, 0, len(cfgs)) for _, cfg := range cfgs { - ps = append(ps, NewProvider(*cfg, authPrefix, path.Join(auth.AuthURLPrefix, "callback"))) + ps = append(ps, NewProvider(*cfg, authPrefix, path.Join(auth.AuthURLPrefix, "callback"), httpcli.ExternalClient)) } return ps } diff --git a/cmd/frontend/internal/auth/openidconnect/middleware.go b/cmd/frontend/internal/auth/openidconnect/middleware.go index acd552d6a07b1..00a5230e9413c 100644 --- a/cmd/frontend/internal/auth/openidconnect/middleware.go +++ b/cmd/frontend/internal/auth/openidconnect/middleware.go @@ -21,7 +21,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/cookie" "github.com/sourcegraph/sourcegraph/internal/database" - "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -106,7 +105,7 @@ func handleOpenIDConnectAuth(db database.DB, w http.ResponseWriter, r *http.Requ http.Error(w, safeErrMsg, http.StatusInternalServerError) return } - RedirectToAuthRequest(w, r, p, stateCookieName, auth.SafeRedirectURL(r.URL.String())) + RedirectToAuthRequest(w, r, p, auth.SafeRedirectURL(r.URL.String())) return } @@ -135,11 +134,11 @@ func authHandler(db database.DB) func(w http.ResponseWriter, r *http.Request) { if redirect == "" { redirect = r.URL.Query().Get("returnTo") } - RedirectToAuthRequest(w, r, p, stateCookieName, redirect) + RedirectToAuthRequest(w, r, p, redirect) return case "/callback": // Endpoint for the OIDC Authorization Response, see http://openid.net/specs/openid-connect-core-1_0.html#AuthResponse. - result, safeErrMsg, errStatus, err := AuthCallback(db, r, stateCookieName, "", GetProvider) + result, safeErrMsg, errStatus, err := AuthCallback(db, r, "", GetProvider) if err != nil { log15.Error("Failed to authenticate with OpenID connect.", "error", err) http.Error(w, safeErrMsg, errStatus) @@ -177,7 +176,7 @@ func authHandler(db database.DB) func(w http.ResponseWriter, r *http.Request) { // if !idToken.Expiry.IsZero() { // exp = time.Until(idToken.Expiry) // } - if err = session.SetActor(w, r, sgactor.FromUser(result.User.ID), exp, result.User.CreatedAt); err != nil { + if _, err = session.SetActorFromUser(r.Context(), w, r, result.User, exp); err != nil { log15.Error("Failed to authenticate with OpenID connect: could not initiate session.", "error", err) http.Error(w, "Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: could not initiate session.", http.StatusInternalServerError) return @@ -211,7 +210,7 @@ type AuthCallbackResult struct { // In case of an error, it returns the internal error, an error message that is // safe to be passed back to the user, and a proper HTTP status code // corresponding to the error. -func AuthCallback(db database.DB, r *http.Request, stateCookieName, usernamePrefix string, getProvider func(id string) *Provider) (result *AuthCallbackResult, safeErrMsg string, errStatus int, err error) { +func AuthCallback(db database.DB, r *http.Request, usernamePrefix string, getProvider func(id string) *Provider) (result *AuthCallbackResult, safeErrMsg string, errStatus int, err error) { if authError := r.URL.Query().Get("error"); authError != "" { errorDesc := r.URL.Query().Get("error_description") return nil, @@ -226,27 +225,23 @@ func AuthCallback(db database.DB, r *http.Request, stateCookieName, usernamePref desc := "Authentication failed. Try signing in again (and clearing cookies for the current site). No OpenID Connect state query parameter specified." return nil, desc, - http.StatusBadRequest, + http.StatusUnauthorized, errors.New(desc) } - stateCookie, err := r.Cookie(stateCookieName) - if err == http.ErrNoCookie { - return nil, - fmt.Sprintf("Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: no state cookie found (possible request forgery, or more than %s elapsed since you started the authentication process).", stateCookieTimeout), - http.StatusBadRequest, - errors.New("no state cookie found (possible request forgery).") - } else if err != nil { + var oidcState string + if err := session.GetData(r, "oidcState", &oidcState); err != nil { return nil, - "Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: invalid state cookie.", - http.StatusInternalServerError, - errors.Wrap(err, "could not read state cookie (possible request forgery)") + "Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: no state cookie found.", + http.StatusUnauthorized, + errors.New("no state found (possible request forgery).") } - if stateCookie.Value != stateParam { + + if oidcState != stateParam { return nil, "Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: state parameter did not match the expected value (possible request forgery).", - http.StatusBadRequest, - errors.New("state cookie mismatch (possible request forgery)") + http.StatusUnauthorized, + errors.New("state mismatch (possible request forgery)") } // Decode state param value @@ -267,7 +262,7 @@ func AuthCallback(db database.DB, r *http.Request, stateCookieName, usernamePref } // Exchange the code for an access token, see http://openid.net/specs/openid-connect-core-1_0.html#TokenRequest. - oauth2Token, err := p.oauth2Config().Exchange(context.WithValue(r.Context(), oauth2.HTTPClient, httpcli.ExternalClient), r.URL.Query().Get("code")) + oauth2Token, err := p.oauth2Config().Exchange(context.WithValue(r.Context(), oauth2.HTTPClient, p.httpClient), r.URL.Query().Get("code")) if err != nil { return nil, "Authentication failed. Try signing in again. The error was: unable to obtain access token from issuer.", @@ -308,7 +303,7 @@ func AuthCallback(db database.DB, r *http.Request, stateCookieName, usernamePref errors.New("nonce is incorrect (possible replay attach)") } - userInfo, err := p.oidcUserInfo(oidc.ClientContext(r.Context(), httpcli.ExternalClient), oauth2.StaticTokenSource(oauth2Token)) + userInfo, err := p.oidcUserInfo(oidc.ClientContext(r.Context(), p.httpClient), oauth2.StaticTokenSource(oauth2Token)) if err != nil { return nil, "Failed to get userinfo: " + err.Error(), @@ -391,32 +386,33 @@ func (s *AuthnState) Decode(encoded string) error { return json.Unmarshal(b, s) } -// stateCookieTimeout defines how long the state cookie should be valid for a -// single authentication flow. -const stateCookieTimeout = time.Minute * 15 - // RedirectToAuthRequest redirects the user to the authentication endpoint on the // external authentication provider. -func RedirectToAuthRequest(w http.ResponseWriter, r *http.Request, p *Provider, cookieName, returnToURL string) { +func RedirectToAuthRequest(w http.ResponseWriter, r *http.Request, p *Provider, returnToURL string) { + // NOTE: We do not have a valid screen at the root path (always gets redirected + // to "/search"), and it is a marketing page on Sourcegraph.com, so redirecting to + // "/search" is a safe default. + if returnToURL == "" || returnToURL == "/" { + returnToURL = "/search" + } + // The state parameter is an opaque value used to maintain state between the // original Authentication Request and the callback. We generate a random unique // value as the OIDC state parameter. // // See http://openid.net/specs/openid-connect-core-1_0.html#AuthRequest of the // OIDC spec. - state := (&AuthnState{ + oidcState := (&AuthnState{ CSRFToken: uuid.NewV4().String(), // NOTE: "CSRF" is misleading here as all we want is a unique random value in the state cookie Redirect: returnToURL, ProviderID: p.ConfigID().ID, }).Encode() - http.SetCookie(w, - &http.Cookie{ - Name: cookieName, - Value: state, - Path: auth.AuthURLPrefix + "/", // Include the OIDC redirect URI (/.auth/callback not /.auth/openidconnect/callback for backwards compatibility) - Expires: time.Now().Add(stateCookieTimeout), - }, - ) + + if err := session.SetData(w, r, "oidcState", oidcState); err != nil { + log15.Error("Failed to saving state to session", "error", err) + http.Error(w, "Failed to saving state to session", http.StatusInternalServerError) + return + } // Redirect to the OP's Authorization Endpoint for authentication. The nonce is // an optional string value used to associate a Client session with an ID Token @@ -427,5 +423,5 @@ func RedirectToAuthRequest(w http.ResponseWriter, r *http.Request, p *Provider, // // See http://openid.net/specs/openid-connect-core-1_0.html#AuthRequest of the // OIDC spec. - http.Redirect(w, r, p.oauth2Config().AuthCodeURL(state, oidc.Nonce(state)), http.StatusFound) + http.Redirect(w, r, p.oauth2Config().AuthCodeURL(oidcState, oidc.Nonce(oidcState)), http.StatusFound) } diff --git a/cmd/frontend/internal/auth/openidconnect/middleware_test.go b/cmd/frontend/internal/auth/openidconnect/middleware_test.go index 99e3f0dd9a1e8..966d62271cc69 100644 --- a/cmd/frontend/internal/auth/openidconnect/middleware_test.go +++ b/cmd/frontend/internal/auth/openidconnect/middleware_test.go @@ -22,6 +22,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -129,6 +130,7 @@ func TestMiddleware(t *testing.T) { Type: providerType, }, callbackUrl: ".auth/callback", + httpClient: httpcli.TestExternalClient, } defer func() { mockGetProviderValue = nil }() providers.MockProviders = []providers.Provider{mockGetProviderValue} @@ -194,6 +196,7 @@ func TestMiddleware(t *testing.T) { req = req.WithContext(actor.WithActor(context.Background(), &actor.Actor{UID: mockUserID})) } respRecorder := httptest.NewRecorder() + session.SetData(respRecorder, req, "oidcState", validState) authedHandler.ServeHTTP(respRecorder, req) return respRecorder.Result() } @@ -221,7 +224,7 @@ func TestMiddleware(t *testing.T) { if got, want := resp.Header.Get("Location"), "/oauth2/v1/authorize?"; !strings.Contains(got, want) { t.Errorf("got redirect URL %v, want contains %v", got, want) } - if state, want := state(t, resp.Header.Get("Location")), "/"; state.Redirect != want { + if state, want := state(t, resp.Header.Get("Location")), "/search"; state.Redirect != want { t.Errorf("got redirect destination %q, want %q", state.Redirect, want) } }) @@ -284,7 +287,7 @@ func TestMiddleware(t *testing.T) { t.Run("OIDC callback without CSRF token -> error", func(t *testing.T) { invalidState := (&AuthnState{CSRFToken: "bad", ProviderID: mockGetProviderValue.ConfigID().ID}).Encode() resp := doRequest("GET", "http://example.com/.auth/callback?code=THECODE&state="+url.PathEscape(invalidState), "", nil, false) - if want := http.StatusBadRequest; resp.StatusCode != want { + if want := http.StatusUnauthorized; resp.StatusCode != want { t.Errorf("got status code %v, want %v", resp.StatusCode, want) } }) @@ -331,6 +334,7 @@ func TestMiddleware_NoOpenRedirect(t *testing.T) { Type: providerType, }, callbackUrl: ".auth/callback", + httpClient: httpcli.TestExternalClient, } defer func() { mockGetProviderValue = nil }() providers.MockProviders = []providers.Provider{mockGetProviderValue} @@ -385,6 +389,7 @@ func TestMiddleware_NoOpenRedirect(t *testing.T) { req.AddCookie(cookie) } respRecorder := httptest.NewRecorder() + session.SetData(respRecorder, req, "oidcState", state) authedHandler.ServeHTTP(respRecorder, req) return respRecorder.Result() } diff --git a/cmd/frontend/internal/auth/openidconnect/provider.go b/cmd/frontend/internal/auth/openidconnect/provider.go index 115a9ff1dbabe..20b8faabd4c34 100644 --- a/cmd/frontend/internal/auth/openidconnect/provider.go +++ b/cmd/frontend/internal/auth/openidconnect/provider.go @@ -14,7 +14,6 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/external/globals" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/extsvc" - "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" ) @@ -27,6 +26,7 @@ type Provider struct { config schema.OpenIDConnectAuthProvider authPrefix string callbackUrl string + httpClient *http.Client mu sync.Mutex oidc *oidcProvider @@ -35,11 +35,12 @@ type Provider struct { // NewProvider creates and returns a new OpenID Connect authentication provider // using the given config. -func NewProvider(config schema.OpenIDConnectAuthProvider, authPrefix string, callbackUrl string) providers.Provider { +func NewProvider(config schema.OpenIDConnectAuthProvider, authPrefix string, callbackUrl string, httpClient *http.Client) providers.Provider { return &Provider{ config: config, authPrefix: authPrefix, callbackUrl: callbackUrl, + httpClient: httpClient, } } @@ -60,7 +61,7 @@ func (p *Provider) Config() schema.AuthProviders { func (p *Provider) Refresh(context.Context) error { p.mu.Lock() defer p.mu.Unlock() - p.oidc, p.refreshErr = newOIDCProvider(p.config.Issuer) + p.oidc, p.refreshErr = newOIDCProvider(p.config.Issuer, p.httpClient) return p.refreshErr } @@ -158,12 +159,12 @@ type providerExtraClaims struct { var mockNewProvider func(issuerURL string) (*oidcProvider, error) -func newOIDCProvider(issuerURL string) (*oidcProvider, error) { +func newOIDCProvider(issuerURL string, httpClient *http.Client) (*oidcProvider, error) { if mockNewProvider != nil { return mockNewProvider(issuerURL) } - bp, err := oidc.NewProvider(oidc.ClientContext(context.Background(), httpcli.ExternalClient), issuerURL) + bp, err := oidc.NewProvider(oidc.ClientContext(context.Background(), httpClient), issuerURL) if err != nil { return nil, err } @@ -193,7 +194,8 @@ func revokeToken(ctx context.Context, p *Provider, accessToken, tokenType string req.Header.Set("Content-Type", "application/x-www-form-urlencoded") req.SetBasicAuth(p.config.ClientID, p.config.ClientSecret) - resp, err := httpcli.ExternalDoer.Do(req.WithContext(ctx)) + + resp, err := p.httpClient.Do(req.WithContext(ctx)) if err != nil { return err } diff --git a/cmd/frontend/internal/auth/openidconnect/user_test.go b/cmd/frontend/internal/auth/openidconnect/user_test.go index 65563e05d4fe7..4d8ba77251418 100644 --- a/cmd/frontend/internal/auth/openidconnect/user_test.go +++ b/cmd/frontend/internal/auth/openidconnect/user_test.go @@ -12,6 +12,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/encryption" "github.com/sourcegraph/sourcegraph/internal/extsvc" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/schema" ) @@ -59,7 +60,8 @@ func TestAllowSignup(t *testing.T) { RequireEmailDomain: "example.com", AllowSignup: test.allowSignup, }, - oidc: &oidcProvider{}, + oidc: &oidcProvider{}, + httpClient: httpcli.ExternalClient, } _, _, _, err := getOrCreateUser( context.Background(), diff --git a/cmd/frontend/internal/auth/saml/BUILD.bazel b/cmd/frontend/internal/auth/saml/BUILD.bazel index f62ef536b9019..590a1ffaaebd4 100644 --- a/cmd/frontend/internal/auth/saml/BUILD.bazel +++ b/cmd/frontend/internal/auth/saml/BUILD.bazel @@ -55,6 +55,7 @@ go_test( "//internal/conf", "//internal/database/dbmocks", "//internal/extsvc", + "//internal/httpcli", "//internal/licensing", "//internal/types", "//lib/errors", diff --git a/cmd/frontend/internal/auth/saml/config.go b/cmd/frontend/internal/auth/saml/config.go index fbe8954256059..7b9255a1fd99c 100644 --- a/cmd/frontend/internal/auth/saml/config.go +++ b/cmd/frontend/internal/auth/saml/config.go @@ -19,6 +19,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/env" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/schema" ) @@ -106,7 +107,7 @@ func getProviders() []providers.Provider { multiple := len(cfgs) >= 2 ps := make([]providers.Provider, 0, len(cfgs)) for _, cfg := range cfgs { - p := &provider{config: *cfg, multiple: multiple} + p := &provider{config: *cfg, multiple: multiple, httpClient: httpcli.ExternalClient} ps = append(ps, p) } return ps diff --git a/cmd/frontend/internal/auth/saml/middleware.go b/cmd/frontend/internal/auth/saml/middleware.go index 81fa53fd208a5..07304f9ff1b9e 100644 --- a/cmd/frontend/internal/auth/saml/middleware.go +++ b/cmd/frontend/internal/auth/saml/middleware.go @@ -174,7 +174,7 @@ func samlSPHandler(db database.DB) func(w http.ResponseWriter, r *http.Request) // if info.SessionNotOnOrAfter != nil { // exp = time.Until(*info.SessionNotOnOrAfter) // } - if err := session.SetActor(w, r, actor, exp, user.CreatedAt); err != nil { + if _, err := session.SetActorFromUser(r.Context(), w, r, user, exp); err != nil { log15.Error("Error setting SAML-authenticated actor in session.", "err", err) http.Error(w, "Error starting SAML-authenticated session. Try signing in again.", http.StatusInternalServerError) return diff --git a/cmd/frontend/internal/auth/saml/middleware_test.go b/cmd/frontend/internal/auth/saml/middleware_test.go index 42fd006f2bbf6..09e73bf747cdb 100644 --- a/cmd/frontend/internal/auth/saml/middleware_test.go +++ b/cmd/frontend/internal/auth/saml/middleware_test.go @@ -27,6 +27,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -187,7 +188,7 @@ func TestMiddleware(t *testing.T) { ServiceProviderPrivateKey: testSAMLSPKey, }) - mockGetProviderValue = &provider{config: *config} + mockGetProviderValue = &provider{config: *config, httpClient: httpcli.TestExternalClient} defer func() { mockGetProviderValue = nil }() providers.MockProviders = []providers.Provider{mockGetProviderValue} defer func() { providers.MockProviders = nil }() diff --git a/cmd/frontend/internal/auth/saml/provider.go b/cmd/frontend/internal/auth/saml/provider.go index 407b44b89c3f3..49ebe9c54b085 100644 --- a/cmd/frontend/internal/auth/saml/provider.go +++ b/cmd/frontend/internal/auth/saml/provider.go @@ -23,7 +23,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/extsvc" - "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" ) @@ -31,8 +30,9 @@ import ( const providerType = "saml" type provider struct { - config schema.SAMLAuthProvider - multiple bool // whether there are multiple SAML auth providers + config schema.SAMLAuthProvider + multiple bool // whether there are multiple SAML auth providers + httpClient *http.Client mu sync.Mutex samlSP *saml2.SAMLServiceProvider @@ -56,7 +56,7 @@ func (p *provider) Config() schema.AuthProviders { func (p *provider) Refresh(ctx context.Context) error { p.mu.Lock() defer p.mu.Unlock() - p.samlSP, p.refreshErr = getServiceProvider(ctx, &p.config) + p.samlSP, p.refreshErr = getServiceProvider(ctx, &p.config, p.httpClient) return p.refreshErr } @@ -104,13 +104,13 @@ func (p *provider) CachedInfo() *providers.Info { return info } -func getServiceProvider(ctx context.Context, pc *schema.SAMLAuthProvider) (*saml2.SAMLServiceProvider, error) { +func getServiceProvider(ctx context.Context, pc *schema.SAMLAuthProvider, httpClient *http.Client) (*saml2.SAMLServiceProvider, error) { c, err := readProviderConfig(pc) if err != nil { return nil, err } - idpMetadata, err := readIdentityProviderMetadata(ctx, c) + idpMetadata, err := readIdentityProviderMetadata(ctx, c, httpClient) if err != nil { return nil, err } @@ -276,7 +276,7 @@ func readProviderConfig(pc *schema.SAMLAuthProvider) (*providerConfig, error) { return &c, nil } -func readIdentityProviderMetadata(ctx context.Context, c *providerConfig) ([]byte, error) { +func readIdentityProviderMetadata(ctx context.Context, c *providerConfig, httpClient *http.Client) ([]byte, error) { if c.identityProviderMetadata != nil { return c.identityProviderMetadata, nil } @@ -286,7 +286,7 @@ func readIdentityProviderMetadata(ctx context.Context, c *providerConfig) ([]byt return nil, errors.WithMessage(err, "bad URL") } - resp, err := httpcli.ExternalDoer.Do(req.WithContext(ctx)) + resp, err := httpClient.Do(req.WithContext(ctx)) if err != nil { return nil, errors.WithMessage(err, "fetching SAML Identity Provider metadata") } diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel b/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel index ef0bec087d639..fca8d369693b6 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel +++ b/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel @@ -23,6 +23,7 @@ go_library( "//internal/conf/conftypes", "//internal/database", "//internal/extsvc", + "//internal/httpcli", "//internal/sourcegraphoperator", "//lib/errors", "//schema", @@ -56,6 +57,7 @@ go_test( "//internal/database/dbmocks", "//internal/database/dbtest", "//internal/extsvc", + "//internal/httpcli", "//internal/sourcegraphoperator", "//internal/types", "//lib/errors", diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go b/cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go index 9147af822c3ae..d2eab143e910f 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go @@ -19,6 +19,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" "github.com/sourcegraph/sourcegraph/internal/extsvc" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/sourcegraphoperator" "github.com/sourcegraph/sourcegraph/internal/types" ) @@ -50,7 +51,7 @@ func TestAddSourcegraphOperatorExternalAccount(t *testing.T) { ctx := context.Background() soap := NewProvider(cloud.SchemaAuthProviderSourcegraphOperator{ ClientID: "soap_client", - }) + }, httpcli.TestExternalClient) serviceID := soap.ConfigID().ID mockDB := func(siteAdmin bool) database.DB { diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/config.go b/cmd/frontend/internal/auth/sourcegraphoperator/config.go index d873860cd23fd..cb6df5d76e0c8 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/config.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/config.go @@ -11,6 +11,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/cloud" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/sourcegraphoperator" ) @@ -39,7 +40,7 @@ func Init() { conf.ContributeValidator(validateConfig) - p := NewProvider(*cloudSiteConfig.AuthProviders.SourcegraphOperator) + p := NewProvider(*cloudSiteConfig.AuthProviders.SourcegraphOperator, httpcli.ExternalClient) logger := log.Scoped(auth.SourcegraphOperatorProviderType) go func() { if err := p.Refresh(context.Background()); err != nil { diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go b/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go index d195dd7cc6666..1dd725860371b 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go @@ -69,11 +69,11 @@ func authHandler(db database.DB) func(w http.ResponseWriter, r *http.Request) { http.Error(w, safeErrMsg, http.StatusInternalServerError) return } - openidconnect.RedirectToAuthRequest(w, r, p, stateCookieName, r.URL.Query().Get("redirect")) + openidconnect.RedirectToAuthRequest(w, r, p, r.URL.Query().Get("redirect")) return case "/callback": // Endpoint for the OIDC Authorization Response, see http://openid.net/specs/openid-connect-core-1_0.html#AuthResponse. - result, safeErrMsg, errStatus, err := openidconnect.AuthCallback(db, r, stateCookieName, usernamePrefix, GetOIDCProvider) + result, safeErrMsg, errStatus, err := openidconnect.AuthCallback(db, r, usernamePrefix, GetOIDCProvider) if err != nil { logger.Error("failed to authenticate with Sourcegraph Operator", log.Error(err)) http.Error(w, safeErrMsg, errStatus) diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go b/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go index d5a9ffdbe31bb..17e49d74fff65 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go @@ -28,6 +28,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/extsvc" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -116,7 +117,7 @@ func newOIDCIDServer(t *testing.T, code string, providerConfig *cloud.SchemaAuth return httptest.NewServer(s), &email } -type doRequestFunc func(method, urlStr, body string, cookies []*http.Cookie, authed bool) *http.Response +type doRequestFunc func(method, urlStr, body string, cookies []*http.Cookie, authed bool, state string) *http.Response type mockDetails struct { usersStore *dbmocks.MockUserStore @@ -149,7 +150,7 @@ func newMockDBAndRequester() mockDetails { authedHandler.Handle("/.api/", Middleware(db).API(h)) authedHandler.Handle("/", Middleware(db).App(h)) - doRequest := func(method, urlStr, body string, cookies []*http.Cookie, authed bool) *http.Response { + doRequest := func(method, urlStr, body string, cookies []*http.Cookie, authed bool, state string) *http.Response { req := httptest.NewRequest(method, urlStr, bytes.NewBufferString(body)) for _, cookie := range cookies { req.AddCookie(cookie) @@ -158,6 +159,9 @@ func newMockDBAndRequester() mockDetails { req = req.WithContext(actor.WithActor(context.Background(), &actor.Actor{UID: 1})) } resp := httptest.NewRecorder() + if state != "" { + session.SetData(resp, req, "oidcState", state) + } authedHandler.ServeHTTP(resp, req) return resp.Result() } @@ -183,7 +187,7 @@ func TestMiddleware(t *testing.T) { defer oidcIDServer.Close() providerConfig.Issuer = oidcIDServer.URL - mockProvider := NewProvider(providerConfig).(*provider) + mockProvider := NewProvider(providerConfig, httpcli.TestExternalClient).(*provider) providers.MockProviders = []providers.Provider{mockProvider} defer func() { providers.MockProviders = nil }() @@ -195,7 +199,7 @@ func TestMiddleware(t *testing.T) { t.Run("unauthenticated API request should pass through", func(t *testing.T) { mocks := newMockDBAndRequester() - resp := mocks.doRequest(http.MethodGet, "http://example.com/.api/foo", "", nil, false) + resp := mocks.doRequest(http.MethodGet, "http://example.com/.api/foo", "", nil, false, "") assert.Equal(t, http.StatusOK, resp.StatusCode) }) @@ -203,7 +207,7 @@ func TestMiddleware(t *testing.T) { mocks := newMockDBAndRequester() urlStr := fmt.Sprintf("http://example.com%s/login?pc=%s", authPrefix, mockProvider.ConfigID().ID) - resp := mocks.doRequest(http.MethodGet, urlStr, "", nil, false) + resp := mocks.doRequest(http.MethodGet, urlStr, "", nil, false, "") assert.Equal(t, http.StatusFound, resp.StatusCode) location := resp.Header.Get("Location") @@ -227,8 +231,8 @@ func TestMiddleware(t *testing.T) { ProviderID: mockProvider.ConfigID().ID, } urlStr := fmt.Sprintf("http://example.com/.auth/sourcegraph-operator/callback?code=%s&state=%s", testCode, badState.Encode()) - resp := mocks.doRequest(http.MethodGet, urlStr, "", nil, false) - assert.Equal(t, http.StatusBadRequest, resp.StatusCode) + resp := mocks.doRequest(http.MethodGet, urlStr, "", nil, false, badState.Encode()) + assert.Equal(t, http.StatusUnauthorized, resp.StatusCode) }) t.Run("callback with good CSRF should set auth cookie", func(t *testing.T) { @@ -268,7 +272,7 @@ func TestMiddleware(t *testing.T) { Value: state.Encode(), }, } - resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false) + resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false, state.Encode()) assert.Equal(t, http.StatusFound, resp.StatusCode) wantRedirect := fmt.Sprintf(`%s?signin=OpenIDConnect`, state.Redirect) assert.Equal(t, wantRedirect, resp.Header.Get("Location")) @@ -305,7 +309,7 @@ func TestMiddleware(t *testing.T) { Value: state.Encode(), }, } - resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false) + resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false, state.Encode()) assert.Equal(t, http.StatusUnauthorized, resp.StatusCode) }) @@ -342,7 +346,7 @@ func TestMiddleware(t *testing.T) { Value: state.Encode(), }, } - resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false) + resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false, state.Encode()) assert.Equal(t, http.StatusFound, resp.StatusCode) assert.Equal(t, "/", resp.Header.Get("Location")) mockrequire.CalledOnce(t, mocks.usersStore.SetIsSiteAdminFunc) @@ -385,7 +389,7 @@ func TestMiddleware(t *testing.T) { Value: state.Encode(), }, } - resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false) + resp := mocks.doRequest(http.MethodGet, urlStr, "", cookies, false, state.Encode()) assert.Equal(t, http.StatusUnauthorized, resp.StatusCode) body, err := io.ReadAll(resp.Body) diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/provider.go b/cmd/frontend/internal/auth/sourcegraphoperator/provider.go index 057ebb3251b86..c560b22a33248 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/provider.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/provider.go @@ -1,6 +1,7 @@ package sourcegraphoperator import ( + "net/http" "path" feAuth "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" @@ -26,7 +27,7 @@ type provider struct { // NewProvider creates and returns a new Sourcegraph Operator authentication // provider using the given config. -func NewProvider(config cloud.SchemaAuthProviderSourcegraphOperator) providers.Provider { +func NewProvider(config cloud.SchemaAuthProviderSourcegraphOperator, httpClient *http.Client) providers.Provider { allowSignUp := true return &provider{ config: config, @@ -43,6 +44,7 @@ func NewProvider(config cloud.SchemaAuthProviderSourcegraphOperator) providers.P }, authPrefix, path.Join(feAuth.AuthURLPrefix, "sourcegraph-operator", "callback"), + httpClient, ).(*openidconnect.Provider), } } diff --git a/cmd/frontend/internal/authz/resolvers/BUILD.bazel b/cmd/frontend/internal/authz/resolvers/BUILD.bazel index a12c5b7146ed1..de97ae485bbeb 100644 --- a/cmd/frontend/internal/authz/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/authz/resolvers/BUILD.bazel @@ -44,7 +44,7 @@ go_library( go_test( name = "resolvers_test", - timeout = "short", + timeout = "moderate", srcs = [ "permissions_sync_jobs_test.go", "resolver_test.go", diff --git a/cmd/frontend/internal/cli/BUILD.bazel b/cmd/frontend/internal/cli/BUILD.bazel index bbf521acbc01b..cbb9dd24f804f 100644 --- a/cmd/frontend/internal/cli/BUILD.bazel +++ b/cmd/frontend/internal/cli/BUILD.bazel @@ -69,6 +69,7 @@ go_library( "//internal/oobmigration/migrations/register", "//internal/redispool", "//internal/requestclient", + "//internal/requestinteraction", "//internal/service", "//internal/session", "//internal/symbols", diff --git a/cmd/frontend/internal/cli/http.go b/cmd/frontend/internal/cli/http.go index dc366471b581c..795657c2141e9 100644 --- a/cmd/frontend/internal/cli/http.go +++ b/cmd/frontend/internal/cli/http.go @@ -30,6 +30,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/instrumentation" "github.com/sourcegraph/sourcegraph/internal/requestclient" + "github.com/sourcegraph/sourcegraph/internal/requestinteraction" "github.com/sourcegraph/sourcegraph/internal/session" tracepkg "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/version" @@ -69,6 +70,7 @@ func newExternalHTTPHandler( apiHandler = session.CookieMiddlewareWithCSRFSafety(logger, db, apiHandler, corsAllowHeader, isTrustedOrigin) // API accepts cookies with special header apiHandler = httpapi.AccessTokenAuthMiddleware(db, logger, apiHandler) // API accepts access tokens apiHandler = requestclient.ExternalHTTPMiddleware(apiHandler, envvar.SourcegraphDotComMode()) + apiHandler = requestinteraction.HTTPMiddleware(apiHandler) apiHandler = gziphandler.GzipHandler(apiHandler) if envvar.SourcegraphDotComMode() { apiHandler = deviceid.Middleware(apiHandler) @@ -92,6 +94,7 @@ func newExternalHTTPHandler( appHandler = session.CookieMiddleware(logger, db, appHandler) // app accepts cookies appHandler = httpapi.AccessTokenAuthMiddleware(db, logger, appHandler) // app accepts access tokens appHandler = requestclient.ExternalHTTPMiddleware(appHandler, envvar.SourcegraphDotComMode()) + appHandler = requestinteraction.HTTPMiddleware(appHandler) if envvar.SourcegraphDotComMode() { appHandler = deviceid.Middleware(appHandler) } diff --git a/cmd/frontend/internal/context/resolvers/context_test.go b/cmd/frontend/internal/context/resolvers/context_test.go index b709681fad70f..bb47a37dcc755 100644 --- a/cmd/frontend/internal/context/resolvers/context_test.go +++ b/cmd/frontend/internal/context/resolvers/context_test.go @@ -4,6 +4,7 @@ import ( "context" "io/fs" "os" + "sort" "strings" "testing" @@ -163,6 +164,8 @@ func TestContextResolver(t *testing.T) { } // One code result and text result from each repo expected := []string{"testcode1.go", "testtext1.md", "testcode2.go", "testtext2.md"} + sort.Strings(expected) + sort.Strings(paths) require.Equal(t, expected, paths) } diff --git a/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel b/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel index 42e5682101072..9b5bf04f25ef7 100644 --- a/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel +++ b/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel @@ -33,11 +33,13 @@ go_library( "//internal/codygateway", "//internal/completions/types", "//internal/conf", + "//internal/conf/conftypes", "//internal/database", "//internal/database/basestore", "//internal/database/dbutil", "//internal/env", "//internal/errcode", + "//internal/featureflag", "//internal/gqlutil", "//internal/hashutil", "//internal/license", diff --git a/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go b/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go index ef60a8d0a9f58..7af387e0dbab8 100644 --- a/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go +++ b/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go @@ -3,6 +3,9 @@ package productsubscription import ( "context" "fmt" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" + "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/internal/featureflag" "math" "github.com/graph-gophers/graphql-go" @@ -161,6 +164,12 @@ func (r codyUserGatewayAccessResolver) CodeCompletionsRateLimit(ctx context.Cont } const tokensPerDollar = int(1 / (0.0001 / 1_000)) +const oneDayInSeconds = int32(60 * 60 * 24) + +// oneMonthInSeconds is a bad approximation. Our logic in Cody Gateway +// is "till the Nth day of the next month", so this is basically a magic number, +// and we shouldn't use this value as a duration. +const oneMonthInSeconds = oneDayInSeconds * 30 func (r codyUserGatewayAccessResolver) EmbeddingsRateLimit(ctx context.Context) (graphqlbackend.CodyGatewayRateLimit, error) { // If the user isn't enabled return no rate limit @@ -168,10 +177,9 @@ func (r codyUserGatewayAccessResolver) EmbeddingsRateLimit(ctx context.Context) return nil, nil } - rateLimit := licensing.CodyGatewayRateLimit{ - AllowedModels: []string{"openai/text-embedding-ada-002"}, - Limit: int64(20 * tokensPerDollar), - IntervalSeconds: math.MaxInt32, + rateLimit, err := getEmbeddingsRateLimit(ctx, r.db) + if err != nil { + return nil, err } return &codyGatewayRateLimitResolver{ @@ -182,11 +190,45 @@ func (r codyUserGatewayAccessResolver) EmbeddingsRateLimit(ctx context.Context) }, nil } +func getEmbeddingsRateLimit(ctx context.Context, db database.DB) (licensing.CodyGatewayRateLimit, error) { + // Hard-coded defaults: 200M tokens for life + limit := int64(20 * tokensPerDollar) + intervalSeconds := int32(math.MaxInt32) + + // Apply self-serve limits if available + cfg := conf.GetEmbeddingsConfig(conf.Get().SiteConfig()) + if cfg != nil && featureflag.FromContext(ctx).GetBoolOr("cody-pro", false) { + actor := sgactor.FromContext(ctx) + user, err := actor.User(ctx, db.Users()) + if err != nil { + return licensing.CodyGatewayRateLimit{}, err + } + intervalSeconds = oneMonthInSeconds + isProUser := user.CodyProEnabledAt != nil + if isProUser { + if cfg.PerProUserEmbeddingsMonthlyLimit > 0 { + limit = int64(cfg.PerProUserEmbeddingsMonthlyLimit) + } + } else { + if cfg.PerCommunityUserEmbeddingsMonthlyLimit > 0 { + limit = int64(cfg.PerCommunityUserEmbeddingsMonthlyLimit) + } + } + } + + return licensing.CodyGatewayRateLimit{ + AllowedModels: []string{"openai/text-embedding-ada-002"}, + Limit: limit, + IntervalSeconds: intervalSeconds, + }, nil +} + func getCompletionsRateLimit(ctx context.Context, db database.DB, userID int32, scope types.CompletionsFeature) (licensing.CodyGatewayRateLimit, graphqlbackend.CodyGatewayRateLimitSource, error) { var limit *int var err error - source := graphqlbackend.CodyGatewayRateLimitSourceOverride + // Apply overrides first. + source := graphqlbackend.CodyGatewayRateLimitSourceOverride switch scope { case types.CompletionsFeatureChat: limit, err = db.Users().GetChatCompletionsQuota(ctx, userID) @@ -198,10 +240,27 @@ func getCompletionsRateLimit(ctx context.Context, db database.DB, userID int32, if err != nil { return licensing.CodyGatewayRateLimit{}, graphqlbackend.CodyGatewayRateLimitSourcePlan, err } + + // If there's no override, check the self-serve limits. + cfg := conf.GetCompletionsConfig(conf.Get().SiteConfig()) + intervalSeconds := oneDayInSeconds + if limit == nil && cfg != nil && featureflag.FromContext(ctx).GetBoolOr("cody-pro", false) { + source = graphqlbackend.CodyGatewayRateLimitSourcePlan + actor := sgactor.FromContext(ctx) + user, err := actor.User(ctx, db.Users()) + if err != nil { + return licensing.CodyGatewayRateLimit{}, graphqlbackend.CodyGatewayRateLimitSourcePlan, err + } + isProUser := user.CodyProEnabledAt != nil + intervalSeconds, limit, err = getSelfServeUsageLimits(scope, isProUser, *cfg) + if err != nil { + return licensing.CodyGatewayRateLimit{}, graphqlbackend.CodyGatewayRateLimitSourcePlan, err + } + } + + // Otherwise, fall back to the pre-Cody-GA global limit. if limit == nil { source = graphqlbackend.CodyGatewayRateLimitSourcePlan - // Otherwise, fall back to the global limit. - cfg := conf.GetCompletionsConfig(conf.Get().SiteConfig()) switch scope { case types.CompletionsFeatureChat: if cfg != nil && cfg.PerUserDailyLimit > 0 { @@ -212,7 +271,7 @@ func getCompletionsRateLimit(ctx context.Context, db database.DB, userID int32, limit = pointers.Ptr(cfg.PerUserCodeCompletionsDailyLimit) } default: - return licensing.CodyGatewayRateLimit{}, graphqlbackend.CodyGatewayRateLimitSourcePlan, errors.Newf("unknown scope: %s", scope) + return licensing.CodyGatewayRateLimit{}, graphqlbackend.CodyGatewayRateLimitSourcePlan, errors.Newf("unknown scope (dotcom limiting): %s", scope) } } if limit == nil { @@ -221,16 +280,42 @@ func getCompletionsRateLimit(ctx context.Context, db database.DB, userID int32, return licensing.CodyGatewayRateLimit{ AllowedModels: allowedModels(scope), Limit: int64(*limit), - IntervalSeconds: 86400, // Daily limit TODO(davejrt) + IntervalSeconds: intervalSeconds, // Daily limit TODO(davejrt) }, source, nil } +func getSelfServeUsageLimits(scope types.CompletionsFeature, isProUser bool, cfg conftypes.CompletionsConfig) (int32, *int, error) { + switch scope { + case types.CompletionsFeatureChat: + if isProUser { + if cfg.PerProUserChatDailyLLMRequestLimit > 0 { + return oneDayInSeconds, pointers.Ptr(cfg.PerProUserChatDailyLLMRequestLimit), nil + } + } else { + if cfg.PerCommunityUserChatMonthlyLLMRequestLimit > 0 { + return oneMonthInSeconds, pointers.Ptr(cfg.PerCommunityUserChatMonthlyLLMRequestLimit), nil + } + } + case types.CompletionsFeatureCode: + if isProUser { + if cfg.PerProUserCodeCompletionsDailyLLMRequestLimit > 0 { + return oneDayInSeconds, pointers.Ptr(cfg.PerProUserCodeCompletionsDailyLLMRequestLimit), nil + } + } else { + if cfg.PerCommunityUserCodeCompletionsMonthlyLLMRequestLimit > 0 { + return oneMonthInSeconds, pointers.Ptr(cfg.PerCommunityUserCodeCompletionsMonthlyLLMRequestLimit), nil + } + } + } + return 0, nil, errors.Newf("unknown scope (self-serve limiting): %s", scope) +} + func allowedModels(scope types.CompletionsFeature) []string { switch scope { case types.CompletionsFeatureChat: - return []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"} + return []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-2.0", "anthropic/claude-2.1", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"} case types.CompletionsFeatureCode: - return []string{"anthropic/claude-instant-v1", "anthropic/claude-instant-1"} + return []string{"anthropic/claude-instant-v1", "anthropic/claude-instant-1", "fireworks/accounts/fireworks/models/starcoder-7b-w8a16", "fireworks/accounts/sourcegraph/models/starcoder-7b", "fireworks/accounts/fireworks/models/starcoder-16b-w8a16", "fireworks/accounts/sourcegraph/models/starcoder-16b"} default: return []string{} } diff --git a/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel b/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel index 9b30703d402d8..ecc4aa9225ced 100644 --- a/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel @@ -33,14 +33,20 @@ go_library( go_test( name = "resolvers_test", - srcs = ["resolvers_test.go"], + srcs = [ + "repo_embedding_jobs_test.go", + "resolvers_test.go", + ], embed = [":resolvers"], + tags = ["requires-network"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/actor", "//internal/api", "//internal/conf", + "//internal/database", "//internal/database/dbmocks", + "//internal/database/dbtest", "//internal/embeddings", "//internal/embeddings/background/repo", "//internal/featureflag", diff --git a/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go b/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go index efc45484c38bd..6aaa1d291524c 100644 --- a/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go +++ b/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go @@ -32,7 +32,12 @@ func NewRepoEmbeddingJobsResolver( store: repoEmbeddingJobsStore, args: args, } - return graphqlutil.NewConnectionResolver[graphqlbackend.RepoEmbeddingJobResolver](store, &args.ConnectionResolverArgs, nil) + opts := &graphqlutil.ConnectionResolverOptions{ + OrderBy: database.OrderBy{ + {Field: "repo_embedding_jobs.id"}, + }, + } + return graphqlutil.NewConnectionResolver[graphqlbackend.RepoEmbeddingJobResolver](store, &args.ConnectionResolverArgs, opts) } type repoEmbeddingJobsConnectionStore struct { diff --git a/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs_test.go b/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs_test.go new file mode 100644 index 0000000000000..37b70029370b2 --- /dev/null +++ b/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs_test.go @@ -0,0 +1,87 @@ +package resolvers + +import ( + "context" + "testing" + + "github.com/sourcegraph/log/logtest" + "github.com/stretchr/testify/require" + + "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" + "github.com/sourcegraph/sourcegraph/internal/actor" + "github.com/sourcegraph/sourcegraph/internal/conf" + "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/database/dbtest" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" + "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/lib/pointers" + "github.com/sourcegraph/sourcegraph/schema" +) + +// TestDBPaginationWithRepoFilter exercises a bug filed in #58313 where +// a unscoped default ordering column from graphqlutil.ConnectionResolver ("id") +// makes into a query joining two tables (both having an id column), +// causing ambiguous SQL. +func TestDBPaginationWithRepoFilter(t *testing.T) { + logger := logtest.Scoped(t) + db := database.NewDB(logger, dbtest.NewDB(t)) + ctx := context.Background() + + // Make a repo and an embedding job: + err := db.Repos().Create(ctx, &types.Repo{ + Name: "testrepo", + }) + require.NoError(t, err) + r, err := db.Repos().GetByName(ctx, "testrepo") + require.NoError(t, err) + jobs := repo.NewRepoEmbeddingJobsStore(db) + jobID, err := jobs.CreateRepoEmbeddingJob(ctx, r.ID, "commitID") + require.NoError(t, err) + + // Enable embeddings, so that resolvers work: + conf.Mock(&conf.Unified{ + SiteConfiguration: schema.SiteConfiguration{ + CodyEnabled: pointers.Ptr(true), + LicenseKey: "foobar", + Embeddings: &schema.Embeddings{ + Provider: "sourcegraph", + }, + }, + }) + t.Cleanup(func() { conf.Mock(nil) }) + require.True(t, conf.EmbeddingsEnabled()) + + // Authenticate with a site-admin. + user, err := db.Users().Create(ctx, database.NewUser{Username: "admin"}) + require.NoError(t, err) + require.NoError(t, db.Users().SetIsSiteAdmin(ctx, user.ID, true)) + a := actor.FromUser(user.ID) + ctx = actor.WithActor(ctx, a) + + // Exercise pagination and filtering via graphQL: + schema, err := graphqlbackend.NewSchema(db, nil, []graphqlbackend.OptionalResolver{{EmbeddingsResolver: NewResolver(db, logger, nil, nil, jobs)}}) + require.NoError(t, err) + graphqlbackend.RunTest(t, &graphqlbackend.Test{ + Schema: schema, + Context: ctx, + Query: `query RepoEmbeddingJobsList($first: Int, $after: String, $query: String) { + repoEmbeddingJobs(first: $first, after: $after, query: $query) { + nodes { + id + } + } + }`, + // Want no error: + ExpectedResult: `{ + "repoEmbeddingJobs": { + "nodes": [] + } + }`, + Variables: map[string]any{ + "first": 1, + "after": marshalRepoEmbeddingJobID(jobID), + "query": r.Name, + }, + }) + +} diff --git a/cmd/frontend/internal/httpapi/BUILD.bazel b/cmd/frontend/internal/httpapi/BUILD.bazel index 04c3256e1fc12..a48c2bf551e91 100644 --- a/cmd/frontend/internal/httpapi/BUILD.bazel +++ b/cmd/frontend/internal/httpapi/BUILD.bazel @@ -44,10 +44,10 @@ go_library( "//internal/encryption/keyring", "//internal/env", "//internal/errcode", - "//internal/featureflag", "//internal/gitserver", "//internal/gitserver/gitdomain", "//internal/httpcli", + "//internal/licensing", "//internal/search", "//internal/search/backend", "//internal/search/searchcontexts", @@ -106,7 +106,6 @@ go_test( "//internal/database", "//internal/database/dbmocks", "//internal/errcode", - "//internal/featureflag", "//internal/gitserver", "//internal/gitserver/gitdomain", "//internal/httpcli", diff --git a/cmd/frontend/internal/httpapi/auth.go b/cmd/frontend/internal/httpapi/auth.go index c05dc5485cbdc..0183af6e097a3 100644 --- a/cmd/frontend/internal/httpapi/auth.go +++ b/cmd/frontend/internal/httpapi/auth.go @@ -20,6 +20,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/cookie" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/errcode" + "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -118,7 +119,19 @@ func AccessTokenAuthMiddleware(db database.DB, baseLogger log.Logger, next http. } else { requiredScope = authz.ScopeSiteAdminSudo } - subjectUserID, err := db.AccessTokens().Lookup(r.Context(), token, requiredScope) + + info, err := licensing.GetConfiguredProductLicenseInfo() + if err != nil { + http.Error(w, "Could not check license for access token authorization.", http.StatusInternalServerError) + return + } + + opts := database.TokenLookupOpts{ + RequiredScope: requiredScope, + OnlyAdmin: info.IsExpired(), + } + + subjectUserID, err := db.AccessTokens().Lookup(r.Context(), token, opts) if err != nil { if err == database.ErrAccessTokenNotFound || errors.HasType(err, database.InvalidTokenError{}) { anonymousId, anonCookieSet := cookie.AnonymousUID(r) diff --git a/cmd/frontend/internal/httpapi/auth_test.go b/cmd/frontend/internal/httpapi/auth_test.go index 2c550bdca70df..4970355428ec8 100644 --- a/cmd/frontend/internal/httpapi/auth_test.go +++ b/cmd/frontend/internal/httpapi/auth_test.go @@ -104,12 +104,12 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { req.Header.Set("Authorization", headerValue) accessTokens := dbmocks.NewMockAccessTokenStore() - accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { + accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded string, opts database.TokenLookupOpts) (subjectUserID int32, err error) { if want := "abcdef"; tokenHexEncoded != want { t.Errorf("got %q, want %q", tokenHexEncoded, want) } - if want := authz.ScopeUserAll; requiredScope != want { - t.Errorf("got %q, want %q", requiredScope, want) + if want := authz.ScopeUserAll; opts.RequiredScope != want { + t.Errorf("got %q, want %q", opts.RequiredScope, want) } return 123, nil }) @@ -127,12 +127,12 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { req = req.WithContext(sgactor.WithActor(context.Background(), &sgactor.Actor{UID: 456})) accessTokens := dbmocks.NewMockAccessTokenStore() - accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { + accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded string, opts database.TokenLookupOpts) (subjectUserID int32, err error) { if want := "abcdef"; tokenHexEncoded != want { t.Errorf("got %q, want %q", tokenHexEncoded, want) } - if want := authz.ScopeUserAll; requiredScope != want { - t.Errorf("got %q, want %q", requiredScope, want) + if want := authz.ScopeUserAll; opts.RequiredScope != want { + t.Errorf("got %q, want %q", opts.RequiredScope, want) } return 123, nil }) @@ -160,12 +160,12 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { req = req.WithContext(sgactor.WithActor(context.Background(), &sgactor.Actor{UID: 456})) accessTokens := dbmocks.NewMockAccessTokenStore() - accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { + accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded string, opts database.TokenLookupOpts) (subjectUserID int32, err error) { if want := "abcdef"; tokenHexEncoded != want { t.Errorf("got %q, want %q", tokenHexEncoded, want) } - if want := authz.ScopeUserAll; requiredScope != want { - t.Errorf("got %q, want %q", requiredScope, want) + if want := authz.ScopeUserAll; opts.RequiredScope != want { + t.Errorf("got %q, want %q", opts.RequiredScope, want) } return 123, nil }) @@ -181,12 +181,12 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { req.Header.Set("Authorization", `token-sudo token="abcdef",user="alice"`) accessTokens := dbmocks.NewMockAccessTokenStore() - accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { + accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded string, opts database.TokenLookupOpts) (subjectUserID int32, err error) { if want := "abcdef"; tokenHexEncoded != want { t.Errorf("got %q, want %q", tokenHexEncoded, want) } - if want := authz.ScopeSiteAdminSudo; requiredScope != want { - t.Errorf("got %q, want %q", requiredScope, want) + if want := authz.ScopeSiteAdminSudo; opts.RequiredScope != want { + t.Errorf("got %q, want %q", opts.RequiredScope, want) } return 123, nil }) @@ -228,12 +228,12 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { req.Header.Set("Authorization", `token-sudo token="abcdef",user="alice"`) accessTokens := dbmocks.NewMockAccessTokenStore() - accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { + accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded string, opts database.TokenLookupOpts) (subjectUserID int32, err error) { if want := "abcdef"; tokenHexEncoded != want { t.Errorf("got %q, want %q", tokenHexEncoded, want) } - if want := authz.ScopeSiteAdminSudo; requiredScope != want { - t.Errorf("got %q, want %q", requiredScope, want) + if want := authz.ScopeSiteAdminSudo; opts.RequiredScope != want { + t.Errorf("got %q, want %q", opts.RequiredScope, want) } return 123, nil }) @@ -279,12 +279,12 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { req.Header.Set("Authorization", `token-sudo token="abcdef",user="alice"`) accessTokens := dbmocks.NewMockAccessTokenStore() - accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { + accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded string, opts database.TokenLookupOpts) (subjectUserID int32, err error) { if want := "abcdef"; tokenHexEncoded != want { t.Errorf("got %q, want %q", tokenHexEncoded, want) } - if want := authz.ScopeSiteAdminSudo; requiredScope != want { - t.Errorf("got %q, want %q", requiredScope, want) + if want := authz.ScopeSiteAdminSudo; opts.RequiredScope != want { + t.Errorf("got %q, want %q", opts.RequiredScope, want) } return 123, nil }) @@ -319,12 +319,12 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { req.Header.Set("Authorization", `token-sudo token="abcdef",user="doesntexist"`) accessTokens := dbmocks.NewMockAccessTokenStore() - accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { + accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded string, opts database.TokenLookupOpts) (subjectUserID int32, err error) { if want := "abcdef"; tokenHexEncoded != want { t.Errorf("got %q, want %q", tokenHexEncoded, want) } - if want := authz.ScopeSiteAdminSudo; requiredScope != want { - t.Errorf("got %q, want %q", requiredScope, want) + if want := authz.ScopeSiteAdminSudo; opts.RequiredScope != want { + t.Errorf("got %q, want %q", opts.RequiredScope, want) } return 123, nil }) diff --git a/cmd/frontend/internal/httpapi/graphql.go b/cmd/frontend/internal/httpapi/graphql.go index 90902cfa53614..cf8e4190a791d 100644 --- a/cmd/frontend/internal/httpapi/graphql.go +++ b/cmd/frontend/internal/httpapi/graphql.go @@ -131,11 +131,13 @@ func serveGraphQL(logger log.Logger, schema *graphql.Schema, rlw graphqlbackend. // Track the cost distribution of requests in a histogram. costHistogram.WithLabelValues(actorTypeLabel(isInternal, anonymous, requestSource)).Observe(float64(cost.FieldCount)) - if !isInternal && (cost.AliasCount > graphqlbackend.MaxAliasCount) { + rl := conf.RateLimits() + + if !isInternal && (cost.AliasCount > rl.GraphQLMaxAliases) { return writeViolationError(w, "query exceeds maximum query cost") } - if !isInternal && (cost.FieldCount > graphqlbackend.MaxFieldCount) { + if !isInternal && (cost.FieldCount > rl.GraphQLMaxFieldCount) { if envvar.SourcegraphDotComMode() { // temporarily logging queries that exceed field count limit on Sourcegraph.com logger.Warn("GQL cost limit exceeded", log.String("query", params.Query)) } diff --git a/cmd/frontend/internal/httpapi/stream_blame.go b/cmd/frontend/internal/httpapi/stream_blame.go index 58f6c7e639a58..edb6ca57531fd 100644 --- a/cmd/frontend/internal/httpapi/stream_blame.go +++ b/cmd/frontend/internal/httpapi/stream_blame.go @@ -16,7 +16,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/errcode" - "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/gitserver/gitdomain" streamhttp "github.com/sourcegraph/sourcegraph/internal/search/streaming/http" @@ -30,11 +29,6 @@ import ( // before that. func handleStreamBlame(logger log.Logger, db database.DB, gitserverClient gitserver.Client) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - flags := featureflag.FromContext(r.Context()) - if !flags.GetBoolOr("enable-streaming-git-blame", false) { - w.WriteHeader(404) - return - } tr, ctx := trace.New(r.Context(), "blame.Stream") defer tr.End() r = r.WithContext(ctx) diff --git a/cmd/frontend/internal/httpapi/stream_blame_test.go b/cmd/frontend/internal/httpapi/stream_blame_test.go index bb129697fa800..82b6e62d547f8 100644 --- a/cmd/frontend/internal/httpapi/stream_blame_test.go +++ b/cmd/frontend/internal/httpapi/stream_blame_test.go @@ -9,18 +9,18 @@ import ( "github.com/gorilla/mux" "github.com/sourcegraph/log/logtest" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/errcode" - "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/gitserver/gitdomain" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func setupMockGSClient(t *testing.T, wantRev api.CommitID, returnErr error, hunks []*gitserver.Hunk) gitserver.Client { @@ -122,19 +122,7 @@ func TestStreamBlame(t *testing.T) { backend.Mocks.Repos = backend.MockRepos{} }) - ffs := featureflag.NewMemoryStore(nil, nil, map[string]bool{"enable-streaming-git-blame": true}) - ctx := featureflag.WithFlags(context.Background(), ffs) - - t.Run("NOK feature flag disabled", func(t *testing.T) { - rec := httptest.NewRecorder() - req, err := http.NewRequest(http.MethodGet, "/no-vars", nil) - require.NoError(t, err) - req = req.WithContext(context.Background()) // no feature flag there - - gsClient := setupMockGSClient(t, "abcd", nil, hunks) - handleStreamBlame(logger, db, gsClient).ServeHTTP(rec, req) - assert.Equal(t, http.StatusNotFound, rec.Code) - }) + ctx := context.Background() t.Run("NOK no mux vars", func(t *testing.T) { rec := httptest.NewRecorder() diff --git a/cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go b/cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go index b5209efe75423..188fdc180cd23 100644 --- a/cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go +++ b/cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go @@ -194,12 +194,6 @@ func getProactiveResultLimit() int { } -func min(x, y int) int { - if x < y { - return x - } - return y -} func getExtendedTimeout(ctx context.Context, db database.DB) int { searchLimit := limits.SearchLimits(conf.Get()).MaxTimeoutSeconds diff --git a/cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go b/cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go index a14206f41d69a..c761343e662e2 100644 --- a/cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go +++ b/cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go @@ -1594,14 +1594,7 @@ func sortSeriesResolvers(ctx context.Context, seriesOptions types.SeriesDisplayO } } - return resolvers[:minInt(int32(len(resolvers)), limit)], nil -} - -func minInt(a, b int32) int32 { - if a < b { - return a - } - return b + return resolvers[:min(int32(len(resolvers)), limit)], nil } func lowercaseGroupBy(groupBy *string) *string { diff --git a/cmd/frontend/internal/telemetry/resolvers/telemetrygateway.go b/cmd/frontend/internal/telemetry/resolvers/telemetrygateway.go index cb7e184f57912..864ec9b7338da 100644 --- a/cmd/frontend/internal/telemetry/resolvers/telemetrygateway.go +++ b/cmd/frontend/internal/telemetry/resolvers/telemetrygateway.go @@ -12,23 +12,59 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" ) +// newTelemetryGatewayEvents converts GraphQL telemetry input to the Telemetry +// Gateway wire format. func newTelemetryGatewayEvents( ctx context.Context, now time.Time, newUUID func() string, - events []graphqlbackend.TelemetryEventInput, + gqlEvents []graphqlbackend.TelemetryEventInput, ) ([]*telemetrygatewayv1.Event, error) { - gatewayEvents := make([]*telemetrygatewayv1.Event, len(events)) - for i, e := range events { + gatewayEvents := make([]*telemetrygatewayv1.Event, len(gqlEvents)) + for i, gqlEvent := range gqlEvents { event := telemetrygatewayv1.NewEventWithDefaults(ctx, now, newUUID) - event.Feature = e.Feature - event.Action = e.Action + event.Feature = gqlEvent.Feature + event.Action = gqlEvent.Action + + // Override interaction ID, or just set it, if an interaction ID is + // explicitly provided as part of event data. + if gqlEvent.Parameters.InteractionID != nil && len(*gqlEvent.Parameters.InteractionID) > 0 { + if event.Interaction == nil { + event.Interaction = &telemetrygatewayv1.EventInteraction{} + } + event.Interaction.InteractionId = gqlEvent.Parameters.InteractionID + } + + // Parse metadata + var metadata map[string]float64 + if gqlEvent.Parameters.Metadata != nil && len(*gqlEvent.Parameters.Metadata) != 0 { + metadata = make(map[string]float64, len(*gqlEvent.Parameters.Metadata)) + for _, kv := range *gqlEvent.Parameters.Metadata { + switch v := kv.Value.Value.(type) { + case int: + metadata[kv.Key] = float64(v) + case int8: + metadata[kv.Key] = float64(v) + case int32: + metadata[kv.Key] = float64(v) + case int64: + metadata[kv.Key] = float64(v) + case float32: + metadata[kv.Key] = float64(v) + case float64: + metadata[kv.Key] = v + default: + return gatewayEvents, + errors.Newf("metadata %q has invalid value type %T", kv.Key, v) + } + } + } // Parse private metadata var privateMetadata *structpb.Struct - if e.Parameters.PrivateMetadata != nil { - switch v := e.Parameters.PrivateMetadata.Value.(type) { + if gqlEvent.Parameters.PrivateMetadata != nil { + switch v := gqlEvent.Parameters.PrivateMetadata.Value.(type) { // If the input is an object, turn it into proto struct as-is case map[string]any: var err error @@ -51,25 +87,16 @@ func newTelemetryGatewayEvents( // Configure parameters event.Parameters = &telemetrygatewayv1.EventParameters{ - Version: e.Parameters.Version, - Metadata: func() map[string]int64 { - if e.Parameters.Metadata == nil || len(*e.Parameters.Metadata) == 0 { - return nil - } - metadata := make(map[string]int64, len(*e.Parameters.Metadata)) - for _, kv := range *e.Parameters.Metadata { - metadata[kv.Key] = int64(kv.Value) - } - return metadata - }(), + Version: gqlEvent.Parameters.Version, + Metadata: metadata, PrivateMetadata: privateMetadata, BillingMetadata: func() *telemetrygatewayv1.EventBillingMetadata { - if e.Parameters.BillingMetadata == nil { + if gqlEvent.Parameters.BillingMetadata == nil { return nil } return &telemetrygatewayv1.EventBillingMetadata{ - Product: e.Parameters.BillingMetadata.Product, - Category: e.Parameters.BillingMetadata.Category, + Product: gqlEvent.Parameters.BillingMetadata.Product, + Category: gqlEvent.Parameters.BillingMetadata.Category, } }(), } @@ -78,21 +105,21 @@ func newTelemetryGatewayEvents( Version: version.Version(), }, Client: &telemetrygatewayv1.EventSource_Client{ - Name: e.Source.Client, - Version: e.Source.ClientVersion, + Name: gqlEvent.Source.Client, + Version: gqlEvent.Source.ClientVersion, }, } - if e.MarketingTracking != nil { + if gqlEvent.MarketingTracking != nil { event.MarketingTracking = &telemetrygatewayv1.EventMarketingTracking{ - Url: e.MarketingTracking.Url, - FirstSourceUrl: e.MarketingTracking.FirstSourceURL, - CohortId: e.MarketingTracking.CohortID, - Referrer: e.MarketingTracking.Referrer, - LastSourceUrl: e.MarketingTracking.LastSourceURL, - DeviceSessionId: e.MarketingTracking.DeviceSessionID, - SessionReferrer: e.MarketingTracking.SessionReferrer, - SessionFirstUrl: e.MarketingTracking.SessionFirstURL, + Url: gqlEvent.MarketingTracking.Url, + FirstSourceUrl: gqlEvent.MarketingTracking.FirstSourceURL, + CohortId: gqlEvent.MarketingTracking.CohortID, + Referrer: gqlEvent.MarketingTracking.Referrer, + LastSourceUrl: gqlEvent.MarketingTracking.LastSourceURL, + DeviceSessionId: gqlEvent.MarketingTracking.DeviceSessionID, + SessionReferrer: gqlEvent.MarketingTracking.SessionReferrer, + SessionFirstUrl: gqlEvent.MarketingTracking.SessionFirstURL, } } diff --git a/cmd/frontend/internal/telemetry/resolvers/telemetrygateway_test.go b/cmd/frontend/internal/telemetry/resolvers/telemetrygateway_test.go index 60f2962f39b4b..146fd81401f4e 100644 --- a/cmd/frontend/internal/telemetry/resolvers/telemetrygateway_test.go +++ b/cmd/frontend/internal/telemetry/resolvers/telemetrygateway_test.go @@ -104,7 +104,7 @@ func TestNewTelemetryGatewayEvents(t *testing.T) { Metadata: &[]graphqlbackend.TelemetryEventMetadataInput{ { Key: "metadata", - Value: 123, + Value: graphqlbackend.JSONValue{Value: 123}, }, }, PrivateMetadata: &graphqlbackend.JSONValue{ @@ -126,7 +126,7 @@ func TestNewTelemetryGatewayEvents(t *testing.T) { "product": "Product" }, "metadata": { - "metadata": "123" + "metadata": 123 }, "privateMetadata": { "private": "super-sensitive" diff --git a/cmd/gitserver/internal/BUILD.bazel b/cmd/gitserver/internal/BUILD.bazel index fe4b743186d09..e523643f6f9c3 100644 --- a/cmd/gitserver/internal/BUILD.bazel +++ b/cmd/gitserver/internal/BUILD.bazel @@ -65,7 +65,6 @@ go_library( "//internal/ratelimit", "//internal/search/streaming/http", "//internal/security", - "//internal/syncx", "//internal/trace", "//internal/types", "//internal/unpack", diff --git a/cmd/gitserver/internal/cacert/BUILD.bazel b/cmd/gitserver/internal/cacert/BUILD.bazel index 14e0d24456036..81601754a1871 100644 --- a/cmd/gitserver/internal/cacert/BUILD.bazel +++ b/cmd/gitserver/internal/cacert/BUILD.bazel @@ -11,7 +11,6 @@ go_library( ], importpath = "github.com/sourcegraph/sourcegraph/cmd/gitserver/internal/cacert", visibility = ["//cmd/gitserver:__subpackages__"], - deps = ["//internal/syncx"], ) go_test( diff --git a/cmd/gitserver/internal/cacert/cacert.go b/cmd/gitserver/internal/cacert/cacert.go index c28f87ea40126..b87a33ed77a79 100644 --- a/cmd/gitserver/internal/cacert/cacert.go +++ b/cmd/gitserver/internal/cacert/cacert.go @@ -3,13 +3,13 @@ package cacert import ( - "github.com/sourcegraph/sourcegraph/internal/syncx" + "sync" ) // System returns PEM encoded system certificates. Note: This function only // works on Linux. Other operating systems do not rely on PEM files at known // locations, instead they rely on system calls. -var System = syncx.OnceValues(func() ([][]byte, error) { +var System = sync.OnceValues(func() ([][]byte, error) { c, err := loadSystemRoots() if err != nil { return nil, err diff --git a/cmd/gitserver/internal/cleanup.go b/cmd/gitserver/internal/cleanup.go index 96f6b17f6ee6e..bbac52f53ed91 100644 --- a/cmd/gitserver/internal/cleanup.go +++ b/cmd/gitserver/internal/cleanup.go @@ -52,6 +52,7 @@ func NewJanitor(ctx context.Context, cfg JanitorConfig, db database.DB, rcf *wre return goroutine.NewPeriodicGoroutine( actor.WithInternalActor(ctx), goroutine.HandlerFunc(func(ctx context.Context) error { + logger.Info("Starting janitor run") // On Sourcegraph.com, we clone repos lazily, meaning whatever github.com // repo is visited will be cloned eventually. So over time, we would always // accumulate terabytes of repos, of which many are probably not visited @@ -64,12 +65,15 @@ func NewJanitor(ctx context.Context, cfg JanitorConfig, db database.DB, rcf *wre if envvar.SourcegraphDotComMode() { diskSizer := &StatDiskSizer{} logger := logger.Scoped("dotcom-repo-cleaner") + start := time.Now() + logger.Info("Starting dotcom repo cleaner") toFree, err := howManyBytesToFree(logger, cfg.ReposDir, diskSizer, cfg.DesiredPercentFree) if err != nil { logger.Error("ensuring free disk space", log.Error(err)) } else if err := freeUpSpace(ctx, logger, db, cfg.ShardID, cfg.ReposDir, diskSizer, cfg.DesiredPercentFree, toFree); err != nil { logger.Error("error freeing up space", log.Error(err)) } + logger.Info("dotcom repo cleaner finished", log.Int64("toFree", toFree), log.Bool("failed", err != nil), log.String("duration", time.Since(start).String())) } gitserverAddrs := gitserver.NewGitserverAddresses(conf.Get()) @@ -248,6 +252,8 @@ func cleanupRepos( ) { logger = logger.Scoped("cleanup") + start := time.Now() + janitorRunning.Set(1) defer janitorRunning.Set(0) @@ -562,6 +568,8 @@ func cleanupRepos( }) } + reposCleaned := 0 + err := iterateGitDirs(reposDir, func(gitDir common.GitDir) (done bool) { for _, cfn := range cleanups { // Check if context has been canceled, if so skip the rest of the repos. @@ -586,6 +594,13 @@ func cleanupRepos( } } + reposCleaned++ + + // Every 1000 repos, log a progress message. + if reposCleaned%1000 == 0 { + logger.Info("Janitor progress", log.Int("repos_cleaned", reposCleaned)) + } + return false }) if err != nil { @@ -598,6 +613,8 @@ func cleanupRepos( logger.Error("setting repo sizes", log.Error(err)) } } + + logger.Info("Janitor run finished", log.String("duration", time.Since(start).String())) } func checkRepoDirCorrupt(rcf *wrexec.RecordingCommandFactory, reposDir string, dir common.GitDir) (bool, string, error) { diff --git a/cmd/gitserver/internal/cloneurl/clone_url.go b/cmd/gitserver/internal/cloneurl/clone_url.go index 3911285c4b0c7..39509a6c6cd57 100644 --- a/cmd/gitserver/internal/cloneurl/clone_url.go +++ b/cmd/gitserver/internal/cloneurl/clone_url.go @@ -129,7 +129,11 @@ func awsCodeCloneURL(logger log.Logger, repo *awscodecommit.Repository, cfg *sch } func azureDevOpsCloneURL(logger log.Logger, repo *azuredevops.Repository, cfg *schema.AzureDevOpsConnection) string { - u, err := url.Parse(repo.CloneURL) + if cfg.GitURLType == "ssh" { + return repo.SSHURL + } + + u, err := url.Parse(repo.RemoteURL) if err != nil { logger.Warn("Error adding authentication to Azure DevOps repo remote URL.", log.String("url", cfg.Url), log.Error(err)) return cfg.Url @@ -174,7 +178,7 @@ func bitbucketServerCloneURL(repo *bitbucketserver.Repo, cfg *schema.BitbucketSe } // bitbucketCloudCloneURL returns the repository's Git remote URL with the configured -// Bitbucket Cloud app password inserted in the URL userinfo. +// Bitbucket Cloud app password or workspace access token inserted in the URL userinfo. func bitbucketCloudCloneURL(logger log.Logger, repo *bitbucketcloud.Repo, cfg *schema.BitbucketCloudConnection) string { if cfg.GitURLType == "ssh" { return fmt.Sprintf("git@%s:%s.git", cfg.Url, repo.FullName) @@ -197,7 +201,11 @@ func bitbucketCloudCloneURL(logger log.Logger, repo *bitbucketcloud.Repo, cfg *s return fallbackURL } - u.User = url.UserPassword(cfg.Username, cfg.AppPassword) + if cfg.AccessToken != "" { + u.User = url.UserPassword("x-token-auth", cfg.AccessToken) + } else { + u.User = url.UserPassword(cfg.Username, cfg.AppPassword) + } return u.String() } diff --git a/cmd/gitserver/internal/cloneurl/clone_url_test.go b/cmd/gitserver/internal/cloneurl/clone_url_test.go index 55a55352f7092..d1e0d5c3f68c5 100644 --- a/cmd/gitserver/internal/cloneurl/clone_url_test.go +++ b/cmd/gitserver/internal/cloneurl/clone_url_test.go @@ -63,8 +63,8 @@ func TestAzureDevOpsCloneURL(t *testing.T) { } repo := &azuredevops.Repository{ - ID: "test-project", - CloneURL: "https://sgtestazure@dev.azure.com/sgtestazure/sgtestazure/_git/sgtestazure", + ID: "test-project", + RemoteURL: "https://sgtestazure@dev.azure.com/sgtestazure/sgtestazure/_git/sgtestazure", } got := azureDevOpsCloneURL(logtest.Scoped(t), repo, &cfg) diff --git a/cmd/gitserver/internal/git/BUILD.bazel b/cmd/gitserver/internal/git/BUILD.bazel index b9b4bfa99f369..9153f79ad155a 100644 --- a/cmd/gitserver/internal/git/BUILD.bazel +++ b/cmd/gitserver/internal/git/BUILD.bazel @@ -20,7 +20,6 @@ go_library( "//internal/conf", "//internal/fileutil", "//internal/gitserver/gitdomain", - "//internal/syncx", "//internal/trace", "//internal/wrexec", "//lib/errors", diff --git a/cmd/gitserver/internal/git/git.go b/cmd/gitserver/internal/git/git.go index c5eb2247c84b1..fff1772016699 100644 --- a/cmd/gitserver/internal/git/git.go +++ b/cmd/gitserver/internal/git/git.go @@ -12,6 +12,7 @@ import ( "sort" "strconv" "strings" + "sync" "syscall" "time" @@ -20,7 +21,6 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/gitserver/internal/common" "github.com/sourcegraph/sourcegraph/internal/fileutil" "github.com/sourcegraph/sourcegraph/internal/gitserver/gitdomain" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -174,7 +174,7 @@ func RemoveBadRefs(ctx context.Context, dir common.GitDir) (errs error) { // older versions of git do not remove tags case insensitively, so we generate // every possible case of HEAD (2^4 = 16) -var badRefs = syncx.OnceValue(func() []string { +var badRefs = sync.OnceValue(func() []string { refs := make([]string, 0, 1<<4) for bits := uint8(0); bits < (1 << 4); bits++ { s := []byte("HEAD") diff --git a/cmd/gitserver/internal/gitservice.go b/cmd/gitserver/internal/gitservice.go index 0ab2edf070403..2deff1fdaff49 100644 --- a/cmd/gitserver/internal/gitservice.go +++ b/cmd/gitserver/internal/gitservice.go @@ -24,8 +24,8 @@ import ( var ( envGitServiceMaxEgressBytesPerSecond = env.Get( "SRC_GIT_SERVICE_MAX_EGRESS_BYTES_PER_SECOND", - "1000000000", - "Git service egress rate limit in bytes per second (-1 = no limit, default = 1Gbps)") + "10000000000", + "Git service egress rate limit in bytes per second (-1 = no limit, default = 10Gbps)") // gitServiceMaxEgressBytesPerSecond must be retrieved by getGitServiceMaxEgressBytesPerSecond, // which parses envGitServiceMaxEgressBytesPerSecond once and logs any error encountered @@ -41,7 +41,7 @@ func getGitServiceMaxEgressBytesPerSecond(logger log.Logger) int64 { var err error gitServiceMaxEgressBytesPerSecond, err = strconv.ParseInt(envGitServiceMaxEgressBytesPerSecond, 10, 64) if err != nil { - gitServiceMaxEgressBytesPerSecond = 1000 * 1000 * 1000 // 1Gbps + gitServiceMaxEgressBytesPerSecond = 10 * 1000 * 1000 * 1000 // 1G0bps logger.Error("failed parsing SRC_GIT_SERVICE_MAX_EGRESS_BYTES_PER_SECOND, defaulting to 1Gbps", log.Int64("bps", gitServiceMaxEgressBytesPerSecond), log.Error(err)) diff --git a/cmd/gitserver/internal/integration_tests/mocks.go b/cmd/gitserver/internal/integration_tests/mocks.go index 641278b15b986..10c84a434994b 100644 --- a/cmd/gitserver/internal/integration_tests/mocks.go +++ b/cmd/gitserver/internal/integration_tests/mocks.go @@ -273,6 +273,9 @@ func (c RepositoryLockSetStatusFuncCall) Results() []interface{} { // github.com/sourcegraph/sourcegraph/cmd/gitserver/internal) used for unit // testing. type MockRepositoryLocker struct { + // AllStatusesFunc is an instance of a mock function object controlling + // the behavior of the method AllStatuses. + AllStatusesFunc *RepositoryLockerAllStatusesFunc // StatusFunc is an instance of a mock function object controlling the // behavior of the method Status. StatusFunc *RepositoryLockerStatusFunc @@ -286,6 +289,11 @@ type MockRepositoryLocker struct { // overwritten. func NewMockRepositoryLocker() *MockRepositoryLocker { return &MockRepositoryLocker{ + AllStatusesFunc: &RepositoryLockerAllStatusesFunc{ + defaultHook: func() (r0 map[common.GitDir]string) { + return + }, + }, StatusFunc: &RepositoryLockerStatusFunc{ defaultHook: func(common.GitDir) (r0 string, r1 bool) { return @@ -303,6 +311,11 @@ func NewMockRepositoryLocker() *MockRepositoryLocker { // interface. All methods panic on invocation, unless overwritten. func NewStrictMockRepositoryLocker() *MockRepositoryLocker { return &MockRepositoryLocker{ + AllStatusesFunc: &RepositoryLockerAllStatusesFunc{ + defaultHook: func() map[common.GitDir]string { + panic("unexpected invocation of MockRepositoryLocker.AllStatuses") + }, + }, StatusFunc: &RepositoryLockerStatusFunc{ defaultHook: func(common.GitDir) (string, bool) { panic("unexpected invocation of MockRepositoryLocker.Status") @@ -321,6 +334,9 @@ func NewStrictMockRepositoryLocker() *MockRepositoryLocker { // implementation, unless overwritten. func NewMockRepositoryLockerFrom(i internal.RepositoryLocker) *MockRepositoryLocker { return &MockRepositoryLocker{ + AllStatusesFunc: &RepositoryLockerAllStatusesFunc{ + defaultHook: i.AllStatuses, + }, StatusFunc: &RepositoryLockerStatusFunc{ defaultHook: i.Status, }, @@ -330,6 +346,106 @@ func NewMockRepositoryLockerFrom(i internal.RepositoryLocker) *MockRepositoryLoc } } +// RepositoryLockerAllStatusesFunc describes the behavior when the +// AllStatuses method of the parent MockRepositoryLocker instance is +// invoked. +type RepositoryLockerAllStatusesFunc struct { + defaultHook func() map[common.GitDir]string + hooks []func() map[common.GitDir]string + history []RepositoryLockerAllStatusesFuncCall + mutex sync.Mutex +} + +// AllStatuses delegates to the next hook function in the queue and stores +// the parameter and result values of this invocation. +func (m *MockRepositoryLocker) AllStatuses() map[common.GitDir]string { + r0 := m.AllStatusesFunc.nextHook()() + m.AllStatusesFunc.appendCall(RepositoryLockerAllStatusesFuncCall{r0}) + return r0 +} + +// SetDefaultHook sets function that is called when the AllStatuses method +// of the parent MockRepositoryLocker instance is invoked and the hook queue +// is empty. +func (f *RepositoryLockerAllStatusesFunc) SetDefaultHook(hook func() map[common.GitDir]string) { + f.defaultHook = hook +} + +// PushHook adds a function to the end of hook queue. Each invocation of the +// AllStatuses method of the parent MockRepositoryLocker instance invokes +// the hook at the front of the queue and discards it. After the queue is +// empty, the default hook function is invoked for any future action. +func (f *RepositoryLockerAllStatusesFunc) PushHook(hook func() map[common.GitDir]string) { + f.mutex.Lock() + f.hooks = append(f.hooks, hook) + f.mutex.Unlock() +} + +// SetDefaultReturn calls SetDefaultHook with a function that returns the +// given values. +func (f *RepositoryLockerAllStatusesFunc) SetDefaultReturn(r0 map[common.GitDir]string) { + f.SetDefaultHook(func() map[common.GitDir]string { + return r0 + }) +} + +// PushReturn calls PushHook with a function that returns the given values. +func (f *RepositoryLockerAllStatusesFunc) PushReturn(r0 map[common.GitDir]string) { + f.PushHook(func() map[common.GitDir]string { + return r0 + }) +} + +func (f *RepositoryLockerAllStatusesFunc) nextHook() func() map[common.GitDir]string { + f.mutex.Lock() + defer f.mutex.Unlock() + + if len(f.hooks) == 0 { + return f.defaultHook + } + + hook := f.hooks[0] + f.hooks = f.hooks[1:] + return hook +} + +func (f *RepositoryLockerAllStatusesFunc) appendCall(r0 RepositoryLockerAllStatusesFuncCall) { + f.mutex.Lock() + f.history = append(f.history, r0) + f.mutex.Unlock() +} + +// History returns a sequence of RepositoryLockerAllStatusesFuncCall objects +// describing the invocations of this function. +func (f *RepositoryLockerAllStatusesFunc) History() []RepositoryLockerAllStatusesFuncCall { + f.mutex.Lock() + history := make([]RepositoryLockerAllStatusesFuncCall, len(f.history)) + copy(history, f.history) + f.mutex.Unlock() + + return history +} + +// RepositoryLockerAllStatusesFuncCall is an object that describes an +// invocation of method AllStatuses on an instance of MockRepositoryLocker. +type RepositoryLockerAllStatusesFuncCall struct { + // Result0 is the value of the 1st result returned from this method + // invocation. + Result0 map[common.GitDir]string +} + +// Args returns an interface slice containing the arguments of this +// invocation. +func (c RepositoryLockerAllStatusesFuncCall) Args() []interface{} { + return []interface{}{} +} + +// Results returns an interface slice containing the results of this +// invocation. +func (c RepositoryLockerAllStatusesFuncCall) Results() []interface{} { + return []interface{}{c.Result0} +} + // RepositoryLockerStatusFunc describes the behavior when the Status method // of the parent MockRepositoryLocker instance is invoked. type RepositoryLockerStatusFunc struct { diff --git a/cmd/gitserver/internal/lock.go b/cmd/gitserver/internal/lock.go index 5fff624c1a23d..8e9388a6d00e2 100644 --- a/cmd/gitserver/internal/lock.go +++ b/cmd/gitserver/internal/lock.go @@ -35,6 +35,8 @@ type RepositoryLocker interface { // Status returns the status of the locked directory dir. If dir is not // locked, then locked is false. Status(dir common.GitDir) (status string, locked bool) + // AllStatuses returns the status of all locked directories. + AllStatuses() map[common.GitDir]string } func NewRepositoryLocker() RepositoryLocker { @@ -88,6 +90,18 @@ func (rl *repositoryLocker) Status(dir common.GitDir) (status string, locked boo return } +func (rl *repositoryLocker) AllStatuses() map[common.GitDir]string { + rl.mu.RLock() + defer rl.mu.RUnlock() + + statuses := make(map[common.GitDir]string, len(rl.status)) + for dir, status := range rl.status { + statuses[dir] = status + } + + return statuses +} + type repositoryLock struct { unlock func() setStatus func(status string) diff --git a/cmd/gitserver/internal/search.go b/cmd/gitserver/internal/search.go index c4110998f3fcb..3d0dd14581374 100644 --- a/cmd/gitserver/internal/search.go +++ b/cmd/gitserver/internal/search.go @@ -4,6 +4,7 @@ import ( "context" "math" "strconv" + "sync" "sync/atomic" "time" @@ -17,7 +18,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/gitserver/protocol" "github.com/sourcegraph/sourcegraph/internal/gitserver/search" "github.com/sourcegraph/sourcegraph/internal/honey" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/internal/trace" ) @@ -69,7 +69,7 @@ func (s *Server) searchWithObservability(ctx context.Context, tr trace.Trace, ar } }() - observeLatency := syncx.OnceFunc(func() { + observeLatency := sync.OnceFunc(func() { searchLatency.Observe(time.Since(searchStart).Seconds()) }) diff --git a/cmd/gitserver/internal/server.go b/cmd/gitserver/internal/server.go index 7706b3beb7c5d..2fe62340fc592 100644 --- a/cmd/gitserver/internal/server.go +++ b/cmd/gitserver/internal/server.go @@ -1514,8 +1514,8 @@ func (s *Server) doClone( } if opts.Overwrite { - // remove the current repo by putting it into our temporary directory - err := fileutil.RenameAndSync(dstPath, filepath.Join(filepath.Dir(tmpDir), "old")) + // remove the current repo by putting it into our temporary directory, outside of the git repo. + err := fileutil.RenameAndSync(dstPath, filepath.Join(tmpDir, "old")) if err != nil && !os.IsNotExist(err) { return errors.Wrapf(err, "failed to remove old clone") } diff --git a/cmd/gitserver/internal/statesyncer.go b/cmd/gitserver/internal/statesyncer.go index ec35968878fe0..56c35963814c4 100644 --- a/cmd/gitserver/internal/statesyncer.go +++ b/cmd/gitserver/internal/statesyncer.go @@ -52,6 +52,7 @@ func NewRepoStateSyncer( ) goroutine.BackgroundRoutine { var previousAddrs string var previousPinned string + fullSync := true return goroutine.NewPeriodicGoroutine( actor.WithInternalActor(ctx), @@ -61,7 +62,8 @@ func NewRepoStateSyncer( // We turn addrs into a string here for easy comparison and storage of previous // addresses since we'd need to take a copy of the slice anyway. currentAddrs := strings.Join(addrs, ",") - fullSync := currentAddrs != previousAddrs + // If the addresses changed, we need to do a full sync. + fullSync = fullSync || currentAddrs != previousAddrs previousAddrs = currentAddrs // We turn PinnedServers into a string here for easy comparison and storage @@ -72,13 +74,20 @@ func NewRepoStateSyncer( } sort.Strings(pinnedServerPairs) currentPinned := strings.Join(pinnedServerPairs, ",") + // If the pinned repos changed, we need to do a full sync. fullSync = fullSync || currentPinned != previousPinned previousPinned = currentPinned if err := syncRepoState(ctx, logger, db, locker, shardID, reposDir, gitServerAddrs, batchSize, perSecond, fullSync); err != nil { + // after a failed full sync, we should attempt it again in the next + // invocation. + fullSync = true return errors.Wrap(err, "syncing repo state") } + // Last full sync was a success, so next time we can be more optimistic. + fullSync = false + return nil }), goroutine.WithName("gitserver.repo-state-syncer"), diff --git a/cmd/gitserver/shared/BUILD.bazel b/cmd/gitserver/shared/BUILD.bazel index 9d7275e269c27..d5eaf39542f7b 100644 --- a/cmd/gitserver/shared/BUILD.bazel +++ b/cmd/gitserver/shared/BUILD.bazel @@ -42,6 +42,7 @@ go_library( "//internal/observation", "//internal/ratelimit", "//internal/requestclient", + "//internal/requestinteraction", "//internal/service", "//internal/trace", "//internal/wrexec", diff --git a/cmd/gitserver/shared/debug.go b/cmd/gitserver/shared/debug.go index 3dff0b7bf6359..ae8d49f21cbfd 100644 --- a/cmd/gitserver/shared/debug.go +++ b/cmd/gitserver/shared/debug.go @@ -1,11 +1,23 @@ package shared import ( + "net/http" + "github.com/sourcegraph/sourcegraph/internal/debugserver" ) -// GRPCWebUIDebugEndpoint returns a debug endpoint that serves the GRPCWebUI that targets -// this gitserver instance. -func GRPCWebUIDebugEndpoint(addr string) debugserver.Endpoint { - return debugserver.NewGRPCWebUIEndpoint("gitserver", addr) +func createDebugServerEndpoints(ready chan struct{}, addr string, debugserverEndpoints *LazyDebugserverEndpoint) []debugserver.Endpoint { + return []debugserver.Endpoint{ + debugserver.NewGRPCWebUIEndpoint("gitserver", addr), + { + Name: "Repository Locker State", + Path: "/repository-locker-state", + Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // wait until we're healthy to respond + <-ready + // lockerStatusEndpoint is guaranteed to be assigned now + debugserverEndpoints.lockerStatusEndpoint(w, r) + }), + }, + } } diff --git a/cmd/gitserver/shared/service.go b/cmd/gitserver/shared/service.go index 13dec8ac5116f..b1d3cf9cdceae 100644 --- a/cmd/gitserver/shared/service.go +++ b/cmd/gitserver/shared/service.go @@ -9,21 +9,31 @@ import ( "github.com/sourcegraph/sourcegraph/internal/service" ) -type svc struct{} +type svc struct { + ready chan struct{} + debugServerEndpoints LazyDebugserverEndpoint +} func (svc) Name() string { return "gitserver" } -func (svc) Configure() (env.Config, []debugserver.Endpoint) { +func (s *svc) Configure() (env.Config, []debugserver.Endpoint) { + s.ready = make(chan struct{}) + c := LoadConfig() - endpoints := []debugserver.Endpoint{ - GRPCWebUIDebugEndpoint(c.ListenAddress), - } - return c, endpoints + return c, createDebugServerEndpoints(s.ready, c.ListenAddress, &s.debugServerEndpoints) } -func (svc) Start(ctx context.Context, observationCtx *observation.Context, ready service.ReadyFunc, config env.Config) error { - return Main(ctx, observationCtx, ready, config.(*Config)) +func (s *svc) Start(ctx context.Context, observationCtx *observation.Context, signalReadyToParent service.ReadyFunc, config env.Config) error { + // This service's debugserver endpoints should start responding when this service is ready (and + // not ewait for *all* services to be ready). Therefore, we need to track whether we are ready + // separately. + ready := service.ReadyFunc(func() { + close(s.ready) + signalReadyToParent() + }) + + return Main(ctx, observationCtx, ready, &s.debugServerEndpoints, config.(*Config)) } -var Service service.Service = svc{} +var Service service.Service = &svc{} diff --git a/cmd/gitserver/shared/shared.go b/cmd/gitserver/shared/shared.go index 10209ca4eeccd..11555067da0b7 100644 --- a/cmd/gitserver/shared/shared.go +++ b/cmd/gitserver/shared/shared.go @@ -5,6 +5,7 @@ import ( "container/list" "context" "database/sql" + "encoding/json" "fmt" "net/http" "os/exec" @@ -44,13 +45,18 @@ import ( "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/internal/requestclient" + "github.com/sourcegraph/sourcegraph/internal/requestinteraction" "github.com/sourcegraph/sourcegraph/internal/service" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/wrexec" "github.com/sourcegraph/sourcegraph/lib/errors" ) -func Main(ctx context.Context, observationCtx *observation.Context, ready service.ReadyFunc, config *Config) error { +type LazyDebugserverEndpoint struct { + lockerStatusEndpoint http.HandlerFunc +} + +func Main(ctx context.Context, observationCtx *observation.Context, ready service.ReadyFunc, debugserverEndpoints *LazyDebugserverEndpoint, config *Config) error { logger := observationCtx.Logger // Load and validate configuration. @@ -133,6 +139,7 @@ func Main(ctx context.Context, observationCtx *observation.Context, ready servic handler := gitserver.Handler() handler = actor.HTTPMiddleware(logger, handler) handler = requestclient.InternalHTTPMiddleware(handler) + handler = requestinteraction.HTTPMiddleware(handler) handler = trace.HTTPMiddleware(logger, handler, conf.DefaultClient()) handler = instrumentation.HTTPMiddleware("", handler) handler = internalgrpc.MultiplexHandlers(makeGRPCServer(logger, &gitserver), handler) @@ -194,6 +201,12 @@ func Main(ctx context.Context, observationCtx *observation.Context, ready servic } rec.RegistrationDone() + debugserverEndpoints.lockerStatusEndpoint = func(w http.ResponseWriter, r *http.Request) { + if err := json.NewEncoder(w).Encode(locker.AllStatuses()); err != nil { + logger.Error("failed to encode locker statuses", log.Error(err)) + } + } + logger.Info("git-server: listening", log.String("addr", config.ListenAddress)) // We're ready! diff --git a/cmd/msp-example/BUILD.bazel b/cmd/msp-example/BUILD.bazel new file mode 100644 index 0000000000000..10af06f6fb163 --- /dev/null +++ b/cmd/msp-example/BUILD.bazel @@ -0,0 +1,63 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") +load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball") +load("@rules_pkg//:pkg.bzl", "pkg_tar") +load("@container_structure_test//:defs.bzl", "container_structure_test") +load("//dev:oci_defs.bzl", "image_repository") + +go_library( + name = "msp-example_lib", + srcs = ["main.go"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/msp-example", + visibility = ["//visibility:private"], + deps = [ + "//cmd/msp-example/internal/example", + "//lib/managedservicesplatform/runtime", + ], +) + +go_binary( + name = "msp-example", + embed = [":msp-example_lib"], + visibility = ["//visibility:public"], +) + +pkg_tar( + name = "tar_msp-example", + srcs = [":msp-example"], +) + +oci_image( + name = "image", + base = "@wolfi_base", + entrypoint = [ + "/sbin/tini", + "--", + "/msp-example", + ], + tars = [":tar_msp-example"], + user = "sourcegraph", +) + +oci_tarball( + name = "image_tarball", + image = ":image", + repo_tags = ["msp-example:candidate"], +) + +container_structure_test( + name = "image_test", + timeout = "short", + configs = ["image_test.yaml"], + driver = "docker", + image = ":image", + tags = [ + "exclusive", + "requires-network", + ], +) + +oci_push( + name = "candidate_push", + image = ":image", + repository = image_repository("msp-example"), +) diff --git a/cmd/msp-example/README.md b/cmd/msp-example/README.md new file mode 100644 index 0000000000000..6e80721677654 --- /dev/null +++ b/cmd/msp-example/README.md @@ -0,0 +1,9 @@ +# msp-example + +This service is an example service testing and demonstrating how to build Managed Services Platform services: [go/msp](https://handbook.sourcegraph.com/departments/engineering/teams/core-services/managed-services/platform/) + +## Pushing a new version + +```sh +bazel run //cmd/msp-example:candidate_push --config darwin-docker --stamp -- --tag insiders --repository us.gcr.io/sourcegraph-dev/msp-example +``` diff --git a/cmd/msp-example/image_test.yaml b/cmd/msp-example/image_test.yaml new file mode 100644 index 0000000000000..57457be5f140c --- /dev/null +++ b/cmd/msp-example/image_test.yaml @@ -0,0 +1,15 @@ +schemaVersion: "2.0.0" + +commandTests: + - name: "binary is runnable" + command: "/msp-example" + envVars: + - key: "SANITY_CHECK" + value: "true" + + - name: "not running as root" + command: "/usr/bin/id" + args: + - -u + excludedOutput: ["^0"] + exitCode: 0 diff --git a/cmd/msp-example/internal/example/BUILD.bazel b/cmd/msp-example/internal/example/BUILD.bazel new file mode 100644 index 0000000000000..198117b9385b2 --- /dev/null +++ b/cmd/msp-example/internal/example/BUILD.bazel @@ -0,0 +1,19 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "example", + srcs = ["example.go"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/msp-example/internal/example", + visibility = [ + "//cmd/msp-example:__pkg__", + "//lib/managedservicesplatform/example:__subpackages__", + ], + deps = [ + "//lib/background", + "//lib/errors", + "//lib/managedservicesplatform/runtime", + "@com_github_sourcegraph_log//:log", + "@io_gorm_driver_postgres//:postgres", + "@io_gorm_gorm//:gorm", + ], +) diff --git a/cmd/msp-example/internal/example/example.go b/cmd/msp-example/internal/example/example.go new file mode 100644 index 0000000000000..b58a12992bb87 --- /dev/null +++ b/cmd/msp-example/internal/example/example.go @@ -0,0 +1,138 @@ +package example + +import ( + "context" + "fmt" + "net/http" + "time" + + "github.com/sourcegraph/log" + "gorm.io/driver/postgres" + "gorm.io/gorm" + + "github.com/sourcegraph/sourcegraph/lib/background" + "github.com/sourcegraph/sourcegraph/lib/errors" + "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/runtime" +) + +type Config struct { + StatelessMode bool + Variable string +} + +func (c *Config) Load(env *runtime.Env) { + c.StatelessMode = env.GetBool("STATELESS_MODE", "false", "if true, disable dependencies") + c.Variable = env.Get("VARIABLE", "13", "variable value") +} + +type Service struct{} + +var _ runtime.Service[Config] = Service{} + +func (s Service) Name() string { return "example" } +func (s Service) Version() string { return "dev" } +func (s Service) Initialize( + ctx context.Context, + logger log.Logger, + contract runtime.Contract, + config Config, +) (background.CombinedRoutine, error) { + logger.Info("starting service") + + if !config.StatelessMode { + if err := initDB(ctx, contract); err != nil { + return nil, errors.Wrap(err, "initDB") + } + logger.Info("database configured") + } + + return background.CombinedRoutine{ + &httpRoutine{ + log: logger, + Server: &http.Server{ + Addr: fmt.Sprintf(":%d", contract.Port), + Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Write([]byte(fmt.Sprintf("Variable: %s", config.Variable))) + }), + }, + }, + }, nil +} + +type httpRoutine struct { + log log.Logger + *http.Server +} + +func (s *httpRoutine) Start() { + if err := s.Server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { + s.log.Error("error stopping server", log.Error(err)) + } +} + +func (s *httpRoutine) Stop() { + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + if err := s.Server.Shutdown(ctx); err != nil { + s.log.Error("error shutting down server", log.Error(err)) + } else { + s.log.Info("server stopped") + } +} + +// initDB connects to a database 'primary' based on a DSN provided by contract. +// It then sets up a few example databases using Gorm, in a manner similar to +// https://github.com/sourcegraph/accounts.sourcegraph.com +func initDB(ctx context.Context, contract runtime.Contract) error { + sqlDB, err := contract.GetPostgreSQLDB(ctx, "primary") + if err != nil { + return errors.Wrap(err, "GetPostgreSQLDB") + } + db, err := gorm.Open( + postgres.New(postgres.Config{Conn: sqlDB}), + &gorm.Config{ + SkipDefaultTransaction: true, + NowFunc: func() time.Time { + return time.Now().UTC().Truncate(time.Microsecond) + }, + }, + ) + if err != nil { + return errors.Wrap(err, "gorm.Open") + } + + for _, table := range []any{ + &User{}, + &Email{}, + } { + if err = db.AutoMigrate(table); err != nil { + return errors.Wrapf(err, "auto migrating table for %T", table) + } + } + + return nil +} + +type User struct { + ID int64 `gorm:"primaryKey"` + CreatedAt time.Time `gorm:"not null"` + UpdatedAt time.Time `gorm:"not null"` + DeletedAt gorm.DeletedAt `gorm:"index"` + + ExternalID string `gorm:"size:36;not null;uniqueIndex,where:deleted_at IS NULL"` + Name string `gorm:"size:256;not null"` + AvatarURL string `gorm:"size:256;not null"` +} + +type Email struct { + CreatedAt time.Time `gorm:"not null"` + UpdatedAt time.Time `gorm:"not null"` + DeletedAt gorm.DeletedAt `gorm:"index"` + + UserID int64 `gorm:"not null;uniqueIndex:,where:deleted_at IS NULL AND verified_at IS NOT NULL"` + Email string `gorm:"size:256;not null;uniqueIndex:,where:deleted_at IS NULL AND verified_at IS NOT NULL"` + VerifiedAt *time.Time + + // ⚠️ DO NOT USE: This field is only used for creating foreign key constraint. + User *User `gorm:"foreignKey:UserID"` +} diff --git a/cmd/msp-example/main.go b/cmd/msp-example/main.go new file mode 100644 index 0000000000000..0158bd6e8f1e7 --- /dev/null +++ b/cmd/msp-example/main.go @@ -0,0 +1,11 @@ +package main + +import ( + "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/runtime" + + "github.com/sourcegraph/sourcegraph/cmd/msp-example/internal/example" +) + +func main() { + runtime.Start[example.Config](example.Service{}) +} diff --git a/cmd/repo-updater/internal/authz/integration_test.go b/cmd/repo-updater/internal/authz/integration_test.go index 8664248f4b131..4ba30ccfdf2fe 100644 --- a/cmd/repo-updater/internal/authz/integration_test.go +++ b/cmd/repo-updater/internal/authz/integration_test.go @@ -111,7 +111,6 @@ func TestIntegration_GitHubPermissions(t *testing.T) { t.Skip() } - github.SetupForTest(t) ratelimit.SetupForTest(t) logger := logtest.Scoped(t) @@ -288,7 +287,6 @@ func TestIntegration_GitHubInternalRepositories(t *testing.T) { t.Skip() } - github.SetupForTest(t) ratelimit.SetupForTest(t) rcache.SetupForTest(t) diff --git a/cmd/repo-updater/internal/repoupdater/server_test.go b/cmd/repo-updater/internal/repoupdater/server_test.go index 967431c5e6ea0..9a30b01afef2a 100644 --- a/cmd/repo-updater/internal/repoupdater/server_test.go +++ b/cmd/repo-updater/internal/repoupdater/server_test.go @@ -461,7 +461,7 @@ func TestServer_RepoLookup(t *testing.T) { Name: npmRepository.Name, VCS: protocol.VCSInfo{URL: string(npmRepository.Name)}, }}, - assert: typestest.Assert.ReposEqual(npmRepository), + assert: typestest.AssertReposEqual(npmRepository), }, { name: "synced - github.com cloud default", @@ -486,7 +486,7 @@ func TestServer_RepoLookup(t *testing.T) { Commit: "github.com/foo/bar/commit/{commit}", }, }}, - assert: typestest.Assert.ReposEqual(githubRepository), + assert: typestest.AssertReposEqual(githubRepository), }, { name: "found - github.com already exists", @@ -520,7 +520,7 @@ func TestServer_RepoLookup(t *testing.T) { src: repos.NewFakeSource(&githubSource, github.ErrRepoNotFound), result: &protocol.RepoLookupResult{ErrorNotFound: true}, err: fmt.Sprintf("repository not found (name=%s notfound=%v)", api.RepoName("github.com/foo/bar"), true), - assert: typestest.Assert.ReposEqual(), + assert: typestest.AssertReposEqual(), }, { name: "unauthorized - github.com", @@ -530,7 +530,7 @@ func TestServer_RepoLookup(t *testing.T) { src: repos.NewFakeSource(&githubSource, &github.APIError{Code: http.StatusUnauthorized}), result: &protocol.RepoLookupResult{ErrorUnauthorized: true}, err: fmt.Sprintf("not authorized (name=%s noauthz=%v)", api.RepoName("github.com/foo/bar"), true), - assert: typestest.Assert.ReposEqual(), + assert: typestest.AssertReposEqual(), }, { name: "temporarily unavailable - github.com", @@ -544,7 +544,7 @@ func TestServer_RepoLookup(t *testing.T) { api.RepoName("github.com/foo/bar"), true, ), - assert: typestest.Assert.ReposEqual(), + assert: typestest.AssertReposEqual(), }, { name: "synced - gitlab.com", @@ -567,7 +567,7 @@ func TestServer_RepoLookup(t *testing.T) { }, ExternalRepo: gitlabRepository.ExternalRepo, }}, - assert: typestest.Assert.ReposEqual(gitlabRepository), + assert: typestest.AssertReposEqual(gitlabRepository), }, { name: "found - gitlab.com", @@ -628,7 +628,7 @@ func TestServer_RepoLookup(t *testing.T) { }, }}, assertDelay: time.Second, - assert: typestest.Assert.ReposEqual(), + assert: typestest.AssertReposEqual(), }, } diff --git a/cmd/repo-updater/shared/main.go b/cmd/repo-updater/shared/main.go index 2a88d41bd6e4f..22be78a31d3a1 100644 --- a/cmd/repo-updater/shared/main.go +++ b/cmd/repo-updater/shared/main.go @@ -166,7 +166,7 @@ func Main(ctx context.Context, observationCtx *observation.Context, ready servic ) if envvar.SourcegraphDotComMode() { - rateLimiter := ratelimit.NewInstrumentedLimiter("SyncReposWithLastErrors", rate.NewLimiter(.05, 1)) + rateLimiter := ratelimit.NewInstrumentedLimiter("SyncReposWithLastErrors", rate.NewLimiter(1, 1)) routines = append(routines, syncer.NewSyncReposWithLastErrorsWorker(ctx, rateLimiter)) } diff --git a/cmd/searcher/internal/search/BUILD.bazel b/cmd/searcher/internal/search/BUILD.bazel index ba7a6fc130ac2..3d37fa5b4f5d6 100644 --- a/cmd/searcher/internal/search/BUILD.bazel +++ b/cmd/searcher/internal/search/BUILD.bazel @@ -43,7 +43,6 @@ go_library( "//internal/search/zoekt", "//internal/searcher/v1:searcher", "//internal/trace", - "//internal/xcontext", "//lib/errors", "//schema", "@com_github_bmatcuk_doublestar//:doublestar", diff --git a/cmd/searcher/internal/search/hybrid.go b/cmd/searcher/internal/search/hybrid.go index efb90fc665dba..5f0636d39d6c9 100644 --- a/cmd/searcher/internal/search/hybrid.go +++ b/cmd/searcher/internal/search/hybrid.go @@ -53,6 +53,9 @@ func (s *Service) hybrid(ctx context.Context, rootLogger log.Logger, p *protocol // request. As such we centralize our observability to always take into // account the state of the ctx. defer func() { + // We can downgrade error logs to rootLogger.Warn + errorLogger := rootLogger.Error + if err != nil { switch ctx.Err() { case context.Canceled: @@ -66,11 +69,12 @@ func (s *Service) hybrid(ctx context.Context, rootLogger log.Logger, p *protocol // path in this case. recordHybridFinalState("search-timeout") unsearched, ok = nil, true + errorLogger = rootLogger.Warn } } if err != nil { - rootLogger.Error("hybrid search failed", log.String("state", finalState), log.Error(err)) + errorLogger("hybrid search failed", log.String("state", finalState), log.Error(err)) } else { rootLogger.Debug("hybrid search done", log.String("state", finalState), log.Bool("ok", ok), log.Int("unsearched.len", len(unsearched))) } diff --git a/cmd/searcher/internal/search/search.go b/cmd/searcher/internal/search/search.go index af1041c7c0bf3..9a3fc7a6f95c0 100644 --- a/cmd/searcher/internal/search/search.go +++ b/cmd/searcher/internal/search/search.go @@ -238,7 +238,8 @@ func (s *Service) search(ctx context.Context, p *protocol.Request, sender matchS unsearched, ok, err := s.hybrid(ctx, logger, p, sender) if err != nil { - logger.Error("hybrid search failed", log.Error(err)) + // error logging is done inside of s.hybrid so we just return + // error here. return errors.Wrap(err, "hybrid search failed") } if !ok { diff --git a/cmd/searcher/internal/search/search_regex_test.go b/cmd/searcher/internal/search/search_regex_test.go index 638869b819d30..5c8684a43f617 100644 --- a/cmd/searcher/internal/search/search_regex_test.go +++ b/cmd/searcher/internal/search/search_regex_test.go @@ -428,6 +428,7 @@ var githubStore = &Store{ GitserverClient: gitserver.NewClient("test"), FetchTar: fetchTarFromGithub, Path: "/tmp/search_test/store", + Log: observation.TestContext.Logger, ObservationCtx: &observation.TestContext, } diff --git a/cmd/searcher/internal/search/store.go b/cmd/searcher/internal/search/store.go index f85e9ccd71ec1..96a656cab1669 100644 --- a/cmd/searcher/internal/search/store.go +++ b/cmd/searcher/internal/search/store.go @@ -29,7 +29,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/metrics" "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/internal/trace" - "github.com/sourcegraph/sourcegraph/internal/xcontext" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -195,7 +194,7 @@ func (s *Store) PrepareZipPaths(ctx context.Context, repo api.RepoName, commit a // TODO: consider adding a cache method that doesn't actually bother opening the file, // since we're just going to close it again immediately. cacheHit := true - bgctx := xcontext.Detach(ctx) + bgctx := context.WithoutCancel(ctx) f, err := s.cache.Open(bgctx, []string{key}, func(ctx context.Context) (io.ReadCloser, error) { cacheHit = false return s.fetch(ctx, repo, commit, filter, paths) diff --git a/cmd/server/macro.bzl b/cmd/server/macro.bzl index cd7373e0471af..553979c7258a1 100644 --- a/cmd/server/macro.bzl +++ b/cmd/server/macro.bzl @@ -17,7 +17,7 @@ def container_dependencies(targets): pkg_tar( name = "tar_{}".format(name), srcs = [target], - remap_paths = { "/{}".format(name): "/usr/local/bin/{}".format(name) } + remap_paths = {"/{}".format(name): "/usr/local/bin/{}".format(name)}, ) def dependencies_tars(targets): @@ -27,4 +27,3 @@ def dependencies_tars(targets): tars.append(":tar_{}".format(name)) return tars - diff --git a/cmd/symbols/Dockerfile b/cmd/symbols/Dockerfile index b053ad941ed74..a72a5306bc04e 100644 --- a/cmd/symbols/Dockerfile +++ b/cmd/symbols/Dockerfile @@ -4,7 +4,7 @@ FROM sourcegraph/alpine-3.14:213466_2023-04-17_5.0-bdda34a71619@sha256:6354a4ff5 COPY cmd/symbols/ctags-install-alpine.sh /ctags-install-alpine.sh RUN /ctags-install-alpine.sh -FROM rust:1.68.0-alpine3.17@sha256:d119a621ae12f84ec0c5fed77c24795120ed1c7874b2428b5a6ccc0f294dbe18 as scip-ctags +FROM rust:1.73.0-alpine3.18@sha256:200be646c656b180aa9cf6cee1766f05fcf5bb0b94cf2900beeedca3bdf4016d as scip-ctags # hadolint ignore=DL3002 USER root RUN apk add --no-cache musl-dev>=1.1.24-r10 build-base diff --git a/cmd/symbols/ctags-install-alpine.sh b/cmd/symbols/ctags-install-alpine.sh index 279a1f10829e9..661f1f4ca6801 100755 --- a/cmd/symbols/ctags-install-alpine.sh +++ b/cmd/symbols/ctags-install-alpine.sh @@ -3,7 +3,7 @@ # This script installs universal-ctags within an alpine container. # Commit hash of github.com/universal-ctags/ctags. -# Last bumped 2022-04-04. +# Last bumped 2023-10-24. # When bumping please remember to also update Zoekt: https://github.com/sourcegraph/zoekt/blob/d3a8fbd8385f0201dd54ab24114ebd588dfcf0d8/install-ctags-alpine.sh CTAGS_VERSION=v6.0.0 CTAGS_ARCHIVE_TOP_LEVEL_DIR=ctags-6.0.0 diff --git a/cmd/symbols/internal/api/BUILD.bazel b/cmd/symbols/internal/api/BUILD.bazel index 664c1b0acdde4..ee3f39a59155d 100644 --- a/cmd/symbols/internal/api/BUILD.bazel +++ b/cmd/symbols/internal/api/BUILD.bazel @@ -18,7 +18,6 @@ go_library( "//cmd/symbols/observability", "//cmd/symbols/squirrel", "//cmd/symbols/types", - "//internal/conf/deploy", "//internal/database", "//internal/env", "//internal/grpc", @@ -31,7 +30,6 @@ go_library( "//internal/types", "//lib/errors", "@com_github_dustin_go_humanize//:go-humanize", - "@com_github_sourcegraph_go_ctags//:go-ctags", "@com_github_sourcegraph_log//:log", "@io_opentelemetry_go_otel//attribute", "@org_golang_google_grpc//codes", diff --git a/cmd/symbols/internal/api/handler.go b/cmd/symbols/internal/api/handler.go index 21913d75f4ac7..631e4b31f49bf 100644 --- a/cmd/symbols/internal/api/handler.go +++ b/cmd/symbols/internal/api/handler.go @@ -6,11 +6,9 @@ import ( "fmt" "net/http" - "github.com/sourcegraph/go-ctags" logger "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/symbols/types" - "github.com/sourcegraph/sourcegraph/internal/conf/deploy" internalgrpc "github.com/sourcegraph/sourcegraph/internal/grpc" "github.com/sourcegraph/sourcegraph/internal/grpc/defaults" "github.com/sourcegraph/sourcegraph/internal/search" @@ -49,22 +47,6 @@ func (s *grpcService) Search(ctx context.Context, r *proto.SearchRequest) (*prot return &response, nil } -func (s *grpcService) ListLanguages(ctx context.Context, _ *proto.ListLanguagesRequest) (*proto.ListLanguagesResponse, error) { - rawMapping, err := ctags.ListLanguageMappings(ctx, s.ctagsBinary) - if err != nil { - return nil, errors.Wrap(err, "listing ctags language mappings") - } - - protoMapping := make(map[string]*proto.ListLanguagesResponse_GlobFilePatterns, len(rawMapping)) - for language, filePatterns := range rawMapping { - protoMapping[language] = &proto.ListLanguagesResponse_GlobFilePatterns{Patterns: filePatterns} - } - - return &proto.ListLanguagesResponse{ - LanguageFileNameMap: protoMapping, - }, nil -} - func (s *grpcService) Healthz(ctx context.Context, _ *proto.HealthzRequest) (*proto.HealthzResponse, error) { // Note: Kubernetes only has beta support for GRPC Healthchecks since version >= 1.23. This means // that we probably need the old non-GRPC healthcheck endpoint for a while. @@ -107,7 +89,6 @@ func NewHandler( mux := http.NewServeMux() mux.HandleFunc("/search", handleSearchWith(jsonLogger, searchFuncWrapper)) mux.HandleFunc("/healthz", handleHealthCheck(jsonLogger)) - mux.HandleFunc("/list-languages", handleListLanguages(ctagsBinary)) addHandlers(mux, searchFunc, readFileFunc) if handleStatus != nil { @@ -151,27 +132,6 @@ func handleSearchWith(l logger.Logger, searchFunc types.SearchFunc) http.Handler } } -func handleListLanguages(ctagsBinary string) func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - if deploy.IsSingleBinary() && ctagsBinary == "" { - // app: ctags is not available - var mapping map[string][]string - if err := json.NewEncoder(w).Encode(mapping); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - } - return - } - mapping, err := ctags.ListLanguageMappings(r.Context(), ctagsBinary) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - if err := json.NewEncoder(w).Encode(mapping); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - } - } -} - func handleHealthCheck(l logger.Logger) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) diff --git a/cmd/symbols/parser/parser.go b/cmd/symbols/parser/parser.go index 7abad359492b9..214c2b077201c 100644 --- a/cmd/symbols/parser/parser.go +++ b/cmd/symbols/parser/parser.go @@ -129,13 +129,6 @@ func (p *parser) Parse(ctx context.Context, args search.SymbolsParameters, paths return symbolOrErrors, nil } -func min(a, b int) int { - if a < b { - return a - } - return b -} - func (p *parser) handleParseRequest( ctx context.Context, symbolOrErrors chan<- SymbolOrError, diff --git a/cmd/symbols/squirrel/hover.go b/cmd/symbols/squirrel/hover.go index 2ff238f5ddcb1..7e2c97ed1e1cf 100644 --- a/cmd/symbols/squirrel/hover.go +++ b/cmd/symbols/squirrel/hover.go @@ -2,6 +2,7 @@ package squirrel import ( "math" + "slices" "strings" ) @@ -19,7 +20,7 @@ func findHover(node Node) string { // Skip over Java annotations and the like. for ; prev != nil; prev = prev.PrevNamedSibling() { - if !contains(style.skipNodeTypes, prev.Type()) { + if !slices.Contains(style.skipNodeTypes, prev.Type()) { break } } @@ -27,7 +28,7 @@ func findHover(node Node) string { // Collect comments backwards. comments := []string{} lastStartRow := -1 - for ; prev != nil && contains(style.nodeTypes, prev.Type()); prev = prev.PrevNamedSibling() { + for ; prev != nil && slices.Contains(style.nodeTypes, prev.Type()); prev = prev.PrevNamedSibling() { if lastStartRow == -1 { lastStartRow = int(prev.StartPoint().Row) } else if lastStartRow != int(prev.EndPoint().Row+1) { diff --git a/cmd/symbols/squirrel/service_test.go b/cmd/symbols/squirrel/service_test.go index f65d2a22e93a1..fcc029f27b154 100644 --- a/cmd/symbols/squirrel/service_test.go +++ b/cmd/symbols/squirrel/service_test.go @@ -4,6 +4,7 @@ import ( "context" "os" "path/filepath" + "slices" "sort" "testing" @@ -140,7 +141,7 @@ func TestNonLocalDefinition(t *testing.T) { gotSymbolInfo, err := squirrel.SymbolInfo(context.Background(), ref.repoCommitPathPoint) fatalIfErrorLabel(t, err, "symbolInfo") - if contains(ref.tags, "nodef") { + if slices.Contains(ref.tags, "nodef") { if gotSymbolInfo != nil { t.Fatalf("unexpected definition for %s", ref.symbol) } diff --git a/cmd/symbols/squirrel/util.go b/cmd/symbols/squirrel/util.go index caaf0a49fb93f..baac38269151d 100644 --- a/cmd/symbols/squirrel/util.go +++ b/cmd/symbols/squirrel/util.go @@ -196,24 +196,6 @@ func nodeLength(node *sitter.Node) int { return length } -// Of course. -func min(a, b int) int { - if a < b { - return a - } - return b -} - -// When generic? -func contains(slice []string, str string) bool { - for _, s := range slice { - if s == str { - return true - } - } - return false -} - // Node is a sitter.Node plus convenient info. type Node struct { RepoCommitPath types.RepoCommitPath diff --git a/cmd/telemetry-gateway/internal/server/BUILD.bazel b/cmd/telemetry-gateway/internal/server/BUILD.bazel index 455fd3dc18821..59033594bcc71 100644 --- a/cmd/telemetry-gateway/internal/server/BUILD.bazel +++ b/cmd/telemetry-gateway/internal/server/BUILD.bazel @@ -5,6 +5,7 @@ go_library( name = "server", srcs = [ "metrics.go", + "migrate_events.go", "publish_events.go", "server.go", ], @@ -29,10 +30,14 @@ go_library( go_test( name = "server_test", - srcs = ["publish_events_test.go"], + srcs = [ + "migrate_events_test.go", + "publish_events_test.go", + ], embed = [":server"], deps = [ "//cmd/telemetry-gateway/internal/events", + "//internal/telemetrygateway/v1:telemetrygateway", "@com_github_hexops_autogold_v2//:autogold", "@com_github_stretchr_testify//assert", ], diff --git a/cmd/telemetry-gateway/internal/server/migrate_events.go b/cmd/telemetry-gateway/internal/server/migrate_events.go new file mode 100644 index 0000000000000..d5eeb58cf6b6d --- /dev/null +++ b/cmd/telemetry-gateway/internal/server/migrate_events.go @@ -0,0 +1,19 @@ +package server + +import telemetrygatewayv1 "github.com/sourcegraph/sourcegraph/internal/telemetrygateway/v1" + +// migrateEvents does an in-place migration of any legacy field usages to support +// older exporters. +func migrateEvents(events []*telemetrygatewayv1.Event) { + for _, ev := range events { + if ev.Parameters != nil && len(ev.Parameters.LegacyMetadata) > 0 { + if ev.Parameters.Metadata == nil { + ev.Parameters.Metadata = make(map[string]float64, len(ev.Parameters.LegacyMetadata)) + } + for k, v := range ev.Parameters.LegacyMetadata { + ev.Parameters.Metadata[k] = float64(v) + } + ev.Parameters.LegacyMetadata = nil // remove + } + } +} diff --git a/cmd/telemetry-gateway/internal/server/migrate_events_test.go b/cmd/telemetry-gateway/internal/server/migrate_events_test.go new file mode 100644 index 0000000000000..0eeb3553b3eef --- /dev/null +++ b/cmd/telemetry-gateway/internal/server/migrate_events_test.go @@ -0,0 +1,43 @@ +package server + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + telemetrygatewayv1 "github.com/sourcegraph/sourcegraph/internal/telemetrygateway/v1" +) + +func TestMigrateEvents(t *testing.T) { + t.Run("legacy metadata format", func(t *testing.T) { + events := []*telemetrygatewayv1.Event{ + { + Parameters: &telemetrygatewayv1.EventParameters{ + LegacyMetadata: map[string]int64{ + "foo": 123, + }, + }, + }, + { + Parameters: &telemetrygatewayv1.EventParameters{ + LegacyMetadata: map[string]int64{ + "foo": 123, + }, + Metadata: map[string]float64{ + "bar": 456, + }, + }, + }, + } + migrateEvents(events) + + // first event + assert.Equal(t, float64(123), events[0].Parameters.Metadata["foo"]) + assert.Nil(t, events[0].Parameters.LegacyMetadata) + + // second event + assert.Equal(t, float64(123), events[1].Parameters.Metadata["foo"]) + assert.Equal(t, float64(456), events[1].Parameters.Metadata["bar"]) + assert.Nil(t, events[1].Parameters.LegacyMetadata) + }) +} diff --git a/cmd/telemetry-gateway/internal/server/server.go b/cmd/telemetry-gateway/internal/server/server.go index 9bda5b4c8d69d..243501a0a1271 100644 --- a/cmd/telemetry-gateway/internal/server/server.go +++ b/cmd/telemetry-gateway/internal/server/server.go @@ -118,6 +118,9 @@ func (s *Server) RecordEvents(stream telemetrygatewayv1.TelemeteryGatewayService return status.Error(codes.InvalidArgument, "got events when metadata not yet received") } + // Handle legacy exporters + migrateEvents(events) + // Publish events resp := handlePublishEvents( stream.Context(), diff --git a/cmd/worker/internal/codemonitors/BUILD.bazel b/cmd/worker/internal/codemonitors/BUILD.bazel index 07296b1d32634..f7269ddb625b4 100644 --- a/cmd/worker/internal/codemonitors/BUILD.bazel +++ b/cmd/worker/internal/codemonitors/BUILD.bazel @@ -6,6 +6,7 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/codemonitors", visibility = ["//cmd/worker:__subpackages__"], deps = [ + "//cmd/frontend/envvar", "//cmd/worker/job", "//cmd/worker/shared/init/db", "//internal/codemonitors/background", diff --git a/cmd/worker/internal/codemonitors/codemonitor_job.go b/cmd/worker/internal/codemonitors/codemonitor_job.go index efdd1317f0e26..973707e20cd33 100644 --- a/cmd/worker/internal/codemonitors/codemonitor_job.go +++ b/cmd/worker/internal/codemonitors/codemonitor_job.go @@ -3,6 +3,7 @@ package codemonitors import ( "context" + "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/worker/job" workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db" "github.com/sourcegraph/sourcegraph/internal/codemonitors/background" @@ -26,6 +27,14 @@ func (j *codeMonitorJob) Config() []env.Config { } func (j *codeMonitorJob) Routines(_ context.Context, observationCtx *observation.Context) ([]goroutine.BackgroundRoutine, error) { + // Code monitors have been deprecated on dotcom and are set to be fully disabled + // after November 29th 2023. + // This is a temporary line to disable the background workers that execute them, + // before we simply turn off the feature via a feature gate or similar. + if envvar.SourcegraphDotComMode() { + return nil, nil + } + db, err := workerdb.InitDB(observationCtx) if err != nil { return nil, err diff --git a/cmd/worker/internal/embeddings/repo/scheduler.go b/cmd/worker/internal/embeddings/repo/scheduler.go index 5475b091602a3..3ea54f1682224 100644 --- a/cmd/worker/internal/embeddings/repo/scheduler.go +++ b/cmd/worker/internal/embeddings/repo/scheduler.go @@ -83,6 +83,6 @@ func newRepoEmbeddingScheduler( enqueueActive, goroutine.WithName("repoEmbeddingSchedulerJob"), goroutine.WithDescription("resolves embedding policies and schedules jobs to embed repos"), - goroutine.WithInterval(1*time.Minute), + goroutine.WithInterval(5*time.Minute), ) } diff --git a/cmd/worker/internal/executorqueue/BUILD.bazel b/cmd/worker/internal/executorqueue/BUILD.bazel index 3ce8cddc59583..4bde4c5ac8ab8 100644 --- a/cmd/worker/internal/executorqueue/BUILD.bazel +++ b/cmd/worker/internal/executorqueue/BUILD.bazel @@ -1,9 +1,6 @@ load("//dev:go_defs.bzl", "go_test") load("@io_bazel_rules_go//go:def.bzl", "go_library") -# gazelle:resolve go google.golang.org/genproto/googleapis/api/metric @go_googleapis//google/api:metric_go_proto -# gazelle:resolve go google.golang.org/genproto/googleapis/api/monitoredres @go_googleapis//google/api:monitoredres_go_proto - go_library( name = "executorqueue", srcs = [ @@ -38,9 +35,9 @@ go_library( "@com_github_inconshreveable_log15//:log15", "@com_google_cloud_go_monitoring//apiv3/v2:apiv3", "@com_google_cloud_go_monitoring//apiv3/v2/monitoringpb", - "@go_googleapis//google/api:metric_go_proto", - "@go_googleapis//google/api:monitoredres_go_proto", "@org_golang_google_api//option", + "@org_golang_google_genproto_googleapis_api//metric", + "@org_golang_google_genproto_googleapis_api//monitoredres", "@org_golang_google_protobuf//types/known/timestamppb", ], ) diff --git a/cmd/worker/internal/executorqueue/queue_allocation.go b/cmd/worker/internal/executorqueue/queue_allocation.go index 012625eb1ce79..eea4d00991112 100644 --- a/cmd/worker/internal/executorqueue/queue_allocation.go +++ b/cmd/worker/internal/executorqueue/queue_allocation.go @@ -1,6 +1,8 @@ package executorqueue import ( + "slices" + "github.com/inconshreveable/log15" executortypes "github.com/sourcegraph/sourcegraph/internal/executor/types" @@ -16,7 +18,7 @@ var validCloudProviderNames = []string{"aws", "gcp"} func normalizeAllocations(m map[string]map[string]float64, awsConfigured, gcpConfigured bool) (map[string]QueueAllocation, error) { for queueName := range m { - if !contains(executortypes.ValidQueueNames, queueName) { + if !slices.Contains(executortypes.ValidQueueNames, queueName) { return nil, errors.Errorf("invalid queue '%s'", queueName) } } @@ -51,7 +53,7 @@ func normalizeQueueAllocation(queueName string, queueAllocation map[string]float } for cloudProvider, allocation := range queueAllocation { - if !contains(validCloudProviderNames, cloudProvider) { + if !slices.Contains(validCloudProviderNames, cloudProvider) { return QueueAllocation{}, errors.Errorf("invalid cloud provider '%s', expected 'aws' or 'gcp'", cloudProvider) } @@ -78,13 +80,3 @@ func normalizeQueueAllocation(queueName string, queueAllocation map[string]float PercentageGCP: queueAllocation["gcp"], }, nil } - -func contains(slice []string, value string) bool { - for _, v := range slice { - if value == v { - return true - } - } - - return false -} diff --git a/cmd/worker/internal/outboundwebhooks/BUILD.bazel b/cmd/worker/internal/outboundwebhooks/BUILD.bazel index 0c0b048bc1dec..69d49c8b0a690 100644 --- a/cmd/worker/internal/outboundwebhooks/BUILD.bazel +++ b/cmd/worker/internal/outboundwebhooks/BUILD.bazel @@ -46,6 +46,7 @@ go_test( "//internal/database/dbmocks", "//internal/encryption", "//internal/types", + "//internal/webhooks/outbound", "//lib/errors", "@com_github_derision_test_go_mockgen//testutil/assert", "@com_github_sourcegraph_log//logtest", diff --git a/cmd/worker/internal/outboundwebhooks/handler.go b/cmd/worker/internal/outboundwebhooks/handler.go index 6d7fd89c67fa2..e2266971eafb0 100644 --- a/cmd/worker/internal/outboundwebhooks/handler.go +++ b/cmd/worker/internal/outboundwebhooks/handler.go @@ -91,7 +91,7 @@ func (h *handler) sendWebhook( return errors.Wrap(err, "decrypting webhook URL") } - err = outbound.CheckAddress(url) + err = outbound.CheckURL(url) if err != nil { logger.Error("webhook URL is not allowed", log.Error(err)) return errors.Wrap(err, "checking webhook URL") diff --git a/cmd/worker/internal/outboundwebhooks/handler_test.go b/cmd/worker/internal/outboundwebhooks/handler_test.go index 645a3897e2792..4be465057ead1 100644 --- a/cmd/worker/internal/outboundwebhooks/handler_test.go +++ b/cmd/worker/internal/outboundwebhooks/handler_test.go @@ -17,6 +17,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/encryption" "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/webhooks/outbound" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -83,6 +84,9 @@ func TestHandler_Handle(t *testing.T) { logStore: logStore, } + outbound.SetTestDenyList() + t.Cleanup(outbound.ResetDenyList) + err := h.Handle(ctx, logger, job) // We expect an error here because sadServer returned a 500. assert.Error(t, err) @@ -112,7 +116,7 @@ func TestHandler_Handle(t *testing.T) { webhook := &types.OutboundWebhook{ ID: 1, - URL: encryption.NewUnencrypted("http://sourcegraph.com/webhook-receiver/1234"), + URL: encryption.NewUnencrypted("http://127.0.0.1/webhook-receiver/1234"), Secret: encryption.NewUnencrypted(secret), } @@ -136,12 +140,16 @@ func TestHandler_Handle(t *testing.T) { logStore: logStore, } + outbound.SetTestDenyList() + t.Cleanup(outbound.ResetDenyList) + err := h.Handle(ctx, logger, job) assert.ErrorIs(t, err, want) mockassert.CalledN(t, store.ListFunc, 1) mockassert.CalledN(t, logStore.CreateFunc, 1) }) + } type badTransport struct { diff --git a/cmd/worker/internal/permissions/BUILD.bazel b/cmd/worker/internal/permissions/BUILD.bazel index ace2cd2af25e4..e2ad44f3d4eee 100644 --- a/cmd/worker/internal/permissions/BUILD.bazel +++ b/cmd/worker/internal/permissions/BUILD.bazel @@ -64,7 +64,6 @@ go_test( "//internal/api", "//internal/auth", "//internal/authz", - "//internal/collections", "//internal/conf", "//internal/database", "//internal/database/dbmocks", diff --git a/cmd/worker/internal/permissions/bitbucket_projects_test.go b/cmd/worker/internal/permissions/bitbucket_projects_test.go index b04775d8985a1..43d643ee39d45 100644 --- a/cmd/worker/internal/permissions/bitbucket_projects_test.go +++ b/cmd/worker/internal/permissions/bitbucket_projects_test.go @@ -1,6 +1,7 @@ package permissions import ( + "cmp" "context" "encoding/json" "testing" @@ -12,7 +13,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/authz" - "github.com/sourcegraph/sourcegraph/internal/collections" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" @@ -183,7 +183,7 @@ func TestSetPermissionsForUsers(t *testing.T) { err := perms.LoadUserPendingPermissions(ctx, userPerms) require.NoError(t, err) - require.Equal(t, []int32{1, 2}, userPerms.IDs.Sorted(collections.NaturalCompare[int32])) + require.Equal(t, []int32{1, 2}, userPerms.IDs.Sorted(cmp.Less[int32])) } } diff --git a/cmd/worker/internal/repostatistics/BUILD.bazel b/cmd/worker/internal/repostatistics/BUILD.bazel index 5d7aae4a5c52e..9dafffe9cba8c 100644 --- a/cmd/worker/internal/repostatistics/BUILD.bazel +++ b/cmd/worker/internal/repostatistics/BUILD.bazel @@ -12,6 +12,7 @@ go_library( "//internal/env", "//internal/goroutine", "//internal/observation", + "//lib/errors", "@com_github_sourcegraph_log//:log", ], ) diff --git a/cmd/worker/internal/repostatistics/compactor.go b/cmd/worker/internal/repostatistics/compactor.go index 0890dc111827f..0b2689537c2dd 100644 --- a/cmd/worker/internal/repostatistics/compactor.go +++ b/cmd/worker/internal/repostatistics/compactor.go @@ -12,6 +12,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/goroutine" "github.com/sourcegraph/sourcegraph/internal/observation" + "github.com/sourcegraph/sourcegraph/lib/errors" ) // compactor is a worker responsible for compacting rows in the repo_statistics table. @@ -60,7 +61,15 @@ var ( ) func (h *handler) Handle(ctx context.Context) error { - return h.store.CompactRepoStatistics(ctx) + var errs error + if err := h.store.CompactRepoStatistics(ctx); err != nil { + errs = errors.Append(errs, errors.Wrap(err, "error compacting repo statistics")) + } + + if err := h.store.CompactGitserverReposStatistics(ctx); err != nil { + errs = errors.Append(errs, errors.Wrap(err, "error compacting gitserver repos statistics")) + } + return errs } func (h *handler) HandleError(err error) { diff --git a/cmd/worker/internal/telemetrygatewayexporter/queue_cleanup.go b/cmd/worker/internal/telemetrygatewayexporter/queue_cleanup.go index 66708a256b0e0..4eb243e68a017 100644 --- a/cmd/worker/internal/telemetrygatewayexporter/queue_cleanup.go +++ b/cmd/worker/internal/telemetrygatewayexporter/queue_cleanup.go @@ -24,7 +24,8 @@ type queueCleanupJob struct { func newQueueCleanupJob(obctx *observation.Context, store database.TelemetryEventsExportQueueStore, cfg config) goroutine.BackgroundRoutine { job := &queueCleanupJob{ - store: store, + store: store, + retentionWindow: cfg.ExportedEventsRetentionWindow, prunedCounter: promauto.NewCounter(prometheus.CounterOpts{ Namespace: "src", Subsystem: "telemetrygatewayexporter", diff --git a/cmd/worker/internal/telemetrygatewayexporter/telemetrygatewayexporter.go b/cmd/worker/internal/telemetrygatewayexporter/telemetrygatewayexporter.go index d57dc680cadef..78daf9ecb7aa8 100644 --- a/cmd/worker/internal/telemetrygatewayexporter/telemetrygatewayexporter.go +++ b/cmd/worker/internal/telemetrygatewayexporter/telemetrygatewayexporter.go @@ -75,7 +75,7 @@ func (c *config) Load() { } c.ExportedEventsRetentionWindow = env.MustGetDuration("TELEMETRY_GATEWAY_EXPORTER_EXPORTED_EVENTS_RETENTION", - 2*24*time.Hour, "Duration to retain already-exported telemetry events before deleting") + 24*time.Hour, "Duration to retain already-exported telemetry events before deleting") c.QueueCleanupInterval = env.MustGetDuration("TELEMETRY_GATEWAY_EXPORTER_QUEUE_CLEANUP_INTERVAL", 30*time.Minute, "Interval at which to clean up telemetry export queue") diff --git a/deps.bzl b/deps.bzl index bed5b3f51e16a..65637046f67d1 100644 --- a/deps.bzl +++ b/deps.bzl @@ -16,7 +16,6 @@ def go_dependencies(): sum = "h1:tdpHgTbmbvEIARu+bixzmleMi14+3imnpoFXz+Qzjp4=", version = "v1.31.0-20230802163732-1c33ebd9ecfa.1", ) - go_repository( name = "cc_mvdan_gofumpt", build_file_proto_mode = "disable_global", @@ -24,7 +23,6 @@ def go_dependencies(): sum = "h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM=", version = "v0.4.0", ) - go_repository( name = "cc_mvdan_xurls_v2", build_file_proto_mode = "disable_global", @@ -32,7 +30,6 @@ def go_dependencies(): sum = "h1:tzxjVAj+wSBmDcF6zBB7/myTy3gX9xvi8Tyr28AuQgc=", version = "v2.4.0", ) - go_repository( name = "co_honnef_go_tools", build_file_proto_mode = "disable_global", @@ -96,7 +93,6 @@ def go_dependencies(): sum = "h1:yczvlwMsfcVu/JtejqfrLwXuSP0yZFhmcss3caEvHw8=", version = "v0.17.2", ) - go_repository( name = "com_github_acomagu_bufpipe", build_file_proto_mode = "disable_global", @@ -111,7 +107,6 @@ def go_dependencies(): sum = "h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=", version = "v0.0.0-20230811130428-ced1acdcaa24", ) - go_repository( name = "com_github_agext_levenshtein", build_file_proto_mode = "disable_global", @@ -126,7 +121,6 @@ def go_dependencies(): sum = "h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=", version = "v1.1.1", ) - go_repository( name = "com_github_ajstarks_svgo", build_file_proto_mode = "disable_global", @@ -134,7 +128,6 @@ def go_dependencies(): sum = "h1:slYM766cy2nI3BwyRiyQj/Ud48djTMtMebDqepE95rw=", version = "v0.0.0-20211024235047-1546f124cd8b", ) - go_repository( name = "com_github_alecthomas_assert_v2", build_file_proto_mode = "disable_global", @@ -142,7 +135,6 @@ def go_dependencies(): sum = "h1:f6L/b7KE2bfA+9O4FL3CM/xJccDEwPVYd5fALBiuwvw=", version = "v2.2.0", ) - go_repository( name = "com_github_alecthomas_chroma", build_file_proto_mode = "disable_global", @@ -157,7 +149,6 @@ def go_dependencies(): sum = "h1:Loe2ZjT5x3q1bcWwemqyqEi8p11/IV/ncFCeLYDpWC4=", version = "v2.4.0", ) - go_repository( name = "com_github_alecthomas_kingpin", build_file_proto_mode = "disable_global", @@ -172,7 +163,6 @@ def go_dependencies(): sum = "h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=", version = "v0.1.0", ) - go_repository( name = "com_github_alecthomas_template", build_file_proto_mode = "disable_global", @@ -194,7 +184,6 @@ def go_dependencies(): sum = "h1:lDWZAXxpAnZUq4qwb86p/3rIJJ2Li81EoMbTMujhVa0=", version = "v1.4.2", ) - go_repository( name = "com_github_alexflint_go_scalar", build_file_proto_mode = "disable_global", @@ -202,7 +191,6 @@ def go_dependencies(): sum = "h1:NGupf1XV/Xb04wXskDFzS0KWOLH632W/EO4fAFi+A70=", version = "v1.0.0", ) - go_repository( name = "com_github_amit7itz_goset", build_file_proto_mode = "disable_global", @@ -210,7 +198,6 @@ def go_dependencies(): sum = "h1:LTn5swPM1a0vFr3yluIQHjvNTfbp7z87baV9x2ugS+4=", version = "v1.0.1", ) - go_repository( name = "com_github_andres_erbsen_clock", build_file_proto_mode = "disable_global", @@ -253,7 +240,6 @@ def go_dependencies(): sum = "h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=", version = "v0.0.0-20200514113438-38f4b401e2be", ) - go_repository( name = "com_github_antihax_optional", build_file_proto_mode = "disable_global", @@ -268,7 +254,6 @@ def go_dependencies(): sum = "h1:goHVqTbFX3AIo0tzGr14pgfAW2ZfPChKO21Z9MGf/gk=", version = "v4.0.0-20230512164433-5d1fd1a340c9", ) - go_repository( name = "com_github_antonmedv_expr", build_file_proto_mode = "disable_global", @@ -276,7 +261,6 @@ def go_dependencies(): sum = "h1:uzMxTbpHpOqV20RrNvBKHGojNwdRpcrgoFtgF4J8xtg=", version = "v1.10.5", ) - go_repository( name = "com_github_aokoli_goutils", build_file_proto_mode = "disable_global", @@ -305,7 +289,6 @@ def go_dependencies(): sum = "h1:ECIpSn0adcYNsBfSRwdDdz9fWlL+S/6EUd9+irwkBgU=", version = "v1.0.1", ) - go_repository( name = "com_github_arbovm_levenshtein", build_file_proto_mode = "disable_global", @@ -313,7 +296,6 @@ def go_dependencies(): sum = "h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=", version = "v0.0.0-20160628152529-48b4e1c0c4d0", ) - go_repository( name = "com_github_armon_circbuf", build_file_proto_mode = "disable_global", @@ -321,7 +303,6 @@ def go_dependencies(): sum = "h1:7Ip0wMmLHLRJdrloDxZfhMm0xrLXZS8+COSu2bXmEQs=", version = "v0.0.0-20190214190532-5111143e8da2", ) - go_repository( name = "com_github_armon_consul_api", build_file_proto_mode = "disable_global", @@ -350,7 +331,6 @@ def go_dependencies(): sum = "h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=", version = "v0.0.0-20160902184237-e75332964ef5", ) - go_repository( name = "com_github_asaskevich_govalidator", build_file_proto_mode = "disable_global", @@ -435,7 +415,6 @@ def go_dependencies(): sum = "h1:C21IDZCm9Yu5xqjb3fKmxDoYvJXtw1DNlOmLZEIlY1M=", version = "v1.0.1", ) - go_repository( name = "com_github_aws_aws_sdk_go_v2_service_appconfig", build_file_proto_mode = "disable_global", @@ -457,7 +436,6 @@ def go_dependencies(): sum = "h1:iEqboXubLCABYFoClUyX/Bv8DfhmV39hPKdRbs21/kI=", version = "v1.11.0", ) - go_repository( name = "com_github_aws_aws_sdk_go_v2_service_internal_accept_encoding", build_file_proto_mode = "disable_global", @@ -472,7 +450,6 @@ def go_dependencies(): sum = "h1:9LSZqt4v1JiehyZTrQnRFf2mY/awmyYNNY/b7zqtduU=", version = "v1.1.5", ) - go_repository( name = "com_github_aws_aws_sdk_go_v2_service_internal_presigned_url", build_file_proto_mode = "disable_global", @@ -529,7 +506,6 @@ def go_dependencies(): sum = "h1:ZvOKkGKQBZC8qrlM3qi2hXnbnqI64o3WtVw5ZVd/q9s=", version = "v1.84.0", ) - go_repository( name = "com_github_aws_smithy_go", build_file_proto_mode = "disable_global", @@ -544,7 +520,6 @@ def go_dependencies(): sum = "h1:0NmehRCgyk5rljDQLKUO+cRJCnduDyn11+zGZIc9Z48=", version = "v0.0.0-20150809002002-ad15bcfc95a0", ) - go_repository( name = "com_github_aymerick_douceur", build_file_proto_mode = "disable_global", @@ -552,7 +527,6 @@ def go_dependencies(): sum = "h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=", version = "v0.2.0", ) - go_repository( name = "com_github_azure_azure_sdk_for_go", build_file_proto_mode = "disable_global", @@ -560,26 +534,33 @@ def go_dependencies(): sum = "h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw=", version = "v65.0.0+incompatible", ) + go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_ai_azopenai", + build_file_proto_mode = "disable_global", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai", + sum = "h1:x7fb22Q43h2DRFCvp9rAua8PoV3gwtl1bK5+pihnihA=", + version = "v0.3.0", + ) go_repository( name = "com_github_azure_azure_sdk_for_go_sdk_azcore", build_file_proto_mode = "disable_global", importpath = "github.com/Azure/azure-sdk-for-go/sdk/azcore", - sum = "h1:Ut0ZGdOwJDw0npYEg+TLlPls3Pq6JiZaP2/aGKir7Zw=", - version = "v1.1.0", + sum = "h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA=", + version = "v1.8.0", ) go_repository( name = "com_github_azure_azure_sdk_for_go_sdk_azidentity", build_file_proto_mode = "disable_global", importpath = "github.com/Azure/azure-sdk-for-go/sdk/azidentity", - sum = "h1:QkAcEIAKbNL4KoFr4SathZPhDhF4mVwpBMFlYjyAqy8=", - version = "v1.1.0", + sum = "h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=", + version = "v1.4.0", ) go_repository( name = "com_github_azure_azure_sdk_for_go_sdk_internal", build_file_proto_mode = "disable_global", importpath = "github.com/Azure/azure-sdk-for-go/sdk/internal", - sum = "h1:jp0dGvZ7ZK0mgqnTSClMxa5xuRL7NZgHameVYF6BurY=", - version = "v1.0.0", + sum = "h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=", + version = "v1.3.0", ) go_repository( name = "com_github_azure_azure_sdk_for_go_sdk_storage_azblob", @@ -588,7 +569,6 @@ def go_dependencies(): sum = "h1:QSdcrd/UFJv6Bp/CfoVf2SrENpFn9P6Yh8yb+xNhYMM=", version = "v0.4.1", ) - go_repository( name = "com_github_azure_go_ansiterm", build_file_proto_mode = "disable_global", @@ -617,7 +597,6 @@ def go_dependencies(): sum = "h1:jjQnVFXPfekaqb8vIsv2G1lxshoW+oGv4MDlhRtnYZk=", version = "v0.9.21", ) - go_repository( name = "com_github_azure_go_autorest_autorest_date", build_file_proto_mode = "disable_global", @@ -632,7 +611,6 @@ def go_dependencies(): sum = "h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk=", version = "v0.4.1", ) - go_repository( name = "com_github_azure_go_autorest_autorest_to", build_file_proto_mode = "disable_global", @@ -672,10 +650,9 @@ def go_dependencies(): name = "com_github_azuread_microsoft_authentication_library_for_go", build_file_proto_mode = "disable_global", importpath = "github.com/AzureAD/microsoft-authentication-library-for-go", - sum = "h1:XMEdVDFxgulDDl0lQmAZS6j8gRQ/0pJ+ZpXH2FHVtDc=", - version = "v0.6.0", + sum = "h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk=", + version = "v1.1.1", ) - go_repository( name = "com_github_bahlo_generic_list_go", build_file_proto_mode = "disable_global", @@ -690,7 +667,6 @@ def go_dependencies(): sum = "h1:mE3dGGkTmpKtT4Z+88t8RStG40yN9T+kFEGj2PZFSzA=", version = "v1.0.0", ) - go_repository( name = "com_github_beevik_etree", build_file_proto_mode = "disable_global", @@ -698,7 +674,6 @@ def go_dependencies(): sum = "h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=", version = "v1.1.0", ) - go_repository( name = "com_github_benbjohnson_clock", build_file_proto_mode = "disable_global", @@ -741,7 +716,6 @@ def go_dependencies(): sum = "h1:w/jqZtC9YD4DS/Vp9GhWfWcCpuAL58oTnLoI8vE9YHU=", version = "v0.0.4", ) - go_repository( name = "com_github_blevesearch_bleve_index_api", build_file_proto_mode = "disable_global", @@ -861,7 +835,6 @@ def go_dependencies(): sum = "h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=", version = "v1.3.4", ) - go_repository( name = "com_github_boj_redistore", build_file_proto_mode = "disable_global", @@ -869,7 +842,6 @@ def go_dependencies(): sum = "h1:RmdPFa+slIr4SCBg4st/l/vZWVe9QJKMXGO60Bxbe04=", version = "v0.0.0-20180917114910-cd5dcc76aeff", ) - go_repository( name = "com_github_boombuler_barcode", build_file_proto_mode = "disable_global", @@ -877,7 +849,6 @@ def go_dependencies(): sum = "h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=", version = "v1.0.1", ) - go_repository( name = "com_github_bradfitz_gomemcache", build_file_proto_mode = "disable_global", @@ -885,7 +856,6 @@ def go_dependencies(): sum = "h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=", version = "v0.0.0-20190913173617-a41fca850d0b", ) - go_repository( name = "com_github_bradleyjkemp_cupaloy_v2", build_file_proto_mode = "disable_global", @@ -893,7 +863,6 @@ def go_dependencies(): sum = "h1:knToPYa2xtfg42U3I6punFEjaGFKWQRXJwj0JTv4mTs=", version = "v2.6.0", ) - go_repository( name = "com_github_bshuster_repo_logrus_logstash_hook", build_file_proto_mode = "disable_global", @@ -915,7 +884,6 @@ def go_dependencies(): sum = "h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=", version = "v1.26.0", ) - go_repository( name = "com_github_bufbuild_buf", build_file_proto_mode = "disable_global", @@ -930,7 +898,6 @@ def go_dependencies(): sum = "h1:pJr07sYhliyfj/STAM7hU4J3FKpVeLVKvOBmOTN8j+s=", version = "v0.2.1", ) - go_repository( name = "com_github_buger_jsonparser", build_file_proto_mode = "disable_global", @@ -973,7 +940,6 @@ def go_dependencies(): sum = "h1:chdLUSpiOj/A4v3dzxyOqixXI6aw7IDA6Dk77FXsvNU=", version = "v3.7.0", ) - go_repository( name = "com_github_burntsushi_toml", build_file_proto_mode = "disable_global", @@ -1002,7 +968,6 @@ def go_dependencies(): sum = "h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY=", version = "v0.0.0-20220606134207-859f65c6625b", ) - go_repository( name = "com_github_caddyserver_certmagic", build_file_proto_mode = "disable_global", @@ -1010,7 +975,6 @@ def go_dependencies(): sum = "h1:o30seC1T/dBqBCNNGNHWwj2i5/I/FMjBbTAhjADP3nE=", version = "v0.17.2", ) - go_repository( name = "com_github_cenkalti_backoff", build_file_proto_mode = "disable_global", @@ -1018,7 +982,6 @@ def go_dependencies(): sum = "h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=", version = "v2.2.1+incompatible", ) - go_repository( name = "com_github_cenkalti_backoff_v4", build_file_proto_mode = "disable_global", @@ -1033,7 +996,6 @@ def go_dependencies(): sum = "h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=", version = "v0.4.1", ) - go_repository( name = "com_github_cespare_xxhash", build_file_proto_mode = "disable_global", @@ -1055,7 +1017,6 @@ def go_dependencies(): sum = "h1:wu15ykPdB7X6chxugG/NNfDUbyyrCLV9XBalj5wdu3g=", version = "v0.5.0", ) - go_repository( name = "com_github_chi_middleware_proxy", build_file_proto_mode = "disable_global", @@ -1063,7 +1024,6 @@ def go_dependencies(): sum = "h1:4HaXUp8o2+bhHr1OhVy+VjN0+L7/07JDcn6v7YrTjrQ=", version = "v1.1.1", ) - go_repository( name = "com_github_chromedp_cdproto", build_file_proto_mode = "disable_global", @@ -1085,7 +1045,6 @@ def go_dependencies(): sum = "h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=", version = "v1.0.0", ) - go_repository( name = "com_github_chzyer_logex", build_file_proto_mode = "disable_global", @@ -1107,7 +1066,6 @@ def go_dependencies(): sum = "h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=", version = "v0.0.0-20180213035817-a1ea475d72b1", ) - go_repository( name = "com_github_client9_misspell", build_file_proto_mode = "disable_global", @@ -1135,7 +1093,6 @@ def go_dependencies(): sum = "h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=", version = "v1.3.3", ) - go_repository( name = "com_github_cloudykit_fastprinter", build_file_proto_mode = "disable_global", @@ -1143,7 +1100,6 @@ def go_dependencies(): sum = "h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c=", version = "v0.0.0-20200109182630-33d98a066a53", ) - go_repository( name = "com_github_cloudykit_jet_v6", build_file_proto_mode = "disable_global", @@ -1151,7 +1107,6 @@ def go_dependencies(): sum = "h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME=", version = "v6.2.0", ) - go_repository( name = "com_github_cncf_udpa_go", build_file_proto_mode = "disable_global", @@ -1180,7 +1135,6 @@ def go_dependencies(): sum = "h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE=", version = "v2.0.1", ) - go_repository( name = "com_github_cockroachdb_datadriven", build_file_proto_mode = "disable_global", @@ -1209,7 +1163,6 @@ def go_dependencies(): sum = "h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=", version = "v1.1.5", ) - go_repository( name = "com_github_codegangsta_inject", build_file_proto_mode = "disable_global", @@ -1217,7 +1170,6 @@ def go_dependencies(): sum = "h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q=", version = "v0.0.0-20150114235600-33e0aa1cb7c0", ) - go_repository( name = "com_github_containerd_cgroups", build_file_proto_mode = "disable_global", @@ -1274,7 +1226,6 @@ def go_dependencies(): sum = "h1:oU+lLv1ULm5taqgV/CJivypVODI4SUz1znWjv3nNYS0=", version = "v1.0.0", ) - go_repository( name = "com_github_containerd_nydus_snapshotter", build_file_proto_mode = "disable_global", @@ -1282,7 +1233,6 @@ def go_dependencies(): sum = "h1:b8WahTrPkt3XsabjG2o/leN4fw3HWZYr+qxo/Z8Mfzk=", version = "v0.3.1", ) - go_repository( name = "com_github_containerd_stargz_snapshotter", build_file_proto_mode = "disable_global", @@ -1311,7 +1261,6 @@ def go_dependencies(): sum = "h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY=", version = "v1.0.2", ) - go_repository( name = "com_github_containernetworking_cni", build_file_proto_mode = "disable_global", @@ -1319,7 +1268,6 @@ def go_dependencies(): sum = "h1:ky20T7c0MvKvbMOwS/FrlbNwjEoqJEUUYfsL4b0mc4k=", version = "v1.1.1", ) - go_repository( name = "com_github_coreos_bbolt", build_file_proto_mode = "disable_global", @@ -1327,7 +1275,6 @@ def go_dependencies(): sum = "h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s=", version = "v1.3.2", ) - go_repository( name = "com_github_coreos_etcd", build_file_proto_mode = "disable_global", @@ -1335,7 +1282,6 @@ def go_dependencies(): sum = "h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04=", version = "v3.3.10+incompatible", ) - go_repository( name = "com_github_coreos_go_iptables", # We need to explictly turn this on, because the repository @@ -1354,7 +1300,6 @@ def go_dependencies(): sum = "h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=", version = "v2.2.1+incompatible", ) - go_repository( name = "com_github_coreos_go_semver", build_file_proto_mode = "disable_global", @@ -1369,7 +1314,6 @@ def go_dependencies(): sum = "h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=", version = "v0.0.0-20190719114852-fd7a80b32e1f", ) - go_repository( name = "com_github_coreos_go_systemd_v22", build_file_proto_mode = "disable_global", @@ -1405,13 +1349,12 @@ def go_dependencies(): sum = "h1:4KDlx3vjalrHD/EfsjCpV91HNX3JPaIqRtt83zZ7x+Y=", version = "v0.0.0-20210118111533-e33d3ffb5401", ) - go_repository( name = "com_github_cpuguy83_go_md2man_v2", build_file_proto_mode = "disable_global", importpath = "github.com/cpuguy83/go-md2man/v2", - sum = "h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=", - version = "v2.0.2", + sum = "h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=", + version = "v2.0.3", ) go_repository( name = "com_github_creack_pty", @@ -1443,7 +1386,6 @@ def go_dependencies(): sum = "h1:13Ix7LoUJ0Yu5F+s6Aw8Afc8x+n98RSJNGHpxEbcYus=", version = "v0.0.0-20221211125903-d951aa2d145a", ) # keep - go_repository( name = "com_github_danieljoos_wincred", build_file_proto_mode = "disable_global", @@ -1458,7 +1400,6 @@ def go_dependencies(): sum = "h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo=", version = "v1.5.0", ) - go_repository( name = "com_github_dave_jennifer", build_file_proto_mode = "disable_global", @@ -1466,7 +1407,6 @@ def go_dependencies(): sum = "h1:T4T/67t6RAA5AIV6+NP8Uk/BIsXgDoqEowgycdQQLuk=", version = "v1.6.1", ) - go_repository( name = "com_github_davecgh_go_spew", build_file_proto_mode = "disable_global", @@ -1488,7 +1428,6 @@ def go_dependencies(): sum = "h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=", version = "v1.2.0", ) - go_repository( name = "com_github_denisenkom_go_mssqldb", build_file_proto_mode = "disable_global", @@ -1496,7 +1435,6 @@ def go_dependencies(): sum = "h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw=", version = "v0.12.2", ) - go_repository( name = "com_github_dennwc_varint", build_file_proto_mode = "disable_global", @@ -1518,7 +1456,6 @@ def go_dependencies(): sum = "h1:b6sViZG+Cm6QtdpqbfWEjaBVbzNPntIS4GzsxpS+CmM=", version = "v1.0.0", ) - go_repository( name = "com_github_derision_test_go_mockgen", build_file_proto_mode = "disable_global", @@ -1526,7 +1463,6 @@ def go_dependencies(): sum = "h1:b/DXAXL2FkaRPpnbYK3ODdZzklmJAwox0tkc6yyXx74=", version = "v1.3.7", ) - go_repository( name = "com_github_dghubble_go_twitter", build_file_proto_mode = "disable_global", @@ -1548,7 +1484,6 @@ def go_dependencies(): sum = "h1:pwcinOZy8z6XkNxvPmUDY52M7RDPxt0Xw1zgZ6Cl5JA=", version = "v0.7.2", ) - go_repository( name = "com_github_dghubble_sling", build_file_proto_mode = "disable_global", @@ -1556,7 +1491,6 @@ def go_dependencies(): sum = "h1:AxjTubpVyozMvbBCtXcsWEyGGgUZutC5YGrfxPNVOcQ=", version = "v1.4.1", ) - go_repository( name = "com_github_dgraph_io_ristretto", build_file_proto_mode = "disable_global", @@ -1564,7 +1498,6 @@ def go_dependencies(): sum = "h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=", version = "v0.1.1", ) - go_repository( name = "com_github_dgrijalva_jwt_go", build_file_proto_mode = "disable_global", @@ -1586,7 +1519,6 @@ def go_dependencies(): sum = "h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=", version = "v0.0.0-20200823014737-9f7001d12a5f", ) - go_repository( name = "com_github_dgryski_go_sip13", build_file_proto_mode = "disable_global", @@ -1601,7 +1533,6 @@ def go_dependencies(): sum = "h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=", version = "v0.0.0-20200323201526-dd97f9abfb48", ) - go_repository( name = "com_github_di_wu_parser", build_file_proto_mode = "disable_global", @@ -1616,7 +1547,6 @@ def go_dependencies(): sum = "h1:vZoGNkbzpBNoc+JyfVLEbutNDNydYV8XwHeV7eUJoxI=", version = "v1.0.0", ) - go_repository( name = "com_github_digitalocean_godo", build_file_proto_mode = "disable_global", @@ -1638,7 +1568,6 @@ def go_dependencies(): sum = "h1:ou+y/Ko923eBli6zJ/TeB2iH38PmytV2UkHJnVdaPtU=", version = "v3.0.0-20220128175647-b60926597a1b", ) - go_repository( name = "com_github_djherbis_buffer", build_file_proto_mode = "disable_global", @@ -1653,7 +1582,6 @@ def go_dependencies(): sum = "h1:6wxhnuppteMa6RHA4L81Dq7ThkZH8SwnDzXDYy95vB4=", version = "v3.0.1", ) - go_repository( name = "com_github_dlclark_regexp2", build_file_proto_mode = "disable_global", @@ -1668,7 +1596,6 @@ def go_dependencies(): sum = "h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=", version = "v1.2.0", ) - go_repository( name = "com_github_docker_cli", build_file_proto_mode = "disable_global", @@ -1676,7 +1603,6 @@ def go_dependencies(): sum = "h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qeXMx3O0wqM=", version = "v24.0.0+incompatible", ) - go_repository( name = "com_github_docker_distribution", build_file_proto_mode = "disable_global", @@ -1698,7 +1624,6 @@ def go_dependencies(): sum = "h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=", version = "v0.7.0", ) - go_repository( name = "com_github_docker_go_connections", build_file_proto_mode = "disable_global", @@ -1720,7 +1645,6 @@ def go_dependencies(): sum = "h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=", version = "v0.0.1", ) - go_repository( name = "com_github_docker_go_units", build_file_proto_mode = "disable_global", @@ -1728,7 +1652,6 @@ def go_dependencies(): sum = "h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=", version = "v0.5.0", ) - go_repository( name = "com_github_docker_libtrust", build_file_proto_mode = "disable_global", @@ -1736,7 +1659,6 @@ def go_dependencies(): sum = "h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4=", version = "v0.0.0-20150114040149-fa567046d9b1", ) - go_repository( name = "com_github_docopt_docopt_go", build_file_proto_mode = "disable_global", @@ -1744,7 +1666,6 @@ def go_dependencies(): sum = "h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=", version = "v0.0.0-20180111231733-ee0de3bc6815", ) - go_repository( name = "com_github_dsnet_compress", build_file_proto_mode = "disable_global", @@ -1759,7 +1680,6 @@ def go_dependencies(): sum = "h1:BaeJtFDlto/NjX9t730OebRRJf2P+t9YEDz3ur18824=", version = "v0.0.0-20220815211337-00c9fb5711f5", ) - go_repository( name = "com_github_dustin_go_humanize", build_file_proto_mode = "disable_global", @@ -1767,7 +1687,6 @@ def go_dependencies(): sum = "h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=", version = "v1.0.1", ) - go_repository( name = "com_github_editorconfig_editorconfig_core_go_v2", build_file_proto_mode = "disable_global", @@ -1775,7 +1694,6 @@ def go_dependencies(): sum = "h1:kTcVMyCvFGQmTk0S5+R7GF+y7wMHkWm4CYS5BwYWN8U=", version = "v2.4.5", ) - go_repository( name = "com_github_edsrzf_mmap_go", build_file_proto_mode = "disable_global", @@ -1804,7 +1722,6 @@ def go_dependencies(): sum = "h1:6fUaAaX4Xe07LhVrHNmpfnlU41Nsto4skz4vhVqGwYk=", version = "v0.0.0-20220121082953-15165b1a61c8", ) - go_repository( name = "com_github_emicklei_go_restful", build_file_proto_mode = "disable_global", @@ -1812,7 +1729,6 @@ def go_dependencies(): sum = "h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw=", version = "v0.0.0-20170410110728-ff4f55a20633", ) - go_repository( name = "com_github_emicklei_go_restful_v3", build_file_proto_mode = "disable_global", @@ -1834,13 +1750,12 @@ def go_dependencies(): sum = "h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=", version = "v1.18.1", ) - go_repository( name = "com_github_envoyproxy_go_control_plane", build_file_proto_mode = "disable_global", importpath = "github.com/envoyproxy/go-control-plane", - sum = "h1:7T++XKzy4xg7PKy+bM+Sa9/oe1OC88yz2hXQUISoXfA=", - version = "v0.11.1-0.20230524094728-9239064ad72f", + sum = "h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM=", + version = "v0.11.1", ) go_repository( name = "com_github_envoyproxy_protoc_gen_validate", @@ -1849,7 +1764,6 @@ def go_dependencies(): sum = "h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=", version = "v1.0.2", ) - go_repository( name = "com_github_ethantkoenig_rupture", build_file_proto_mode = "disable_global", @@ -1857,7 +1771,6 @@ def go_dependencies(): sum = "h1:6aAXghmvtnngMgQzy7SMGdicMvkV86V4n9fT0meE5E4=", version = "v1.0.1", ) - go_repository( name = "com_github_evanphx_json_patch", build_file_proto_mode = "disable_global", @@ -1907,7 +1820,6 @@ def go_dependencies(): sum = "h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk=", version = "v0.0.0-20200203212716-c811ad88dec4", ) - go_repository( name = "com_github_fatih_color", build_file_proto_mode = "disable_global", @@ -1929,7 +1841,6 @@ def go_dependencies(): sum = "h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=", version = "v0.9.3", ) - go_repository( name = "com_github_felixge_httpsnoop", build_file_proto_mode = "disable_global", @@ -1945,7 +1856,6 @@ def go_dependencies(): sum = "h1:QcxHhicvH6TFpSmC3vZKWbwLSHmwy72+CESqjjaIsZA=", version = "v1.19.1-0.20230624001757-345a8df15ded", ) - go_repository( name = "com_github_flosch_pongo2_v4", build_file_proto_mode = "disable_global", @@ -1953,7 +1863,6 @@ def go_dependencies(): sum = "h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=", version = "v4.0.2", ) - go_repository( name = "com_github_form3tech_oss_jwt_go", build_file_proto_mode = "disable_global", @@ -1961,7 +1870,6 @@ def go_dependencies(): sum = "h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c=", version = "v3.2.3+incompatible", ) - go_repository( name = "com_github_frankban_quicktest", build_file_proto_mode = "disable_global", @@ -1976,7 +1884,6 @@ def go_dependencies(): sum = "h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=", version = "v1.6.0", ) - go_repository( name = "com_github_fullstorydev_grpcui", build_file_proto_mode = "disable_global", @@ -1984,7 +1891,6 @@ def go_dependencies(): sum = "h1:lVXozTNkJJouBL+wpmvxMnltiwYp8mgyd0TRs93i6Rw=", version = "v1.3.1", ) - go_repository( name = "com_github_fullstorydev_grpcurl", build_file_proto_mode = "disable_global", @@ -2006,7 +1912,6 @@ def go_dependencies(): sum = "h1:Sk0u0gIncQaQD23zAoAZs2DNi2u2l5UTLi4CmCBL5v8=", version = "v1.1.1-0.20170914051019-70e1b1943d4f", ) - go_repository( name = "com_github_gen2brain_beeep", build_file_proto_mode = "disable_global", @@ -2021,7 +1926,6 @@ def go_dependencies(): sum = "h1:j77zg3Ec+k+r+GA3d8hBoXpAc6KX9TbBPrwQGBIy2sY=", version = "v0.76.0", ) - go_repository( name = "com_github_getsentry_sentry_go", build_file_proto_mode = "disable_global", @@ -2036,7 +1940,6 @@ def go_dependencies(): sum = "h1:Ea58sAu8LX/NS7z3aeL+YX/7+FSd9jsxq6Ecpz7QEDM=", version = "v0.0.0-20230626192437-8d7be5866751", ) - go_repository( name = "com_github_ghodss_yaml", build_file_proto_mode = "disable_global", @@ -2080,7 +1983,6 @@ def go_dependencies(): sum = "h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=", version = "v0.0.0-20181015135952-eeefdecb41b8", ) - go_repository( name = "com_github_go_ap_activitypub", build_file_proto_mode = "disable_global", @@ -2109,7 +2011,6 @@ def go_dependencies(): sum = "h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=", version = "v1.5.4", ) - go_repository( name = "com_github_go_chi_chi_v5", build_file_proto_mode = "disable_global", @@ -2124,7 +2025,6 @@ def go_dependencies(): sum = "h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=", version = "v1.2.1", ) - go_repository( name = "com_github_go_enry_go_enry_v2", build_file_proto_mode = "disable_global", @@ -2153,7 +2053,6 @@ def go_dependencies(): sum = "h1:oRq/fiirun5HqlEWMLIcDmLpIELlG4iGbd0s8iqgPi8=", version = "v1.1.1-0.20201223112313-55836744818e", ) - go_repository( name = "com_github_go_fonts_liberation", build_file_proto_mode = "disable_global", @@ -2161,7 +2060,6 @@ def go_dependencies(): sum = "h1:3BI2iaE7R/s6uUUtzNCjo3QijJu3aS4wmrMgfSpYQ+8=", version = "v0.3.0", ) - go_repository( name = "com_github_go_git_gcfg", build_file_proto_mode = "disable_global", @@ -2190,7 +2088,6 @@ def go_dependencies(): sum = "h1:t9AudWVLmqzlo+4bqdf7GY+46SUuRsx59SboFxkq2aE=", version = "v5.7.0", ) - go_repository( name = "com_github_go_gl_glfw", build_file_proto_mode = "disable_global", @@ -2205,7 +2102,6 @@ def go_dependencies(): sum = "h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=", version = "v0.0.0-20200222043503-6f7a984d4dc4", ) - go_repository( name = "com_github_go_kit_kit", build_file_proto_mode = "disable_global", @@ -2241,7 +2137,6 @@ def go_dependencies(): sum = "h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs=", version = "v3.4.4", ) - go_repository( name = "com_github_go_logfmt_logfmt", build_file_proto_mode = "disable_global", @@ -2253,8 +2148,8 @@ def go_dependencies(): name = "com_github_go_logr_logr", build_file_proto_mode = "disable_global", importpath = "github.com/go-logr/logr", - sum = "h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=", - version = "v1.2.4", + sum = "h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=", + version = "v1.3.0", ) go_repository( name = "com_github_go_logr_stdr", @@ -2277,7 +2172,6 @@ def go_dependencies(): sum = "h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=", version = "v1.2.6", ) - go_repository( name = "com_github_go_openapi_analysis", build_file_proto_mode = "disable_global", @@ -2299,7 +2193,6 @@ def go_dependencies(): sum = "h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4=", version = "v0.19.0", ) - go_repository( name = "com_github_go_openapi_jsonpointer", build_file_proto_mode = "disable_global", @@ -2328,7 +2221,6 @@ def go_dependencies(): sum = "h1:yX9HMGQbz32M87ECaAhGpJjBmErO3QLcgdZj9BzGx7c=", version = "v0.24.2", ) - go_repository( name = "com_github_go_openapi_spec", build_file_proto_mode = "disable_global", @@ -2364,7 +2256,6 @@ def go_dependencies(): sum = "h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8=", version = "v0.6.0", ) - go_repository( name = "com_github_go_playground_locales", build_file_proto_mode = "disable_global", @@ -2400,7 +2291,6 @@ def go_dependencies(): sum = "h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4=", version = "v7.4.0", ) - go_repository( name = "com_github_go_redis_redis_v8", build_file_proto_mode = "disable_global", @@ -2415,7 +2305,6 @@ def go_dependencies(): sum = "h1:rq2RvdTI0obznMdxKUWGdmmulo7lS9yCzb8fgDKOlbM=", version = "v4.8.1", ) - go_repository( name = "com_github_go_resty_resty_v2", build_file_proto_mode = "disable_global", @@ -2427,10 +2316,9 @@ def go_dependencies(): name = "com_github_go_sql_driver_mysql", build_file_proto_mode = "disable_global", importpath = "github.com/go-sql-driver/mysql", - sum = "h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=", - version = "v1.6.0", + sum = "h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=", + version = "v1.7.1", ) - go_repository( name = "com_github_go_stack_stack", build_file_proto_mode = "disable_global", @@ -2452,7 +2340,6 @@ def go_dependencies(): sum = "h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=", version = "v0.0.0-20230315185526-52ccab3ef572", ) - go_repository( name = "com_github_go_test_deep", build_file_proto_mode = "disable_global", @@ -2474,7 +2361,6 @@ def go_dependencies(): sum = "h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=", version = "v0.0.0-20190211030409-01e6764cf0a4", ) - go_repository( name = "com_github_go_zookeeper_zk", build_file_proto_mode = "disable_global", @@ -2566,7 +2452,6 @@ def go_dependencies(): sum = "h1:tpom+2CJmpzAWj5/VEHync2rJGi+epHNIeRSWjzGA+4=", version = "v0.0.0-20190224160051-33c29581e754", ) - go_repository( name = "com_github_gobwas_glob", build_file_proto_mode = "disable_global", @@ -2599,10 +2484,9 @@ def go_dependencies(): name = "com_github_goccy_go_json", build_file_proto_mode = "disable_global", importpath = "github.com/goccy/go-json", - sum = "h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=", - version = "v0.9.11", + sum = "h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=", + version = "v0.10.2", ) - go_repository( name = "com_github_godbus_dbus_v5", build_file_proto_mode = "disable_global", @@ -2610,7 +2494,6 @@ def go_dependencies(): sum = "h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro=", version = "v5.0.6", ) - go_repository( name = "com_github_gofrs_flock", build_file_proto_mode = "disable_global", @@ -2688,13 +2571,12 @@ def go_dependencies(): sum = "h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=", version = "v0.0.0-20210211234256-740aa86cb551", ) - go_repository( name = "com_github_golang_glog", build_file_proto_mode = "disable_global", importpath = "github.com/golang/glog", - sum = "h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=", - version = "v1.1.0", + sum = "h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=", + version = "v1.1.2", ) go_repository( name = "com_github_golang_groupcache", @@ -2717,6 +2599,13 @@ def go_dependencies(): sum = "h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=", version = "v4.5.0", ) + go_repository( + name = "com_github_golang_jwt_jwt_v5", + build_file_proto_mode = "disable_global", + importpath = "github.com/golang-jwt/jwt/v5", + sum = "h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=", + version = "v5.0.0", + ) go_repository( name = "com_github_golang_lint", build_file_proto_mode = "disable_global", @@ -2725,7 +2614,6 @@ def go_dependencies(): sum = "h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE=", version = "v0.0.0-20191125180803-fdd1cda4f05f", ) - go_repository( name = "com_github_golang_mock", build_file_proto_mode = "disable_global", @@ -2761,7 +2649,6 @@ def go_dependencies(): sum = "h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=", version = "v0.1.0", ) - go_repository( name = "com_github_golangplus_bytes", build_file_proto_mode = "disable_global", @@ -2790,7 +2677,6 @@ def go_dependencies(): sum = "h1:/nNHAD99yipOEspQFbAnNmwGTZ1UNXiD/+JLxwx79fo=", version = "v0.2.0", ) - go_repository( name = "com_github_gomodule_redigo", build_file_proto_mode = "disable_global", @@ -2813,7 +2699,6 @@ def go_dependencies(): sum = "h1:s2151PDGy/eqpCI80/8dl4VL3xTkqI/YubXLXCFw0mw=", version = "v0.17.1", ) - go_repository( name = "com_github_google_certificate_transparency_go", build_file_proto_mode = "disable_global", @@ -2828,7 +2713,6 @@ def go_dependencies(): sum = "h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM=", version = "v2.0.8+incompatible", ) - go_repository( name = "com_github_google_gnostic", build_file_proto_mode = "disable_global", @@ -2864,7 +2748,6 @@ def go_dependencies(): sum = "h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI=", version = "v45.2.0", ) - go_repository( name = "com_github_google_go_github_v48", build_file_proto_mode = "disable_global", @@ -2879,15 +2762,13 @@ def go_dependencies(): sum = "h1:4pp/1tNMB9X/LuAhs5i0KQAE40NmiR/y6prLNb9x9cg=", version = "v55.0.0", ) - go_repository( name = "com_github_google_go_pkcs11", build_file_proto_mode = "disable_global", importpath = "github.com/google/go-pkcs11", - sum = "h1:5meDPB26aJ98f+K9G21f0AqZwo/S5BJMJh8nuhMbdsI=", - version = "v0.2.0", + sum = "h1:OF1IPgv+F4NmqmJ98KTjdN97Vs1JxDPB3vbmYzV2dpk=", + version = "v0.2.1-0.20230907215043-c6f79328ddf9", ) - go_repository( name = "com_github_google_go_querystring", build_file_proto_mode = "disable_global", @@ -2895,7 +2776,6 @@ def go_dependencies(): sum = "h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=", version = "v1.1.0", ) - go_repository( name = "com_github_google_gofuzz", build_file_proto_mode = "disable_global", @@ -2935,10 +2815,9 @@ def go_dependencies(): name = "com_github_google_s2a_go", build_file_proto_mode = "disable_global", importpath = "github.com/google/s2a-go", - sum = "h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=", - version = "v0.1.4", + sum = "h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=", + version = "v0.1.7", ) - go_repository( name = "com_github_google_shlex", build_file_proto_mode = "disable_global", @@ -2953,21 +2832,19 @@ def go_dependencies(): sum = "h1:iuModVoTuW2lBUobX9QBgqD+ipHbWKug6n8qkJfDtUE=", version = "v0.0.0-20190717100203-59c1163fd173", ) - go_repository( name = "com_github_google_uuid", build_file_proto_mode = "disable_global", importpath = "github.com/google/uuid", - sum = "h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=", - version = "v1.3.1", + sum = "h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=", + version = "v1.4.0", ) - go_repository( name = "com_github_googleapis_enterprise_certificate_proxy", build_file_proto_mode = "disable_global", importpath = "github.com/googleapis/enterprise-certificate-proxy", - sum = "h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=", - version = "v0.2.5", + sum = "h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=", + version = "v0.3.2", ) go_repository( name = "com_github_googleapis_gax_go", @@ -2976,7 +2853,6 @@ def go_dependencies(): sum = "h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU=", version = "v2.0.0+incompatible", ) - go_repository( name = "com_github_googleapis_gax_go_v2", build_file_proto_mode = "disable_global", @@ -2992,31 +2868,20 @@ def go_dependencies(): sum = "h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=", version = "v0.5.5", ) - go_repository( name = "com_github_googlecloudplatform_opentelemetry_operations_go_detectors_gcp", build_file_proto_mode = "disable_global", importpath = "github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp", - sum = "h1:/o9L4jKKshKO6U4q6e5oo0SkVtF5DDNLGK+liqsDt+w=", - version = "v1.16.1", + sum = "h1:tk85AYGwOf6VNtoOQi8w/kVDi2vmPxp3/OU2FsUpdcA=", + version = "v1.20.0", ) go_repository( name = "com_github_googlecloudplatform_opentelemetry_operations_go_exporter_metric", - build_directives = [ - # @go_googleapis is the modern version of @org_golang_google_genproto - # use @go_googleapis to avoid dependency conflicts between the two - "gazelle:resolve go google.golang.org/genproto/googleapis/api/metric @go_googleapis//google/api:metric_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api @go_googleapis//google/api:api_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/label @go_googleapis//google/api:label_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/monitoredres @go_googleapis//google/api:monitoredres_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric", sum = "h1:VahL5SjDdCas8mMKARolw2vvBsuLc5oV7XNSbxeMQP8=", version = "v0.41.0", ) - go_repository( name = "com_github_googlecloudplatform_opentelemetry_operations_go_exporter_trace", build_file_proto_mode = "disable_global", @@ -3038,7 +2903,6 @@ def go_dependencies(): sum = "h1:MWQ81b2TkSLbDpLINiKdZdoht1VMEHCKr4BSZpb/KQ8=", version = "v0.41.0", ) - go_repository( name = "com_github_gophercloud_gophercloud", build_file_proto_mode = "disable_global", @@ -3067,7 +2931,6 @@ def go_dependencies(): sum = "h1:vc7Dmrk4JwS0ZPS6WZvWlwDflgDTA26jItmbSj83nug=", version = "v0.0.0-20200309095847-7953dde2c7bf", ) - go_repository( name = "com_github_gorilla_context", build_file_proto_mode = "disable_global", @@ -3075,7 +2938,6 @@ def go_dependencies(): sum = "h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=", version = "v1.1.1", ) - go_repository( name = "com_github_gorilla_css", build_file_proto_mode = "disable_global", @@ -3125,7 +2987,6 @@ def go_dependencies(): sum = "h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=", version = "v1.2.1", ) - go_repository( name = "com_github_gorilla_websocket", build_file_proto_mode = "disable_global", @@ -3147,7 +3008,6 @@ def go_dependencies(): sum = "h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=", version = "v1.0.1", ) - go_repository( name = "com_github_goware_urlx", build_file_proto_mode = "disable_global", @@ -3155,7 +3015,6 @@ def go_dependencies(): sum = "h1:BbvKl8oiXtJAzOzMqAQ0GfIhf96fKeNEZfm9ocNSUBI=", version = "v0.3.1", ) - go_repository( name = "com_github_grafana_regexp", build_file_proto_mode = "disable_global", @@ -3198,7 +3057,6 @@ def go_dependencies(): sum = "h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=", version = "v1.3.0", ) - go_repository( name = "com_github_grpc_ecosystem_go_grpc_middleware_providers_prometheus", build_file_proto_mode = "disable_global", @@ -3206,7 +3064,6 @@ def go_dependencies(): sum = "h1:mdLirNAJBxnGgyB6pjZLcs6ue/6eZGBui6gXspfq4ks=", version = "v1.0.0-rc.0", ) - go_repository( name = "com_github_grpc_ecosystem_go_grpc_middleware_v2", build_file_proto_mode = "disable_global", @@ -3214,7 +3071,6 @@ def go_dependencies(): sum = "h1:2cz5kSrxzMYHiWOBbKj8itQm+nRykkB8aMv4ThcHYHA=", version = "v2.0.0", ) - go_repository( name = "com_github_grpc_ecosystem_go_grpc_prometheus", build_file_proto_mode = "disable_global", @@ -3222,7 +3078,6 @@ def go_dependencies(): sum = "h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=", version = "v1.2.0", ) - go_repository( name = "com_github_grpc_ecosystem_grpc_gateway", build_file_proto_mode = "disable_global", @@ -3234,12 +3089,9 @@ def go_dependencies(): name = "com_github_grpc_ecosystem_grpc_gateway_v2", build_file_proto_mode = "disable_global", importpath = "github.com/grpc-ecosystem/grpc-gateway/v2", - patch_args = ["-p1"], - patches = ["//third_party/com_github_grpc_ecosystem_grpc_gateway_v2:grpc_gateway.patch"], - sum = "h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=", - version = "v2.16.0", + sum = "h1:RoziI+96HlQWrbaVhgOOdFYUHtX81pwA6tCgDS9FNRo=", + version = "v2.16.1", ) - go_repository( name = "com_github_hanwen_go_fuse_v2", build_file_proto_mode = "disable_global", @@ -3247,7 +3099,6 @@ def go_dependencies(): sum = "h1:ibbzF2InxMOS+lLCphY9PHNKPURDUBNKaG6ErSq8gJQ=", version = "v2.1.1-0.20220112183258-f57e95bda82d", ) - go_repository( name = "com_github_hashicorp_consul_api", build_file_proto_mode = "disable_global", @@ -3262,7 +3113,6 @@ def go_dependencies(): sum = "h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU=", version = "v0.8.0", ) - go_repository( name = "com_github_hashicorp_cronexpr", build_file_proto_mode = "disable_global", @@ -3277,7 +3127,6 @@ def go_dependencies(): sum = "h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=", version = "v1.1.0", ) - go_repository( name = "com_github_hashicorp_go_cleanhttp", build_file_proto_mode = "disable_global", @@ -3289,8 +3138,8 @@ def go_dependencies(): name = "com_github_hashicorp_go_hclog", build_file_proto_mode = "disable_global", importpath = "github.com/hashicorp/go-hclog", - sum = "h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=", - version = "v0.16.2", + sum = "h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=", + version = "v1.2.0", ) go_repository( name = "com_github_hashicorp_go_immutable_radix", @@ -3327,7 +3176,6 @@ def go_dependencies(): sum = "h1:4OtAfUGbnKC6yS48p0CtMX2oFYtzFZVv6rok3cRWgnE=", version = "v1.0.1", ) - go_repository( name = "com_github_hashicorp_go_retryablehttp", build_file_proto_mode = "disable_global", @@ -3349,7 +3197,6 @@ def go_dependencies(): sum = "h1:lYhmKXXonP4KGSz3JBmks6YpDRjP1cMA/yvcoPxoNw8=", version = "v0.12.1", ) - go_repository( name = "com_github_hashicorp_go_sockaddr", build_file_proto_mode = "disable_global", @@ -3371,7 +3218,6 @@ def go_dependencies(): sum = "h1:5G84t70g70xWK5U0WaYb8wLfbC5fR6dvawqCkmMN5X0=", version = "v1.32.1", ) - go_repository( name = "com_github_hashicorp_go_uuid", build_file_proto_mode = "disable_global", @@ -3379,7 +3225,6 @@ def go_dependencies(): sum = "h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=", version = "v1.0.3", ) - go_repository( name = "com_github_hashicorp_go_version", build_file_proto_mode = "disable_global", @@ -3401,7 +3246,6 @@ def go_dependencies(): sum = "h1:Dwmkdr5Nc/oBiXgJS3CDHNhJtIHkuZ3DZF5twqnfBdU=", version = "v2.0.2", ) - go_repository( name = "com_github_hashicorp_hcl", build_file_proto_mode = "disable_global", @@ -3416,7 +3260,6 @@ def go_dependencies(): sum = "h1:9ARUJJ1VVynB176G1HCwleORqCaXm/Vx0uUi0dL26I0=", version = "v0.0.0-20210826224640-ee7dae0fb22d", ) - go_repository( name = "com_github_hashicorp_logutils", build_file_proto_mode = "disable_global", @@ -3438,7 +3281,6 @@ def go_dependencies(): sum = "h1:8+567mCcFDnS5ADl7lrpxPMWiFCElyUEeW0gtj34fMA=", version = "v0.3.0", ) - go_repository( name = "com_github_hashicorp_nomad_api", build_file_proto_mode = "disable_global", @@ -3474,7 +3316,6 @@ def go_dependencies(): sum = "h1:Zj6fR5wnpOHnJUmLyWozjMeDaVuE+cstMPj41/eKmSQ=", version = "v0.0.1", ) - go_repository( name = "com_github_hashicorp_vault_api", build_file_proto_mode = "disable_global", @@ -3503,7 +3344,6 @@ def go_dependencies(): sum = "h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=", version = "v1.1.2", ) - go_repository( name = "com_github_hetznercloud_hcloud_go", build_file_proto_mode = "disable_global", @@ -3525,7 +3365,6 @@ def go_dependencies(): sum = "h1:5s9J6CROngFPkgowSkV20bIflBrImSdDqIpoXJeZSkU=", version = "v2.1.0", ) - go_repository( name = "com_github_hexops_gotextdiff", build_file_proto_mode = "disable_global", @@ -3554,7 +3393,6 @@ def go_dependencies(): sum = "h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs=", version = "v4.0.0", ) - go_repository( name = "com_github_honeycombio_libhoney_go", build_file_proto_mode = "disable_global", @@ -3562,7 +3400,6 @@ def go_dependencies(): sum = "h1:TECEltZ48K6J4NG1JVYqmi0vCJNnHYooFor83fgKesA=", version = "v1.15.8", ) - go_repository( name = "com_github_hpcloud_tail", build_file_proto_mode = "disable_global", @@ -3591,7 +3428,6 @@ def go_dependencies(): sum = "h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA=", version = "v0.2.0", ) - go_repository( name = "com_github_iancoleman_strcase", build_file_proto_mode = "disable_global", @@ -3613,7 +3449,6 @@ def go_dependencies(): sum = "h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=", version = "v0.3.16", ) - go_repository( name = "com_github_in_toto_in_toto_golang", build_file_proto_mode = "disable_global", @@ -3621,7 +3456,6 @@ def go_dependencies(): sum = "h1:hb8bgwr0M2hGdDsLjkJ3ZqJ8JFLL/tgYdAxF/XEFBbY=", version = "v0.5.0", ) - go_repository( name = "com_github_inconshreveable_log15", build_file_proto_mode = "disable_global", @@ -3629,7 +3463,6 @@ def go_dependencies(): sum = "h1:n1DqxAo4oWPMvH1+v+DLYlMCecgumhhgnxAPdqDIFHI=", version = "v0.0.0-20201112154412-8562bdadbbac", ) - go_repository( name = "com_github_inconshreveable_mousetrap", build_file_proto_mode = "disable_global", @@ -3637,7 +3470,6 @@ def go_dependencies(): sum = "h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=", version = "v1.1.0", ) - go_repository( name = "com_github_invopop_jsonschema", build_file_proto_mode = "disable_global", @@ -3645,7 +3477,6 @@ def go_dependencies(): sum = "h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy770So=", version = "v0.7.0", ) - go_repository( name = "com_github_ionos_cloud_sdk_go_v6", build_file_proto_mode = "disable_global", @@ -3653,7 +3484,6 @@ def go_dependencies(): sum = "h1:vb6yqdpiqaytvreM0bsn2pXw+1YDvEk2RKSmBAQvgDQ=", version = "v6.1.3", ) - go_repository( name = "com_github_iris_contrib_schema", build_file_proto_mode = "disable_global", @@ -3661,7 +3491,6 @@ def go_dependencies(): sum = "h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw=", version = "v0.0.6", ) - go_repository( name = "com_github_itchyny_gojq", build_file_proto_mode = "disable_global", @@ -3676,7 +3505,6 @@ def go_dependencies(): sum = "h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=", version = "v0.1.5", ) - go_repository( name = "com_github_jackc_chunkreader", build_file_proto_mode = "disable_global", @@ -3695,8 +3523,8 @@ def go_dependencies(): name = "com_github_jackc_pgconn", build_file_proto_mode = "disable_global", importpath = "github.com/jackc/pgconn", - sum = "h1:rsDFzIpRk7xT4B8FufgpCCeyjdNpKyghZeSefViE5W8=", - version = "v1.12.1", + sum = "h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q=", + version = "v1.14.0", ) go_repository( name = "com_github_jackc_pgerrcode", @@ -3705,7 +3533,6 @@ def go_dependencies(): sum = "h1:s+4MhCQ6YrzisK6hFJUX53drDT4UsSW3DEhKn0ifuHw=", version = "v0.0.0-20220416144525-469b46aa5efa", ) - go_repository( name = "com_github_jackc_pgio", build_file_proto_mode = "disable_global", @@ -3738,38 +3565,51 @@ def go_dependencies(): name = "com_github_jackc_pgproto3_v2", build_file_proto_mode = "disable_global", importpath = "github.com/jackc/pgproto3/v2", - sum = "h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y=", - version = "v2.3.0", + sum = "h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0=", + version = "v2.3.2", ) go_repository( name = "com_github_jackc_pgservicefile", build_file_proto_mode = "disable_global", importpath = "github.com/jackc/pgservicefile", - sum = "h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=", - version = "v0.0.0-20200714003250-2b9c44734f2b", + sum = "h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=", + version = "v0.0.0-20221227161230-091c0ba34f0a", ) go_repository( name = "com_github_jackc_pgtype", build_file_proto_mode = "disable_global", importpath = "github.com/jackc/pgtype", - sum = "h1:MRSWOsXwvdLExF8roCltbid5ADD917dy1S3fgI+OHVE=", - version = "v1.11.1-0.20220425133820-53266f029fbb", + sum = "h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=", + version = "v1.14.0", ) go_repository( name = "com_github_jackc_pgx_v4", build_file_proto_mode = "disable_global", importpath = "github.com/jackc/pgx/v4", - sum = "h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y=", - version = "v4.16.1", + sum = "h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=", + version = "v4.18.1", + ) + go_repository( + name = "com_github_jackc_pgx_v5", + build_file_proto_mode = "disable_global", + importpath = "github.com/jackc/pgx/v5", + sum = "h1:NxstgwndsTRy7eq9/kqYc/BZh5w2hHJV86wjvO+1xPw=", + version = "v5.5.0", ) go_repository( name = "com_github_jackc_puddle", build_file_proto_mode = "disable_global", importpath = "github.com/jackc/puddle", - sum = "h1:gI8os0wpRXFd4FiAY2dWiqRK037tjj3t7rKFeO4X5iw=", - version = "v1.2.1", + sum = "h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=", + version = "v1.3.0", + ) + go_repository( + name = "com_github_jackc_puddle_v2", + build_file_proto_mode = "disable_global", + importpath = "github.com/jackc/puddle/v2", + sum = "h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=", + version = "v2.2.1", ) - go_repository( name = "com_github_jaytaylor_html2text", build_file_proto_mode = "disable_global", @@ -3784,7 +3624,6 @@ def go_dependencies(): sum = "h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=", version = "v0.0.0-20150711004518-d14ea06fba99", ) - go_repository( name = "com_github_jdxcode_netrc", build_file_proto_mode = "disable_global", @@ -3792,7 +3631,6 @@ def go_dependencies(): sum = "h1:d4+I1YEKVmWZrgkt6jpXBnLgV2ZjO0YxEtLDdfIZfH4=", version = "v0.0.0-20210204082910-926c7f70242a", ) - go_repository( name = "com_github_jessevdk_go_flags", build_file_proto_mode = "disable_global", @@ -3800,7 +3638,6 @@ def go_dependencies(): sum = "h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=", version = "v1.5.0", ) - go_repository( name = "com_github_jhump_gopoet", build_file_proto_mode = "disable_global", @@ -3829,7 +3666,20 @@ def go_dependencies(): sum = "h1:uFlcJKZPLQd7rmOY/RrvBuUaYmAFnlFHKLivhO6cOy8=", version = "v1.12.1-0.20220417024638-438db461d753", ) - + go_repository( + name = "com_github_jinzhu_inflection", + build_file_proto_mode = "disable_global", + importpath = "github.com/jinzhu/inflection", + sum = "h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=", + version = "v1.0.0", + ) + go_repository( + name = "com_github_jinzhu_now", + build_file_proto_mode = "disable_global", + importpath = "github.com/jinzhu/now", + sum = "h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=", + version = "v1.1.5", + ) go_repository( name = "com_github_jmespath_go_jmespath", build_file_proto_mode = "disable_global", @@ -3844,7 +3694,6 @@ def go_dependencies(): sum = "h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=", version = "v1.5.1", ) - go_repository( name = "com_github_johncgriffin_overflow", build_file_proto_mode = "disable_global", @@ -3852,7 +3701,6 @@ def go_dependencies(): sum = "h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=", version = "v0.0.0-20211019200055-46fa312c352c", ) - go_repository( name = "com_github_joho_godotenv", build_file_proto_mode = "disable_global", @@ -3860,7 +3708,6 @@ def go_dependencies(): sum = "h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=", version = "v1.4.0", ) - go_repository( name = "com_github_joker_jade", build_file_proto_mode = "disable_global", @@ -3868,7 +3715,6 @@ def go_dependencies(): sum = "h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk=", version = "v1.1.3", ) - go_repository( name = "com_github_jonboulle_clockwork", build_file_proto_mode = "disable_global", @@ -3883,7 +3729,6 @@ def go_dependencies(): sum = "h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=", version = "v4.0.1-0.20210109023952-943e75fe5223+incompatible", ) - go_repository( name = "com_github_josharian_intern", build_file_proto_mode = "disable_global", @@ -3919,7 +3764,6 @@ def go_dependencies(): sum = "h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=", version = "v4.20.0+incompatible", ) - go_repository( name = "com_github_julienschmidt_httprouter", build_file_proto_mode = "disable_global", @@ -3927,7 +3771,6 @@ def go_dependencies(): sum = "h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=", version = "v1.3.0", ) - go_repository( name = "com_github_k0kubun_go_ansi", build_file_proto_mode = "disable_global", @@ -3935,7 +3778,6 @@ def go_dependencies(): sum = "h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg=", version = "v0.0.0-20180517002512-3bf9e2903213", ) - go_repository( name = "com_github_k0kubun_pp_v3", build_file_proto_mode = "disable_global", @@ -3978,7 +3820,6 @@ def go_dependencies(): sum = "h1:cF3RDY/vxnSRezc7vLFlQFTYXG/yAr1o7WImJuZbzC4=", version = "v0.0.7", ) - go_repository( name = "com_github_kataras_golog", build_file_proto_mode = "disable_global", @@ -3993,7 +3834,6 @@ def go_dependencies(): sum = "h1:WzDY5nGuW/LgVaFS5BtTkW3crdSKJ/FEgWnxPnIVVLI=", version = "v12.2.0", ) - go_repository( name = "com_github_kataras_pio", build_file_proto_mode = "disable_global", @@ -4057,7 +3897,6 @@ def go_dependencies(): sum = "h1:AQgYHURDOmnVJ62jnEk0W/7yFKEn+Lv8RHN6t7mB0Zo=", version = "v1.0.0", ) - go_repository( name = "com_github_keybase_go_crypto", build_file_proto_mode = "disable_global", @@ -4072,7 +3911,6 @@ def go_dependencies(): sum = "h1:TMZJ+tl/BpbmGyIBiXzKzUftDhw4ZWxQZ+1ydn0gyII=", version = "v0.5.0", ) - go_repository( name = "com_github_kisielk_errcheck", build_file_proto_mode = "disable_global", @@ -4094,7 +3932,6 @@ def go_dependencies(): sum = "h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=", version = "v1.3.2", ) - go_repository( name = "com_github_klauspost_compress", build_file_proto_mode = "disable_global", @@ -4102,7 +3939,6 @@ def go_dependencies(): sum = "h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=", version = "v1.16.7", ) - go_repository( name = "com_github_klauspost_cpuid_v2", build_file_proto_mode = "disable_global", @@ -4110,7 +3946,6 @@ def go_dependencies(): sum = "h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=", version = "v2.2.4", ) - go_repository( name = "com_github_klauspost_pgzip", build_file_proto_mode = "disable_global", @@ -4153,7 +3988,6 @@ def go_dependencies(): sum = "h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=", version = "v2.0.1", ) - go_repository( name = "com_github_kolo_xmlrpc", build_file_proto_mode = "disable_global", @@ -4168,7 +4002,6 @@ def go_dependencies(): sum = "h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=", version = "v1.0.2", ) - go_repository( name = "com_github_kr_fs", build_file_proto_mode = "disable_global", @@ -4183,7 +4016,6 @@ def go_dependencies(): sum = "h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=", version = "v0.0.0-20140226030751-b84e30acd515", ) - go_repository( name = "com_github_kr_pretty", build_file_proto_mode = "disable_global", @@ -4212,7 +4044,6 @@ def go_dependencies(): sum = "h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=", version = "v1.1.0", ) - go_repository( name = "com_github_labstack_echo_v4", build_file_proto_mode = "disable_global", @@ -4248,7 +4079,6 @@ def go_dependencies(): sum = "h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis=", version = "v0.2.1", ) - go_repository( name = "com_github_linode_linodego", build_file_proto_mode = "disable_global", @@ -4256,7 +4086,6 @@ def go_dependencies(): sum = "h1:+lxNZw4avRxhCqGjwfPgQ2PvMT+vOL0OMsTdzixR7hQ=", version = "v1.9.3", ) - go_repository( name = "com_github_logrusorgru_aurora_v3", build_file_proto_mode = "disable_global", @@ -4264,7 +4093,6 @@ def go_dependencies(): sum = "h1:R6zcoZZbvVcGMvDCKo45A9U/lzYyzl5NfYIvznmDfE4=", version = "v3.0.0", ) - go_repository( name = "com_github_lucasb_eyer_go_colorful", build_file_proto_mode = "disable_global", @@ -4286,7 +4114,6 @@ def go_dependencies(): sum = "h1:/3+/2sWyXeMLzKd1bX+ixWKgEMsULrIivpDsuaF441o=", version = "v2.0.3", ) - go_repository( name = "com_github_machinebox_graphql", build_file_proto_mode = "disable_global", @@ -4294,7 +4121,6 @@ def go_dependencies(): sum = "h1:dWKpJligYKhYKO5A2gvNhkJdQMNZeChZYyBbrZkBZfo=", version = "v0.2.2", ) - go_repository( name = "com_github_magiconair_properties", build_file_proto_mode = "disable_global", @@ -4309,7 +4135,6 @@ def go_dependencies(): sum = "h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqACtjw=", version = "v2.0.48", ) - go_repository( name = "com_github_mailru_easyjson", build_file_proto_mode = "disable_global", @@ -4317,7 +4142,6 @@ def go_dependencies(): sum = "h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=", version = "v0.7.7", ) - go_repository( name = "com_github_markbates_going", build_file_proto_mode = "disable_global", @@ -4346,7 +4170,6 @@ def go_dependencies(): sum = "h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI=", version = "v1.0.1", ) - go_repository( name = "com_github_masterminds_goutils", build_file_proto_mode = "disable_global", @@ -4354,7 +4177,6 @@ def go_dependencies(): sum = "h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=", version = "v1.1.1", ) - go_repository( name = "com_github_masterminds_semver", build_file_proto_mode = "disable_global", @@ -4369,7 +4191,6 @@ def go_dependencies(): sum = "h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=", version = "v3.2.1", ) - go_repository( name = "com_github_masterminds_sprig", build_file_proto_mode = "disable_global", @@ -4384,7 +4205,6 @@ def go_dependencies(): sum = "h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=", version = "v3.2.2", ) - go_repository( name = "com_github_matryer_is", build_file_proto_mode = "disable_global", @@ -4399,7 +4219,6 @@ def go_dependencies(): sum = "h1:Q06vEqnBYjjfx5KKgHfYRKE/lvlRu+Nj+xodG4YdHnU=", version = "v0.2.3", ) - go_repository( name = "com_github_mattermost_xml_roundtrip_validator", build_file_proto_mode = "disable_global", @@ -4407,7 +4226,6 @@ def go_dependencies(): sum = "h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU=", version = "v0.1.0", ) - go_repository( name = "com_github_mattn_go_colorable", build_file_proto_mode = "disable_global", @@ -4415,7 +4233,6 @@ def go_dependencies(): sum = "h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=", version = "v0.1.13", ) - go_repository( name = "com_github_mattn_go_isatty", build_file_proto_mode = "disable_global", @@ -4430,7 +4247,6 @@ def go_dependencies(): sum = "h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=", version = "v0.0.14", ) - go_repository( name = "com_github_mattn_go_sqlite3", build_file_proto_mode = "disable_global", @@ -4438,7 +4254,6 @@ def go_dependencies(): sum = "h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=", version = "v1.14.16", ) - go_repository( name = "com_github_matttproud_golang_protobuf_extensions", build_file_proto_mode = "disable_global", @@ -4446,7 +4261,6 @@ def go_dependencies(): sum = "h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=", version = "v1.0.4", ) - go_repository( name = "com_github_mcuadros_go_version", build_file_proto_mode = "disable_global", @@ -4454,7 +4268,6 @@ def go_dependencies(): sum = "h1:YocNLcTBdEdvY3iDK6jfWXvEaM5OCKkjxPKoJRdB3Gg=", version = "v0.0.0-20190830083331-035f6764e8d2", ) - go_repository( name = "com_github_mholt_acmez", build_file_proto_mode = "disable_global", @@ -4469,7 +4282,6 @@ def go_dependencies(): sum = "h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo=", version = "v3.5.1", ) - go_repository( name = "com_github_microcosm_cc_bluemonday", build_file_proto_mode = "disable_global", @@ -4477,6 +4289,13 @@ def go_dependencies(): sum = "h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=", version = "v1.0.23", ) + go_repository( + name = "com_github_microsoft_go_mssqldb", + build_file_proto_mode = "disable_global", + importpath = "github.com/microsoft/go-mssqldb", + sum = "h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67NNNpc=", + version = "v1.6.0", + ) go_repository( name = "com_github_microsoft_go_winio", build_file_proto_mode = "disable_global", @@ -4491,7 +4310,6 @@ def go_dependencies(): sum = "h1:lf7xxK2+Ikbj9sVf2QZsouGjRjEp2STj1yDHgoVtU5k=", version = "v0.9.8", ) - go_repository( name = "com_github_miekg_dns", build_file_proto_mode = "disable_global", @@ -4499,7 +4317,6 @@ def go_dependencies(): sum = "h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=", version = "v1.1.50", ) - go_repository( name = "com_github_minio_asm2plan9s", build_file_proto_mode = "disable_global", @@ -4514,7 +4331,6 @@ def go_dependencies(): sum = "h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=", version = "v0.0.0-20190812172519-36a3d3bbc4f3", ) - go_repository( name = "com_github_minio_md5_simd", build_file_proto_mode = "disable_global", @@ -4536,7 +4352,6 @@ def go_dependencies(): sum = "h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=", version = "v1.0.0", ) - go_repository( name = "com_github_mitchellh_cli", build_file_proto_mode = "disable_global", @@ -4551,7 +4366,6 @@ def go_dependencies(): sum = "h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=", version = "v0.0.0-20190213212951-d06e56a500db", ) - go_repository( name = "com_github_mitchellh_copystructure", build_file_proto_mode = "disable_global", @@ -4566,7 +4380,6 @@ def go_dependencies(): sum = "h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=", version = "v1.1.0", ) - go_repository( name = "com_github_mitchellh_go_testing_interface", build_file_proto_mode = "disable_global", @@ -4574,7 +4387,6 @@ def go_dependencies(): sum = "h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=", version = "v1.0.0", ) - go_repository( name = "com_github_mitchellh_go_wordwrap", build_file_proto_mode = "disable_global", @@ -4603,7 +4415,6 @@ def go_dependencies(): sum = "h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=", version = "v2.0.2", ) - go_repository( name = "com_github_mitchellh_iochan", build_file_proto_mode = "disable_global", @@ -4611,7 +4422,6 @@ def go_dependencies(): sum = "h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=", version = "v1.0.0", ) - go_repository( name = "com_github_mitchellh_mapstructure", build_file_proto_mode = "disable_global", @@ -4626,7 +4436,6 @@ def go_dependencies(): sum = "h1:2+myh5ml7lgEU/51gbeLHfKGNfgEQQIWrlbdaOsidbQ=", version = "v0.0.0-20151018003038-5e2d6d41470f", ) - go_repository( name = "com_github_mitchellh_reflectwalk", build_file_proto_mode = "disable_global", @@ -4641,7 +4450,6 @@ def go_dependencies(): sum = "h1:nAco9/aI9Lg2kiuROBY6BhCI/z0t5jEvJfjWbL8qXLU=", version = "v0.5.0", ) - go_repository( name = "com_github_moby_buildkit", build_file_proto_mode = "disable_global", @@ -4663,7 +4471,6 @@ def go_dependencies(): sum = "h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=", version = "v0.5.0", ) - go_repository( name = "com_github_moby_spdystream", build_file_proto_mode = "disable_global", @@ -4699,7 +4506,6 @@ def go_dependencies(): sum = "h1:25RW3d5TnQEoKvRbEKUGay6DCQ46IxAVTT9CUMgmsSI=", version = "v0.7.0", ) - go_repository( name = "com_github_moby_term", build_file_proto_mode = "disable_global", @@ -4739,10 +4545,9 @@ def go_dependencies(): name = "com_github_montanaflynn_stats", build_file_proto_mode = "disable_global", importpath = "github.com/montanaflynn/stats", - sum = "h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=", - version = "v0.0.0-20171201202039-1bf9dbcd8cbe", + sum = "h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU=", + version = "v0.7.0", ) - go_repository( name = "com_github_morikuni_aec", build_file_proto_mode = "disable_global", @@ -4757,7 +4562,6 @@ def go_dependencies(): sum = "h1:KJzRFSYPXlcoYjG5/xLZB8tpuOyWF2UnlW4tAuaWnfI=", version = "v1.2.0", ) - go_repository( name = "com_github_mpvl_unique", build_file_proto_mode = "disable_global", @@ -4779,7 +4583,6 @@ def go_dependencies(): sum = "h1:zrEVDIaau/E4QLOKu02kpg8T8myweFlMGikIgbIdrRA=", version = "v2.0.1", ) - go_repository( name = "com_github_mschoch_smat", build_file_proto_mode = "disable_global", @@ -4794,7 +4597,6 @@ def go_dependencies(): sum = "h1:VhLun/0n0kQYxiRBJJvVpC2jR6d21SWJFjpvUVj20Kc=", version = "v1.1.0", ) - go_repository( name = "com_github_muesli_reflow", build_file_proto_mode = "disable_global", @@ -4837,7 +4639,6 @@ def go_dependencies(): sum = "h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=", version = "v0.0.0-20140419014527-cca7078d478f", ) - go_repository( name = "com_github_ncw_swift", build_file_proto_mode = "disable_global", @@ -4859,7 +4660,6 @@ def go_dependencies(): sum = "h1:bY6ktFuJkt+ZXkX0RChQch2FtHpWQLVS8Qo1YasiIVk=", version = "v0.0.0-20200213170602-2833bce08e4c", ) - go_repository( name = "com_github_nfnt_resize", build_file_proto_mode = "disable_global", @@ -4867,7 +4667,6 @@ def go_dependencies(): sum = "h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=", version = "v0.0.0-20180221191011-83c6a9932646", ) - go_repository( name = "com_github_niemeyer_pretty", build_file_proto_mode = "disable_global", @@ -4896,7 +4695,6 @@ def go_dependencies(): sum = "h1:3f0nxAmdj/VoCGN/ijdMy7bj6SBagaqYg1B0hu8clMA=", version = "v0.0.0-20200524104333-86fad755b4d3", ) - go_repository( name = "com_github_npillmayer_nestext", build_file_proto_mode = "disable_global", @@ -4925,7 +4723,6 @@ def go_dependencies(): sum = "h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=", version = "v1.4.8", ) - go_repository( name = "com_github_nytimes_gziphandler", build_file_proto_mode = "disable_global", @@ -4933,7 +4730,6 @@ def go_dependencies(): sum = "h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=", version = "v1.1.1", ) - go_repository( name = "com_github_oklog_run", build_file_proto_mode = "disable_global", @@ -4976,7 +4772,6 @@ def go_dependencies(): sum = "h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E=", version = "v7.0.32", ) - go_repository( name = "com_github_oneofone_xxhash", build_file_proto_mode = "disable_global", @@ -4998,7 +4793,6 @@ def go_dependencies(): sum = "h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=", version = "v2.9.7", ) - go_repository( name = "com_github_onsi_gomega", build_file_proto_mode = "disable_global", @@ -5006,7 +4800,6 @@ def go_dependencies(): sum = "h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=", version = "v1.27.8", ) - go_repository( name = "com_github_opencontainers_go_digest", build_file_proto_mode = "disable_global", @@ -5035,7 +4828,6 @@ def go_dependencies(): sum = "h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc=", version = "v1.0.3-0.20210326190908-1c3f411f0417", ) - go_repository( name = "com_github_opencontainers_selinux", build_file_proto_mode = "disable_global", @@ -5060,7 +4852,6 @@ def go_dependencies(): sum = "h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=", version = "v1.2.0", ) - go_repository( name = "com_github_opsgenie_opsgenie_go_sdk_v2", build_file_proto_mode = "disable_global", @@ -5068,7 +4859,13 @@ def go_dependencies(): sum = "h1:nV98dkBpqaYbDnhefmOQ+Rn4hE+jD6AtjYHXaU5WyJI=", version = "v1.2.13", ) - + go_repository( + name = "com_github_oschwald_maxminddb_golang", + build_file_proto_mode = "disable_global", + importpath = "github.com/oschwald/maxminddb-golang", + sum = "h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=", + version = "v1.12.0", + ) go_repository( name = "com_github_ovh_go_ovh", build_file_proto_mode = "disable_global", @@ -5083,7 +4880,6 @@ def go_dependencies(): sum = "h1:DiLBVp4DAcZlBVBEtJpNWZpZVq0AEeCY7Hqk8URVs4o=", version = "v0.1.1-0.20220428063043-89078438f170", ) - go_repository( name = "com_github_pandatix_go_cvss", build_file_proto_mode = "disable_global", @@ -5091,7 +4887,6 @@ def go_dependencies(): sum = "h1:9441i+Sn/P/TP9kNBl3kI7mwYtNYFr1eN8JdsiybiMM=", version = "v0.5.2", ) - go_repository( name = "com_github_pascaldekloe_goe", build_file_proto_mode = "disable_global", @@ -5106,7 +4901,6 @@ def go_dependencies(): sum = "h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=", version = "v1.2.0", ) - go_repository( name = "com_github_pelletier_go_toml", build_file_proto_mode = "disable_global", @@ -5149,7 +4943,6 @@ def go_dependencies(): sum = "h1:s2+RH8EGuI/mI4QwrWGSYQCRz7uNgip9BaM04HKu5kc=", version = "v1.1.0", ) - go_repository( name = "com_github_pierrec_lz4", build_file_proto_mode = "disable_global", @@ -5157,7 +4950,6 @@ def go_dependencies(): sum = "h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=", version = "v2.0.5+incompatible", ) - go_repository( name = "com_github_pierrec_lz4_v4", build_file_proto_mode = "disable_global", @@ -5165,7 +4957,6 @@ def go_dependencies(): sum = "h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=", version = "v4.1.17", ) - go_repository( name = "com_github_pingcap_errors", build_file_proto_mode = "disable_global", @@ -5180,7 +4971,6 @@ def go_dependencies(): sum = "h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=", version = "v0.3.0", ) - go_repository( name = "com_github_pkg_browser", build_file_proto_mode = "disable_global", @@ -5224,7 +5014,6 @@ def go_dependencies(): sum = "h1:Wu8W50qCMC+BYoBQY/wTPt0QNglXF/IO3zljM+LKuNM=", version = "v0.0.0-20230905173153-caab340cf008", ) - go_repository( name = "com_github_pmezard_go_difflib", build_file_proto_mode = "disable_global", @@ -5267,7 +5056,6 @@ def go_dependencies(): sum = "h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=", version = "v1.1.0", ) - go_repository( name = "com_github_prometheus_alertmanager", build_file_proto_mode = "disable_global", @@ -5287,8 +5075,8 @@ def go_dependencies(): name = "com_github_prometheus_client_model", build_file_proto_mode = "disable_global", importpath = "github.com/prometheus/client_model", - sum = "h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=", - version = "v0.4.0", + sum = "h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=", + version = "v0.5.0", ) go_repository( name = "com_github_prometheus_common", @@ -5323,8 +5111,8 @@ def go_dependencies(): name = "com_github_prometheus_procfs", build_file_proto_mode = "disable_global", importpath = "github.com/prometheus/procfs", - sum = "h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk=", - version = "v0.11.0", + sum = "h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=", + version = "v0.11.1", ) go_repository( name = "com_github_prometheus_prometheus", @@ -5361,7 +5149,6 @@ def go_dependencies(): sum = "h1:vV3RryLxt42+ZIVOFbYJCH1jsZNTNmj2NYru5zfx+4E=", version = "v0.0.0-20230626094100-7e9e0395ebec", ) - go_repository( name = "com_github_pseudomuto_protoc_gen_doc", build_file_proto_mode = "disable_global", @@ -5383,7 +5170,6 @@ def go_dependencies(): sum = "h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U=", version = "v1.8.0", ) - go_repository( name = "com_github_puerkitobio_purell", build_file_proto_mode = "disable_global", @@ -5398,7 +5184,6 @@ def go_dependencies(): sum = "h1:JFZ7OeK+hbJpTxhNB0NDZT47AuXqCU0Smxfjtph7/Rs=", version = "v1.1.0", ) - go_repository( name = "com_github_puerkitobio_urlesc", build_file_proto_mode = "disable_global", @@ -5413,7 +5198,6 @@ def go_dependencies(): sum = "h1:kh5B4yWjrd5BcynJoA4014mZlI/j6++inCMMQoKUOtI=", version = "v1.4.1", ) - go_repository( name = "com_github_quasoft_websspi", build_file_proto_mode = "disable_global", @@ -5445,7 +5229,6 @@ def go_dependencies(): sum = "h1:B4Y0XJQiPjpwYmkH55aratKX1VfR+JRqzmDKyZbC99o=", version = "v3.1.2", ) - go_repository( name = "com_github_rainycape_unidecode", build_file_proto_mode = "disable_global", @@ -5467,7 +5250,6 @@ def go_dependencies(): sum = "h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=", version = "v0.0.0-20230129092748-24d4a6f8daec", ) - go_repository( name = "com_github_rhnvrm_simples3", build_file_proto_mode = "disable_global", @@ -5475,7 +5257,6 @@ def go_dependencies(): sum = "h1:H0DJwybR6ryQE+Odi9eqkHuzjYAeJgtGcGtuBwOhsH8=", version = "v0.6.1", ) - go_repository( name = "com_github_rivo_uniseg", build_file_proto_mode = "disable_global", @@ -5497,7 +5278,6 @@ def go_dependencies(): sum = "h1:aQmu9zQxDU0uhwR8SXOH/OrqEf+X8A0LQmwW3JX8Lcg=", version = "v1.3.0", ) - go_repository( name = "com_github_rogpeppe_fastuuid", build_file_proto_mode = "disable_global", @@ -5533,7 +5313,6 @@ def go_dependencies(): sum = "h1:uPRuwkWF4J6fGsJ2R0Gn2jB1EQiav9k3S6CSdygQJXY=", version = "v1.15.0", ) - go_repository( name = "com_github_russellhaering_gosaml2", build_file_proto_mode = "disable_global", @@ -5563,7 +5342,6 @@ def go_dependencies(): sum = "h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=", version = "v2.1.0", ) - go_repository( name = "com_github_ryanuber_columnize", build_file_proto_mode = "disable_global", @@ -5585,7 +5363,6 @@ def go_dependencies(): sum = "h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=", version = "v0.0.0-20210923224102-525f6e181f06", ) - go_repository( name = "com_github_santhosh_tekuri_jsonschema_v5", build_file_proto_mode = "disable_global", @@ -5593,7 +5370,6 @@ def go_dependencies(): sum = "h1:HNLA3HtUIROrQwG1cuu5EYuqk3UEoJ61Dr/9xkd6sok=", version = "v5.0.1", ) - go_repository( name = "com_github_satori_go_uuid", build_file_proto_mode = "disable_global", @@ -5601,7 +5377,6 @@ def go_dependencies(): sum = "h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=", version = "v1.2.0", ) - go_repository( name = "com_github_scaleway_scaleway_sdk_go", build_file_proto_mode = "disable_global", @@ -5616,13 +5391,12 @@ def go_dependencies(): sum = "h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=", version = "v2.1.0+incompatible", ) - go_repository( name = "com_github_schollz_progressbar_v3", build_file_proto_mode = "disable_global", importpath = "github.com/schollz/progressbar/v3", - sum = "h1:VcmmNRO+eFN3B0m5dta6FXYXY+MEJmXdWoIS+jjssQM=", - version = "v3.8.5", + sum = "h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE=", + version = "v3.13.1", ) go_repository( name = "com_github_scim2_filter_parser_v2", @@ -5631,7 +5405,6 @@ def go_dependencies(): sum = "h1:QGadEcsmypxg8gYChRSM2j1edLyE/2j72j+hdmI4BJM=", version = "v2.2.0", ) - go_repository( name = "com_github_sean_seed", build_file_proto_mode = "disable_global", @@ -5639,7 +5412,6 @@ def go_dependencies(): sum = "h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=", version = "v0.0.0-20170313163322-e2103e2c3529", ) - go_repository( name = "com_github_secure_systems_lab_go_securesystemslib", build_file_proto_mode = "disable_global", @@ -5647,7 +5419,6 @@ def go_dependencies(): sum = "h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=", version = "v0.4.0", ) - go_repository( name = "com_github_segmentio_fasthash", build_file_proto_mode = "disable_global", @@ -5662,7 +5433,6 @@ def go_dependencies(): sum = "h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=", version = "v1.0.4", ) - go_repository( name = "com_github_sergi_go_diff", build_file_proto_mode = "disable_global", @@ -5684,7 +5454,6 @@ def go_dependencies(): sum = "h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI=", version = "v1.3.0", ) - go_repository( name = "com_github_shirou_gopsutil_v3", build_file_proto_mode = "disable_global", @@ -5706,7 +5475,6 @@ def go_dependencies(): sum = "h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=", version = "v0.6.4", ) - go_repository( name = "com_github_shopify_goreferrer", build_file_proto_mode = "disable_global", @@ -5721,7 +5489,6 @@ def go_dependencies(): sum = "h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=", version = "v0.0.0-20171204204709-577dee27f20d", ) - go_repository( name = "com_github_shopspring_decimal", build_file_proto_mode = "disable_global", @@ -5729,7 +5496,6 @@ def go_dependencies(): sum = "h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=", version = "v1.2.0", ) - go_repository( name = "com_github_shurcool_go", build_file_proto_mode = "disable_global", @@ -5744,7 +5510,6 @@ def go_dependencies(): sum = "h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc=", version = "v0.0.0-20170922171312-37c2f522c041", ) - go_repository( name = "com_github_shurcool_httpfs", build_file_proto_mode = "disable_global", @@ -5760,7 +5525,6 @@ def go_dependencies(): sum = "h1:VaS8k40GiNVUxVx0ZUilU38NU6tWUHNQOX342DWtZUM=", version = "v0.0.0-20211015085752-0bad89b3b4df", ) - go_repository( name = "com_github_shurcool_sanitized_anchor_name", build_file_proto_mode = "disable_global", @@ -5775,13 +5539,12 @@ def go_dependencies(): sum = "h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=", version = "v0.0.0-20200824052919-0d455de96546", ) - go_repository( name = "com_github_sirupsen_logrus", build_file_proto_mode = "disable_global", importpath = "github.com/sirupsen/logrus", - sum = "h1:Ou41VVR3nMWWmTiEUnj0OlsgOSCUFgsPAOl6jRIcVtQ=", - version = "v1.9.1", + sum = "h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=", + version = "v1.9.3", ) go_repository( name = "com_github_skeema_knownhosts", @@ -5790,7 +5553,6 @@ def go_dependencies(): sum = "h1:MTk78x9FPgDFVFkDLTrsnnfCJl7g1C/nnKvePgrIngE=", version = "v1.1.1", ) - go_repository( name = "com_github_slack_go_slack", build_file_proto_mode = "disable_global", @@ -5798,7 +5560,6 @@ def go_dependencies(): sum = "h1:BGbxa0kMsGEvLOEoZmYs8T1wWfoZXwmQFBb6FgYCXUA=", version = "v0.10.1", ) - go_repository( name = "com_github_smacker_go_tree_sitter", build_file_proto_mode = "disable_global", @@ -5813,7 +5574,6 @@ def go_dependencies(): sum = "h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs=", version = "v1.13.0", ) - go_repository( name = "com_github_smartystreets_goconvey", build_file_proto_mode = "disable_global", @@ -5821,7 +5581,6 @@ def go_dependencies(): sum = "h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=", version = "v1.6.4", ) - go_repository( name = "com_github_soheilhy_cmux", build_file_proto_mode = "disable_global", @@ -5829,7 +5588,6 @@ def go_dependencies(): sum = "h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=", version = "v0.1.5", ) - go_repository( name = "com_github_sourcegraph_conc", build_directives = [ @@ -5847,7 +5605,6 @@ def go_dependencies(): sum = "h1:7MrEECTEf+UmMdllIIbAHng17Uwqm8WbHEUAyv9LMBk=", version = "v0.0.0-20231024141911-299d0263dc95", ) - go_repository( name = "com_github_sourcegraph_go_diff", build_file_proto_mode = "disable_global", @@ -5883,7 +5640,6 @@ def go_dependencies(): sum = "h1:uBLhh66Nf4BcRnvCkMVEuYZ/bQ9ok0rOlEJhfVUpJj4=", version = "v0.0.0-20210910070954-ef39ade5591d", ) - go_repository( name = "com_github_sourcegraph_jsonx", build_file_proto_mode = "disable_global", @@ -5919,7 +5675,13 @@ def go_dependencies(): sum = "h1:3rJiF4VGyStWXrqJtVlXBJnpe82Q1k9k74dElVPolR8=", version = "v0.0.0-20231106184355-f739cf8e1d49", ) - + go_repository( + name = "com_github_sourcegraph_managed_services_platform_cdktf_gen_postgresql", + build_file_proto_mode = "disable_global", + importpath = "github.com/sourcegraph/managed-services-platform-cdktf/gen/postgresql", + sum = "h1:7TTODwd/f0hhqmZhbQcKXSkoxSx9OczTWgWPBTxVOrA=", + version = "v0.0.0-20231121191755-214be625af21", + ) go_repository( name = "com_github_sourcegraph_managed_services_platform_cdktf_gen_random", build_file_proto_mode = "disable_global", @@ -5927,7 +5689,6 @@ def go_dependencies(): sum = "h1:N0OxHqeujHxvVU666KQY9whauLyw4s3BJGBLxx6gKR0=", version = "v0.0.0-20230822024612-edb48c530722", ) - go_repository( name = "com_github_sourcegraph_mountinfo", build_file_proto_mode = "disable_global", @@ -5942,7 +5703,6 @@ def go_dependencies(): sum = "h1:3A8w5e8HIYPfafHekvmdmmh42RHKGVhmiTZAPJclg7I=", version = "v0.12.0", ) - go_repository( name = "com_github_sourcegraph_scip", # This fixes the build for sourcegraph/scip which depends on sourcegraph/sourcegraph/lib but @@ -5958,15 +5718,13 @@ def go_dependencies(): sum = "h1:o+eq0cjVV3B5ngIBF04Lv3GwttKOuYFF5NTcfXWXzfA=", version = "v0.3.1-0.20230627154934-45df7f6d33fc", ) - go_repository( name = "com_github_sourcegraph_zoekt", build_file_proto_mode = "disable_global", importpath = "github.com/sourcegraph/zoekt", - sum = "h1:6+khC/kBCn1Am0TX4ne4fwqKGdY02BZgm/gKNKppNnA=", - version = "v0.0.0-20231110161813-2355607d5ff8", + sum = "h1:nhxLVoE/muGcygm76NwutJC4fQ1IVgkNXY7xOLGnDI8=", + version = "v0.0.0-20231129132138-0d03621d45a3", ) - go_repository( name = "com_github_spaolacci_murmur3", build_file_proto_mode = "disable_global", @@ -5981,7 +5739,6 @@ def go_dependencies(): sum = "h1:9B623Cfs+mclYK6dsae7gLSwuIBHvlgmEup87qpqsAQ=", version = "v0.3.1-0.20230104082527-d6f58551be3f", ) - go_repository( name = "com_github_spf13_afero", build_file_proto_mode = "disable_global", @@ -6024,7 +5781,6 @@ def go_dependencies(): sum = "h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=", version = "v1.12.0", ) - go_repository( name = "com_github_ssor_bom", build_file_proto_mode = "disable_global", @@ -6032,7 +5788,6 @@ def go_dependencies(): sum = "h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=", version = "v0.0.0-20170718123548-6386211fdfcf", ) - go_repository( name = "com_github_stoewer_go_strcase", build_file_proto_mode = "disable_global", @@ -6040,7 +5795,6 @@ def go_dependencies(): sum = "h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=", version = "v1.3.0", ) - go_repository( name = "com_github_stretchr_objx", build_file_proto_mode = "disable_global", @@ -6062,7 +5816,6 @@ def go_dependencies(): sum = "h1:LUsDduamlucuNnWcaTbXQ6aLILFcLXADpOzeEH3U+OI=", version = "v0.0.0-20201019212854-469649b16807", ) - go_repository( name = "com_github_stvp_tempredis", build_file_proto_mode = "disable_global", @@ -6070,7 +5823,6 @@ def go_dependencies(): sum = "h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM=", version = "v0.0.0-20181119212430-b82af8480203", ) - go_repository( name = "com_github_subosito_gotenv", build_file_proto_mode = "disable_global", @@ -6078,7 +5830,6 @@ def go_dependencies(): sum = "h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=", version = "v1.3.0", ) - go_repository( name = "com_github_syndtr_goleveldb", build_file_proto_mode = "disable_global", @@ -6093,7 +5844,6 @@ def go_dependencies(): sum = "h1:6yITBqGTE2lEeTPG04SN9W+iWHCRyHqlVYILiSXziwk=", version = "v0.0.0-20190226123456-11a2b8fa57af", ) - go_repository( name = "com_github_tdewolff_minify_v2", build_file_proto_mode = "disable_global", @@ -6108,7 +5858,6 @@ def go_dependencies(): sum = "h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ=", version = "v2.6.4", ) - go_repository( name = "com_github_temoto_robotstxt", build_file_proto_mode = "disable_global", @@ -6116,7 +5865,6 @@ def go_dependencies(): sum = "h1:W2pOjSJ6SWvldyEuiFXNxz3xZ8aiWX5LbfDiOFd7Fxg=", version = "v1.1.2", ) - go_repository( name = "com_github_throttled_throttled_v2", build_file_proto_mode = "disable_global", @@ -6155,7 +5903,6 @@ def go_dependencies(): sum = "h1:NSWpaDaurcAJY7PkL8Xt0PhZE7qpvbZl5ljd8r6U0bI=", version = "v0.0.0-20190920132354-ee03d75cd160", ) # keep - go_repository( name = "com_github_tj_go_naturaldate", build_file_proto_mode = "disable_global", @@ -6163,7 +5910,6 @@ def go_dependencies(): sum = "h1:OgJIPkR/Jk4bFMBLbxZ8w+QUxwjqSvzd9x+yXocY4RI=", version = "v1.3.0", ) - go_repository( name = "com_github_tklauser_go_sysconf", build_file_proto_mode = "disable_global", @@ -6185,7 +5931,6 @@ def go_dependencies(): sum = "h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=", version = "v0.0.0-20201229170055-e5319fda7802", ) - go_repository( name = "com_github_tomnomnom_linkheader", build_file_proto_mode = "disable_global", @@ -6214,7 +5959,6 @@ def go_dependencies(): sum = "h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=", version = "v1.0.0", ) - go_repository( name = "com_github_tonistiigi_units", build_file_proto_mode = "disable_global", @@ -6243,7 +5987,6 @@ def go_dependencies(): sum = "h1:HhJkSzDDlVSVIVt7pDJwCHQj67k7A5EeBgPmeD+pVsQ=", version = "v1.0.0", ) - go_repository( name = "com_github_uber_gonduit", build_file_proto_mode = "disable_global", @@ -6265,7 +6008,6 @@ def go_dependencies(): sum = "h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=", version = "v2.4.1+incompatible", ) - go_repository( name = "com_github_ugorji_go", build_file_proto_mode = "disable_global", @@ -6287,7 +6029,6 @@ def go_dependencies(): sum = "h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=", version = "v0.5.10", ) - go_repository( name = "com_github_unknwon_com", build_file_proto_mode = "disable_global", @@ -6309,7 +6050,6 @@ def go_dependencies(): sum = "h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=", version = "v1.22.12", ) - go_repository( name = "com_github_urfave_cli_v2", build_file_proto_mode = "disable_global", @@ -6324,7 +6064,6 @@ def go_dependencies(): sum = "h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=", version = "v1.0.0", ) - go_repository( name = "com_github_valyala_bytebufferpool", build_file_proto_mode = "disable_global", @@ -6346,7 +6085,6 @@ def go_dependencies(): sum = "h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=", version = "v1.6.3", ) - go_repository( name = "com_github_valyala_fasttemplate", build_file_proto_mode = "disable_global", @@ -6354,7 +6092,6 @@ def go_dependencies(): sum = "h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=", version = "v1.2.2", ) - go_repository( name = "com_github_vbatts_tar_split", build_file_proto_mode = "disable_global", @@ -6362,7 +6099,6 @@ def go_dependencies(): sum = "h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck=", version = "v0.11.3", ) - go_repository( name = "com_github_vektah_gqlparser", build_file_proto_mode = "disable_global", @@ -6377,7 +6113,6 @@ def go_dependencies(): sum = "h1:C02NsyEsL4TXJB7ndonqTfuQOL4XPIu0aAWugdmTgmc=", version = "v2.4.5", ) - go_repository( name = "com_github_vmihailenco_msgpack_v5", build_file_proto_mode = "disable_global", @@ -6392,7 +6127,6 @@ def go_dependencies(): sum = "h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=", version = "v2.0.0", ) - go_repository( name = "com_github_vultr_govultr_v2", build_file_proto_mode = "disable_global", @@ -6400,7 +6134,6 @@ def go_dependencies(): sum = "h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=", version = "v2.17.2", ) - go_repository( name = "com_github_wk8_go_ordered_map_v2", build_file_proto_mode = "disable_global", @@ -6408,7 +6141,6 @@ def go_dependencies(): sum = "h1:jLbYIFyWQMUwHLO20cImlCRBoNc5lp0nmE2dvwcxc7k=", version = "v2.1.5", ) - go_repository( name = "com_github_wsxiaoys_terminal", build_file_proto_mode = "disable_global", @@ -6472,7 +6204,6 @@ def go_dependencies(): sum = "h1:n+nNi93yXLkJvKwXNP9d55HC7lGK4H/SRcwB5IaUZLo=", version = "v0.0.0-20180714160509-73f8eece6fdc", ) - go_repository( name = "com_github_xeipuuv_gojsonpointer", build_file_proto_mode = "disable_global", @@ -6522,7 +6253,6 @@ def go_dependencies(): sum = "h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=", version = "v1.1.0", ) - go_repository( name = "com_github_xordataexchange_crypt", build_file_proto_mode = "disable_global", @@ -6544,7 +6274,6 @@ def go_dependencies(): sum = "h1:NsJQS9YhI1+RDsFqE9mW5XIQmPmdF/qa8qQOLZN8XEA=", version = "v0.23.0", ) - go_repository( name = "com_github_yohcop_openid_go", build_file_proto_mode = "disable_global", @@ -6566,7 +6295,6 @@ def go_dependencies(): sum = "h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=", version = "v0.0.0-20181117223130-1be2e3e5546d", ) - go_repository( name = "com_github_yuin_goldmark", build_file_proto_mode = "disable_global", @@ -6644,7 +6372,6 @@ def go_dependencies(): sum = "h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=", version = "v1.0.2", ) - go_repository( name = "com_github_zenazn_goji", build_file_proto_mode = "disable_global", @@ -6652,199 +6379,194 @@ def go_dependencies(): sum = "h1:4lbD8Mx2h7IvloP7r2C0D6ltZP6Ufip8Hn0wmSK5LR8=", version = "v1.0.1", ) - go_repository( name = "com_google_cloud_go", - build_directives = [ - # @go_googleapis is the modern version of @org_golang_google_genproto - # use @go_googleapis to avoid dependency conflicts between the two - "gazelle:resolve go google.golang.org/genproto/googleapis/api/metric @go_googleapis//google/api:metric_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api @go_googleapis//google/api:api_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go", - sum = "h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME=", - version = "v0.110.8", + sum = "h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y=", + version = "v0.110.10", ) go_repository( name = "com_google_cloud_go_accessapproval", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/accessapproval", - sum = "h1:/5YjNhR6lzCvmJZAnByYkfEgWjfAKwYP6nkuTk6nKFE=", - version = "v1.7.1", + sum = "h1:ZvLvJ952zK8pFHINjpMBY5k7LTAp/6pBf50RDMRgBUI=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_accesscontextmanager", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/accesscontextmanager", - sum = "h1:WIAt9lW9AXtqw/bnvrEUaE8VG/7bAAeMzRCBGMkc4+w=", - version = "v1.8.1", + sum = "h1:Yo4g2XrBETBCqyWIibN3NHNPQKUfQqti0lI+70rubeE=", + version = "v1.8.4", ) go_repository( name = "com_google_cloud_go_aiplatform", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/aiplatform", - sum = "h1:J89aj+lqwtjn0qpQBMVaiOmDxBkKDEKUwl+GL19RRpc=", - version = "v1.50.0", + sum = "h1:wH7OYl9Vq/5tupok0BPTFY9xaTLb0GxkReHtB5PF7cI=", + version = "v1.54.0", ) go_repository( name = "com_google_cloud_go_analytics", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/analytics", - sum = "h1:TFBC1ZAqX9/jL56GEXdLrVe5vT3I22bDVWyDwZX4IEg=", - version = "v0.21.3", + sum = "h1:fnV7B8lqyEYxCU0LKk+vUL7mTlqRAq4uFlIthIdr/iA=", + version = "v0.21.6", ) go_repository( name = "com_google_cloud_go_apigateway", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/apigateway", - sum = "h1:aBSwCQPcp9rZ0zVEUeJbR623palnqtvxJlUyvzsKGQc=", - version = "v1.6.1", + sum = "h1:VVIxCtVerchHienSlaGzV6XJGtEM9828Erzyr3miUGs=", + version = "v1.6.4", ) go_repository( name = "com_google_cloud_go_apigeeconnect", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/apigeeconnect", - sum = "h1:6u/jj0P2c3Mcm+H9qLsXI7gYcTiG9ueyQL3n6vCmFJM=", - version = "v1.6.1", + sum = "h1:jSoGITWKgAj/ssVogNE9SdsTqcXnryPzsulENSRlusI=", + version = "v1.6.4", ) go_repository( name = "com_google_cloud_go_apigeeregistry", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/apigeeregistry", - sum = "h1:hgq0ANLDx7t2FDZDJQrCMtCtddR/pjCqVuvQWGrQbXw=", - version = "v0.7.1", + sum = "h1:DSaD1iiqvELag+lV4VnnqUUFd8GXELu01tKVdWZrviE=", + version = "v0.8.2", ) - go_repository( name = "com_google_cloud_go_appengine", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/appengine", - sum = "h1:J+aaUZ6IbTpBegXbmEsh8qZZy864ZVnOoWyfa1XSNbI=", - version = "v1.8.1", + sum = "h1:Qub3fqR7iA1daJWdzjp/Q0Jz0fUG0JbMc7Ui4E9IX/E=", + version = "v1.8.4", ) go_repository( name = "com_google_cloud_go_area120", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/area120", - sum = "h1:wiOq3KDpdqXmaHzvZwKdpoM+3lDcqsI2Lwhyac7stss=", - version = "v0.8.1", + sum = "h1:YnSO8m02pOIo6AEOgiOoUDVbw4pf+bg2KLHi4rky320=", + version = "v0.8.4", ) go_repository( name = "com_google_cloud_go_artifactregistry", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/artifactregistry", - sum = "h1:k6hNqab2CubhWlGcSzunJ7kfxC7UzpAfQ1UPb9PDCKI=", - version = "v1.14.1", + sum = "h1:/hQaadYytMdA5zBh+RciIrXZQBWK4vN7EUsrQHG+/t8=", + version = "v1.14.6", ) go_repository( name = "com_google_cloud_go_asset", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/asset", - sum = "h1:vlHdznX70eYW4V1y1PxocvF6tEwxJTTarwIGwOhFF3U=", - version = "v1.14.1", + sum = "h1:uI8Bdm81s0esVWbWrTHcjFDFKNOa9aB7rI1vud1hO84=", + version = "v1.15.3", ) go_repository( name = "com_google_cloud_go_assuredworkloads", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/assuredworkloads", - sum = "h1:yaO0kwS+SnhVSTF7BqTyVGt3DTocI6Jqo+S3hHmCwNk=", - version = "v1.11.1", + sum = "h1:FsLSkmYYeNuzDm8L4YPfLWV+lQaUrJmH5OuD37t1k20=", + version = "v1.11.4", ) go_repository( name = "com_google_cloud_go_automl", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/automl", - sum = "h1:iP9iQurb0qbz+YOOMfKSEjhONA/WcoOIjt6/m+6pIgo=", - version = "v1.13.1", + sum = "h1:i9tOKXX+1gE7+rHpWKjiuPfGBVIYoWvLNIGpWgPtF58=", + version = "v1.13.4", ) go_repository( name = "com_google_cloud_go_baremetalsolution", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/baremetalsolution", - sum = "h1:3zztyuQHjfU0C0qEsI9LkC3kf5/TQQ3jUJhbmetUoRA=", - version = "v1.2.0", + sum = "h1:oQiFYYCe0vwp7J8ZmF6siVKEumWtiPFJMJcGuyDVRUk=", + version = "v1.2.3", ) go_repository( name = "com_google_cloud_go_batch", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/batch", - sum = "h1:/4ADpZKoKH300HN2SB6aI7lXX/0hnnbR74wxjLHkyQo=", - version = "v1.4.1", + sum = "h1:mPiIH20a5NU02rucbAmLeO4sLPO9hrTK0BLjdHyW8xw=", + version = "v1.6.3", ) go_repository( name = "com_google_cloud_go_beyondcorp", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/beyondcorp", - sum = "h1:VPg+fZXULQjs8LiMeWdLaB5oe8G9sEoZ0I0j6IMiG1Q=", - version = "v1.0.0", + sum = "h1:VXf9SnrnSmj2BF2cHkoTHvOUp8gjsz1KJFOMW7czdsY=", + version = "v1.0.3", ) go_repository( name = "com_google_cloud_go_bigquery", - build_directives = [ - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/bigquery", - sum = "h1:hs44Xxov3XLWQiCx2J8lK5U/ihLqnpm4RVVl5fdtLLI=", - version = "v1.55.0", + sum = "h1:FiULdbbzUxWD0Y4ZGPSVCDLvqRSyCIO6zKV7E2nf5uA=", + version = "v1.57.1", ) go_repository( name = "com_google_cloud_go_billing", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/billing", - sum = "h1:CpagWXb/+QNye+vouomndbc4Gsr0uo+AGR24V16uk8Q=", - version = "v1.17.0", + sum = "h1:77/4kCqzH6Ou5CCDzNmqmboE+WvbwFBJmw1QZQz19AI=", + version = "v1.17.4", ) go_repository( name = "com_google_cloud_go_binaryauthorization", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/binaryauthorization", - sum = "h1:7L6uUWo/xNCfdVNnnzh2M4x5YA732YPgqRdCG8aKVAU=", - version = "v1.7.0", + sum = "h1:3R6WYn1JKIaVicBmo18jXubu7xh4mMkmbIgsTXk0cBA=", + version = "v1.7.3", ) go_repository( name = "com_google_cloud_go_certificatemanager", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/certificatemanager", - sum = "h1:uKsohpE0hiobx1Eak9jNcPCznwfB6gvyQCcS28Ah9E8=", - version = "v1.7.1", + sum = "h1:5YMQ3Q+dqGpwUZ9X5sipsOQ1fLPsxod9HNq0+nrqc6I=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_channel", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/channel", - sum = "h1:Hy2EaOiOB7BS1IJmg2lLilEo8uMfFWTy7RgjTzbUqjM=", - version = "v1.17.0", + sum = "h1:Rd4+fBrjiN6tZ4TR8R/38elkyEkz6oogGDr7jDyjmMY=", + version = "v1.17.3", ) go_repository( name = "com_google_cloud_go_cloudbuild", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/cloudbuild", - sum = "h1:YTMxmFra7eIjKFgnyQUxOwWNseNqeO38kGh7thy7v4s=", - version = "v1.14.0", + sum = "h1:9IHfEMWdCklJ1cwouoiQrnxmP0q3pH7JUt8Hqx4Qbck=", + version = "v1.15.0", ) go_repository( name = "com_google_cloud_go_clouddms", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/clouddms", - sum = "h1:vTcaFaFZTZZ11gXB6aZHdAx+zn30P8YJw4X/S3NC+VQ=", - version = "v1.7.0", + sum = "h1:xe/wJKz55VO1+L891a1EG9lVUgfHr9Ju/I3xh1nwF84=", + version = "v1.7.3", + ) + go_repository( + name = "com_google_cloud_go_cloudsqlconn", + build_file_proto_mode = "disable_global", + importpath = "cloud.google.com/go/cloudsqlconn", + sum = "h1:rMtPv66pkuk2K1ciCicjZY8Ma1DSyOYSoqwPUw/Timo=", + version = "v1.5.1", ) go_repository( name = "com_google_cloud_go_cloudtasks", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/cloudtasks", - sum = "h1:cMh9Q6dkvh+Ry5LAPbD/U2aw6KAqdiU6FttwhbTo69w=", - version = "v1.12.1", + sum = "h1:5xXuFfAjg0Z5Wb81j2GAbB3e0bwroCeSF+5jBn/L650=", + version = "v1.12.4", ) go_repository( name = "com_google_cloud_go_compute", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/compute", - sum = "h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=", - version = "v1.23.0", + sum = "h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=", + version = "v1.23.3", ) go_repository( name = "com_google_cloud_go_compute_metadata", @@ -6857,135 +6579,134 @@ def go_dependencies(): name = "com_google_cloud_go_contactcenterinsights", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/contactcenterinsights", - sum = "h1:YR2aPedGVQPpFBZXJnPkqRj8M//8veIZZH5ZvICoXnI=", - version = "v1.10.0", + sum = "h1:wP41IUA4ucMVooj/TP53jd7vbNjWrDkAPOeulVJGT5U=", + version = "v1.12.0", ) go_repository( name = "com_google_cloud_go_container", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/container", - sum = "h1:SszQdI0qlyKsImz8/l26rpTZMyqvaH9yfua7rirDZvY=", - version = "v1.26.0", + sum = "h1:/o82CFWXIYnT9p/07SnRgybqL3Pmmu86jYIlzlJVUBY=", + version = "v1.28.0", ) go_repository( name = "com_google_cloud_go_containeranalysis", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/containeranalysis", - sum = "h1:/EsoP+UTIjvl4yqrLA4WgUG83kwQhqZmbXEfqirT2LM=", - version = "v0.11.0", + sum = "h1:5rhYLX+3a01drpREqBZVXR9YmWH45RnML++8NsCtuD8=", + version = "v0.11.3", ) go_repository( name = "com_google_cloud_go_datacatalog", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/datacatalog", - sum = "h1:qGWrlYvWtK+8jD1jhwq5BsGoSr7S4/LOroV7LwXi00g=", - version = "v1.17.1", + sum = "h1:rbYNmHwvAOOwnW2FPXYkaK3Mf1MmGqRzK0mMiIEyLdo=", + version = "v1.19.0", ) go_repository( name = "com_google_cloud_go_dataflow", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/dataflow", - sum = "h1:VzG2tqsk/HbmOtq/XSfdF4cBvUWRK+S+oL9k4eWkENQ=", - version = "v0.9.1", + sum = "h1:7VmCNWcPJBS/srN2QnStTB6nu4Eb5TMcpkmtaPVhRt4=", + version = "v0.9.4", ) go_repository( name = "com_google_cloud_go_dataform", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/dataform", - sum = "h1:xcWso0hKOoxeW72AjBSIp/UfkvpqHNzzS0/oygHlcqY=", - version = "v0.8.1", + sum = "h1:jV+EsDamGX6cE127+QAcCR/lergVeeZdEQ6DdrxW3sQ=", + version = "v0.9.1", ) go_repository( name = "com_google_cloud_go_datafusion", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/datafusion", - sum = "h1:eX9CZoyhKQW6g1Xj7+RONeDj1mV8KQDKEB9KLELX9/8=", - version = "v1.7.1", + sum = "h1:Q90alBEYlMi66zL5gMSGQHfbZLB55mOAg03DhwTTfsk=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_datalabeling", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/datalabeling", - sum = "h1:zxsCD/BLKXhNuRssen8lVXChUj8VxF3ofN06JfdWOXw=", - version = "v0.8.1", + sum = "h1:zrq4uMmunf2KFDl/7dS6iCDBBAxBnKVDyw6+ajz3yu0=", + version = "v0.8.4", ) go_repository( name = "com_google_cloud_go_dataplex", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/dataplex", - sum = "h1:wqPAP1vRskOoWwNka1yey2wxxCrxRrcxJf78MyFvrbs=", - version = "v1.9.1", + sum = "h1:AfFFR15Ifh4U+Me1IBztrSd5CrasTODzy3x8KtDyHdc=", + version = "v1.11.2", ) go_repository( name = "com_google_cloud_go_dataproc_v2", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/dataproc/v2", - sum = "h1:jKijbdsERm2hy/5dFl/LeQN+7CNssLdGXQYBMvMH/M4=", - version = "v2.2.0", + sum = "h1:tTVP9tTxmc8fixxOd/8s6Q6Pz/+yzn7r7XdZHretQH0=", + version = "v2.3.0", ) - go_repository( name = "com_google_cloud_go_dataqna", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/dataqna", - sum = "h1:ITpUJep04hC9V7C+gcK390HO++xesQFSUJ7S4nSnF3U=", - version = "v0.8.1", + sum = "h1:NJnu1kAPamZDs/if3bJ3+Wb6tjADHKL83NUWsaIp2zg=", + version = "v0.8.4", ) go_repository( name = "com_google_cloud_go_datastore", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/datastore", - sum = "h1:Mq0ApTRdLW3/dyiw+DkjTk0+iGIUvkbzaC8sfPwWTH4=", - version = "v1.14.0", + sum = "h1:0P9WcsQeTWjuD1H14JIY7XQscIPQ4Laje8ti96IC5vg=", + version = "v1.15.0", ) go_repository( name = "com_google_cloud_go_datastream", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/datastream", - sum = "h1:ra/+jMv36zTAGPfi8TRne1hXme+UsKtdcK4j6bnqQiw=", - version = "v1.10.0", + sum = "h1:Z2sKPIB7bT2kMW5Uhxy44ZgdJzxzE5uKjavoW+EuHEE=", + version = "v1.10.3", ) go_repository( name = "com_google_cloud_go_deploy", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/deploy", - sum = "h1:A+w/xpWgz99EYzB6e31gMGAI/P5jTZ2UO7veQK5jQ8o=", - version = "v1.13.0", + sum = "h1:ZdmYzRMTGkVyP1nXEUat9FpbJGJemDcNcx82RSSOElc=", + version = "v1.15.0", ) go_repository( name = "com_google_cloud_go_dialogflow", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/dialogflow", - sum = "h1:0hBV5ipVbhYNKCyiBoM47bUt+43Kd8eWXhBr+pwUSTw=", - version = "v1.43.0", + sum = "h1:cK/f88KX+YVR4tLH4clMQlvrLWD2qmKJQziusjGPjmc=", + version = "v1.44.3", ) go_repository( name = "com_google_cloud_go_dlp", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/dlp", - sum = "h1:tF3wsJ2QulRhRLWPzWVkeDz3FkOGVoMl6cmDUHtfYxw=", - version = "v1.10.1", + sum = "h1:OFlXedmPP/5//X1hBEeq3D9kUVm9fb6ywYANlpv/EsQ=", + version = "v1.11.1", ) go_repository( name = "com_google_cloud_go_documentai", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/documentai", - sum = "h1:cBndyac7kPWwSuhUcgdbnqzszfZ57HBEHfD33DIwsBM=", - version = "v1.22.1", + sum = "h1:KAlzT+q8qvRxAmhsJUvLtfFHH0PNvz3M79H6CgVBKL8=", + version = "v1.23.5", ) go_repository( name = "com_google_cloud_go_domains", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/domains", - sum = "h1:rqz6KY7mEg7Zs/69U6m6LMbB7PxFDWmT3QWNXIqhHm0=", - version = "v0.9.1", + sum = "h1:ua4GvsDztZ5F3xqjeLKVRDeOvJshf5QFgWGg1CKti3A=", + version = "v0.9.4", ) go_repository( name = "com_google_cloud_go_edgecontainer", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/edgecontainer", - sum = "h1:zhHWnLzg6AqzE+I3gzJqiIwHfjEBhWctNQEzqb+FaRo=", - version = "v1.1.1", + sum = "h1:Szy3Q/N6bqgQGyxqjI+6xJZbmvPvnFHp3UZr95DKcQ0=", + version = "v1.1.4", ) go_repository( name = "com_google_cloud_go_errorreporting", @@ -6994,134 +6715,124 @@ def go_dependencies(): sum = "h1:kj1XEWMu8P0qlLhm3FwcaFsUvXChV/OraZwA70trRR0=", version = "v0.3.0", ) - go_repository( name = "com_google_cloud_go_essentialcontacts", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/essentialcontacts", - sum = "h1:OEJ0MLXXCW/tX1fkxzEZOsv/wRfyFsvDVNaHWBAvoV0=", - version = "v1.6.2", + sum = "h1:S2if6wkjR4JCEAfDtIiYtD+sTz/oXjh2NUG4cgT1y/Q=", + version = "v1.6.5", ) go_repository( name = "com_google_cloud_go_eventarc", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/eventarc", - sum = "h1:xIP3XZi0Xawx8DEfh++mE2lrIi5kQmCr/KcWhJ1q0J4=", - version = "v1.13.0", + sum = "h1:+pFmO4eu4dOVipSaFBLkmqrRYG94Xl/TQZFOeohkuqU=", + version = "v1.13.3", ) go_repository( name = "com_google_cloud_go_filestore", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/filestore", - sum = "h1:Eiz8xZzMJc5ppBWkuaod/PUdUZGCFR8ku0uS+Ah2fRw=", - version = "v1.7.1", + sum = "h1:/+wUEGwk3x3Kxomi2cP5dsR8+SIXxo7M0THDjreFSYo=", + version = "v1.8.0", ) go_repository( name = "com_google_cloud_go_firestore", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/firestore", - sum = "h1:/3S4RssUV4GO/kvgJZB+tayjhOfyAHs+KcpJgRVu/Qk=", - version = "v1.13.0", + sum = "h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw=", + version = "v1.14.0", ) - go_repository( name = "com_google_cloud_go_functions", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/functions", - sum = "h1:LtAyqvO1TFmNLcROzHZhV0agEJfBi+zfMZsF4RT/a7U=", - version = "v1.15.1", + sum = "h1:ZjdiV3MyumRM6++1Ixu6N0VV9LAGlCX4AhW6Yjr1t+U=", + version = "v1.15.4", ) - go_repository( name = "com_google_cloud_go_gkebackup", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/gkebackup", - sum = "h1:Kfha8SOF2tqsu4O4jVle66mk7qNdlJ2KhL3E2YyiNZc=", - version = "v1.3.1", + sum = "h1:KhnOrr9A1tXYIYeXKqCKbCI8TL2ZNGiD3dm+d7BDUBg=", + version = "v1.3.4", ) go_repository( name = "com_google_cloud_go_gkeconnect", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/gkeconnect", - sum = "h1:a1ckRvVznnuvDWESM2zZDzSVFvggeBaVY5+BVB8tbT0=", - version = "v0.8.1", + sum = "h1:1JLpZl31YhQDQeJ98tK6QiwTpgHFYRJwpntggpQQWis=", + version = "v0.8.4", ) go_repository( name = "com_google_cloud_go_gkehub", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/gkehub", - sum = "h1:2BLSb8i+Co1P05IYCKATXy5yaaIw/ZqGvVSBTLdzCQo=", - version = "v0.14.1", + sum = "h1:J5tYUtb3r0cl2mM7+YHvV32eL+uZQ7lONyUZnPikCEo=", + version = "v0.14.4", ) go_repository( name = "com_google_cloud_go_gkemulticloud", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/gkemulticloud", - sum = "h1:MluqhtPVZReoriP5+adGIw+ij/RIeRik8KApCW2WMTw=", - version = "v1.0.0", + sum = "h1:NmJsNX9uQ2CT78957xnjXZb26TDIMvv+d5W2vVUt0Pg=", + version = "v1.0.3", ) - go_repository( name = "com_google_cloud_go_gsuiteaddons", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/gsuiteaddons", - sum = "h1:mi9jxZpzVjLQibTS/XfPZvl+Jr6D5Bs8pGqUjllRb00=", - version = "v1.6.1", + sum = "h1:uuw2Xd37yHftViSI8J2hUcCS8S7SH3ZWH09sUDLW30Q=", + version = "v1.6.4", ) go_repository( name = "com_google_cloud_go_iam", - build_directives = [ - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/iam", - sum = "h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4=", - version = "v1.1.2", + sum = "h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=", + version = "v1.1.5", ) go_repository( name = "com_google_cloud_go_iap", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/iap", - sum = "h1:RNhVq/6OMI99/wjPVhqFxjlBxYOBRdaG6rLpBvyaqYY=", - version = "v1.9.0", + sum = "h1:M4vDbQ4TLXdaljXVZSwW7XtxpwXUUarY2lIs66m0aCM=", + version = "v1.9.3", ) go_repository( name = "com_google_cloud_go_ids", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/ids", - sum = "h1:khXYmSoDDhWGEVxHl4c4IgbwSRR+qE/L4hzP3vaU9Hc=", - version = "v1.4.1", + sum = "h1:VuFqv2ctf/A7AyKlNxVvlHTzjrEvumWaZflUzBPz/M4=", + version = "v1.4.4", ) go_repository( name = "com_google_cloud_go_iot", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/iot", - sum = "h1:yrH0OSmicD5bqGBoMlWG8UltzdLkYzNUwNVUVz7OT54=", - version = "v1.7.1", + sum = "h1:m1WljtkZnvLTIRYW1YTOv5A6H1yKgLHR6nU7O8yf27w=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_kms", - build_directives = [ - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/kms", - sum = "h1:lh6qra6oC4AyWe5fUUUBe/S27k12OHAleOOOw6KakdE=", - version = "v1.15.2", + sum = "h1:pj1sRfut2eRbD9pFRjNnPNg/CzJPuQAzUujMIM1vVeM=", + version = "v1.15.5", ) go_repository( name = "com_google_cloud_go_language", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/language", - sum = "h1:KnYolG0T5Oex722ZW/sP5QErhVAVNcqpJ16tVJd9RTw=", - version = "v1.11.0", + sum = "h1:zg9uq2yS9PGIOdc0Kz/l+zMtOlxKWonZjjo5w5YPG2A=", + version = "v1.12.2", ) go_repository( name = "com_google_cloud_go_lifesciences", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/lifesciences", - sum = "h1:axkANGx1wiBXHiPcJZAE+TDjjYoJRIDzbHC/WYllCBU=", - version = "v0.9.1", + sum = "h1:rZEI/UxcxVKEzyoRS/kdJ1VoolNItRWjNN0Uk9tfexg=", + version = "v0.9.4", ) go_repository( name = "com_google_cloud_go_logging", @@ -7130,149 +6841,138 @@ def go_dependencies(): sum = "h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU=", version = "v1.8.1", ) - go_repository( name = "com_google_cloud_go_longrunning", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/longrunning", - sum = "h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI=", - version = "v0.5.1", + sum = "h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=", + version = "v0.5.4", ) go_repository( name = "com_google_cloud_go_managedidentities", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/managedidentities", - sum = "h1:2/qZuOeLgUHorSdxSQGtnOu9xQkBn37+j+oZQv/KHJY=", - version = "v1.6.1", + sum = "h1:SF/u1IJduMqQQdJA4MDyivlIQ4SrV5qAawkr/ZEREkY=", + version = "v1.6.4", ) go_repository( name = "com_google_cloud_go_maps", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/maps", - sum = "h1:PdfgpBLhAoSzZrQXP+/zBc78fIPLZSJp5y8+qSMn2UU=", - version = "v1.4.0", + sum = "h1:2+eMp/1MvMPp5qrSOd3vtnLKa/pylt+krVRqET3jWsM=", + version = "v1.6.1", ) - go_repository( name = "com_google_cloud_go_mediatranslation", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/mediatranslation", - sum = "h1:50cF7c1l3BanfKrpnTCaTvhf+Fo6kdF21DG0byG7gYU=", - version = "v0.8.1", + sum = "h1:VRCQfZB4s6jN0CSy7+cO3m4ewNwgVnaePanVCQh/9Z4=", + version = "v0.8.4", ) go_repository( name = "com_google_cloud_go_memcache", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/memcache", - sum = "h1:7lkLsF0QF+Mre0O/NvkD9Q5utUNwtzvIYjrOLOs0HO0=", - version = "v1.10.1", + sum = "h1:cdex/ayDd294XBj2cGeMe6Y+H1JvhN8y78B9UW7pxuQ=", + version = "v1.10.4", ) go_repository( name = "com_google_cloud_go_metastore", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/metastore", - sum = "h1:+9DsxUOHvsqvC0ylrRc/JwzbXJaaBpfIK3tX0Lx8Tcc=", - version = "v1.12.0", + sum = "h1:94l/Yxg9oBZjin2bzI79oK05feYefieDq0o5fjLSkC8=", + version = "v1.13.3", ) go_repository( name = "com_google_cloud_go_monitoring", - build_directives = [ - # @go_googleapis is the modern version of @org_golang_google_genproto - # use @go_googleapis to avoid dependency conflicts between the two - "gazelle:resolve go google.golang.org/genproto/googleapis/api/metric @go_googleapis//google/api:metric_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api @go_googleapis//google/api:api_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/label @go_googleapis//google/api:label_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/monitoredres @go_googleapis//google/api:monitoredres_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/monitoring", - sum = "h1:rlndy4K8yknMY9JuGe2aK4SbCh21FXoCdX7SAGHmRgI=", - version = "v1.16.0", + sum = "h1:mf2SN9qSoBtIgiMA4R/y4VADPWZA7VCNJA079qLaZQ8=", + version = "v1.16.3", ) go_repository( name = "com_google_cloud_go_networkconnectivity", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/networkconnectivity", - sum = "h1:kG2PX6URJ9Kvotfdm+hH8WIhrRY77sAKytUGOz+MgN0=", - version = "v1.13.0", + sum = "h1:e9lUkCe2BexsqsUc2bjV8+gFBpQa54J+/F3qKVtW+wA=", + version = "v1.14.3", ) go_repository( name = "com_google_cloud_go_networkmanagement", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/networkmanagement", - sum = "h1:aA6L8aioyM4S6nlPYzp2SvB88lBcByZmqMJM6ReafzU=", - version = "v1.9.0", + sum = "h1:HsQk4FNKJUX04k3OI6gUsoveiHMGvDRqlaFM2xGyvqU=", + version = "v1.9.3", ) go_repository( name = "com_google_cloud_go_networksecurity", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/networksecurity", - sum = "h1:TBLEkMp3AE+6IV/wbIGRNTxnqLXHCTEQWoxRVC18TzY=", - version = "v0.9.1", + sum = "h1:947tNIPnj1bMGTIEBo3fc4QrrFKS5hh0bFVsHmFm4Vo=", + version = "v0.9.4", ) go_repository( name = "com_google_cloud_go_notebooks", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/notebooks", - sum = "h1:6x2K1JAWv6RW2yQO6oa+xtKUGOpGQseCmT94vpOt1vc=", - version = "v1.10.0", + sum = "h1:eTOTfNL1yM6L/PCtquJwjWg7ZZGR0URFaFgbs8kllbM=", + version = "v1.11.2", ) go_repository( name = "com_google_cloud_go_optimization", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/optimization", - sum = "h1:sGvPVtBJUKNYAwldhJvFmnM+EEdOXjDzjcly3g0n0Xg=", - version = "v1.5.0", + sum = "h1:iFsoexcp13cGT3k/Hv8PA5aK+FP7FnbhwDO9llnruas=", + version = "v1.6.2", ) go_repository( name = "com_google_cloud_go_orchestration", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/orchestration", - sum = "h1:KmN18kE/xa1n91cM5jhCh7s1/UfIguSCisw7nTMUzgE=", - version = "v1.8.1", + sum = "h1:kgwZ2f6qMMYIVBtUGGoU8yjYWwMTHDanLwM/CQCFaoQ=", + version = "v1.8.4", ) go_repository( name = "com_google_cloud_go_orgpolicy", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/orgpolicy", - sum = "h1:I/7dHICQkNwym9erHqmlb50LRU588NPCvkfIY0Bx9jI=", - version = "v1.11.1", + sum = "h1:RWuXQDr9GDYhjmrredQJC7aY7cbyqP9ZuLbq5GJGves=", + version = "v1.11.4", ) go_repository( name = "com_google_cloud_go_osconfig", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/osconfig", - sum = "h1:dgyEHdfqML6cUW6/MkihNdTVc0INQst0qSE8Ou1ub9c=", - version = "v1.12.1", + sum = "h1:OrRCIYEAbrbXdhm13/JINn9pQchvTTIzgmOCA7uJw8I=", + version = "v1.12.4", ) go_repository( name = "com_google_cloud_go_oslogin", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/oslogin", - sum = "h1:LdSuG3xBYu2Sgr3jTUULL1XCl5QBx6xwzGqzoDUw1j0=", - version = "v1.10.1", + sum = "h1:NP/KgsD9+0r9hmHC5wKye0vJXVwdciv219DtYKYjgqE=", + version = "v1.12.2", ) go_repository( name = "com_google_cloud_go_phishingprotection", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/phishingprotection", - sum = "h1:aK/lNmSd1vtbft/vLe2g7edXK72sIQbqr2QyrZN/iME=", - version = "v0.8.1", + sum = "h1:sPLUQkHq6b4AL0czSJZ0jd6vL55GSTHz2B3Md+TCZI0=", + version = "v0.8.4", ) go_repository( name = "com_google_cloud_go_policytroubleshooter", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/policytroubleshooter", - sum = "h1:pT4qSiL5o0hBSWHDiOcmes/s301PeLLWEhAr/eMQB/g=", - version = "v1.9.0", + sum = "h1:sq+ScLP83d7GJy9+wpwYJVnY+q6xNTXwOdRIuYjvHT4=", + version = "v1.10.2", ) go_repository( name = "com_google_cloud_go_privatecatalog", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/privatecatalog", - sum = "h1:B/18xGo+E0EMS9LOEQ0zXz7F2asMgmVgTYGSI89MHOA=", - version = "v0.9.1", + sum = "h1:Vo10IpWKbNvc/z/QZPVXgCiwfjpWoZ/wbgful4Uh/4E=", + version = "v0.9.4", ) go_repository( name = "com_google_cloud_go_profiler", @@ -7281,12 +6981,8 @@ def go_dependencies(): sum = "h1:b5got9Be9Ia0HVvyt7PavWxXEht15B9lWnigdvHtxOc=", version = "v0.3.1", ) - go_repository( name = "com_google_cloud_go_pubsub", - build_directives = [ - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/pubsub", sum = "h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g=", @@ -7299,130 +6995,120 @@ def go_dependencies(): sum = "h1:pX+idpWMIH30/K7c0epN6V703xpIcMXWRjKJsz0tYGY=", version = "v1.8.1", ) - go_repository( name = "com_google_cloud_go_recaptchaenterprise_v2", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/recaptchaenterprise/v2", - sum = "h1:IGkbudobsTXAwmkEYOzPCQPApUCsN4Gbq3ndGVhHQpI=", - version = "v2.7.2", + sum = "h1:KOlLHLv3h3HwcZAkx91ubM3Oztz3JtT3ZacAJhWDorQ=", + version = "v2.8.4", ) go_repository( name = "com_google_cloud_go_recommendationengine", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/recommendationengine", - sum = "h1:nMr1OEVHuDambRn+/y4RmNAmnR/pXCuHtH0Y4tCgGRQ=", - version = "v0.8.1", + sum = "h1:JRiwe4hvu3auuh2hujiTc2qNgPPfVp+Q8KOpsXlEzKQ=", + version = "v0.8.4", ) go_repository( name = "com_google_cloud_go_recommender", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/recommender", - sum = "h1:SuzbMJhDAiPro7tR9QP7EX97+TI31urjsIgNh9XQHl8=", - version = "v1.11.0", + sum = "h1:VndmgyS/J3+izR8V8BHa7HV/uun8//ivQ3k5eVKKyyM=", + version = "v1.11.3", ) go_repository( name = "com_google_cloud_go_redis", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/redis", - sum = "h1:YrjQnCC7ydk+k30op7DSjSHw1yAYhqYXFcOq1bSXRYA=", - version = "v1.13.1", + sum = "h1:J9cEHxG9YLmA9o4jTSvWt/RuVEn6MTrPlYSCRHujxDQ=", + version = "v1.14.1", ) go_repository( name = "com_google_cloud_go_resourcemanager", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/resourcemanager", - sum = "h1:QIAMfndPOHR6yTmMUB0ZN+HSeRmPjR/21Smq5/xwghI=", - version = "v1.9.1", + sum = "h1:JwZ7Ggle54XQ/FVYSBrMLOQIKoIT/uer8mmNvNLK51k=", + version = "v1.9.4", ) go_repository( name = "com_google_cloud_go_resourcesettings", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/resourcesettings", - sum = "h1:Fdyq418U69LhvNPFdlEO29w+DRRjwDA4/pFamm4ksAg=", - version = "v1.6.1", + sum = "h1:yTIL2CsZswmMfFyx2Ic77oLVzfBFoWBYgpkgiSPnC4Y=", + version = "v1.6.4", ) go_repository( name = "com_google_cloud_go_retail", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/retail", - sum = "h1:gYBrb9u/Hc5s5lUTFXX1Vsbc/9BEvgtioY6ZKaK0DK8=", - version = "v1.14.1", + sum = "h1:geqdX1FNqqL2p0ADXjPpw8lq986iv5GrVcieTYafuJQ=", + version = "v1.14.4", ) go_repository( name = "com_google_cloud_go_run", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/run", - sum = "h1:kHeIG8q+N6Zv0nDkBjSOYfK2eWqa5FnaiDPH/7/HirE=", - version = "v1.2.0", + sum = "h1:qdfZteAm+vgzN1iXzILo3nJFQbzziudkJrvd9wCf3FQ=", + version = "v1.3.3", ) go_repository( name = "com_google_cloud_go_scheduler", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/scheduler", - sum = "h1:yoZbZR8880KgPGLmACOMCiY2tPk+iX4V/dkxqTirlz8=", - version = "v1.10.1", + sum = "h1:eMEettHlFhG5pXsoHouIM5nRT+k+zU4+GUvRtnxhuVI=", + version = "v1.10.5", ) go_repository( name = "com_google_cloud_go_secretmanager", - build_directives = [ - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/secretmanager", - sum = "h1:cLTCwAjFh9fKvU6F13Y4L9vPcx9yiWPyWXE4+zkuEQs=", - version = "v1.11.1", + sum = "h1:krnX9qpG2kR2fJ+u+uNyNo+ACVhplIAS4Pu7u+4gd+k=", + version = "v1.11.4", ) go_repository( name = "com_google_cloud_go_security", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/security", - sum = "h1:jR3itwycg/TgGA0uIgTItcVhA55hKWiNJxaNNpQJaZE=", - version = "v1.15.1", + sum = "h1:sdnh4Islb1ljaNhpIXlIPgb3eYj70QWgPVDKOUYvzJc=", + version = "v1.15.4", ) go_repository( name = "com_google_cloud_go_securitycenter", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/securitycenter", - sum = "h1:XOGJ9OpnDtqg8izd7gYk/XUhj8ytjIalyjjsR6oyG0M=", - version = "v1.23.0", + sum = "h1:qCEyXoJoxNKKA1bDywBjjqCB7ODXazzHnVWnG5Uqd1M=", + version = "v1.24.2", ) - go_repository( name = "com_google_cloud_go_servicedirectory", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/servicedirectory", - sum = "h1:pBWpjCFVGWkzVTkqN3TBBIqNSoSHY86/6RL0soSQ4z8=", - version = "v1.11.0", + sum = "h1:5niCMfkw+jifmFtbBrtRedbXkJm3fubSR/KHbxSJZVM=", + version = "v1.11.3", ) - go_repository( name = "com_google_cloud_go_shell", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/shell", - sum = "h1:aHbwH9LSqs4r2rbay9f6fKEls61TAjT63jSyglsw7sI=", - version = "v1.7.1", + sum = "h1:nurhlJcSVFZneoRZgkBEHumTYf/kFJptCK2eBUq/88M=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_spanner", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/spanner", - sum = "h1:+HY8C4uztU7XyLz3xMi/LCXdetLEOExhvRFJu2NiVXM=", - version = "v1.49.0", + sum = "h1:/NzWQJ1MEhdRcffiutRKbW/AIGVKhcTeivWTDjEyCCo=", + version = "v1.53.0", ) - go_repository( name = "com_google_cloud_go_speech", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/speech", - sum = "h1:MCagaq8ObV2tr1kZJcJYgXYbIn8Ai5rp42tyGYw9rls=", - version = "v1.19.0", + sum = "h1:qkxNao58oF8ghAHE1Eghen7XepawYEN5zuZXYWaUTA4=", + version = "v1.21.0", ) go_repository( name = "com_google_cloud_go_storage", - build_directives = [ - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/storage", sum = "h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM=", @@ -7432,113 +7118,106 @@ def go_dependencies(): name = "com_google_cloud_go_storagetransfer", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/storagetransfer", - sum = "h1:+ZLkeXx0K0Pk5XdDmG0MnUVqIR18lllsihU/yq39I8Q=", - version = "v1.10.0", + sum = "h1:YM1dnj5gLjfL6aDldO2s4GeU8JoAvH1xyIwXre63KmI=", + version = "v1.10.3", ) go_repository( name = "com_google_cloud_go_talent", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/talent", - sum = "h1:j46ZgD6N2YdpFPux9mc7OAf4YK3tiBCsbLKc8rQx+bU=", - version = "v1.6.2", + sum = "h1:LnRJhhYkODDBoTwf6BeYkiJHFw9k+1mAFNyArwZUZAs=", + version = "v1.6.5", ) go_repository( name = "com_google_cloud_go_texttospeech", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/texttospeech", - sum = "h1:S/pR/GZT9p15R7Y2dk2OXD/3AufTct/NSxT4a7nxByw=", - version = "v1.7.1", + sum = "h1:ahrzTgr7uAbvebuhkBAAVU6kRwVD0HWsmDsvMhtad5Q=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_tpu", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/tpu", - sum = "h1:kQf1jgPY04UJBYYjNUO+3GrZtIb57MfGAW2bwgLbR3A=", - version = "v1.6.1", + sum = "h1:XIEH5c0WeYGaVy9H+UueiTaf3NI6XNdB4/v6TFQJxtE=", + version = "v1.6.4", ) go_repository( name = "com_google_cloud_go_trace", - build_directives = [ - # @go_googleapis is the modern version of @org_golang_google_genproto - # use @go_googleapis to avoid dependency conflicts between the two - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/trace", - sum = "h1:EwGdOLCNfYOOPtgqo+D2sDLZmRCEO1AagRTJCU6ztdg=", - version = "v1.10.1", + sum = "h1:2qOAuAzNezwW3QN+t41BtkDJOG42HywL73q8x/f6fnM=", + version = "v1.10.4", ) go_repository( name = "com_google_cloud_go_translate", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/translate", - sum = "h1:0na4gC54Lu05ir00dmUSuMkLAojDe1ALq4hBTUkhwjE=", - version = "v1.9.0", + sum = "h1:t5WXTqlrk8VVJu/i3WrYQACjzYJiff5szARHiyqqPzI=", + version = "v1.9.3", ) go_repository( name = "com_google_cloud_go_video", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/video", - sum = "h1:AkjXyJfQ7DtPyDOAbTMeiGcuKsO8/iKSb3fAmTUHYSg=", - version = "v1.20.0", + sum = "h1:Xrpbm2S9UFQ1pZEeJt9Vqm5t2T/z9y/M3rNXhFoo8Is=", + version = "v1.20.3", ) go_repository( name = "com_google_cloud_go_videointelligence", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/videointelligence", - sum = "h1:MBMWnkQ78GQnRz5lfdTAbBq/8QMCF3wahgtHh3s/J+k=", - version = "v1.11.1", + sum = "h1:YS4j7lY0zxYyneTFXjBJUj2r4CFe/UoIi/PJG0Zt/Rg=", + version = "v1.11.4", ) - go_repository( name = "com_google_cloud_go_vision_v2", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/vision/v2", - sum = "h1:ccK6/YgPfGHR/CyESz1mvIbsht5Y2xRsWCPqmTNydEw=", - version = "v2.7.2", + sum = "h1:T/ujUghvEaTb+YnFY/jiYwVAkMbIC8EieK0CJo6B4vg=", + version = "v2.7.5", ) go_repository( name = "com_google_cloud_go_vmmigration", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/vmmigration", - sum = "h1:gnjIclgqbEMc+cF5IJuPxp53wjBIlqZ8h9hE8Rkwp7A=", - version = "v1.7.1", + sum = "h1:qPNdab4aGgtaRX+51jCOtJxlJp6P26qua4o1xxUDjpc=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_vmwareengine", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/vmwareengine", - sum = "h1:qsJ0CPlOQu/3MFBGklu752v3AkD+Pdu091UmXJ+EjTA=", - version = "v1.0.0", + sum = "h1:WY526PqM6QNmFHSqe2sRfK6gRpzWjmL98UFkql2+JDM=", + version = "v1.0.3", ) - go_repository( name = "com_google_cloud_go_vpcaccess", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/vpcaccess", - sum = "h1:ram0GzjNWElmbxXMIzeOZUkQ9J8ZAahD6V8ilPGqX0Y=", - version = "v1.7.1", + sum = "h1:zbs3V+9ux45KYq8lxxn/wgXole6SlBHHKKyZhNJoS+8=", + version = "v1.7.4", ) go_repository( name = "com_google_cloud_go_webrisk", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/webrisk", - sum = "h1:Ssy3MkOMOnyRV5H2bkMQ13Umv7CwB/kugo3qkAX83Fk=", - version = "v1.9.1", + sum = "h1:iceR3k0BCRZgf2D/NiKviVMFfuNC9LmeNLtxUFRB/wI=", + version = "v1.9.4", ) go_repository( name = "com_google_cloud_go_websecurityscanner", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/websecurityscanner", - sum = "h1:CfEF/vZ+xXyAR3zC9iaC/QRdf1MEgS20r5UR17Q4gOg=", - version = "v1.6.1", + sum = "h1:5Gp7h5j7jywxLUp6NTpjNPkgZb3ngl0tUSw6ICWvtJQ=", + version = "v1.6.4", ) go_repository( name = "com_google_cloud_go_workflows", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/workflows", - sum = "h1:cSUlx4PVV9O0vYCl+pHAUmu0996A7eN602d4wjjVHRs=", - version = "v1.12.0", + sum = "h1:qocsqETmLAl34mSa01hKZjcqAvt699gaoFbooGGMvaM=", + version = "v1.12.3", ) go_repository( name = "com_jolheiser_go_hcaptcha", @@ -7568,7 +7247,6 @@ def go_dependencies(): sum = "h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=", version = "v1.2.0", ) - go_repository( name = "com_shuralyov_dmitri_gpu_mtl", build_file_proto_mode = "disable_global", @@ -7576,7 +7254,6 @@ def go_dependencies(): sum = "h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY=", version = "v0.0.0-20190408044501-666a987793e9", ) - go_repository( name = "dev_bobheadxi_go_gobenchdata", build_file_proto_mode = "disable_global", @@ -7591,7 +7268,6 @@ def go_dependencies(): sum = "h1:Mv2NE8svJMB5K7nIT9WGwF014yuY/lPXtT8mvNr1OrU=", version = "v1.2.2", ) - go_repository( name = "ht_sr_git_mariusor_go_xsd_duration", build_file_proto_mode = "disable_global", @@ -7606,7 +7282,6 @@ def go_dependencies(): sum = "h1:LNhjNn8DerC8f9DHLz6lS0YYul/b602DUxDgGkd/Aik=", version = "v0.3.1", ) - go_repository( name = "in_gopkg_alecthomas_kingpin_v2", build_file_proto_mode = "disable_global", @@ -7635,7 +7310,6 @@ def go_dependencies(): sum = "h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=", version = "v1.0.0-20181015200546-f715ec2f112d", ) - go_repository( name = "in_gopkg_check_v1", build_file_proto_mode = "disable_global", @@ -7650,7 +7324,6 @@ def go_dependencies(): sum = "h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk=", version = "v1.0.28", ) - go_repository( name = "in_gopkg_errgo_v2", build_file_proto_mode = "disable_global", @@ -7665,7 +7338,6 @@ def go_dependencies(): sum = "h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=", version = "v1.4.7", ) - go_repository( name = "in_gopkg_go_playground_assert_v1", build_file_proto_mode = "disable_global", @@ -7673,7 +7345,6 @@ def go_dependencies(): sum = "h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=", version = "v1.2.1", ) - go_repository( name = "in_gopkg_go_playground_validator_v9", build_file_proto_mode = "disable_global", @@ -7695,7 +7366,6 @@ def go_dependencies(): sum = "h1:RlWgLqCMMIYYEVcAR5MDsuHlVkaIPDAF+5Dehzg8L5A=", version = "v2.0.0-20180818164646-67afb5ed74ec", ) - go_repository( name = "in_gopkg_inf_v0", build_file_proto_mode = "disable_global", @@ -7710,7 +7380,6 @@ def go_dependencies(): sum = "h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=", version = "v1.67.0", ) - go_repository( name = "in_gopkg_natefinch_lumberjack_v2", build_file_proto_mode = "disable_global", @@ -7732,7 +7401,6 @@ def go_dependencies(): sum = "h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=", version = "v2.6.0", ) - go_repository( name = "in_gopkg_tomb_v1", build_file_proto_mode = "disable_global", @@ -7747,7 +7415,6 @@ def go_dependencies(): sum = "h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=", version = "v0.1.2", ) - go_repository( name = "in_gopkg_yaml_v2", build_file_proto_mode = "disable_global", @@ -7769,7 +7436,6 @@ def go_dependencies(): sum = "h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=", version = "v1.3.6", ) - go_repository( name = "io_etcd_go_etcd_api_v3", build_file_proto_mode = "disable_global", @@ -7861,7 +7527,20 @@ def go_dependencies(): sum = "h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M=", version = "v0.15.1", ) - + go_repository( + name = "io_gorm_driver_postgres", + build_file_proto_mode = "disable_global", + importpath = "gorm.io/driver/postgres", + sum = "h1:Iyrp9Meh3GmbSuyIAGyjkN+n9K+GHX9b9MqsTL4EJCo=", + version = "v1.5.4", + ) + go_repository( + name = "io_gorm_gorm", + build_file_proto_mode = "disable_global", + importpath = "gorm.io/gorm", + sum = "h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=", + version = "v1.25.5", + ) go_repository( name = "io_k8s_api", build_file_proto_mode = "disable_global", @@ -7876,7 +7555,6 @@ def go_dependencies(): sum = "h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc=", version = "v0.25.4", ) - go_repository( name = "io_k8s_client_go", build_file_proto_mode = "disable_global", @@ -7884,7 +7562,6 @@ def go_dependencies(): sum = "h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8=", version = "v0.25.4", ) - go_repository( name = "io_k8s_gengo", build_file_proto_mode = "disable_global", @@ -7892,7 +7569,6 @@ def go_dependencies(): sum = "h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=", version = "v0.0.0-20210813121822-485abfe95c7c", ) - go_repository( name = "io_k8s_klog", build_file_proto_mode = "disable_global", @@ -7914,7 +7590,6 @@ def go_dependencies(): sum = "h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=", version = "v0.0.0-20220803162953-67bda5d908f1", ) - go_repository( name = "io_k8s_sigs_json", build_file_proto_mode = "disable_global", @@ -7929,7 +7604,6 @@ def go_dependencies(): sum = "h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4=", version = "v0.13.3", ) - go_repository( name = "io_k8s_sigs_structured_merge_diff_v4", build_file_proto_mode = "disable_global", @@ -7958,7 +7632,6 @@ def go_dependencies(): sum = "h1:mUcz5b3FJbP5Cvdq7Khzn6J9OCUQJaBwgBkCR+MOwSs=", version = "v0.0.0-20191008002943-06d1c002b251", ) - go_repository( name = "io_opencensus_go", build_file_proto_mode = "disable_global", @@ -7966,7 +7639,6 @@ def go_dependencies(): sum = "h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=", version = "v0.24.0", ) - go_repository( name = "io_opencensus_go_contrib_exporter_prometheus", build_file_proto_mode = "disable_global", @@ -7974,7 +7646,6 @@ def go_dependencies(): sum = "h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg=", version = "v0.4.2", ) - go_repository( name = "io_opentelemetry_go_collector", build_file_proto_mode = "disable_global", @@ -8052,7 +7723,6 @@ def go_dependencies(): sum = "h1:wRV2PBnJygdmKpIdt/xfG7zdQvXvHz9L+z8MhGsOji4=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_collector_confmap", build_file_proto_mode = "disable_global", @@ -8067,7 +7737,6 @@ def go_dependencies(): sum = "h1:5jYYjQwxxgJKFtVvvbFLd0+2QHsvS0z+lVDxzmRv8uk=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_collector_consumer", build_file_proto_mode = "disable_global", @@ -8082,7 +7751,6 @@ def go_dependencies(): sum = "h1:GLhB8WGrBx+zZSB1HIOx2ivFUMahGtAVO2CC5xbCUHQ=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_collector_exporter_otlpexporter", build_file_proto_mode = "disable_global", @@ -8111,7 +7779,6 @@ def go_dependencies(): sum = "h1:UzVQSG9naJh1hX7hh+HVcvB3n+rpCJXX2BBdUoL/Ybo=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_collector_extension_zpagesextension", build_file_proto_mode = "disable_global", @@ -8126,7 +7793,6 @@ def go_dependencies(): sum = "h1:tiTUG9X/gEDN1oDYQOBVUFYQfhUG2CvgW9VhBc2uk1U=", version = "v1.0.0-rcv0013", ) - go_repository( name = "io_opentelemetry_go_collector_pdata", build_file_proto_mode = "disable_global", @@ -8141,7 +7807,6 @@ def go_dependencies(): sum = "h1:ypyNV5R0bnN3XGMAsH/q5eNARF5vXtFgSOK9rBWzsLc=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_collector_receiver", build_file_proto_mode = "disable_global", @@ -8149,7 +7814,6 @@ def go_dependencies(): sum = "h1:0c+YtIV7fmd9ev+zmwS9qjx5ASi8cw+gSypu4I7Gugc=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_collector_receiver_otlpreceiver", build_file_proto_mode = "disable_global", @@ -8157,7 +7821,6 @@ def go_dependencies(): sum = "h1:ewVbfATnAeQkwFK3r0dpFKCXcTb8HJKX4AixUioRt+c=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_collector_semconv", build_file_proto_mode = "disable_global", @@ -8165,7 +7828,6 @@ def go_dependencies(): sum = "h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw=", version = "v0.81.0", ) - go_repository( name = "io_opentelemetry_go_contrib_detectors_gcp", build_file_proto_mode = "disable_global", @@ -8173,7 +7835,6 @@ def go_dependencies(): sum = "h1:SsuF2+gqrnmTKSz+KLXcx3A4A7PZXqbuRZbm4I6HcX0=", version = "v1.17.0", ) - go_repository( name = "io_opentelemetry_go_contrib_instrumentation_google_golang_org_grpc_otelgrpc", build_file_proto_mode = "disable_global", @@ -8213,7 +7874,6 @@ def go_dependencies(): sum = "h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo=", version = "v1.17.0", ) - go_repository( name = "io_opentelemetry_go_contrib_propagators_jaeger", build_file_proto_mode = "disable_global", @@ -8235,7 +7895,6 @@ def go_dependencies(): sum = "h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q=", version = "v0.42.0", ) - go_repository( name = "io_opentelemetry_go_otel", build_file_proto_mode = "disable_global", @@ -8250,7 +7909,6 @@ def go_dependencies(): sum = "h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ=", version = "v0.39.0", ) - go_repository( name = "io_opentelemetry_go_otel_bridge_opentracing", build_file_proto_mode = "disable_global", @@ -8265,7 +7923,6 @@ def go_dependencies(): sum = "h1:YhxxmXZ011C0aDZKoNw+juVWAmEfv/0W2XBOv9aHTaA=", version = "v1.16.0", ) - go_repository( name = "io_opentelemetry_go_otel_exporters_otlp_internal_retry", build_file_proto_mode = "disable_global", @@ -8326,7 +7983,6 @@ def go_dependencies(): sum = "h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk=", version = "v0.27.0", ) - go_repository( name = "io_opentelemetry_go_otel_metric", build_file_proto_mode = "disable_global", @@ -8334,7 +7990,6 @@ def go_dependencies(): sum = "h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc=", version = "v1.17.0", ) - go_repository( name = "io_opentelemetry_go_otel_sdk", build_file_proto_mode = "disable_global", @@ -8342,7 +7997,6 @@ def go_dependencies(): sum = "h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=", version = "v1.16.0", ) - go_repository( name = "io_opentelemetry_go_otel_sdk_metric", build_file_proto_mode = "disable_global", @@ -8350,7 +8004,6 @@ def go_dependencies(): sum = "h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=", version = "v0.39.0", ) - go_repository( name = "io_opentelemetry_go_otel_trace", build_file_proto_mode = "disable_global", @@ -8379,7 +8032,6 @@ def go_dependencies(): sum = "h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=", version = "v0.1.1", ) - go_repository( name = "io_rsc_quote_v3", build_file_proto_mode = "disable_global", @@ -8415,7 +8067,6 @@ def go_dependencies(): sum = "h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=", version = "v0.0.0-20200306205701-8dd3e2ee1dd5", ) - go_repository( name = "org_bitbucket_creachadair_shell", build_file_proto_mode = "disable_global", @@ -8423,7 +8074,6 @@ def go_dependencies(): sum = "h1:Z96pB6DkSb7F3Y3BBnJeOZH2gazyMTWlvecSD4vDqfk=", version = "v0.0.7", ) - go_repository( name = "org_codeberg_gusted_mcaptcha", build_file_proto_mode = "disable_global", @@ -8438,13 +8088,12 @@ def go_dependencies(): sum = "h1:W3oBBjDTm7+IZfCKZAmC8uDG0eYfJL4Pp/xbbCMKaVo=", version = "v0.4.3", ) - go_repository( name = "org_golang_google_api", build_file_proto_mode = "disable_global", importpath = "google.golang.org/api", - sum = "h1:8t2/+qZ26kAOGSmOiHwVycqVaDg7q3JDILrNi/Z6rvc=", - version = "v0.132.0", + sum = "h1:Z9k22qD289SZ8gCJrk4DrWXkNjtfvKAUo/l1ma8eBYE=", + version = "v0.150.0", ) go_repository( name = "org_golang_google_appengine", @@ -8460,50 +8109,41 @@ def go_dependencies(): sum = "h1:Cpp2P6TPjujNoC5M2KHY6g7wfyLYfIWRZaSdIKfDasA=", version = "v0.0.0-20151119220103-975617b05ea8", ) - go_repository( name = "org_golang_google_genproto", - build_directives = [ - "gazelle:resolve go google.golang.org/genproto/googleapis/api @go_googleapis//google/api:api_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/label @go_googleapis//google/api:label_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep - "gazelle:resolve go google.golang.org/genproto/googleapis/api/monitoredres @go_googleapis//google/api:monitoredres_go_proto", # keep - ], build_file_proto_mode = "disable_global", importpath = "google.golang.org/genproto", - sum = "h1:vlzZttNJGVqTsRFU9AmdnrcO1Znh8Ew9kCD//yjigk0=", - version = "v0.0.0-20230920204549-e6e6cdab5c13", + sum = "h1:W12Pwm4urIbRdGhMEg2NM9O3TWKjNcxQhs46V0ypf/k=", + version = "v0.0.0-20231127180814-3a041ad873d4", ) go_repository( name = "org_golang_google_genproto_googleapis_api", build_file_proto_mode = "disable_global", importpath = "google.golang.org/genproto/googleapis/api", - sum = "h1:U7+wNaVuSTaUqNvK2+osJ9ejEZxbjHHk8F2b6Hpx0AE=", - version = "v0.0.0-20230920204549-e6e6cdab5c13", + sum = "h1:ZcOkrmX74HbKFYnpPY8Qsw93fC29TbJXspYKaBkSXDQ=", + version = "v0.0.0-20231127180814-3a041ad873d4", ) go_repository( name = "org_golang_google_genproto_googleapis_bytestream", build_file_proto_mode = "disable_global", importpath = "google.golang.org/genproto/googleapis/bytestream", - sum = "h1:Hm7pO7oy28D47G/nht5kL85gWK/270UoRu7tx7rU0xg=", - version = "v0.0.0-20230711160842-782d3b101e98", + sum = "h1:o4S3HvTUEXgRsNSUQsALDVog0O9F/U1JJlHmmUN8Uas=", + version = "v0.0.0-20231030173426-d783a09b4405", ) go_repository( name = "org_golang_google_genproto_googleapis_rpc", build_file_proto_mode = "disable_global", importpath = "google.golang.org/genproto/googleapis/rpc", - sum = "h1:tdhlmiMZNpc5p2W5qqKgRrOubaMZ3c85uG/GJtGgL98=", - version = "v0.0.0-20230920183334-c177e329c48b", + sum = "h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE=", + version = "v0.0.0-20231127180814-3a041ad873d4", ) - go_repository( name = "org_golang_google_grpc", build_file_proto_mode = "disable_global", importpath = "google.golang.org/grpc", - sum = "h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg=", - version = "v1.57.1", + sum = "h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=", + version = "v1.59.0", ) - go_repository( name = "org_golang_google_protobuf", build_file_proto_mode = "disable_global", @@ -8511,13 +8151,12 @@ def go_dependencies(): sum = "h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=", version = "v1.31.0", ) - go_repository( name = "org_golang_x_crypto", build_file_proto_mode = "disable_global", importpath = "golang.org/x/crypto", - sum = "h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=", - version = "v0.14.0", + sum = "h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=", + version = "v0.15.0", ) go_repository( name = "org_golang_x_exp", @@ -8551,65 +8190,64 @@ def go_dependencies(): name = "org_golang_x_mod", build_file_proto_mode = "disable_global", importpath = "golang.org/x/mod", - sum = "h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=", - version = "v0.12.0", + sum = "h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=", + version = "v0.14.0", ) go_repository( name = "org_golang_x_net", build_file_proto_mode = "disable_global", importpath = "golang.org/x/net", - sum = "h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=", - version = "v0.17.0", + sum = "h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=", + version = "v0.18.0", ) go_repository( name = "org_golang_x_oauth2", build_file_proto_mode = "disable_global", importpath = "golang.org/x/oauth2", - sum = "h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=", - version = "v0.10.0", + sum = "h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0=", + version = "v0.14.0", ) - go_repository( name = "org_golang_x_sync", build_file_proto_mode = "disable_global", importpath = "golang.org/x/sync", - sum = "h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=", - version = "v0.3.0", + sum = "h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=", + version = "v0.5.0", ) go_repository( name = "org_golang_x_sys", build_file_proto_mode = "disable_global", importpath = "golang.org/x/sys", - sum = "h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=", - version = "v0.13.0", + sum = "h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=", + version = "v0.14.0", ) go_repository( name = "org_golang_x_term", build_file_proto_mode = "disable_global", importpath = "golang.org/x/term", - sum = "h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=", - version = "v0.13.0", + sum = "h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=", + version = "v0.14.0", ) go_repository( name = "org_golang_x_text", build_file_proto_mode = "disable_global", importpath = "golang.org/x/text", - sum = "h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=", - version = "v0.13.0", + sum = "h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=", + version = "v0.14.0", ) go_repository( name = "org_golang_x_time", build_file_proto_mode = "disable_global", importpath = "golang.org/x/time", - sum = "h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=", - version = "v0.3.0", + sum = "h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=", + version = "v0.4.0", ) go_repository( name = "org_golang_x_tools", build_file_proto_mode = "disable_global", importpath = "golang.org/x/tools", - sum = "h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=", - version = "v0.10.0", + sum = "h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=", + version = "v0.15.0", ) go_repository( name = "org_golang_x_xerrors", @@ -8625,7 +8263,6 @@ def go_dependencies(): sum = "h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM=", version = "v0.13.0", ) - go_repository( name = "org_gonum_v1_plot", build_file_proto_mode = "disable_global", @@ -8696,7 +8333,6 @@ def go_dependencies(): sum = "h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=", version = "v1.1.0", ) - go_repository( name = "org_mongodb_go_mongo_driver", build_file_proto_mode = "disable_global", @@ -8704,7 +8340,6 @@ def go_dependencies(): sum = "h1:Ql6K6qYHEzB6xvu4+AU0BoRoqf9vFPcc4o7MUIdPW8Y=", version = "v1.11.3", ) - go_repository( name = "org_uber_go_atomic", build_file_proto_mode = "disable_global", @@ -8747,7 +8382,6 @@ def go_dependencies(): sum = "h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=", version = "v0.0.0-20190618225709-2cfd321de3ee", ) - go_repository( name = "org_uber_go_zap", build_file_proto_mode = "disable_global", @@ -8762,7 +8396,6 @@ def go_dependencies(): sum = "h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=", version = "v2.2.0+incompatible", ) - go_repository( name = "tools_gotest_v3", build_file_proto_mode = "disable_global", diff --git a/dev/backcompat/flakes.json b/dev/backcompat/flakes.json index 8cccac3c0df6e..801b956609133 100644 --- a/dev/backcompat/flakes.json +++ b/dev/backcompat/flakes.json @@ -26,6 +26,31 @@ "path": "internal/database", "prefix": "TestUserCredentials_CreateUpdate", "reason": "Update to crypto internals affects ability to compare authenticators" + }, + { + "path": "internal/database", + "prefix": "TestRepoStatistics", + "reason": "Updates the gitserver_repos_statistics table to different format that doesn't work with old query anymore" + }, + { + "path": "internal/database", + "prefix": "TestRepoStatistics_RecloneAndCorruption", + "reason": "Updates the gitserver_repos_statistics table to different format that doesn't work with old query anymore" + }, + { + "path": "internal/database", + "prefix": "TestRepoStatistics_DeleteAndUndelete", + "reason": "Updates the gitserver_repos_statistics table to different format that doesn't work with old query anymore" + }, + { + "path": "internal/database", + "prefix": "TestRepoStatistics_AvoidZeros", + "reason": "Updates the gitserver_repos_statistics table to different format that doesn't work with old query anymore" + }, + { + "path": "internal/database", + "prefix": "TestRepoStatistics_Compaction", + "reason": "Updates the gitserver_repos_statistics table to different format that doesn't work with old query anymore" } ] } diff --git a/dev/build-tracker/notify/slack.go b/dev/build-tracker/notify/slack.go index fc826cd2c09b7..1c927f0dd833a 100644 --- a/dev/build-tracker/notify/slack.go +++ b/dev/build-tracker/notify/slack.go @@ -285,8 +285,8 @@ func (c *Client) createMessageBlocks(info *BuildNotification, author string) []s }, &slack.ButtonBlockElement{ Type: slack.METButton, - URL: "https://www.loom.com/share/58cedf44d44c45a292f650ddd3547337", - Text: &slack.TextBlockObject{Type: slack.PlainTextType, Text: "Is this a flake?"}, + URL: "https://buildkite.com/organizations/sourcegraph/analytics/suites/sourcegraph-bazel?branch=main", + Text: &slack.TextBlockObject{Type: slack.PlainTextType, Text: "View test analytics"}, }, }..., ), diff --git a/dev/buildchecker/BUILD.bazel b/dev/buildchecker/BUILD.bazel index 8b6466a430c87..b74b71c30deaf 100644 --- a/dev/buildchecker/BUILD.bazel +++ b/dev/buildchecker/BUILD.bazel @@ -17,6 +17,7 @@ go_library( deps = [ "//dev/team", "//lib/errors", + "//lib/pointers", "@com_github_buildkite_go_buildkite_v3//buildkite", "@com_github_google_go_github_v55//github", "@com_github_honeycombio_libhoney_go//:libhoney-go", diff --git a/dev/buildchecker/checker.go b/dev/buildchecker/checker.go index 6f35c99b14a78..b8e9665e53fbc 100644 --- a/dev/buildchecker/checker.go +++ b/dev/buildchecker/checker.go @@ -130,10 +130,3 @@ func isBuildFailed(build buildkite.Build, timeout time.Duration) bool { } return false } - -func max(x, y int) int { - if x < y { - return y - } - return x -} diff --git a/dev/buildchecker/failures.go b/dev/buildchecker/failures.go index 9fc07d26914c9..67afd08a645c2 100644 --- a/dev/buildchecker/failures.go +++ b/dev/buildchecker/failures.go @@ -5,6 +5,7 @@ import ( "time" "github.com/buildkite/go-buildkite/v3/buildkite" + "github.com/sourcegraph/sourcegraph/lib/pointers" ) // findConsecutiveFailures scans the given set of builds for a series of consecutive @@ -48,11 +49,11 @@ func findConsecutiveFailures( consecutiveFailures += 1 commit := CommitInfo{ Author: author, - Commit: maybeString(build.Commit), + Commit: pointers.DerefZero(build.Commit), } if build.Number != nil { commit.BuildNumber = *build.Number - commit.BuildURL = maybeString(build.WebURL) + commit.BuildURL = pointers.DerefZero(build.WebURL) } if build.CreatedAt != nil { commit.BuildCreated = build.CreatedAt.Time @@ -65,10 +66,3 @@ func findConsecutiveFailures( return } - -func maybeString(s *string) string { - if s != nil { - return *s - } - return "" -} diff --git a/dev/ci/BUILD.bazel b/dev/ci/BUILD.bazel index f37785fe2a00f..3a724bde6bb92 100644 --- a/dev/ci/BUILD.bazel +++ b/dev/ci/BUILD.bazel @@ -1,5 +1,9 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") +exports_files([ + "bazel-configure.sh", +]) + go_library( name = "ci_lib", srcs = ["gen-pipeline.go"], diff --git a/dev/ci/bazel-configure.sh b/dev/ci/bazel-configure.sh new file mode 100755 index 0000000000000..25816def6749d --- /dev/null +++ b/dev/ci/bazel-configure.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +# Add go to PATH +readonly runfiles_dir="${PWD}" +PATH="$(dirname "${runfiles_dir}/${GO}"):${PATH}" +# Remove bazelisk from path +PATH=$(echo "${PATH}" | awk -v RS=: -v ORS=: '/bazelisk/ {next} {print}') +export PATH +# Allow Aspect to re-enter again +export ASPECT_REENTRANT= + +cd "${BUILD_WORKSPACE_DIRECTORY}" + +bazel configure + +if [ "${CI:-}" ]; then + git ls-files --exclude-standard --others | grep -v .aspect/bazelrc/ci.generated.bazelrc | xargs git add --intent-to-add || true + + diff_file=$(mktemp) + trap 'rm -f "${diff_file}"' EXIT + + EXIT_CODE=0 + git diff --color=never --output="${diff_file}" --exit-code || EXIT_CODE=$? + + # if we have a diff, BUILD files were updated so we notify people + if [[ $EXIT_CODE -ne 0 ]]; then + cat "${diff_file}" + exit 1 + fi +fi diff --git a/dev/ci/ci-checkov.sh b/dev/ci/ci-checkov.sh deleted file mode 100755 index 0140c8e4f3f0d..0000000000000 --- a/dev/ci/ci-checkov.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash -# Set this to fail on the install -set -euxo pipefail - -# Install and run the plugin for checkov -# Use the full path to run pip3.10 -pip3 install checkov - -# List of checks we do not want to run here -# This is a living list and will see additions and mostly removals over time. -SKIP_CHECKS="CKV_GCP_22,CKV_GCP_66,CKV_GCP_13,CKV_GCP_71,CKV_GCP_61,CKV_GCP_21,CKV_GCP_65,CKV_GCP_67,CKV_GCP_20,CKV_GCP_69,CKV_GCP_12,CKV_GCP_24,CKV_GCP_25,CKV_GCP_64,CKV_GCP_68,CKV2_AWS_5,CKV2_GCP_3,CKV2_GCP_5,CKV_AWS_23,CKV_GCP_70,CKV_GCP_62,CKV_GCP_62,CKV_GCP_62,CKV_GCP_62,CKV_GCP_29,CKV_GCP_39" - -set +x -# In case no terraform code is present -echo "--- Starting Checkov..." -echo "Note: If there is no output below here then no terraform code was found to scan. All good!" -echo "===========================================================================================" - -# Set not to fail on non-zero exit code -set +e -# Run checkov -python3 -m checkov.main --skip-check $SKIP_CHECKS --quiet --framework terraform --compact -d . - -# Options -# --quiet: Only show failing tests -# --compact: Do not show code snippets -# --framework: Only scan terraform code - -# Capture the error code -CHECKOV_EXIT_CODE="$?" - -# We check the exit code and display a warning if anything was found -if [[ "$CHECKOV_EXIT_CODE" != 0 ]]; then - echo "^^^ +++" - echo "Possible Terraform security issues found. " - echo "Please refer to the Sourcegraph handbook for guidance: https://handbook.sourcegraph.com/product-engineering/engineering/cloud/security/checkov" - exit 222 -fi diff --git a/dev/ci/gen-pipeline.go b/dev/ci/gen-pipeline.go index c86d0f0b305e5..c16cd97cd35fb 100644 --- a/dev/ci/gen-pipeline.go +++ b/dev/ci/gen-pipeline.go @@ -82,6 +82,8 @@ func main() { func previewPipeline(w io.Writer, c ci.Config, pipeline *buildkite.Pipeline) { fmt.Fprintf(w, "- **Detected run type:** %s\n", c.RunType.String()) fmt.Fprintf(w, "- **Detected diffs:** %s\n", c.Diff.String()) + fmt.Fprintf(w, "- **Computed variables:**\n") + fmt.Fprintf(w, " - VERSION=%s\n", c.Version) fmt.Fprintf(w, "- **Computed build steps:**\n") printPipeline(w, "", pipeline) } diff --git a/dev/ci/internal/ci/bazel_operations.go b/dev/ci/internal/ci/bazel_operations.go index 04029ffab4511..73ca65199e86b 100644 --- a/dev/ci/internal/ci/bazel_operations.go +++ b/dev/ci/internal/ci/bazel_operations.go @@ -15,16 +15,18 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" ) -func BazelOperations(buildOpts bk.BuildOptions, isMain bool) []operations.Operation { +func BazelOperations(buildOpts bk.BuildOptions, opts CoreTestOperationsOptions) []operations.Operation { ops := []operations.Operation{} - ops = append(ops, bazelPrechecks()) - if isMain { - ops = append(ops, bazelTest("//...", "//client/web:test", "//testing:codeintel_integration_test", "//testing:grpc_backend_integration_test")) - } else { - ops = append(ops, bazelTest("//...", "//client/web:test")) + if !opts.AspectWorkflows { + ops = append(ops, bazelPrechecks()) + if opts.IsMainBranch { + ops = append(ops, bazelTest("//...", "//client/web:test", "//testing:codeintel_integration_test", "//testing:grpc_backend_integration_test")) + } else { + ops = append(ops, bazelTest("//...", "//client/web:test")) + } } - ops = append(ops, triggerBackCompatTest(buildOpts), bazelGoModTidy()) + ops = append(ops, triggerBackCompatTest(buildOpts, opts.AspectWorkflows), bazelGoModTidy()) return ops } @@ -163,13 +165,6 @@ func bazelTest(targets ...string) func(*bk.Pipeline) { cmds = append(cmds, bazelApplyPrecheckChanges()) - // bazel build //client/web:bundle is very resource hungry and often crashes when ran along other targets - // so we run it first to avoid failing builds midway. - cmds = append(cmds, - bazelAnnouncef("bazel build //client/web:bundle"), - bk.Cmd(bazelCmd("build //client/web:bundle")), - ) - for _, target := range targets { cmd := bazelCmd(fmt.Sprintf("test %s", target)) bazelTestCmds = append(bazelTestCmds, @@ -185,14 +180,22 @@ func bazelTest(targets ...string) func(*bk.Pipeline) { } } -func triggerBackCompatTest(buildOpts bk.BuildOptions) func(*bk.Pipeline) { +func triggerBackCompatTest(buildOpts bk.BuildOptions, isAspectWorkflows bool) func(*bk.Pipeline) { + if isAspectWorkflows { + buildOpts.Message += " (Aspect)" + } return func(pipeline *bk.Pipeline) { - pipeline.AddTrigger(":bazel::snail: Async BackCompat Tests", "sourcegraph-backcompat", + steps := []bk.StepOpt{ + bk.Async(true), bk.Key("trigger-backcompat"), - bk.DependsOn("bazel-prechecks"), bk.AllowDependencyFailure(), bk.Build(buildOpts), - ) + } + + if !isAspectWorkflows { + steps = append(steps, bk.DependsOn("bazel-prechecks")) + } + pipeline.AddTrigger(":bazel::snail: Async BackCompat Tests", "sourcegraph-backcompat", steps...) } } @@ -344,12 +347,11 @@ func bazelBuildCandidateDockerImages(apps []string, version string, tag string, } } -func bazelBuildCandidateDockerImage(app string, version string, tag string, rt runtype.RunType) operations.Operation { +func legacyBuildCandidateDockerImage(app string, version string, tag string, rt runtype.RunType) operations.Operation { return func(pipeline *bk.Pipeline) { cmds := []bk.StepOpt{} cmds = append(cmds, bk.Key(candidateImageStepKey(app)), - bk.Env("DOCKER_BAZEL", "true"), bk.Env("VERSION", version), bk.Agent("queue", "bazel"), ) @@ -384,16 +386,8 @@ func bazelBuildCandidateDockerImage(app string, version string, tag string, rt r if _, err := os.Stat(filepath.Join("docker-images", app)); err == nil { // Building Docker image located under $REPO_ROOT/docker-images/ buildScriptPath := filepath.Join("docker-images", app, "build.sh") - _, err := os.Stat(filepath.Join("docker-images", app, "build-bazel.sh")) - if err == nil { - // If the file exists. - buildScriptPath = filepath.Join("docker-images", app, "build-bazel.sh") - } - cmds = append(cmds, - bk.Cmd("ls -lah "+buildScriptPath), - bk.Cmd(buildScriptPath), - ) + cmds = append(cmds, bk.Cmd(buildScriptPath)) } else if _, err := os.Stat(filepath.Join("client", app)); err == nil { // Building Docker image located under $REPO_ROOT/client/ cmds = append(cmds, bk.AnnotatedCmd("client/"+app+"/build.sh", buildAnnotationOptions)) @@ -413,11 +407,6 @@ func bazelBuildCandidateDockerImage(app string, version string, tag string, rt r return "cmd/" + folder }() buildScriptPath := filepath.Join(cmdDir, "build.sh") - _, err := os.Stat(filepath.Join(cmdDir, "build-bazel.sh")) - if err == nil { - // If the file exists. - buildScriptPath = filepath.Join(cmdDir, "build-bazel.sh") - } cmds = append(cmds, bk.AnnotatedCmd(buildScriptPath, buildAnnotationOptions)) } @@ -433,7 +422,7 @@ func bazelBuildCandidateDockerImage(app string, version string, tag string, rt r // Retry in case of flakes when pushing // bk.AutomaticRetryStatus(3, 222), ) - pipeline.AddStep(fmt.Sprintf(":bazel::docker: :construction: Build %s", app), cmds...) + pipeline.AddStep(fmt.Sprintf(":old-man::docker: :construction: Build %s", app), cmds...) } } diff --git a/dev/ci/internal/ci/changed/files.go b/dev/ci/internal/ci/changed/files.go index 432d8ec883985..b474e6df44952 100644 --- a/dev/ci/internal/ci/changed/files.go +++ b/dev/ci/internal/ci/changed/files.go @@ -1,15 +1,9 @@ package changed -import "path/filepath" - -func contains(s []string, str string) bool { - for _, v := range s { - if v == str { - return true - } - } - return false -} +import ( + "path/filepath" + "slices" +) // Changes in the root directory files should trigger client tests. var clientRootFiles = []string{ @@ -25,5 +19,5 @@ var clientRootFiles = []string{ } func isRootClientFile(p string) bool { - return filepath.Dir(p) == "." && contains(clientRootFiles, p) + return filepath.Dir(p) == "." && slices.Contains(clientRootFiles, p) } diff --git a/dev/ci/internal/ci/operations.go b/dev/ci/internal/ci/operations.go index 8cf85dc048f22..f928fc46976b7 100644 --- a/dev/ci/internal/ci/operations.go +++ b/dev/ci/internal/ci/operations.go @@ -28,6 +28,9 @@ type CoreTestOperationsOptions struct { CreateBundleSizeDiff bool // for addWebAppEnterpriseBuild IsMainBranch bool + + // AspectWorkflows is set to true when we generate steps as part of the Aspect Workflows pipeline + AspectWorkflows bool } // CoreTestOperations is a core set of tests that should be run in most CI cases. More @@ -45,7 +48,7 @@ func CoreTestOperations(buildOpts bk.BuildOptions, diff changed.Diff, opts CoreT ops := operations.NewSet() // Simple, fast-ish linter checks - ops.Append(BazelOperations(buildOpts, opts.IsMainBranch)...) + ops.Append(BazelOperations(buildOpts, opts)...) linterOps := operations.NewNamedSet("Linters and static analysis") if targets := changed.GetLinterTargets(diff); len(targets) > 0 { linterOps.Append(addSgLints(targets)) diff --git a/dev/ci/internal/ci/pipeline.go b/dev/ci/internal/ci/pipeline.go index 1f2327b5ffbbe..cab1d02b5ea86 100644 --- a/dev/ci/internal/ci/pipeline.go +++ b/dev/ci/internal/ci/pipeline.go @@ -6,6 +6,7 @@ import ( "bufio" "fmt" "os" + "slices" "strconv" "strings" "time" @@ -87,6 +88,10 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { Env: env, } + // We generate the pipeline slightly differently when running as part of the Aspect Workflows pipeline. + // Primarily, we don't run any `bazel test` since Aspect has got that covered + isAspectWorkflowBuild := os.Getenv("ASPECT_WORKFLOWS_BUILD") == "1" + // Test upgrades from mininum upgradeable Sourcegraph version - updated by release tool const minimumUpgradeableVersion = "5.2.0" @@ -136,11 +141,14 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { MinimumUpgradeableVersion: minimumUpgradeableVersion, ForceReadyForReview: c.MessageFlags.ForceReadyForReview, CreateBundleSizeDiff: true, + AspectWorkflows: isAspectWorkflowBuild, })) - securityOps := operations.NewNamedSet("Security Scanning") - securityOps.Append(sonarcloudScan()) - ops.Merge(securityOps) + if !isAspectWorkflowBuild { + securityOps := operations.NewNamedSet("Security Scanning") + securityOps.Append(sonarcloudScan()) + ops.Merge(securityOps) + } // Wolfi package and base images packageOps, baseImageOps := addWolfiOps(c) @@ -164,6 +172,10 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { // If this is a browser extension release branch, run the browser-extension tests and // builds. ops = BazelOpsSet(buildOptions, + CoreTestOperationsOptions{ + IsMainBranch: buildOptions.Branch == "main", + AspectWorkflows: isAspectWorkflowBuild, + }, addBrowserExtensionIntegrationTests(0), // we pass 0 here as we don't have other pipeline steps to contribute to the resulting Percy build wait, addBrowserExtensionReleaseSteps) @@ -172,6 +184,10 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { // If this is a browser extension nightly build, run the browser-extension tests and // e2e tests. ops = BazelOpsSet(buildOptions, + CoreTestOperationsOptions{ + IsMainBranch: buildOptions.Branch == "main", + AspectWorkflows: isAspectWorkflowBuild, + }, recordBrowserExtensionIntegrationTests, wait, addBrowserExtensionE2ESteps) @@ -208,16 +224,17 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { if err != nil { panic(fmt.Sprintf("ExtractBranchArgument: %s", err)) } - if !contains(images.SourcegraphDockerImages, patchImage) { + if !slices.Contains(images.SourcegraphDockerImages, patchImage) { panic(fmt.Sprintf("no image %q found", patchImage)) } ops = operations.NewSet( - bazelBuildCandidateDockerImage(patchImage, c.Version, c.candidateImageTag(), c.RunType), + legacyBuildCandidateDockerImage(patchImage, c.Version, c.candidateImageTag(), c.RunType), trivyScanCandidateImage(patchImage, c.candidateImageTag())) // Test images ops.Merge(CoreTestOperations(buildOptions, changed.All, CoreTestOperationsOptions{ MinimumUpgradeableVersion: minimumUpgradeableVersion, + AspectWorkflows: isAspectWorkflowBuild, })) // Publish images after everything is done ops.Append( @@ -230,17 +247,17 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { if err != nil { panic(fmt.Sprintf("ExtractBranchArgument: %s", err)) } - if !contains(images.SourcegraphDockerImages, patchImage) { + if !slices.Contains(images.SourcegraphDockerImages, patchImage) { panic(fmt.Sprintf("no image %q found", patchImage)) } ops = operations.NewSet( - bazelBuildCandidateDockerImage(patchImage, c.Version, c.candidateImageTag(), c.RunType), + legacyBuildCandidateDockerImage(patchImage, c.Version, c.candidateImageTag(), c.RunType), wait, publishFinalDockerImage(c, patchImage)) case runtype.ExecutorPatchNoTest: executorVMImage := "executor-vm" ops = operations.NewSet( - bazelBuildCandidateDockerImage(executorVMImage, c.Version, c.candidateImageTag(), c.RunType), + legacyBuildCandidateDockerImage(executorVMImage, c.Version, c.candidateImageTag(), c.RunType), trivyScanCandidateImage(executorVMImage, c.candidateImageTag()), buildExecutorVM(c, true), buildExecutorDockerMirror(c), @@ -275,12 +292,15 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { ForceReadyForReview: c.MessageFlags.ForceReadyForReview, CacheBundleSize: c.RunType.Is(runtype.MainBranch, runtype.MainDryRun), IsMainBranch: true, + AspectWorkflows: isAspectWorkflowBuild, })) // Security scanning - sonarcloud - securityOps := operations.NewNamedSet("Security Scanning") - securityOps.Append(sonarcloudScan()) - ops.Merge(securityOps) + if isAspectWorkflowBuild { + securityOps := operations.NewNamedSet("Security Scanning") + securityOps.Append(sonarcloudScan()) + ops.Merge(securityOps) + } // Publish candidate images to dev registry publishOpsDev := operations.NewNamedSet("Publish candidate images") @@ -402,10 +422,9 @@ func withAgentLostRetries(s *bk.Step) { }) } -func BazelOpsSet(buildOptions bk.BuildOptions, extra ...operations.Operation) *operations.Set { - var isMain = buildOptions.Branch == "main" +func BazelOpsSet(buildOptions bk.BuildOptions, opts CoreTestOperationsOptions, extra ...operations.Operation) *operations.Set { ops := operations.NewSet( - BazelOperations(buildOptions, isMain)..., + BazelOperations(buildOptions, opts)..., ) ops.Append(extra...) return ops diff --git a/dev/ci/internal/ci/web-integration-workloads.go b/dev/ci/internal/ci/web-integration-workloads.go index 1ef8d642aa328..36eb7c54782e6 100644 --- a/dev/ci/internal/ci/web-integration-workloads.go +++ b/dev/ci/internal/ci/web-integration-workloads.go @@ -9,15 +9,6 @@ import ( // Code in this file is used to split web integration tests workloads. -func contains(s []string, str string) bool { - for _, v := range s { - if v == str { - return true - } - } - return false -} - func getWebIntegrationFileNames() []string { var fileNames []string @@ -54,14 +45,6 @@ func chunkItems(items []string, size int) [][]string { return chunks } -func min(x int, y int) int { - if x < y { - return x - } - - return y -} - // getChunkedWebIntegrationFileNames gets web integration test filenames and splits them in chunks for parallelizing client integration tests. func getChunkedWebIntegrationFileNames(chunkSize int) []string { testFiles := getWebIntegrationFileNames() diff --git a/dev/ci/internal/ci/wolfi_operations.go b/dev/ci/internal/ci/wolfi_operations.go index d2200fb73e3c5..5bf5fc3643e87 100644 --- a/dev/ci/internal/ci/wolfi_operations.go +++ b/dev/ci/internal/ci/wolfi_operations.go @@ -113,7 +113,6 @@ func buildWolfiBaseImage(target string, tag string, dependOnPackages bool) (func }), // We want to run on the bazel queue, so we have a pretty minimal agent. bk.Agent("queue", "bazel"), - bk.Env("DOCKER_BAZEL", "true"), bk.Key(stepKey), bk.SoftFail(222), } diff --git a/dev/ci/push_all.sh b/dev/ci/push_all.sh index ff0acecefd2e2..ff7a503160ea0 100755 --- a/dev/ci/push_all.sh +++ b/dev/ci/push_all.sh @@ -19,6 +19,11 @@ function create_push_command() { target="$3" tags_args="$4" + # TODO(JH): https://github.com/sourcegraph/sourcegraph/issues/58442 + if [[ "$target" == "//docker-images/syntax-highlighter:scip-ctags_candidate_push" ]]; then + repository="scip-ctags" + fi + repositories_args="" for registry in "${registries[@]}"; do repositories_args="$repositories_args --repository ${registry}/${repository}" diff --git a/dev/defs.bzl b/dev/defs.bzl index 62cdedbc0d2f0..69633aa58d712 100644 --- a/dev/defs.bzl +++ b/dev/defs.bzl @@ -3,10 +3,9 @@ load("@aspect_rules_swc//swc:defs.bzl", "swc") load("@bazel_skylib//lib:partial.bzl", "partial") load("@bazel_skylib//rules:expand_template.bzl", "expand_template") -load("@aspect_rules_js//js:defs.bzl", "js_library") +load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library") load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package") load("@aspect_rules_ts//ts:defs.bzl", _ts_project = "ts_project") -load("@aspect_rules_js//js:defs.bzl", "js_binary") load("//dev:eslint.bzl", "eslint_test_with_types", "get_client_package_path") load("@npm//:vitest/package_json.bzl", vitest_bin = "bin") load(":sass.bzl", _sass = "sass") @@ -153,8 +152,8 @@ def vitest_test(name, data = [], **kwargs): "//:node_modules/jsdom", ], env = {"BAZEL": "1", "CI": "1"}, - patch_node_fs = False, - tags = kwargs.pop("tags", []) + ["no-sandbox"], + patch_node_fs = True, + tags = kwargs.pop("tags", []), timeout = kwargs.pop("timeout", "short"), **kwargs ) diff --git a/dev/global-settings.json b/dev/global-settings.json index f5e52672e80c0..b32a366078410 100644 --- a/dev/global-settings.json +++ b/dev/global-settings.json @@ -11,5 +11,8 @@ }, "search.repositoryGroups": { "test": ["github.com/gorilla/mux", "github.com/gorilla/pat"] - } + }, + // team search platform: This enables the experimental "precise (NEW)" search mode by default + "search.defaultMode": "precise", + "search.defaultPatternType": "newStandardRC1" } diff --git a/dev/go_defs.bzl b/dev/go_defs.bzl index c0fa734332bcc..af2d6c1b73b13 100644 --- a/dev/go_defs.bzl +++ b/dev/go_defs.bzl @@ -1,4 +1,4 @@ -load("@io_bazel_rules_go//go:def.bzl", _go_test="go_test") +load("@io_bazel_rules_go//go:def.bzl", _go_test = "go_test") def go_test(**kwargs): # All go tests have their timeout set to short by default, unless specified otherwise. diff --git a/dev/linters/staticcheck/analyzers.bzl b/dev/linters/staticcheck/analyzers.bzl index b4972b731efb8..d038d34156d6a 100644 --- a/dev/linters/staticcheck/analyzers.bzl +++ b/dev/linters/staticcheck/analyzers.bzl @@ -4,129 +4,129 @@ # and re-run go generate STATIC_CHECK_ANALYZERS = [ - "//dev/linters/staticcheck:S1000", - "//dev/linters/staticcheck:S1001", - "//dev/linters/staticcheck:S1002", - "//dev/linters/staticcheck:S1003", - "//dev/linters/staticcheck:S1004", - "//dev/linters/staticcheck:S1005", - "//dev/linters/staticcheck:S1006", - "//dev/linters/staticcheck:S1007", - "//dev/linters/staticcheck:S1008", - "//dev/linters/staticcheck:S1009", - "//dev/linters/staticcheck:S1010", - "//dev/linters/staticcheck:S1011", - "//dev/linters/staticcheck:S1012", - "//dev/linters/staticcheck:S1016", - "//dev/linters/staticcheck:S1017", - "//dev/linters/staticcheck:S1018", - "//dev/linters/staticcheck:S1019", - "//dev/linters/staticcheck:S1020", - "//dev/linters/staticcheck:S1021", - "//dev/linters/staticcheck:S1023", - "//dev/linters/staticcheck:S1024", - "//dev/linters/staticcheck:S1025", - "//dev/linters/staticcheck:S1028", - "//dev/linters/staticcheck:S1029", - "//dev/linters/staticcheck:S1030", - "//dev/linters/staticcheck:S1031", - "//dev/linters/staticcheck:S1032", - "//dev/linters/staticcheck:S1033", - "//dev/linters/staticcheck:S1034", - "//dev/linters/staticcheck:S1035", - "//dev/linters/staticcheck:S1036", - "//dev/linters/staticcheck:S1037", - "//dev/linters/staticcheck:S1038", - "//dev/linters/staticcheck:S1039", - "//dev/linters/staticcheck:S1040", - "//dev/linters/staticcheck:SA1000", - "//dev/linters/staticcheck:SA1001", - "//dev/linters/staticcheck:SA1002", - "//dev/linters/staticcheck:SA1003", - "//dev/linters/staticcheck:SA1004", - "//dev/linters/staticcheck:SA1005", - "//dev/linters/staticcheck:SA1006", - "//dev/linters/staticcheck:SA1007", - "//dev/linters/staticcheck:SA1008", - "//dev/linters/staticcheck:SA1010", - "//dev/linters/staticcheck:SA1011", - "//dev/linters/staticcheck:SA1012", - "//dev/linters/staticcheck:SA1013", - "//dev/linters/staticcheck:SA1014", - "//dev/linters/staticcheck:SA1015", - "//dev/linters/staticcheck:SA1016", - "//dev/linters/staticcheck:SA1017", - "//dev/linters/staticcheck:SA1018", - "//dev/linters/staticcheck:SA1019", - "//dev/linters/staticcheck:SA1020", - "//dev/linters/staticcheck:SA1021", - "//dev/linters/staticcheck:SA1023", - "//dev/linters/staticcheck:SA1024", - "//dev/linters/staticcheck:SA1025", - "//dev/linters/staticcheck:SA1026", - "//dev/linters/staticcheck:SA1027", - "//dev/linters/staticcheck:SA1028", - "//dev/linters/staticcheck:SA1029", - "//dev/linters/staticcheck:SA1030", - "//dev/linters/staticcheck:SA2000", - "//dev/linters/staticcheck:SA2001", - "//dev/linters/staticcheck:SA2002", - "//dev/linters/staticcheck:SA2003", - "//dev/linters/staticcheck:SA3000", - "//dev/linters/staticcheck:SA3001", - "//dev/linters/staticcheck:SA4000", - "//dev/linters/staticcheck:SA4001", - "//dev/linters/staticcheck:SA4003", - "//dev/linters/staticcheck:SA4004", - "//dev/linters/staticcheck:SA4005", - "//dev/linters/staticcheck:SA4006", - "//dev/linters/staticcheck:SA4008", - "//dev/linters/staticcheck:SA4009", - "//dev/linters/staticcheck:SA4010", - "//dev/linters/staticcheck:SA4011", - "//dev/linters/staticcheck:SA4012", - "//dev/linters/staticcheck:SA4013", - "//dev/linters/staticcheck:SA4014", - "//dev/linters/staticcheck:SA4015", - "//dev/linters/staticcheck:SA4016", - "//dev/linters/staticcheck:SA4017", - "//dev/linters/staticcheck:SA4018", - "//dev/linters/staticcheck:SA4019", - "//dev/linters/staticcheck:SA4020", - "//dev/linters/staticcheck:SA4021", - "//dev/linters/staticcheck:SA4022", - "//dev/linters/staticcheck:SA4023", - "//dev/linters/staticcheck:SA4024", - "//dev/linters/staticcheck:SA4025", - "//dev/linters/staticcheck:SA4026", - "//dev/linters/staticcheck:SA4027", - "//dev/linters/staticcheck:SA4028", - "//dev/linters/staticcheck:SA4029", - "//dev/linters/staticcheck:SA4030", - "//dev/linters/staticcheck:SA4031", - "//dev/linters/staticcheck:SA5000", - "//dev/linters/staticcheck:SA5001", - "//dev/linters/staticcheck:SA5002", - "//dev/linters/staticcheck:SA5003", - "//dev/linters/staticcheck:SA5004", - "//dev/linters/staticcheck:SA5005", - "//dev/linters/staticcheck:SA5007", - "//dev/linters/staticcheck:SA5008", - "//dev/linters/staticcheck:SA5009", - "//dev/linters/staticcheck:SA5010", - "//dev/linters/staticcheck:SA5011", - "//dev/linters/staticcheck:SA5012", - "//dev/linters/staticcheck:SA6000", - "//dev/linters/staticcheck:SA6001", - "//dev/linters/staticcheck:SA6002", - "//dev/linters/staticcheck:SA6003", - "//dev/linters/staticcheck:SA6005", - "//dev/linters/staticcheck:SA9001", - "//dev/linters/staticcheck:SA9002", - "//dev/linters/staticcheck:SA9003", - "//dev/linters/staticcheck:SA9004", - "//dev/linters/staticcheck:SA9005", - "//dev/linters/staticcheck:SA9006", - "//dev/linters/staticcheck:SA9007", - "//dev/linters/staticcheck:SA9008", + "//dev/linters/staticcheck:S1000", + "//dev/linters/staticcheck:S1001", + "//dev/linters/staticcheck:S1002", + "//dev/linters/staticcheck:S1003", + "//dev/linters/staticcheck:S1004", + "//dev/linters/staticcheck:S1005", + "//dev/linters/staticcheck:S1006", + "//dev/linters/staticcheck:S1007", + "//dev/linters/staticcheck:S1008", + "//dev/linters/staticcheck:S1009", + "//dev/linters/staticcheck:S1010", + "//dev/linters/staticcheck:S1011", + "//dev/linters/staticcheck:S1012", + "//dev/linters/staticcheck:S1016", + "//dev/linters/staticcheck:S1017", + "//dev/linters/staticcheck:S1018", + "//dev/linters/staticcheck:S1019", + "//dev/linters/staticcheck:S1020", + "//dev/linters/staticcheck:S1021", + "//dev/linters/staticcheck:S1023", + "//dev/linters/staticcheck:S1024", + "//dev/linters/staticcheck:S1025", + "//dev/linters/staticcheck:S1028", + "//dev/linters/staticcheck:S1029", + "//dev/linters/staticcheck:S1030", + "//dev/linters/staticcheck:S1031", + "//dev/linters/staticcheck:S1032", + "//dev/linters/staticcheck:S1033", + "//dev/linters/staticcheck:S1034", + "//dev/linters/staticcheck:S1035", + "//dev/linters/staticcheck:S1036", + "//dev/linters/staticcheck:S1037", + "//dev/linters/staticcheck:S1038", + "//dev/linters/staticcheck:S1039", + "//dev/linters/staticcheck:S1040", + "//dev/linters/staticcheck:SA1000", + "//dev/linters/staticcheck:SA1001", + "//dev/linters/staticcheck:SA1002", + "//dev/linters/staticcheck:SA1003", + "//dev/linters/staticcheck:SA1004", + "//dev/linters/staticcheck:SA1005", + "//dev/linters/staticcheck:SA1006", + "//dev/linters/staticcheck:SA1007", + "//dev/linters/staticcheck:SA1008", + "//dev/linters/staticcheck:SA1010", + "//dev/linters/staticcheck:SA1011", + "//dev/linters/staticcheck:SA1012", + "//dev/linters/staticcheck:SA1013", + "//dev/linters/staticcheck:SA1014", + "//dev/linters/staticcheck:SA1015", + "//dev/linters/staticcheck:SA1016", + "//dev/linters/staticcheck:SA1017", + "//dev/linters/staticcheck:SA1018", + "//dev/linters/staticcheck:SA1019", + "//dev/linters/staticcheck:SA1020", + "//dev/linters/staticcheck:SA1021", + "//dev/linters/staticcheck:SA1023", + "//dev/linters/staticcheck:SA1024", + "//dev/linters/staticcheck:SA1025", + "//dev/linters/staticcheck:SA1026", + "//dev/linters/staticcheck:SA1027", + "//dev/linters/staticcheck:SA1028", + "//dev/linters/staticcheck:SA1029", + "//dev/linters/staticcheck:SA1030", + "//dev/linters/staticcheck:SA2000", + "//dev/linters/staticcheck:SA2001", + "//dev/linters/staticcheck:SA2002", + "//dev/linters/staticcheck:SA2003", + "//dev/linters/staticcheck:SA3000", + "//dev/linters/staticcheck:SA3001", + "//dev/linters/staticcheck:SA4000", + "//dev/linters/staticcheck:SA4001", + "//dev/linters/staticcheck:SA4003", + "//dev/linters/staticcheck:SA4004", + "//dev/linters/staticcheck:SA4005", + "//dev/linters/staticcheck:SA4006", + "//dev/linters/staticcheck:SA4008", + "//dev/linters/staticcheck:SA4009", + "//dev/linters/staticcheck:SA4010", + "//dev/linters/staticcheck:SA4011", + "//dev/linters/staticcheck:SA4012", + "//dev/linters/staticcheck:SA4013", + "//dev/linters/staticcheck:SA4014", + "//dev/linters/staticcheck:SA4015", + "//dev/linters/staticcheck:SA4016", + "//dev/linters/staticcheck:SA4017", + "//dev/linters/staticcheck:SA4018", + "//dev/linters/staticcheck:SA4019", + "//dev/linters/staticcheck:SA4020", + "//dev/linters/staticcheck:SA4021", + "//dev/linters/staticcheck:SA4022", + "//dev/linters/staticcheck:SA4023", + "//dev/linters/staticcheck:SA4024", + "//dev/linters/staticcheck:SA4025", + "//dev/linters/staticcheck:SA4026", + "//dev/linters/staticcheck:SA4027", + "//dev/linters/staticcheck:SA4028", + "//dev/linters/staticcheck:SA4029", + "//dev/linters/staticcheck:SA4030", + "//dev/linters/staticcheck:SA4031", + "//dev/linters/staticcheck:SA5000", + "//dev/linters/staticcheck:SA5001", + "//dev/linters/staticcheck:SA5002", + "//dev/linters/staticcheck:SA5003", + "//dev/linters/staticcheck:SA5004", + "//dev/linters/staticcheck:SA5005", + "//dev/linters/staticcheck:SA5007", + "//dev/linters/staticcheck:SA5008", + "//dev/linters/staticcheck:SA5009", + "//dev/linters/staticcheck:SA5010", + "//dev/linters/staticcheck:SA5011", + "//dev/linters/staticcheck:SA5012", + "//dev/linters/staticcheck:SA6000", + "//dev/linters/staticcheck:SA6001", + "//dev/linters/staticcheck:SA6002", + "//dev/linters/staticcheck:SA6003", + "//dev/linters/staticcheck:SA6005", + "//dev/linters/staticcheck:SA9001", + "//dev/linters/staticcheck:SA9002", + "//dev/linters/staticcheck:SA9003", + "//dev/linters/staticcheck:SA9004", + "//dev/linters/staticcheck:SA9005", + "//dev/linters/staticcheck:SA9006", + "//dev/linters/staticcheck:SA9007", + "//dev/linters/staticcheck:SA9008", ] diff --git a/dev/linters/staticcheck/cmd/gen.go b/dev/linters/staticcheck/cmd/gen.go index fd2f3b57f0fa2..f510792d26db1 100644 --- a/dev/linters/staticcheck/cmd/gen.go +++ b/dev/linters/staticcheck/cmd/gen.go @@ -7,8 +7,9 @@ import ( "strings" "text/template" - "github.com/sourcegraph/sourcegraph/dev/linters/staticcheck" "honnef.co/go/tools/analysis/lint" + + "github.com/sourcegraph/sourcegraph/dev/linters/staticcheck" ) var ignoredAnalyzer = map[string]string{ @@ -62,7 +63,7 @@ var BazelDefTemplate = `# DO NOT EDIT - this file was generated by running go ge STATIC_CHECK_ANALYZERS = [ {{- range .Analyzers}} - "//dev/linters/staticcheck:{{.Analyzer.Name}}", + "//dev/linters/staticcheck:{{.Analyzer.Name}}", {{- end}} ] ` diff --git a/dev/managedservicesplatform/internal/resource/cloudsql/BUILD.bazel b/dev/managedservicesplatform/internal/resource/cloudsql/BUILD.bazel new file mode 100644 index 0000000000000..862ea9fcd0fc7 --- /dev/null +++ b/dev/managedservicesplatform/internal/resource/cloudsql/BUILD.bazel @@ -0,0 +1,22 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "cloudsql", + srcs = ["cloudsql.go"], + importpath = "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/cloudsql", + visibility = ["//dev/managedservicesplatform:__subpackages__"], + deps = [ + "//dev/managedservicesplatform/internal/resource/random", + "//dev/managedservicesplatform/internal/resource/serviceaccount", + "//dev/managedservicesplatform/internal/resourceid", + "//dev/managedservicesplatform/spec", + "//lib/pointers", + "@com_github_aws_constructs_go_constructs_v10//:constructs", + "@com_github_hashicorp_terraform_cdk_go_cdktf//:cdktf", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//computenetwork", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//sqldatabase", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//sqldatabaseinstance", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//sqluser", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_random//password", + ], +) diff --git a/dev/managedservicesplatform/internal/resource/cloudsql/cloudsql.go b/dev/managedservicesplatform/internal/resource/cloudsql/cloudsql.go new file mode 100644 index 0000000000000..e24135ad94e48 --- /dev/null +++ b/dev/managedservicesplatform/internal/resource/cloudsql/cloudsql.go @@ -0,0 +1,194 @@ +package cloudsql + +import ( + "fmt" + + "github.com/aws/constructs-go/constructs/v10" + "github.com/hashicorp/terraform-cdk-go/cdktf" + + "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/computenetwork" + "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/sqldatabase" + "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/sqldatabaseinstance" + "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/sqluser" + "github.com/sourcegraph/managed-services-platform-cdktf/gen/random/password" + + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/random" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/serviceaccount" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resourceid" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/spec" + "github.com/sourcegraph/sourcegraph/lib/pointers" +) + +type Output struct { + // Instance is the Cloud SQL database instance. It can be accessed using + // WorkloadUser + Instance sqldatabaseinstance.SqlDatabaseInstance + // AdminUser is a cloudsqlsuperuser on the Cloud SQL instance. + AdminUser sqluser.SqlUser + // WorkloadUser is the SQL user corresponding to the Cloud Run workload + // service account. It should be used for automatic IAM authentication: + // https://pkg.go.dev/cloud.google.com/go/cloudsqlconn#readme-automatic-iam-database-authentication + // + // Before using WorkloadUser, WorkloadSuperuserGrant should be ready. + WorkloadUser sqluser.SqlUser +} + +type Config struct { + ProjectID string + Region string + + // Spec configures the Cloud SQL instance. + Spec spec.EnvironmentResourcePostgreSQLSpec + // WorkloadIdentity is the service account attached to the Cloud Run workload. + // A database user will be provisioned that can be accessed as this identity. + WorkloadIdentity serviceaccount.Output + // Network to connect the created Cloud SQL instance to. + Network computenetwork.ComputeNetwork + + DependsOn []cdktf.ITerraformDependable +} + +func New(scope constructs.Construct, id resourceid.ID, config Config) (*Output, error) { + machineType := fmt.Sprintf("db-custom-%d-%d", + pointers.Deref(config.Spec.CPU, 1), + pointers.Deref(config.Spec.MemoryGB, 4)*1024) + + instance := sqldatabaseinstance.NewSqlDatabaseInstance(scope, id.TerraformID("instance"), &sqldatabaseinstance.SqlDatabaseInstanceConfig{ + Project: &config.ProjectID, + Region: &config.Region, + + // Current default: https://cloud.google.com/sql/docs/postgres/db-versions + DatabaseVersion: pointers.Ptr("POSTGRES_15"), + + // Randomize instance name + Name: pointers.Ptr(fmt.Sprintf("%s-%s", + id.DisplayName(), + random.New(scope, id.Group("instance_name_suffix"), random.Config{ + ByteLength: 2, + }).HexValue)), + + Settings: &sqldatabaseinstance.SqlDatabaseInstanceSettings{ + Tier: pointers.Ptr(machineType), + AvailabilityType: pointers.Ptr("ZONAL"), + DiskType: pointers.Ptr("PD_SSD"), + + // Arbitrary starting disk size - we use autoresizing to scale the + // disk up automatically. The minimum size is 10GB. + DiskSize: pointers.Float64(10), + DiskAutoresize: pointers.Ptr(true), + DiskAutoresizeLimit: pointers.Float64(0), + + DatabaseFlags: []sqldatabaseinstance.SqlDatabaseInstanceSettingsDatabaseFlags{{ + Name: pointers.Ptr("cloudsql.iam_authentication"), + Value: pointers.Ptr("on"), + }}, + + // 🚨SECURITY🚨 SOC2/CI-79 + // Production disks for MSP are configured with daily snapshots and retention set at ninety days, + // so we do the same. + BackupConfiguration: &sqldatabaseinstance.SqlDatabaseInstanceSettingsBackupConfiguration{ + Enabled: pointers.Ptr(true), + PointInTimeRecoveryEnabled: pointers.Ptr(false), // PITR uses a lot of resources and is cumbersome to use + StartTime: pointers.Ptr("10:00"), + TransactionLogRetentionDays: pointers.Float64(7), + BackupRetentionSettings: &sqldatabaseinstance.SqlDatabaseInstanceSettingsBackupConfigurationBackupRetentionSettings{ + // 🚨SECURITY🚨 SOC2/CI-79 + RetainedBackups: pointers.Float64(90), + RetentionUnit: pointers.Ptr("COUNT"), + }, + }, + + MaintenanceWindow: &sqldatabaseinstance.SqlDatabaseInstanceSettingsMaintenanceWindow{ + UpdateTrack: pointers.Ptr("stable"), + Day: pointers.Float64(1), + Hour: pointers.Float64(15), + }, + + InsightsConfig: &sqldatabaseinstance.SqlDatabaseInstanceSettingsInsightsConfig{ + QueryInsightsEnabled: pointers.Ptr(true), + QueryStringLength: pointers.Float64(4096), + RecordApplicationTags: pointers.Ptr(true), + RecordClientAddress: pointers.Ptr(true), + }, + + IpConfiguration: &sqldatabaseinstance.SqlDatabaseInstanceSettingsIpConfiguration{ + Ipv4Enabled: pointers.Ptr(true), + PrivateNetwork: config.Network.Id(), + RequireSsl: pointers.Ptr(true), + }, + }, + + // More of an inconvenience than anything else - is still delete-able + // from the UI. + DeletionProtection: pointers.Ptr(false), + + Lifecycle: &cdktf.TerraformResourceLifecycle{ + // Autoscaling is typically enabled - no need to worry about it + IgnoreChanges: []string{"settings[0].disk_size"}, + }, + + // Instance is the primary resource here, so placing DependsOn here + // effectively blocks this resource from being created until dependencies + // are ready. + DependsOn: &config.DependsOn, + }) + + // Collect resources that must be ready before database can be accessed + var databaseResources []cdktf.ITerraformDependable + + // Provision prerequisite databases + for _, db := range config.Spec.Databases { + databaseResources = append(databaseResources, + sqldatabase.NewSqlDatabase(scope, id.Group("database").TerraformID(db), + &sqldatabase.SqlDatabaseConfig{ + Name: pointers.Ptr(db), + Instance: instance.Name(), + // PostgreSQL cannot delete databases if there are users + // other than cloudsqlsuperuser with access + DeletionPolicy: pointers.Ptr("ABANDON"), + })) + } + + // Configure a root MSP admin user + adminPassword := password.NewPassword(scope, id.TerraformID("admin_password"), &password.PasswordConfig{ + Length: pointers.Float64(32), + Special: pointers.Ptr(false), + }) + adminUser := sqluser.NewSqlUser(scope, id.TerraformID("admin_user"), &sqluser.SqlUserConfig{ + Instance: instance.Name(), + Project: &config.ProjectID, + Name: pointers.Ptr("msp-admin"), + Password: adminPassword.Result(), + + // PostgreSQL cannot delete users with roles, so we just abandon the + // users in a deletion event. + DeletionPolicy: pointers.Ptr("ABANDON"), + }) + + // Grant access to workload service account + workloadUser := sqluser.NewSqlUser(scope, id.TerraformID("workload_service_account_user"), &sqluser.SqlUserConfig{ + Instance: instance.Name(), + Project: &config.ProjectID, + Type: pointers.Ptr("CLOUD_IAM_SERVICE_ACCOUNT"), + // Note: for Postgres only, GCP requires omitting the ".gserviceaccount.com" suffix + // from the service account email due to length limits on database usernames. + // See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/sql_user + Name: cdktf.Fn_Trimsuffix(&config.WorkloadIdentity.Email, + pointers.Ptr(".gserviceaccount.com")), + + // PostgreSQL cannot delete users with roles, so we just abandon the + // users in a deletion event. + DeletionPolicy: pointers.Ptr("ABANDON"), + + // workloadUser's username is required to connect to this instance, so + // to ensure database resources are all fully provisioned, we gate the + // availability of this secret on all database resources being ready. + DependsOn: &databaseResources, + }) + + return &Output{ + Instance: instance, + AdminUser: adminUser, + WorkloadUser: workloadUser, + }, nil +} diff --git a/dev/managedservicesplatform/internal/resource/gsmsecret/BUILD.bazel b/dev/managedservicesplatform/internal/resource/gsmsecret/BUILD.bazel index 921b891fc2828..2d8d4414044d2 100644 --- a/dev/managedservicesplatform/internal/resource/gsmsecret/BUILD.bazel +++ b/dev/managedservicesplatform/internal/resource/gsmsecret/BUILD.bazel @@ -9,6 +9,7 @@ go_library( "//dev/managedservicesplatform/internal/resourceid", "//lib/pointers", "@com_github_aws_constructs_go_constructs_v10//:constructs", + "@com_github_hashicorp_terraform_cdk_go_cdktf//:cdktf", "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//datagooglesecretmanagersecretversion", "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//secretmanagersecret", "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//secretmanagersecretversion", diff --git a/dev/managedservicesplatform/internal/resource/gsmsecret/gsmsecret.go b/dev/managedservicesplatform/internal/resource/gsmsecret/gsmsecret.go index 43962589b60f3..6880cd1fae343 100644 --- a/dev/managedservicesplatform/internal/resource/gsmsecret/gsmsecret.go +++ b/dev/managedservicesplatform/internal/resource/gsmsecret/gsmsecret.go @@ -2,6 +2,7 @@ package gsmsecret import ( "github.com/aws/constructs-go/constructs/v10" + "github.com/hashicorp/terraform-cdk-go/cdktf" "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/datagooglesecretmanagersecretversion" "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/secretmanagersecret" "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/secretmanagersecretversion" @@ -20,6 +21,8 @@ type Config struct { ID string Value string + + DependsOn []cdktf.ITerraformDependable } func New(scope constructs.Construct, id resourceid.ID, config Config) *Output { @@ -38,6 +41,7 @@ func New(scope constructs.Construct, id resourceid.ID, config Config) *Output { &secretmanagersecretversion.SecretManagerSecretVersionConfig{ Secret: secret.Id(), SecretData: &config.Value, + DependsOn: &config.DependsOn, }) return &Output{ diff --git a/dev/managedservicesplatform/internal/resource/postgresqlroles/BUILD.bazel b/dev/managedservicesplatform/internal/resource/postgresqlroles/BUILD.bazel new file mode 100644 index 0000000000000..670401caebfa8 --- /dev/null +++ b/dev/managedservicesplatform/internal/resource/postgresqlroles/BUILD.bazel @@ -0,0 +1,18 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "postgresqlroles", + srcs = ["postgresqlroles.go"], + importpath = "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/postgresqlroles", + visibility = ["//dev/managedservicesplatform:__subpackages__"], + deps = [ + "//dev/managedservicesplatform/internal/resource/cloudsql", + "//dev/managedservicesplatform/internal/resourceid", + "//lib/pointers", + "@com_github_aws_constructs_go_constructs_v10//:constructs", + "@com_github_aws_jsii_runtime_go//:jsii-runtime-go", + "@com_github_hashicorp_terraform_cdk_go_cdktf//:cdktf", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_postgresql//grantrole", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_postgresql//provider", + ], +) diff --git a/dev/managedservicesplatform/internal/resource/postgresqlroles/postgresqlroles.go b/dev/managedservicesplatform/internal/resource/postgresqlroles/postgresqlroles.go new file mode 100644 index 0000000000000..a5bd8ac3e041b --- /dev/null +++ b/dev/managedservicesplatform/internal/resource/postgresqlroles/postgresqlroles.go @@ -0,0 +1,58 @@ +package postgresqlroles + +import ( + "github.com/aws/constructs-go/constructs/v10" + "github.com/aws/jsii-runtime-go" + "github.com/hashicorp/terraform-cdk-go/cdktf" + + "github.com/sourcegraph/managed-services-platform-cdktf/gen/postgresql/grantrole" + postgresql "github.com/sourcegraph/managed-services-platform-cdktf/gen/postgresql/provider" + + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/cloudsql" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resourceid" + "github.com/sourcegraph/sourcegraph/lib/pointers" +) + +type Output struct { + // WorkloadSuperuserGrant should be referenced as a dependency before + // WorkloadUser is used. + WorkloadSuperuserGrant cdktf.ITerraformDependable +} + +type Config *cloudsql.Output + +// New applies PostgreSQL roles to a Cloud SQL database. +// +// When tearing down a database only (i.e. not destroying the entire environment), +// we must manually remove resources managed by this provider from state in order +// to apply the diff: +// +// terraform state list | grep postgresql_grant_role | xargs terraform state rm +// +// This is because we cannot instantiate the provider when removing the +// database, causing plans and applies to fail. We'll likely be stuck with the +// workaround for a while, which is acceptable because CloudSQL-only teardowns +// should be rare - we'll more likely be removing entire environments in general. +// +// TODO(@bobheadxi): Improve documentation around this teardown scenario. +func New(scope constructs.Construct, id resourceid.ID, config Config) (*Output, error) { + pgProvider := postgresql.NewPostgresqlProvider(scope, id.TerraformID("postgresql_provider"), &postgresql.PostgresqlProviderConfig{ + Scheme: pointers.Ptr("gcppostgres"), + Host: config.Instance.ConnectionName(), + Username: config.AdminUser.Name(), + Password: config.AdminUser.Password(), + Port: jsii.Number(5432), + Superuser: jsii.Bool(false), + }) + + workloadSuperuserGrant := grantrole.NewGrantRole(scope, id.TerraformID("workload_service_account_role_cloudsqlsuperuser"), &grantrole.GrantRoleConfig{ + Provider: pgProvider, + Role: config.WorkloadUser.Name(), + GrantRole: jsii.String("cloudsqlsuperuser"), + WithAdminOption: jsii.Bool(true), + }) + + return &Output{ + WorkloadSuperuserGrant: workloadSuperuserGrant, + }, nil +} diff --git a/dev/managedservicesplatform/internal/resource/privatenetwork/BUILD.bazel b/dev/managedservicesplatform/internal/resource/privatenetwork/BUILD.bazel index ba588f23d0a94..716100403e53a 100644 --- a/dev/managedservicesplatform/internal/resource/privatenetwork/BUILD.bazel +++ b/dev/managedservicesplatform/internal/resource/privatenetwork/BUILD.bazel @@ -8,8 +8,10 @@ go_library( deps = [ "//lib/pointers", "@com_github_aws_constructs_go_constructs_v10//:constructs", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//computeglobaladdress", "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//computenetwork", "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//computesubnetwork", + "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//servicenetworkingconnection", "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//vpcaccessconnector", ], ) diff --git a/dev/managedservicesplatform/internal/resource/privatenetwork/privatenetwork.go b/dev/managedservicesplatform/internal/resource/privatenetwork/privatenetwork.go index 9767e68d2dfee..c1b88558ae83b 100644 --- a/dev/managedservicesplatform/internal/resource/privatenetwork/privatenetwork.go +++ b/dev/managedservicesplatform/internal/resource/privatenetwork/privatenetwork.go @@ -1,9 +1,13 @@ package privatenetwork import ( + "fmt" + "github.com/aws/constructs-go/constructs/v10" + "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/computeglobaladdress" "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/computenetwork" "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/computesubnetwork" + "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/servicenetworkingconnection" "github.com/sourcegraph/managed-services-platform-cdktf/gen/google/vpcaccessconnector" "github.com/sourcegraph/sourcegraph/lib/pointers" @@ -16,14 +20,19 @@ type Config struct { } type Output struct { - Network computenetwork.ComputeNetwork - Subnetwork computesubnetwork.ComputeSubnetwork - Connector vpcaccessconnector.VpcAccessConnector + // Network is the private network for GCP resources that the Cloud Run + // workload needs to access. + Network computenetwork.ComputeNetwork + // ServiceNetworkingConnection is required for Cloud SQL access, and is + // provisioned by default. + ServiceNetworkingConnection servicenetworkingconnection.ServiceNetworkingConnection + // Connector is used by Cloud Run to connect to the private network. + Connector vpcaccessconnector.VpcAccessConnector } -// New sets up a network for the Cloud Run service to interface -// with other GCP services. We create it directly in this stack package becasue -// it is very specific to the Cloud Run service. +// New sets up a network for the Cloud Run service to interface with other GCP +// services. This should only be created once, hence why it does not have accept +// a resourceid.ID func New(scope constructs.Construct, config Config) *Output { network := computenetwork.NewComputeNetwork( scope, @@ -61,6 +70,28 @@ func New(scope constructs.Construct, config Config) *Output { }, ) + // https://cloud.google.com/sql/docs/mysql/private-ip#network_requirements + // This is configured per project and usually doesn't change + serviceNetworkingConnectionIP := computeglobaladdress.NewComputeGlobalAddress( + scope, + pointers.Ptr("cloudrun-network-service-networking-connection-ip"), + &computeglobaladdress.ComputeGlobalAddressConfig{ + Project: &config.ProjectID, + Name: pointers.Ptr(fmt.Sprintf("%s-service-networking-connection", config.ServiceID)), + Network: network.Id(), + Purpose: pointers.Ptr("VPC_PEERING"), + AddressType: pointers.Ptr("INTERNAL"), + PrefixLength: pointers.Float64(16), + }) + serviceNetworkingConnection := servicenetworkingconnection.NewServiceNetworkingConnection( + scope, + pointers.Ptr("cloudrun-network-service-networking-connection"), + &servicenetworkingconnection.ServiceNetworkingConnectionConfig{ + Network: network.Id(), + Service: pointers.Ptr("servicenetworking.googleapis.com"), + ReservedPeeringRanges: &[]*string{serviceNetworkingConnectionIP.Name()}, + }) + // Cloud Run services can't connect directly to networks, and seem to require a // VPC connector, so we provision one to allow Cloud Run services to talk to // other GCP services (like Redis) @@ -78,8 +109,8 @@ func New(scope constructs.Construct, config Config) *Output { ) return &Output{ - Network: network, - Subnetwork: subnetwork, - Connector: connector, + Network: network, + ServiceNetworkingConnection: serviceNetworkingConnection, + Connector: connector, } } diff --git a/dev/managedservicesplatform/internal/resource/random/random.go b/dev/managedservicesplatform/internal/resource/random/random.go index 601300200a1ae..0f838711dff7d 100644 --- a/dev/managedservicesplatform/internal/resource/random/random.go +++ b/dev/managedservicesplatform/internal/resource/random/random.go @@ -9,6 +9,8 @@ import ( ) type Config struct { + // ByteLength is the number of bytes of randomness to generate. The converted + // hex value's length is twice this value. ByteLength int `validate:"required"` // Prefix is added to the start of the random output followed by a '-', for // example: diff --git a/dev/managedservicesplatform/internal/resource/redis/redis.go b/dev/managedservicesplatform/internal/resource/redis/redis.go index aba486b0b489f..753b6e70179d5 100644 --- a/dev/managedservicesplatform/internal/resource/redis/redis.go +++ b/dev/managedservicesplatform/internal/resource/redis/redis.go @@ -21,11 +21,11 @@ type Output struct { type Config struct { ProjectID string - - Region string - Network computenetwork.ComputeNetwork + Region string Spec spec.EnvironmentResourceRedisSpec + + Network computenetwork.ComputeNetwork } func New(scope constructs.Construct, id resourceid.ID, config Config) (*Output, error) { diff --git a/dev/managedservicesplatform/internal/stack/cloudrun/BUILD.bazel b/dev/managedservicesplatform/internal/stack/cloudrun/BUILD.bazel index 516c0abf93ce6..8db04a2ed0ce0 100644 --- a/dev/managedservicesplatform/internal/stack/cloudrun/BUILD.bazel +++ b/dev/managedservicesplatform/internal/stack/cloudrun/BUILD.bazel @@ -8,7 +8,9 @@ go_library( deps = [ "//dev/managedservicesplatform/googlesecretsmanager", "//dev/managedservicesplatform/internal/resource/bigquery", + "//dev/managedservicesplatform/internal/resource/cloudsql", "//dev/managedservicesplatform/internal/resource/gsmsecret", + "//dev/managedservicesplatform/internal/resource/postgresqlroles", "//dev/managedservicesplatform/internal/resource/privatenetwork", "//dev/managedservicesplatform/internal/resource/random", "//dev/managedservicesplatform/internal/resource/redis", @@ -26,6 +28,7 @@ go_library( "//dev/managedservicesplatform/spec", "//lib/errors", "//lib/pointers", + "@com_github_hashicorp_terraform_cdk_go_cdktf//:cdktf", "@org_golang_x_exp//maps", "@org_golang_x_exp//slices", ], diff --git a/dev/managedservicesplatform/internal/stack/cloudrun/cloudrun.go b/dev/managedservicesplatform/internal/stack/cloudrun/cloudrun.go index 0450216654317..4e84b32cffd32 100644 --- a/dev/managedservicesplatform/internal/stack/cloudrun/cloudrun.go +++ b/dev/managedservicesplatform/internal/stack/cloudrun/cloudrun.go @@ -5,13 +5,18 @@ import ( "html/template" "strconv" "strings" + "sync" "golang.org/x/exp/maps" "golang.org/x/exp/slices" + "github.com/hashicorp/terraform-cdk-go/cdktf" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/googlesecretsmanager" "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/bigquery" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/cloudsql" "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/gsmsecret" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/postgresqlroles" "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/privatenetwork" "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/random" "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/redis" @@ -149,26 +154,26 @@ func NewStack(stacks *stack.Set, vars Variables) (crossStackOutput *CrossStackOu Description: "Resolved image tag to deploy", }) - // Set up build configuration. - cloudRunBuildVars := builder.Variables{ - Service: vars.Service, - Image: vars.Image, - ResolvedImageTag: *imageTag.StringValue, - Environment: vars.Environment, - GCPProjectID: vars.ProjectID, - GCPRegion: gcpRegion, - ServiceAccount: vars.CloudRunWorkloadServiceAccount, - DiagnosticsSecret: diagnosticsSecret, - ResourceLimits: makeContainerResourceLimits(vars.Environment.Instances.Resources), - } - - if vars.Environment.Resources.NeedsCloudRunConnector() { - cloudRunBuildVars.PrivateNetwork = privatenetwork.New(stack, privatenetwork.Config{ + // privateNetworkEnabled indicates if privateNetwork has been instantiated + // before. + var privateNetworkEnabled bool + // privateNetwork is only instantiated if used, and is only instantiated + // once. If called, it always returns a non-nil value. + privateNetwork := sync.OnceValue(func() *privatenetwork.Output { + privateNetworkEnabled = true + return privatenetwork.New(stack, privatenetwork.Config{ ProjectID: vars.ProjectID, ServiceID: vars.Service.ID, Region: gcpRegion, }) - } + }) + + // Add MSP env var indicating that the service is running in a Managed + // Services Platform environment. + cloudRunBuilder.AddEnv("MSP", "true") + + // For SSL_CERT_DIR, configure right before final build + sslCertDirs := []string{"/etc/ssl/certs"} // redisInstance is only created and non-nil if Redis is configured for the // environment. @@ -177,13 +182,14 @@ func NewStack(stacks *stack.Set, vars Variables) (crossStackOutput *CrossStackOu resourceid.New("redis"), redis.Config{ ProjectID: vars.ProjectID, - Network: cloudRunBuildVars.PrivateNetwork.Network, Region: gcpRegion, Spec: *vars.Environment.Resources.Redis, + Network: privateNetwork().Network, }) if err != nil { return nil, errors.Wrap(err, "failed to render Redis instance") } + // We don't use serviceEnvVarPrefix here because this is a // Sourcegraph-wide convention. cloudRunBuilder.AddEnv("REDIS_ENDPOINT", redisInstance.Endpoint) @@ -200,7 +206,45 @@ func NewStack(stacks *stack.Set, vars Variables) (crossStackOutput *CrossStackOu 292, // 0444 read-only ) cloudRunBuilder.AddVolumeMount(caCertVolumeName, "/etc/ssl/custom-certs") - cloudRunBuilder.AddEnv("SSL_CERT_DIR", "/etc/ssl/certs:/etc/ssl/custom-certs") + sslCertDirs = append(sslCertDirs, "/etc/ssl/custom-certs") + } + + if vars.Environment.Resources != nil && vars.Environment.Resources.PostgreSQL != nil { + sqlInstance, err := cloudsql.New(stack, resourceid.New("postgresql"), cloudsql.Config{ + ProjectID: vars.ProjectID, + Region: gcpRegion, + Spec: *vars.Environment.Resources.PostgreSQL, + Network: privateNetwork().Network, + + WorkloadIdentity: *vars.CloudRunWorkloadServiceAccount, + + // ServiceNetworkingConnection is required for Cloud SQL to connect + // to the private network, so we must wait for it to be provisioned. + // See https://cloud.google.com/sql/docs/mysql/private-ip#network_requirements + DependsOn: []cdktf.ITerraformDependable{ + privateNetwork().ServiceNetworkingConnection, + }, + }) + if err != nil { + return nil, errors.Wrap(err, "failed to render Cloud SQL instance") + } + + // Add parameters required for authentication + cloudRunBuilder.AddEnv("PGINSTANCE", *sqlInstance.Instance.ConnectionName()) + cloudRunBuilder.AddEnv("PGUSER", *sqlInstance.WorkloadUser.Name()) + // NOTE: https://pkg.go.dev/cloud.google.com/go/cloudsqlconn#section-readme + // magically handles certs for us, so we don't need to mount certs in + // Cloud Run. + + // Apply additional runtime configuration + pgRoles, err := postgresqlroles.New(stack, id.Group("postgresqlroles"), sqlInstance) + if err != nil { + return nil, errors.Wrap(err, "failed to render Cloud SQL PostgreSQL roles") + } + + // We need the workload superuser role to be granted before Cloud Run + // can correctly use the database instance + cloudRunBuilder.AddDependency(pgRoles.WorkloadSuperuserGrant) } // bigqueryDataset is only created and non-nil if BigQuery is configured for @@ -219,8 +263,25 @@ func NewStack(stacks *stack.Set, vars Variables) (crossStackOutput *CrossStackOu } // Finalize output of builder - if _, err := cloudRunBuilder.Build(stack, cloudRunBuildVars); err != nil { - return nil, err + cloudRunBuilder.AddEnv("SSL_CERT_DIR", strings.Join(sslCertDirs, ":")) + if _, err := cloudRunBuilder.Build(stack, builder.Variables{ + Service: vars.Service, + Image: vars.Image, + ResolvedImageTag: *imageTag.StringValue, + Environment: vars.Environment, + GCPProjectID: vars.ProjectID, + GCPRegion: gcpRegion, + ServiceAccount: vars.CloudRunWorkloadServiceAccount, + DiagnosticsSecret: diagnosticsSecret, + ResourceLimits: makeContainerResourceLimits(vars.Environment.Instances.Resources), + PrivateNetwork: func() *privatenetwork.Output { + if privateNetworkEnabled { + return privateNetwork() + } + return nil + }(), + }); err != nil { + return nil, errors.Wrapf(err, "build Cloud Run resource kind %q", cloudRunBuilder.Kind()) } // Collect outputs diff --git a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/builder.go b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/builder.go index 28d48aca5cdfe..29d49f6c1eb1b 100644 --- a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/builder.go +++ b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/builder.go @@ -30,9 +30,6 @@ type Variables struct { PrivateNetwork *privatenetwork.Output // ResourceLimits is a map of resource limits for the Cloud Run resource. ResourceLimits map[string]*string - // DependsOn ensures that particular Terraform resources are provisioned - // before the Cloud Run resource is created. - DependsOn []cdktf.ITerraformDependable } type SecretRef struct { @@ -48,6 +45,9 @@ type Resource interface { // Builder configures and creates Cloud Run Services or Jobs. type Builder interface { + // Kind indicates what this Builder implementation creates. + Kind() spec.ServiceKind + // AddEnv adds an environment variable to the resource, and should only be // used before Build. AddEnv(key, value string) @@ -60,6 +60,9 @@ type Builder interface { // AddVolumeMount adds a volume mount sourced from a secret to the resource, // and should only be used before Build. AddSecretVolume(name, mountPath string, secret SecretRef, mode int) + // AddDependency adds an explicit resource dependency that must be available + // before the Cloud Run resource is created. + AddDependency(cdktf.ITerraformDependable) // Build finalizes the resource. Build(cdktf.TerraformStack, Variables) (Resource, error) diff --git a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/BUILD.bazel b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/BUILD.bazel index cc1c6c4a70f19..077de4c2d831b 100644 --- a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/BUILD.bazel +++ b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/BUILD.bazel @@ -9,6 +9,7 @@ go_library( "//dev/managedservicesplatform/internal/resource/serviceaccount", "//dev/managedservicesplatform/internal/resourceid", "//dev/managedservicesplatform/internal/stack/cloudrun/internal/builder", + "//dev/managedservicesplatform/spec", "//lib/pointers", "@com_github_hashicorp_terraform_cdk_go_cdktf//:cdktf", "@com_github_sourcegraph_managed_services_platform_cdktf_gen_google//cloudrunv2job", diff --git a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/job.go b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/job.go index ec2091b2d1c2d..f5c1c88b1df50 100644 --- a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/job.go +++ b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/job/job.go @@ -12,6 +12,7 @@ import ( "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resource/serviceaccount" "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/resourceid" "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/spec" "github.com/sourcegraph/sourcegraph/lib/pointers" ) @@ -19,6 +20,7 @@ type jobBuilder struct { env []*cloudrunv2job.CloudRunV2JobTemplateTemplateContainersEnv volumes []*cloudrunv2job.CloudRunV2JobTemplateTemplateVolumes volumeMounts []*cloudrunv2job.CloudRunV2JobTemplateTemplateContainersVolumeMounts + dependencies []cdktf.ITerraformDependable } var _ builder.Builder = (*jobBuilder)(nil) @@ -29,6 +31,8 @@ func NewBuilder() builder.Builder { return &jobBuilder{} } +func (b *jobBuilder) Kind() spec.ServiceKind { return spec.ServiceKindJob } + func (b *jobBuilder) AddEnv(key, value string) { b.env = append(b.env, &cloudrunv2job.CloudRunV2JobTemplateTemplateContainersEnv{ Name: pointers.Ptr(key), @@ -69,6 +73,12 @@ func (b *jobBuilder) AddSecretVolume(name, mountPath string, secret builder.Secr }) } +// AddDependency ensures that particular Terraform resources are provisioned +// before the Cloud Run resource is created. +func (b *jobBuilder) AddDependency(dep cdktf.ITerraformDependable) { + b.dependencies = append(b.dependencies, dep) +} + func (b *jobBuilder) Build(stack cdktf.TerraformStack, vars builder.Variables) (builder.Resource, error) { var vpcAccess *cloudrunv2job.CloudRunV2JobTemplateTemplateVpcAccess if vars.PrivateNetwork != nil { @@ -81,7 +91,7 @@ func (b *jobBuilder) Build(stack cdktf.TerraformStack, vars builder.Variables) ( job := cloudrunv2job.NewCloudRunV2Job(stack, pointers.Ptr("cloudrun"), &cloudrunv2job.CloudRunV2JobConfig{ Name: pointers.Ptr(vars.Service.ID), Location: pointers.Ptr(vars.GCPRegion), - DependsOn: &vars.DependsOn, + DependsOn: &b.dependencies, Template: &cloudrunv2job.CloudRunV2JobTemplate{ TaskCount: pointers.Ptr(float64(1)), diff --git a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/service/service.go b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/service/service.go index e7658dc9723ba..b30d0a6e98397 100644 --- a/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/service/service.go +++ b/dev/managedservicesplatform/internal/stack/cloudrun/internal/builder/service/service.go @@ -25,6 +25,7 @@ type serviceBuilder struct { env []*cloudrunv2service.CloudRunV2ServiceTemplateContainersEnv volumes []*cloudrunv2service.CloudRunV2ServiceTemplateVolumes volumeMounts []*cloudrunv2service.CloudRunV2ServiceTemplateContainersVolumeMounts + dependencies []cdktf.ITerraformDependable } var _ builder.Builder = (*serviceBuilder)(nil) @@ -35,6 +36,8 @@ func NewBuilder() builder.Builder { return &serviceBuilder{} } +func (b *serviceBuilder) Kind() spec.ServiceKind { return spec.ServiceKindService } + func (b *serviceBuilder) AddEnv(key, value string) { b.env = append(b.env, &cloudrunv2service.CloudRunV2ServiceTemplateContainersEnv{ Name: pointers.Ptr(key), @@ -75,6 +78,12 @@ func (b *serviceBuilder) AddSecretVolume(name, mountPath string, secret builder. }) } +// AddDependency ensures that particular Terraform resources are provisioned +// before the Cloud Run resource is created. +func (b *serviceBuilder) AddDependency(dep cdktf.ITerraformDependable) { + b.dependencies = append(b.dependencies, dep) +} + func (b *serviceBuilder) Build(stack cdktf.TerraformStack, vars builder.Variables) (builder.Resource, error) { var vpcAccess *cloudrunv2service.CloudRunV2ServiceTemplateVpcAccess if vars.PrivateNetwork != nil { @@ -92,7 +101,7 @@ func (b *serviceBuilder) Build(stack cdktf.TerraformStack, vars builder.Variable svc := cloudrunv2service.NewCloudRunV2Service(stack, pointers.Ptr("cloudrun"), &cloudrunv2service.CloudRunV2ServiceConfig{ Name: pointers.Ptr(vars.Service.ID), Location: pointers.Ptr(vars.GCPRegion), - DependsOn: &vars.DependsOn, + DependsOn: &b.dependencies, // Disallows direct traffic from public internet, we have a LB set up for that. Ingress: pointers.Ptr("INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"), diff --git a/dev/managedservicesplatform/internal/stack/iam/iam.go b/dev/managedservicesplatform/internal/stack/iam/iam.go index d107db16deb9f..1381fc7a6bcd4 100644 --- a/dev/managedservicesplatform/internal/stack/iam/iam.go +++ b/dev/managedservicesplatform/internal/stack/iam/iam.go @@ -52,6 +52,9 @@ func NewStack(stacks *stack.Set, vars Variables) (*CrossStackOutput, error) { {ID: resourceid.New("role_monitoring_metricwriter"), Role: "roles/monitoring.metricWriter"}, // Allow service to publish Cloud Profiler profiles {ID: resourceid.New("role_cloudprofiler_agent"), Role: "roles/cloudprofiler.agent"}, + // Allow service to connect to Cloud SQL + {ID: resourceid.New("role_cloudsql_client"), Role: "roles/cloudsql.client"}, + {ID: resourceid.New("role_cloudsql_instanceuser"), Role: "roles/cloudsql.instanceUser"}, } // Grant configured roles to the workload identity @@ -83,6 +86,7 @@ func NewStack(stacks *stack.Set, vars Variables) (*CrossStackOutput, error) { }) } + // Create a service account for the workload identity in Cloud Run workloadServiceAccount := serviceaccount.New(stack, id.Group("workload"), serviceaccount.Config{ diff --git a/dev/managedservicesplatform/internal/stack/project/project.go b/dev/managedservicesplatform/internal/stack/project/project.go index e4e013aa045ea..2e9d7fb4db7da 100644 --- a/dev/managedservicesplatform/internal/stack/project/project.go +++ b/dev/managedservicesplatform/internal/stack/project/project.go @@ -37,6 +37,7 @@ var gcpServices = []string{ "bigquery.googleapis.com", "cloudprofiler.googleapis.com", "cloudscheduler.googleapis.com", + "sqladmin.googleapis.com", } const ( diff --git a/dev/managedservicesplatform/spec/BUILD.bazel b/dev/managedservicesplatform/spec/BUILD.bazel index fd2267d4208b3..d7aea1694d4a2 100644 --- a/dev/managedservicesplatform/spec/BUILD.bazel +++ b/dev/managedservicesplatform/spec/BUILD.bazel @@ -22,7 +22,14 @@ go_library( go_test( name = "spec_test", - srcs = ["service_test.go"], + srcs = [ + "environment_test.go", + "service_test.go", + ], embed = [":spec"], - deps = ["@com_github_stretchr_testify//assert"], + deps = [ + "//lib/pointers", + "@com_github_hexops_autogold_v2//:autogold", + "@com_github_stretchr_testify//assert", + ], ) diff --git a/dev/managedservicesplatform/spec/environment.go b/dev/managedservicesplatform/spec/environment.go index 10bca8d78ae35..f44857e194194 100644 --- a/dev/managedservicesplatform/spec/environment.go +++ b/dev/managedservicesplatform/spec/environment.go @@ -5,6 +5,7 @@ import ( "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/internal/imageupdater" "github.com/sourcegraph/sourcegraph/lib/errors" + "github.com/sourcegraph/sourcegraph/lib/pointers" ) type EnvironmentSpec struct { @@ -45,6 +46,7 @@ type EnvironmentSpec struct { func (s EnvironmentSpec) Validate() []error { var errs []error errs = append(errs, s.Deploy.Validate()...) + errs = append(errs, s.Resources.Validate()...) return errs } @@ -256,14 +258,21 @@ type EnvironmentJobScheduleSpec struct { } type EnvironmentResourcesSpec struct { - // Redis, if provided, provisions a Redis instance. Details for using this - // Redis instance is automatically provided in environment variables: + // Redis, if provided, provisions a Redis instance backed by Cloud Memorystore. + // Details for using this Redis instance is automatically provided in + // environment variables: // // - REDIS_ENDPOINT // // Sourcegraph Redis libraries (i.e. internal/redispool) will automatically // use the given configuration. Redis *EnvironmentResourceRedisSpec `json:"redis,omitempty"` + // PostgreSQL, if provided, provisions a PostgreSQL database instance backed + // by Cloud SQL. + // + // To connect to the database, use + // (lib/managedservicesplatform/service.Contract).GetPostgreSQLDB(). + PostgreSQL *EnvironmentResourcePostgreSQLSpec `json:"postgreSQL,omitempty"` // BigQueryTable, if provided, provisions a table for the service to write // to. Details for writing to the table are automatically provided in // environment variables: @@ -280,16 +289,13 @@ type EnvironmentResourcesSpec struct { BigQueryTable *EnvironmentResourceBigQueryTableSpec `json:"bigQueryTable,omitempty"` } -// NeedsCloudRunConnector indicates if there are any resources that require a -// connector network for Cloud Run to talk to provisioned resources. -func (s *EnvironmentResourcesSpec) NeedsCloudRunConnector() bool { +func (s *EnvironmentResourcesSpec) Validate() []error { if s == nil { - return false - } - if s.Redis != nil { - return true + return nil } - return false + var errs []error + errs = append(errs, s.PostgreSQL.Validate()...) + return errs } type EnvironmentResourceRedisSpec struct { @@ -299,6 +305,47 @@ type EnvironmentResourceRedisSpec struct { MemoryGB *int `json:"memoryGB,omitempty"` } +type EnvironmentResourcePostgreSQLSpec struct { + // Databases to provision - required. + Databases []string `json:"databases"` + // Defaults to 1. Must be 1, or an even number between 2 and 96. + CPU *int `json:"cpu,omitempty"` + // Defaults to 4 (to meet CloudSQL minimum). You must request 0.9 to 6.5 GB + // per vCPU. + MemoryGB *int `json:"memoryGB,omitempty"` +} + +func (s *EnvironmentResourcePostgreSQLSpec) Validate() []error { + if s == nil { + return nil + } + var errs []error + if s.CPU != nil { + if *s.CPU < 1 { + errs = append(errs, errors.New("postgreSQL.cpu must be >= 1")) + } + if *s.CPU > 1 && *s.CPU%2 != 0 { + errs = append(errs, errors.New("postgreSQL.cpu must be 1 or a multiple of 2")) + } + if *s.CPU > 96 { + errs = append(errs, errors.New("postgreSQL.cpu must be <= 96")) + } + } + if s.MemoryGB != nil { + cpu := pointers.Deref(s.CPU, 1) + if *s.MemoryGB < 4 { + errs = append(errs, errors.New("postgreSQL.memoryGB must be >= 4")) + } + if *s.MemoryGB < cpu { + errs = append(errs, errors.New("postgreSQL.memoryGB must be >= postgreSQL.cpu")) + } + if *s.MemoryGB > 6*cpu { + errs = append(errs, errors.New("postgreSQL.memoryGB must be <= 6*postgreSQL.cpu")) + } + } + return errs +} + type EnvironmentResourceBigQueryTableSpec struct { Region string `json:"region"` // TableID is the ID of table to create within the service's BigQuery diff --git a/dev/managedservicesplatform/spec/environment_test.go b/dev/managedservicesplatform/spec/environment_test.go new file mode 100644 index 0000000000000..4a2241d781ec6 --- /dev/null +++ b/dev/managedservicesplatform/spec/environment_test.go @@ -0,0 +1,80 @@ +package spec + +import ( + "testing" + + "github.com/hexops/autogold/v2" + "github.com/stretchr/testify/assert" + + "github.com/sourcegraph/sourcegraph/lib/pointers" +) + +func errorMessages(errs []error) []string { + var messages []string + for _, e := range errs { + messages = append(messages, e.Error()) + } + return messages +} + +func TestEnvironmentResourcePostgreSQLSpecValidate(t *testing.T) { + for _, tc := range []struct { + name string + spec *EnvironmentResourcePostgreSQLSpec + wantErrors autogold.Value + }{ + { + name: "nil", + spec: nil, + wantErrors: nil, + }, + { + name: "defaults", + spec: &EnvironmentResourcePostgreSQLSpec{}, + wantErrors: nil, + }, + { + name: "odd CPU", + spec: &EnvironmentResourcePostgreSQLSpec{ + CPU: pointers.Ptr(3), + }, + wantErrors: autogold.Expect([]string{"postgreSQL.cpu must be 1 or a multiple of 2"}), + }, + { + name: "too little memory for CPU", + spec: &EnvironmentResourcePostgreSQLSpec{ + CPU: pointers.Ptr(12), + MemoryGB: pointers.Ptr(4), + }, + wantErrors: autogold.Expect([]string{"postgreSQL.memoryGB must be >= postgreSQL.cpu"}), + }, + { + name: "too much memory for CPU", + spec: &EnvironmentResourcePostgreSQLSpec{ + MemoryGB: pointers.Ptr(12), + }, + wantErrors: autogold.Expect([]string{"postgreSQL.memoryGB must be <= 6*postgreSQL.cpu"}), + }, + { + name: "odd CPU, too much memory for CPU", + spec: &EnvironmentResourcePostgreSQLSpec{ + CPU: pointers.Ptr(5), + MemoryGB: pointers.Ptr(50), + }, + wantErrors: autogold.Expect([]string{ + "postgreSQL.cpu must be 1 or a multiple of 2", + "postgreSQL.memoryGB must be <= 6*postgreSQL.cpu", + }), + }, + } { + t.Run(tc.name, func(t *testing.T) { + errs := tc.spec.Validate() + if tc.wantErrors == nil { + assert.Empty(t, errs) + } else { + assert.NotEmpty(t, errs) + tc.wantErrors.Equal(t, errorMessages(errs)) + } + }) + } +} diff --git a/dev/managedservicesplatform/spec/spec.go b/dev/managedservicesplatform/spec/spec.go index 9275a31a15ba5..17beb52785fe9 100644 --- a/dev/managedservicesplatform/spec/spec.go +++ b/dev/managedservicesplatform/spec/spec.go @@ -81,6 +81,14 @@ func (s Spec) GetEnvironment(id string) *EnvironmentSpec { return nil } +func (s Spec) ListEnvironmentIDs() []string { + var ids []string + for _, e := range s.Environments { + ids = append(ids, e.ID) + } + return ids +} + // MarshalYAML marshals the spec to YAML using our YAML library of choice. func (s Spec) MarshalYAML() ([]byte, error) { return yaml.Marshal(s) diff --git a/dev/managedservicesplatform/terraformcloud/terraformcloud.go b/dev/managedservicesplatform/terraformcloud/terraformcloud.go index cf27716b75e1c..121a7608b7dd0 100644 --- a/dev/managedservicesplatform/terraformcloud/terraformcloud.go +++ b/dev/managedservicesplatform/terraformcloud/terraformcloud.go @@ -159,7 +159,7 @@ func (c *Client) SyncWorkspaces(ctx context.Context, svc spec.ServiceSpec, env s if projects, err := c.client.Projects.List(ctx, c.org, &tfe.ProjectListOptions{ Name: tfcProjectName, }); err != nil { - return nil, err + return nil, errors.Wrap(err, "Projects.List") } else { for _, p := range projects.Items { if p.Name == tfcProjectName { @@ -174,41 +174,31 @@ func (c *Client) SyncWorkspaces(ctx context.Context, svc spec.ServiceSpec, env s Name: tfcProjectName, }) if err != nil { - return nil, err + return nil, errors.Wrap(err, "Projects.Create") } } - // Assign access to project - wantTeam := "team-gGtVVgtNRaCnkhKp" // TODO: Currently Core Services, parameterize later - var existingAccessID string + // Grant access to project for Core Services if resp, err := c.client.TeamProjectAccess.List(ctx, tfe.TeamProjectAccessListOptions{ ProjectID: tfcProject.ID, }); err != nil { - return nil, errors.Wrap(err, "TeamAccess.List") + return nil, errors.Wrap(err, "TeamProjectAccess.List") } else { - for _, a := range resp.Items { - if a.Team.ID == wantTeam { - existingAccessID = a.ID + for _, team := range []struct { + name string // only for reference + terraformCloudTeamID string + }{ + {name: "Core Services", terraformCloudTeamID: "team-gGtVVgtNRaCnkhKp"}, + // Operators should use Entitle to request access to this team to + // get access to workspaces, if they aren't in Core Services + {name: "Managed Services Platform Operators", terraformCloudTeamID: "team-Wdejc42bWrRonQEY"}, + } { + if err := c.ensureAccessForTeam(ctx, tfcProject, resp, team.terraformCloudTeamID); err != nil { + return nil, errors.Wrapf(err, "ensure access for %q Terraform Cloud team %q", + team.name, team.terraformCloudTeamID) } } } - if existingAccessID != "" { - _, err := c.client.TeamProjectAccess.Update(ctx, existingAccessID, tfe.TeamProjectAccessUpdateOptions{ - Access: pointers.Ptr(tfe.TeamProjectAccessWrite), - }) - if err != nil { - return nil, errors.Wrap(err, "TeamAccess.Update") - } - } else { - _, err := c.client.TeamProjectAccess.Add(ctx, tfe.TeamProjectAccessAddOptions{ - Project: &tfe.Project{ID: tfcProject.ID}, - Team: &tfe.Team{ID: wantTeam}, - Access: tfe.TeamProjectAccessWrite, - }) - if err != nil { - return nil, errors.Wrap(err, "TeamAccess.Add") - } - } var workspaces []Workspace for _, s := range stacks { @@ -337,3 +327,31 @@ func (c *Client) DeleteWorkspaces(ctx context.Context, svc spec.ServiceSpec, env return errs } + +func (c *Client) ensureAccessForTeam(ctx context.Context, project *tfe.Project, currentTeams *tfe.TeamProjectAccessList, teamID string) error { + var existingAccessID string + for _, a := range currentTeams.Items { + if a.Team.ID == teamID { + existingAccessID = a.ID + } + } + if existingAccessID != "" { + _, err := c.client.TeamProjectAccess.Update(ctx, existingAccessID, tfe.TeamProjectAccessUpdateOptions{ + Access: pointers.Ptr(tfe.TeamProjectAccessWrite), + }) + if err != nil { + return errors.Wrap(err, "TeamAccess.Update") + } + } else { + _, err := c.client.TeamProjectAccess.Add(ctx, tfe.TeamProjectAccessAddOptions{ + Project: &tfe.Project{ID: project.ID}, + Team: &tfe.Team{ID: teamID}, + Access: tfe.TeamProjectAccessWrite, + }) + if err != nil { + return errors.Wrap(err, "TeamAccess.Add") + } + } + + return nil +} diff --git a/dev/migrations.bzl b/dev/migrations.bzl index 7f0d08d991d49..4dcc3af668b86 100644 --- a/dev/migrations.bzl +++ b/dev/migrations.bzl @@ -92,7 +92,7 @@ def _generate_schemas_impl(ctx): out_codeintel_schema_md = ctx.outputs.out_codeintel_schema_md.path, out_codeinsights_schema_md = ctx.outputs.out_codeinsights_schema_md.path, ), - tools = ctx.attr._sg[DefaultInfo].default_runfiles.files + tools = ctx.attr._sg[DefaultInfo].default_runfiles.files, ) return [ @@ -107,40 +107,36 @@ def _generate_schemas_impl(ctx): ctx.outputs.out_frontend_schema_md, ctx.outputs.out_codeintel_schema_md, ctx.outputs.out_codeinsights_schema_md, - ]) + ]), ), OutputGroupInfo( - frontend_squash = depset([ctx.outputs.out_frontend_squash]), - codeintel_squash = depset([ctx.outputs.out_codeintel_squash]), - codeinsights_squash = depset([ctx.outputs.out_codeinsights_squash]), - schemas = depset([ - ctx.outputs.out_frontend_schema, - ctx.outputs.out_codeintel_schema, - ctx.outputs.out_codeinsights_schema, - ctx.outputs.out_frontend_schema_md, - ctx.outputs.out_codeintel_schema_md, - ctx.outputs.out_codeinsights_schema_md, - ]) + frontend_squash = depset([ctx.outputs.out_frontend_squash]), + codeintel_squash = depset([ctx.outputs.out_codeintel_squash]), + codeinsights_squash = depset([ctx.outputs.out_codeinsights_squash]), + schemas = depset([ + ctx.outputs.out_frontend_schema, + ctx.outputs.out_codeintel_schema, + ctx.outputs.out_codeinsights_schema, + ctx.outputs.out_frontend_schema_md, + ctx.outputs.out_codeintel_schema_md, + ctx.outputs.out_codeinsights_schema_md, + ]), ), ] generate_schemas = rule( implementation = _generate_schemas_impl, attrs = { - "srcs": attr.label_list(allow_files= True, mandatory= True), - + "srcs": attr.label_list(allow_files = True, mandatory = True), "out_frontend_squash": attr.output(mandatory = True), "out_codeintel_squash": attr.output(mandatory = True), "out_codeinsights_squash": attr.output(mandatory = True), - "out_frontend_schema": attr.output(mandatory = True), "out_codeintel_schema": attr.output(mandatory = True), "out_codeinsights_schema": attr.output(mandatory = True), - "out_frontend_schema_md": attr.output(mandatory = True), "out_codeintel_schema_md": attr.output(mandatory = True), "out_codeinsights_schema_md": attr.output(mandatory = True), - "_sg": attr.label(executable = True, default = "//dev/sg:sg", cfg = "exec"), }, ) diff --git a/dev/mocha.bzl b/dev/mocha.bzl index c493579f23226..e57327a59679d 100644 --- a/dev/mocha.bzl +++ b/dev/mocha.bzl @@ -114,11 +114,6 @@ def mocha_test(name, tests, deps = [], args = [], data = [], env = {}, is_percy_ srcs = data, out_dirs = ["out"], silent_on_success = True, - - # Used to provide BUILDKITE_BRANCH and BUILDKITE_COMMIT to Percy via - # dev/bazel_buildkite_stamp_vars.sh. See the tool implementation for more details. - stamp = 1, - # Executed mocha tests with Percy enabled via `percy exec -- mocha ...` # Prepends volatile env variables to the command to make Percy aware of the # current git branch and commit. diff --git a/dev/oci_defs.bzl b/dev/oci_defs.bzl index 544f1e7bbfd73..9424ac947bdf9 100644 --- a/dev/oci_defs.bzl +++ b/dev/oci_defs.bzl @@ -3,4 +3,3 @@ REGISTRY_REPOSITORY_PREFIX = "europe-west1-docker.pkg.dev/sourcegraph-security-l def image_repository(image): return REGISTRY_REPOSITORY_PREFIX.format(image) - diff --git a/dev/oci_deps.bzl b/dev/oci_deps.bzl index 0a8ff64983535..0895cd51b34fd 100644 --- a/dev/oci_deps.bzl +++ b/dev/oci_deps.bzl @@ -41,169 +41,169 @@ def oci_deps(): """ oci_pull( name = "wolfi_base", - digest = "sha256:818eb895261404efd4952f11faa70e8530079f7b9ff9225aca74b343f49e3918", + digest = "sha256:04fe3ffb3ccee7a6b5a958e9b68696d1df65402597473edd86e32eb9c1482178", image = "index.docker.io/sourcegraph/wolfi-sourcegraph-base", ) oci_pull( name = "wolfi_cadvisor_base", - digest = "sha256:930e29cf754a780e9948b9da793de99ec9ae94513ea80d917c6a67ac979fc855", + digest = "sha256:97c40d7556aa59709d5b6fbfc1055271dbdd6a05b7c3dce052edf8959696602e", image = "index.docker.io/sourcegraph/wolfi-cadvisor-base", ) oci_pull( name = "wolfi_symbols_base", - digest = "sha256:d82045bda06fc745f3a0bcc20507912f530f5d48fbb16f23d88cdfebcd7b324d", + digest = "sha256:ff850ff119266997b8a1be28c212b68d5d3049f0576e39777b05f11c49df06e6", image = "index.docker.io/sourcegraph/wolfi-symbols-base", ) oci_pull( name = "wolfi_server_base", - digest = "sha256:269ddcfff8b268af2a348c25f4bf15d07951281fabff347a7c92bf3bb09cf65f", + digest = "sha256:a03f800177465bf309918aed5e9ceac9ee5ee351a626947eabf9958c2ac1e307", image = "index.docker.io/sourcegraph/wolfi-server-base", ) oci_pull( name = "wolfi_gitserver_base", - digest = "sha256:b5dd7bfde3df1bc8b4f5a9134bf509f4facc172d721fd3d24ced22e28ada956d", + digest = "sha256:207fd4e9d228091c656da0cb3871137565efbb01d85086619ac095eab57716a2", image = "index.docker.io/sourcegraph/wolfi-gitserver-base", ) oci_pull( name = "wolfi_grafana_base", - digest = "sha256:07a31e9c49300872deeb162910207611261475634bd7bc92e4dcf9a285c98f16", + digest = "sha256:461ef0c0233c20716398a0ad1a38dc2df955e26ec091400f64a18fa7de9d2621", image = "us.gcr.io/sourcegraph-dev/wolfi-grafana", ) oci_pull( name = "wolfi_postgres_exporter_base", - digest = "sha256:c5b1536f1dbb378b9f1da1f0b03ba3cff784965372c21943c902276f0b67dcb7", + digest = "sha256:d87b630de2a16291f6644c501a25376513eddb778416a201e40945b18d91a96a", image = "index.docker.io/sourcegraph/wolfi-postgres-exporter-base", ) oci_pull( name = "wolfi_jaeger_all_in_one_base", - digest = "sha256:c5546f349b20c02ebd7428a11e2a6e7a9ae6f89564327a64e1544a0dfbe8915c", + digest = "sha256:6ef2ca500d978d37dd20d0010a020935534b681f19ebde3843c4c75935cb0af0", image = "index.docker.io/sourcegraph/wolfi-jaeger-all-in-one-base", ) oci_pull( name = "wolfi_jaeger_agent_base", - digest = "sha256:d2e7110fb2deef97562bc472e6eab126e885f0229ad8162d7a96b2e05b74ca1d", + digest = "sha256:87d0549c5f3365688644b5dbbb44abc82eb683ae31fb089dd17b413a0df3c3bb", image = "index.docker.io/sourcegraph/wolfi-jaeger-agent-base", ) oci_pull( name = "wolfi_redis_base", - digest = "sha256:c2ff8b3e0f21b5698c2a693741a5bdccaf0198908093eba348c9e21edbe1f630", + digest = "sha256:dabedab967e27330d474ed4eb0f47d7954a07b8a86f7fcdb3b7830865c16c9b4", image = "index.docker.io/sourcegraph/wolfi-redis-base", ) oci_pull( name = "wolfi_redis_exporter_base", - digest = "sha256:5abd3fd25651b5af3c30d25f33215a7e7d2c4108b6e28b0e6380879d831df68f", + digest = "sha256:0ed382bc737790879b643b67ab48bf183418aee290605189925340e8dbd9c8a1", image = "index.docker.io/sourcegraph/wolfi-redis-exporter-base", ) oci_pull( name = "wolfi_syntax_highlighter_base", - digest = "sha256:f9cc9923f84989639b3d03ef3f8120deb9c2d3cc6d1e8bfc703fa9a5327b4612", + digest = "sha256:9e0bbaeed967ef87e3e9499962d0fae997f0d4446f68df00c4a60063f4e8e0c9", image = "index.docker.io/sourcegraph/wolfi-syntax-highlighter-base", ) oci_pull( name = "wolfi_search_indexer_base", - digest = "sha256:782e33b097b9f68ade8e613c21cc1531a8fc01208c021fe307b05cbdf6dca761", + digest = "sha256:036b552907944acd986f6140b7165facdd15a99a630fba852fb7907b762f2f23", image = "index.docker.io/sourcegraph/wolfi-search-indexer-base", ) oci_pull( name = "wolfi_repo_updater_base", - digest = "sha256:5596447f4c22b5b305016f0fb095e3fc28700d364a660a635f03b14feeda5c03", + digest = "sha256:288f60d65ad281516c030bdc03beb6d437ce0a7bead37a10a039e606a72b3708", image = "index.docker.io/sourcegraph/wolfi-repo-updater-base", ) oci_pull( name = "wolfi_searcher_base", - digest = "sha256:8ae66efec501aca7d6bc66a2b3a19775e2cd2b8db0e4e8c077bca9c764d55673", + digest = "sha256:9529888fa1cb0abe5806ce3b466523ae53518d12178640953e9a7d039bbe26f9", image = "index.docker.io/sourcegraph/wolfi-searcher-base", ) oci_pull( name = "wolfi_executor_base", - digest = "sha256:8f6728cadb10d37df4f8da1eecf59b93625977c974ff3d6e4747763eaa734cd5", + digest = "sha256:17adec2e52fd5dc9a89d86b5224684c66b76380b2db9db10f6426bf83be26923", image = "index.docker.io/sourcegraph/wolfi-executor-base", ) # ??? oci_pull( name = "wolfi_bundled_executor_base", - digest = "sha256:aa2816aedaf4964ed9263960bcbe62f5ce6c626e626d351d2073c281c61c4bad", + digest = "sha256:2ec4c35a901a919b50722d82f1d0eb19cfc341cacec85acac3b059eb4b864e87", image = "index.docker.io/sourcegraph/wolfi-bundled-executor-base", ) oci_pull( name = "wolfi_executor_kubernetes_base", - digest = "sha256:183442440539edc342eb7a136b4be35cb43ff819eb1b88e21e7db4ac5a6b373e", + digest = "sha256:94921f555efcd91ff75e22fdb5f24de035a1688b2e05a5f0506f7c13f12e4ef0", image = "index.docker.io/sourcegraph/wolfi-executor-kubernetes-base", ) oci_pull( name = "wolfi_batcheshelper_base", - digest = "sha256:a290fbe16018386fa96666f828cc983533cf6760030104e698a254fff5430519", + digest = "sha256:e6c96b4d0ac78d6982fa903b2c4936d65def1a5da144f3c2fd3d1513318e1550", image = "index.docker.io/sourcegraph/wolfi-batcheshelper-base", ) oci_pull( name = "wolfi_prometheus_base", - digest = "sha256:845a876fcbe7609cfa999517996bd7c1974c403f4cad81ff6e1e0c2a8cf2263c", + digest = "sha256:e0abf1763ac6967451ff1239744b320ff08c09bcc50bb1cc67b43eb3419bd5c0", image = "index.docker.io/sourcegraph/wolfi-prometheus-base", ) oci_pull( name = "wolfi_prometheus_gcp_base", - digest = "sha256:9e02d2c560539ae860bf08ec18748559cb78e11c71ba7342cf4c8816ce1604d8", + digest = "sha256:b7318f12e19caea342a5d2e9c4fae5d46eb50e804fc48bded6b11c7e642ddae1", image = "index.docker.io/sourcegraph/wolfi-prometheus-gcp-base", ) oci_pull( name = "wolfi_postgresql-12_base", - digest = "sha256:24dc2c4153f12aea87d6abc085fd32c83c864ce04c95553b0cb402811e0ef517", + digest = "sha256:8857309f8e3234782119d67880b1418943eaa8ca22b287c9ef71a6b982363844", image = "index.docker.io/sourcegraph/wolfi-postgresql-12-base", ) oci_pull( name = "wolfi_postgresql-12-codeinsights_base", - digest = "sha256:81007215d3808d69658e4bf2305599c27fdffc5df9df1d0e3091f4ca062a2abb", + digest = "sha256:6954a84e772195968e7ef053db811052af20a0f107783c6c494a53272629ab91", image = "index.docker.io/sourcegraph/wolfi-postgresql-12-codeinsights-base", ) oci_pull( name = "wolfi_node_exporter_base", - digest = "sha256:15d2aa75d3c0d27de62109ea6245f1a7a0a9abf9bf0a97b19ed545b3ab911624", + digest = "sha256:e9ea035b2446e75fb0d55c1372883b97dd8407c26fbad0485e5dc6e04cfcfbe9", image = "index.docker.io/sourcegraph/wolfi-node-exporter-base", ) oci_pull( name = "wolfi_opentelemetry_collector_base", - digest = "sha256:fb77c37fe80a7e23796a5f0b54478dd075fb7ebf82a58a145d48aad0b03c2618", + digest = "sha256:58bdd2fe8bed1ba35f1e9e7522ea1c4aa35e654ced9e89f515236afa3e564bfc", image = "index.docker.io/sourcegraph/wolfi-opentelemetry-collector-base", ) oci_pull( name = "wolfi_searcher_base", - digest = "sha256:8ae66efec501aca7d6bc66a2b3a19775e2cd2b8db0e4e8c077bca9c764d55673", + digest = "sha256:9529888fa1cb0abe5806ce3b466523ae53518d12178640953e9a7d039bbe26f9", image = "index.docker.io/sourcegraph/wolfi-searcher-base", ) oci_pull( name = "wolfi_s3proxy_base", - digest = "sha256:41fe629da39e876f54902b072470ee379fcf5c3bf7340fc3ae6d294959f0b5bf", + digest = "sha256:ad0c8791d1a9a3a2a2f7e30933da0aa031c55c3b5bc3263802fcee4d9d955031", image = "index.docker.io/sourcegraph/wolfi-blobstore-base", ) oci_pull( name = "wolfi_qdrant_base", - digest = "sha256:c6d5509a1bfee07ae27d45347ff36a4cb0c14b23c7d597e161385c34b9742490", + digest = "sha256:dcc08b0228a5abd8a542efc7ee86ec58299591a737cafe19e92af6c1e1301c26", image = "index.docker.io/sourcegraph/wolfi-qdrant-base", ) diff --git a/dev/release/release-config.jsonc b/dev/release/release-config.jsonc index 4c09e4cdfd9da..a917c1ff3b136 100644 --- a/dev/release/release-config.jsonc +++ b/dev/release/release-config.jsonc @@ -22,6 +22,14 @@ "current": "5.2.0", "captainGitHubUsername": "unknwon", "captainSlackUsername": "joe" + }, + "5.2.4": { + "codeFreezeDate": "2023-11-22T10:18:45.722-08:00", + "securityApprovalDate": "2023-11-22T10:18:45.722-08:00", + "releaseDate": "2023-11-29T10:18:45.722-08:00", + "current": "5.2.4", + "captainGitHubUsername": "BolajiOlajide", + "captainSlackUsername": "bolaji.olajide" } }, "dryRun": { @@ -30,5 +38,15 @@ "trackingIssues": false, "calendar": false, "slack": false + }, + "in_progress": { + "captainGitHubUsername": "BolajiOlajide", + "captainSlackUsername": "bolaji.olajide", + "releases": [ + { + "version": "5.2.4", + "previous": "5.2.3" + } + ] } -} \ No newline at end of file +} diff --git a/dev/release/src/release.ts b/dev/release/src/release.ts index d3be69cb08067..18903df9a5968 100644 --- a/dev/release/src/release.ts +++ b/dev/release/src/release.ts @@ -1073,7 +1073,7 @@ ${patchRequestIssues.map(issue => `* #${issue.number}`).join('\n')}` }, { id: 'release:deactivate-release', - description: 'Activate a feature release', + description: 'De-activate a feature release', run: async config => { await verifyWithInput('Are you sure you want to deactivate all releases?') deactivateAllReleases(config) diff --git a/dev/release/templates/release_issue_template.md b/dev/release/templates/release_issue_template.md index 2bd1f767b5555..8a7f5e774e307 100644 --- a/dev/release/templates/release_issue_template.md +++ b/dev/release/templates/release_issue_template.md @@ -77,7 +77,11 @@ Do the [branch cut](https://handbook.sourcegraph.com/departments/engineering/dev Revert or disable features that may cause delays. As necessary, `git cherry-pick` bugfix (not feature!) commits from `main` into the release branch. Continue to create new release candidates as necessary, until no more `release-blocker` issues remain. -**Note**: You will need to re-check the above pipelines for any subsequent release candidates. You can see the Buildkite logs by tweaking the "branch" query parameter in the URLs to point to the desired release candidate. In general, the URL scheme looks like the following (replacing `N` in the URL): +- [ ] Update the [target branch of the RC test instance](https://github.com/sourcegraph/cloud/blob/main/.github/workflows/mi_upgrade_rctest.yml#L51) to the new release branch `$MAJOR.$MINOR`. +- [ ] Trigger a [manual run of the GitHub Action](https://github.com/sourcegraph/cloud/actions/workflows/mi_upgrade_rctest.yml) to upgrade the RC test instance. It should complete without an error, otherwise there might be a database migration problem that warrants a `release-blocker` issue. + +> [!important] +> You will need to re-check the above pipelines for any subsequent release candidates. You can see the Buildkite logs by tweaking the "branch" query parameter in the URLs to point to the desired release candidate. In general, the URL scheme looks like the following (replacing `N` in the URL): - Sourcegraph: `https://buildkite.com/sourcegraph/sourcegraph/builds?branch=v$MAJOR.$MINOR.$PATCH-rc.N` diff --git a/dev/sg/BUILD.bazel b/dev/sg/BUILD.bazel index ba6d9e4de5bf5..0dd06afb780c7 100644 --- a/dev/sg/BUILD.bazel +++ b/dev/sg/BUILD.bazel @@ -127,6 +127,11 @@ go_library( go_binary( name = "sg", embed = [":sg_lib"], + # keep + gotags = select({ + "//:sg_msp_flag": ["msp"], + "//conditions:default": [], + }), visibility = ["//visibility:public"], x_defs = { "github.com/sourcegraph/sourcegraph/internal/version.version": "{STABLE_VERSION}", diff --git a/dev/sg/checks.go b/dev/sg/checks.go index 67d30e6cc4177..bbf78f29cf39f 100644 --- a/dev/sg/checks.go +++ b/dev/sg/checks.go @@ -34,7 +34,7 @@ var checks = map[string]check.CheckFunc{ "asdf": check.CommandOutputContains("asdf", "version"), "git": check.Combine(check.InPath("git"), checkGitVersion(">= 2.34.1")), "pnpm": check.Combine(check.InPath("pnpm"), checkPnpmVersion(">= 8.3.0")), - "go": check.Combine(check.InPath("go"), checkGoVersion("~> 1.20.10")), + "go": check.Combine(check.InPath("go"), checkGoVersion("~> 1.21.4")), "node": check.Combine(check.InPath("node"), check.CommandOutputContains(`node -e "console.log(\"foobar\")"`, "foobar")), "rust": check.Combine(check.InPath("cargo"), check.CommandOutputContains(`cargo version`, "1.58.0")), "docker-installed": check.WrapErrMessage(check.InPath("docker"), "if Docker is installed and the check fails, you might need to start Docker.app and restart terminal and 'sg setup'"), diff --git a/dev/sg/ci/subcommands.go b/dev/sg/ci/subcommands.go index 32d1e7502b4af..5b3df46563a41 100644 --- a/dev/sg/ci/subcommands.go +++ b/dev/sg/ci/subcommands.go @@ -318,7 +318,7 @@ sg ci build docker-images-patch-notest prometheus # Publish all images without testing sg ci build docker-images-candidates-notest `, - BashComplete: completions.CompleteOptions(getAllowedBuildTypeArgs), + BashComplete: completions.CompleteArgs(getAllowedBuildTypeArgs), Flags: []cli.Flag{ &ciPipelineFlag, &cli.StringFlag{ diff --git a/dev/sg/dependencies/helpers.go b/dev/sg/dependencies/helpers.go index d482adb41635c..773ebaa1b5213 100644 --- a/dev/sg/dependencies/helpers.go +++ b/dev/sg/dependencies/helpers.go @@ -489,7 +489,7 @@ func checkPGUtilsPath(ctx context.Context, out *std.Output, args CheckArgs) erro // If the file exists, but doesn't reference PG_UTILS_PATH, that's an error as well. if pgUtilsPath == "" { - return errors.Newf("%s doesn't define PG_UTILS_PATH", userBazelRcPath) + return errors.Newf("none on the content in %s matched %q", userBazelRcPath, pgUtilsPathRe.String()) } // Check that this path contains createdb as expected. diff --git a/dev/sg/dependencies/mac.go b/dev/sg/dependencies/mac.go index d4ac1f938d34c..4e3d38774b453 100644 --- a/dev/sg/dependencies/mac.go +++ b/dev/sg/dependencies/mac.go @@ -158,6 +158,12 @@ var Mac = []category{ Check: checkAction(check.Combine(check.InPath("src"), checkSrcCliVersion(">= 4.2.0"))), Fix: cmdFix(`brew upgrade sourcegraph/src-cli/src-cli || brew install sourcegraph/src-cli/src-cli`), }, + // gnu-parallel is never available by default on MacOs. + &dependency{ + Name: "gnu-parallel", + Check: checkAction(check.InPath("parallel")), + Fix: cmdFix(`brew install parallel`), + }, ), { Name: "Postgres database", diff --git a/dev/sg/generates.go b/dev/sg/generates.go index 4d0a4707351f0..b9dedc1daf54b 100644 --- a/dev/sg/generates.go +++ b/dev/sg/generates.go @@ -71,27 +71,24 @@ func generateProtoRunner(ctx context.Context, args []string) *generate.Report { return proto.Generate(ctx, args, verbose) } - // By default, we will run buf generate in every directory with buf.gen.yaml - bufGenFilePaths, err := buf.PluginConfigurationFiles() - if err != nil { - return &generate.Report{Err: errors.Wrapf(err, "finding plugin configuration files")} - } + // If we're not in CI, we check for proto file changes + if os.Getenv("CI") != "true" { + out, err := exec.Command("git", "diff", "--name-only", "main").Output() + if err != nil { + return &generate.Report{Err: errors.Wrap(err, "git diff failed")} // should never happen + } - // Always run in CI - if os.Getenv("CI") == "true" { - return proto.Generate(ctx, bufGenFilePaths, verbose) + if !strings.Contains(string(out), ".proto") { + return &generate.Report{Output: "No .proto files changed or not in CI. Skipping buf gen.\n"} + } } - // Otherwise, only run if any .proto files are changed - out, err := exec.Command("git", "diff", "--name-only", "main...HEAD").Output() + // By default, we will run buf generate in every directory with buf.gen.yaml + bufGenFilePaths, err := buf.PluginConfigurationFiles() if err != nil { - return &generate.Report{Err: errors.Wrap(err, "git diff failed")} // should never happen + return &generate.Report{Err: errors.Wrapf(err, "finding plugin configuration files")} } - // Don't run buf gen if no .proto files changed or not in CI - if !strings.Contains(string(out), ".proto") { - return &generate.Report{Output: "No .proto files changed or not in CI. Skipping buf gen.\n"} - } // Run buf gen by default return proto.Generate(ctx, bufGenFilePaths, verbose) } diff --git a/dev/sg/internal/run/command.go b/dev/sg/internal/run/command.go index 724a4ff558f7c..6926631aab992 100644 --- a/dev/sg/internal/run/command.go +++ b/dev/sg/internal/run/command.go @@ -2,7 +2,9 @@ package run import ( "context" + "fmt" "io" + "net" "os/exec" "github.com/sourcegraph/conc/pool" @@ -160,6 +162,14 @@ func getSecrets(ctx context.Context, name string, extSecrets map[string]secrets. return secretsEnv, errs } +var sgConn net.Conn + +func OpenUnixSocket() error { + var err error + sgConn, err = net.Dial("unix", "/tmp/sg.sock") + return err +} + func startCmd(ctx context.Context, dir string, cmd Command, parentEnv map[string]string) (*startedCmd, error) { sc := &startedCmd{ stdoutBuf: &prefixSuffixSaver{N: 32 << 10}, @@ -182,17 +192,40 @@ func startCmd(ctx context.Context, dir string, cmd Command, parentEnv map[string var stdoutWriter, stderrWriter io.Writer logger := newCmdLogger(commandCtx, cmd.Name, std.Out.Output) - if cmd.IgnoreStdout { - std.Out.WriteLine(output.Styledf(output.StyleSuggestion, "Ignoring stdout of %s", cmd.Name)) - stdoutWriter = sc.stdoutBuf - } else { - stdoutWriter = io.MultiWriter(logger, sc.stdoutBuf) - } - if cmd.IgnoreStderr { - std.Out.WriteLine(output.Styledf(output.StyleSuggestion, "Ignoring stderr of %s", cmd.Name)) - stderrWriter = sc.stderrBuf + + // TODO(JH) sgtail experiment going on, this is a bit ugly, that will do it + // for the demo day. + if sgConn != nil { + sink := func(data string) { + sgConn.Write([]byte(fmt.Sprintf("%s: %s\n", cmd.Name, data))) + } + sgConnLog := process.NewLogger(ctx, sink) + + if cmd.IgnoreStdout { + std.Out.WriteLine(output.Styledf(output.StyleSuggestion, "Ignoring stdout of %s", cmd.Name)) + stdoutWriter = sc.stdoutBuf + } else { + stdoutWriter = io.MultiWriter(logger, sc.stdoutBuf, sgConnLog) + } + if cmd.IgnoreStderr { + std.Out.WriteLine(output.Styledf(output.StyleSuggestion, "Ignoring stderr of %s", cmd.Name)) + stderrWriter = sc.stderrBuf + } else { + stderrWriter = io.MultiWriter(logger, sc.stderrBuf, sgConnLog) + } } else { - stderrWriter = io.MultiWriter(logger, sc.stderrBuf) + if cmd.IgnoreStdout { + std.Out.WriteLine(output.Styledf(output.StyleSuggestion, "Ignoring stdout of %s", cmd.Name)) + stdoutWriter = sc.stdoutBuf + } else { + stdoutWriter = io.MultiWriter(logger, sc.stdoutBuf) + } + if cmd.IgnoreStderr { + std.Out.WriteLine(output.Styledf(output.StyleSuggestion, "Ignoring stderr of %s", cmd.Name)) + stderrWriter = sc.stderrBuf + } else { + stderrWriter = io.MultiWriter(logger, sc.stderrBuf) + } } if cmd.Preamble != "" { diff --git a/dev/sg/internal/run/prefix_suffix_saver.go b/dev/sg/internal/run/prefix_suffix_saver.go index 080577a9ec13c..ed02f3ed17eca 100644 --- a/dev/sg/internal/run/prefix_suffix_saver.go +++ b/dev/sg/internal/run/prefix_suffix_saver.go @@ -52,7 +52,7 @@ func (w *prefixSuffixSaver) Write(p []byte) (n int, err error) { // grow larger than w.N. It returns the un-appended suffix of p. func (w *prefixSuffixSaver) fill(dst *[]byte, p []byte) (pRemain []byte) { if remain := w.N - len(*dst); remain > 0 { - add := minInt(len(p), remain) + add := min(len(p), remain) *dst = append(*dst, p[:add]...) p = p[add:] } @@ -76,10 +76,3 @@ func (w *prefixSuffixSaver) Bytes() []byte { buf.Write(w.suffix[:w.suffixOff]) return buf.Bytes() } - -func minInt(a, b int) int { - if a < b { - return a - } - return b -} diff --git a/dev/sg/msp/repo/BUILD.bazel b/dev/sg/msp/repo/BUILD.bazel index 59ffc4b576068..5d51c9403c20f 100644 --- a/dev/sg/msp/repo/BUILD.bazel +++ b/dev/sg/msp/repo/BUILD.bazel @@ -9,7 +9,9 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/dev/sg/msp/repo", visibility = ["//visibility:public"], deps = [ + "//dev/managedservicesplatform/spec", "//dev/sg/internal/std", + "//lib/cliutil/completions", "//lib/errors", "@com_github_urfave_cli_v2//:cli", ], diff --git a/dev/sg/msp/repo/repo.go b/dev/sg/msp/repo/repo.go index 069ea8d86e43e..52c38e2bcf08b 100644 --- a/dev/sg/msp/repo/repo.go +++ b/dev/sg/msp/repo/repo.go @@ -7,7 +7,9 @@ import ( "github.com/urfave/cli/v2" + "github.com/sourcegraph/sourcegraph/dev/managedservicesplatform/spec" "github.com/sourcegraph/sourcegraph/dev/sg/internal/std" + "github.com/sourcegraph/sourcegraph/lib/cliutil/completions" ) // UseManagedServicesRepo is a cli.BeforeFunc that enforces that we are in the @@ -29,10 +31,10 @@ func UseManagedServicesRepo(c *cli.Context) error { return nil } -func ListServices() ([]string, error) { +func listServicesFromRoot(root string) ([]string, error) { var services []string - return services, filepath.Walk("services", func(path string, info fs.FileInfo, err error) error { - if info.Name() == "services" { + return services, filepath.Walk(filepath.Join(root, "services"), func(path string, info fs.FileInfo, err error) error { + if info == nil || info.Name() == "services" { return nil } if err != nil { @@ -41,7 +43,7 @@ func ListServices() ([]string, error) { if !info.IsDir() { return nil } - if _, err := os.Stat(ServiceYAMLPath(info.Name())); err != nil { + if _, err := os.Stat(filepath.Join(root, ServiceYAMLPath(info.Name()))); err != nil { if os.IsNotExist(err) { return nil } @@ -53,6 +55,41 @@ func ListServices() ([]string, error) { }) } +// ListServices returns a list of services, assuming MSP conventions in the +// working directory. Expected to be run after UseManagedServicesRepo() in a +// command context. +func ListServices() ([]string, error) { + return listServicesFromRoot(".") +} + +// ServicesAndEnvironmentsCompletion provides completions capabilities for +// commands that accept ' ' positional arguments. +func ServicesAndEnvironmentsCompletion() cli.BashCompleteFunc { + cwd, err := os.Getwd() + if err != nil { + return nil + } + repoRoot, err := repositoryRoot(cwd) + if err != nil { + return nil + } + return completions.CompletePositionalArgs( + func(args cli.Args) (options []string) { + services, _ := listServicesFromRoot(repoRoot) + return services + }, + func(args cli.Args) (options []string) { + svc, err := spec.Open(filepath.Join(repoRoot, ServiceYAMLPath(args.First()))) + if err != nil { + // try to complete services as a fallback + services, _ := listServicesFromRoot(repoRoot) + return services + } + return svc.ListEnvironmentIDs() + }, + ) +} + func ServiceYAMLPath(serviceID string) string { return filepath.Join("services", serviceID, "service.yaml") } diff --git a/dev/sg/msp/sg_msp.go b/dev/sg/msp/sg_msp.go index fada76824c056..6457434128531 100644 --- a/dev/sg/msp/sg_msp.go +++ b/dev/sg/msp/sg_msp.go @@ -48,9 +48,9 @@ func init() { // All 'sg msp ...' subcommands Command.Subcommands = []*cli.Command{ { - Name: "init", - ArgsUsage: "", - Description: "Initialize a template Managed Services Platform service spec", + Name: "init", + ArgsUsage: "", + Usage: "Initialize a template Managed Services Platform service spec", Flags: []cli.Flag{ &cli.StringFlag{ Name: "kind", @@ -186,9 +186,13 @@ func init() { }, }, { - Name: "generate", - ArgsUsage: " ", - Description: "Generate Terraform assets for a Managed Services Platform service spec.", + Name: "generate", + Aliases: []string{"gen"}, + ArgsUsage: "", + Usage: "Generate Terraform assets for a Managed Services Platform service spec.", + Description: `Optionally use '-all' to sync all environments for a service. + +Supports completions on services and environments.`, UsageText: ` # generate single env for a single service sg msp generate @@ -215,6 +219,7 @@ sg msp generate -all Value: true, }, }, + BashComplete: msprepo.ServicesAndEnvironmentsCompletion(), Action: func(c *cli.Context) error { var ( generateAll = c.Bool("all") @@ -262,17 +267,24 @@ sg msp generate -all }, }, { - Name: "terraform-cloud", - Aliases: []string{"tfc"}, - Description: "Manage Terraform Cloud workspaces for a service", - Before: msprepo.UseManagedServicesRepo, + Name: "terraform-cloud", + Aliases: []string{"tfc"}, + Usage: "Manage Terraform Cloud workspaces for a service", + Before: msprepo.UseManagedServicesRepo, Subcommands: []*cli.Command{ { - Name: "sync", - Description: "Create or update all required Terraform Cloud workspaces for a service", - Usage: "Optionally provide an environment ID as well to only sync that environment.", - ArgsUsage: " [environment ID]", + Name: "sync", + Usage: "Create or update all required Terraform Cloud workspaces for an environment", + Description: `Optionally use '-all' to sync all environments for a service. + +Supports completions on services and environments.`, + ArgsUsage: " [environment ID]", Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "all", + Usage: "Generate Terraform Cloud workspaces for all environments", + Value: false, + }, &cli.StringFlag{ Name: "workspace-run-mode", Usage: "One of 'vcs', 'cli'", @@ -284,6 +296,7 @@ sg msp generate -all Value: false, }, }, + BashComplete: msprepo.ServicesAndEnvironmentsCompletion(), Action: func(c *cli.Context) error { serviceID := c.Args().First() if serviceID == "" { @@ -337,6 +350,9 @@ sg msp generate -all return errors.Wrapf(err, "sync env %q", env.ID) } } else { + if targetEnv == "" && !c.Bool("all") { + return errors.New("second argument environment ID is required without the '-all' flag") + } for _, env := range service.Environments { if err := syncEnvironmentWorkspaces(c, tfcClient, service.Service, service.Build, env); err != nil { return errors.Wrapf(err, "sync env %q", env.ID) @@ -350,8 +366,8 @@ sg msp generate -all }, }, { - Name: "schema", - Description: "Generate JSON schema definition for service specification", + Name: "schema", + Usage: "Generate JSON schema definition for service specification", Flags: []cli.Flag{ &cli.StringFlag{ Name: "output", diff --git a/dev/sg/sg_generate.go b/dev/sg/sg_generate.go index 751ecf5120abd..d22bf5acace2d 100644 --- a/dev/sg/sg_generate.go +++ b/dev/sg/sg_generate.go @@ -114,7 +114,7 @@ func (gt generateTargets) Commands() (cmds []*cli.Command) { for _, c := range gt { var complete cli.BashCompleteFunc if c.Completer != nil { - complete = completions.CompleteOptions(c.Completer) + complete = completions.CompleteArgs(c.Completer) } cmds = append(cmds, &cli.Command{ Name: c.Name, diff --git a/dev/sg/sg_lint.go b/dev/sg/sg_lint.go index 5fe97ef987431..312b1f726c8e3 100644 --- a/dev/sg/sg_lint.go +++ b/dev/sg/sg_lint.go @@ -174,7 +174,7 @@ func (lt lintTargets) Commands() (cmds []*cli.Command) { return runner.Check(cmd.Context, repoState) }, // Completions to chain multiple commands - BashComplete: completions.CompleteOptions(func() (options []string) { + BashComplete: completions.CompleteArgs(func() (options []string) { for _, c := range lt { options = append(options, c.Name) } diff --git a/dev/sg/sg_live.go b/dev/sg/sg_live.go index c49f24d7553b4..bfac5a5d9b9c7 100644 --- a/dev/sg/sg_live.go +++ b/dev/sg/sg_live.go @@ -45,7 +45,7 @@ sg live -n 50 s2 Usage: "Number of commits to check for live version", }, }, - BashComplete: completions.CompleteOptions(func() (options []string) { + BashComplete: completions.CompleteArgs(func() (options []string) { return append(environmentNames(), `https\://...`) }), } diff --git a/dev/sg/sg_run.go b/dev/sg/sg_run.go index 1be26be3925a0..a30fe02916e54 100644 --- a/dev/sg/sg_run.go +++ b/dev/sg/sg_run.go @@ -67,7 +67,7 @@ sg run -describe jaeger }, }, Action: runExec, - BashComplete: completions.CompleteOptions(func() (options []string) { + BashComplete: completions.CompleteArgs(func() (options []string) { config, _ := getConfig() if config == nil { return diff --git a/dev/sg/sg_secret.go b/dev/sg/sg_secret.go index 81a9534e92d44..85948c74a1ec2 100644 --- a/dev/sg/sg_secret.go +++ b/dev/sg/sg_secret.go @@ -35,7 +35,7 @@ sg secret reset buildkite ArgsUsage: "<...key>", Usage: "Remove a specific secret from secrets file", Action: resetSecretExec, - BashComplete: completions.CompleteOptions(bashCompleteSecrets), + BashComplete: completions.CompleteArgs(bashCompleteSecrets), }, { Name: "list", diff --git a/dev/sg/sg_src.go b/dev/sg/sg_src.go index dd5b026b5ba57..82a5ad3ac75a3 100644 --- a/dev/sg/sg_src.go +++ b/dev/sg/sg_src.go @@ -4,13 +4,13 @@ import ( "context" "net/url" "os" + "os/exec" "github.com/urfave/cli/v2" "github.com/sourcegraph/sourcegraph/dev/sg/internal/category" "github.com/sourcegraph/sourcegraph/dev/sg/internal/secrets" "github.com/sourcegraph/sourcegraph/dev/sg/internal/std" - "github.com/sourcegraph/sourcegraph/dev/sg/internal/usershell" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/lib/output" ) @@ -87,7 +87,7 @@ var srcInstanceCommand = &cli.Command{ name := cmd.Args().First() instance, ok := sc.Instances[name] if !ok { - std.Out.WriteFailuref("Instance not found, register one with 'sg src register-instance'") + std.Out.WriteFailuref("Instance not found, register one with 'sg src-instance register'") return errors.New("instance not found") } sc.Current = name @@ -132,21 +132,21 @@ var srcCommand = &cli.Command{ } instanceName := sc.Current if instanceName == "" { - std.Out.WriteFailuref("Instance not found, register one with 'sg src register-instance'") + std.Out.WriteFailuref("Instance not found, register one with 'sg src-instance register'") return errors.New("set an instance with sg src-instance use [instance-name]") } instance, ok := sc.Instances[instanceName] if !ok { - std.Out.WriteFailuref("Instance not found, register one with 'sg src register-instance'") + std.Out.WriteFailuref("Instance not found, register one with 'sg src-instance register'") return errors.New("instance not found") } - c := usershell.Command(cmd.Context, append([]string{"src"}, cmd.Args().Slice()...)...) - c = c.Env(map[string]string{ - "SRC_ACCESS_TOKEN": instance.AccessToken, - "SRC_ENDPOINT": instance.Endpoint, - }) - return c.Run().Stream(os.Stdout) + c := exec.CommandContext(cmd.Context, "src", cmd.Args().Slice()...) + c.Env = append(c.Environ(), "SRC_ACCESS_TOKEN="+instance.AccessToken, "SRC_ENDPOINT="+instance.Endpoint) + c.Stdout = os.Stdout + c.Stderr = os.Stderr + c.Stdin = os.Stdin + return c.Run() }, } diff --git a/dev/sg/sg_start.go b/dev/sg/sg_start.go index 7a70e0c3d2d07..f9faeeecd4abe 100644 --- a/dev/sg/sg_start.go +++ b/dev/sg/sg_start.go @@ -8,6 +8,7 @@ import ( "path/filepath" "sort" "strings" + "sync" "time" "github.com/sourcegraph/conc/pool" @@ -85,6 +86,10 @@ sg start -describe single-program Name: "describe", Usage: "Print details about the selected commandset", }, + &cli.BoolFlag{ + Name: "sgtail", + Usage: "Connects to running sgtail instance", + }, &cli.StringSliceFlag{ Name: "debug", @@ -127,7 +132,7 @@ sg start -describe single-program Destination: &onlyServices, }, }, - BashComplete: completions.CompleteOptions(func() (options []string) { + BashComplete: completions.CompleteArgs(func() (options []string) { config, _ := getConfig() if config == nil { return @@ -154,7 +159,7 @@ func constructStartCmdLongHelp() string { } fmt.Fprintf(&out, "\n\n") - fmt.Fprintf(&out, "Available comamndsets in `%s`:\n", configFile) + fmt.Fprintf(&out, "Available commandsets in `%s`:\n", configFile) var names []string for name := range config.Commandsets { @@ -173,6 +178,8 @@ func constructStartCmdLongHelp() string { return out.String() } +var sgOnce sync.Once + func startExec(ctx *cli.Context) error { config, err := getConfig() if err != nil { @@ -204,6 +211,12 @@ func startExec(ctx *cli.Context) error { return errors.New("no concurrent sg start with same arguments allowed") } + if ctx.Bool("sgtail") { + if err := run.OpenUnixSocket(); err != nil { + return errors.Wrapf(err, "Did you forget to run sgtail first?") + } + } + commandset := args[0] set, ok := config.Commandsets[commandset] if !ok { diff --git a/dev/sg/sg_tests.go b/dev/sg/sg_tests.go index e2302dd1dc704..1f1946de5b682 100644 --- a/dev/sg/sg_tests.go +++ b/dev/sg/sg_tests.go @@ -40,7 +40,7 @@ sg test -help sg test backend-integration -run TestSearch `, Category: category.Dev, - BashComplete: completions.CompleteOptions(func() (options []string) { + BashComplete: completions.CompleteArgs(func() (options []string) { config, _ := getConfig() if config == nil { return diff --git a/dev/tool_deps.bzl b/dev/tool_deps.bzl index 121906c23837e..1ebb10e8b85ce 100644 --- a/dev/tool_deps.bzl +++ b/dev/tool_deps.bzl @@ -1,3 +1,5 @@ +"Third party dev tooling dependencies" + load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") DOCSITE_VERSION = "1.9.4" @@ -12,7 +14,18 @@ filegroup( ) """ +GCLOUD_VERSION = "415.0.0" +GCLOUD_BUILDFILE = """package(default_visibility = ["//visibility:public"])\nexports_files(["gcloud", "gsutil", "bq", "git-credential-gcloud"])""" +GCLOUD_PATCH_CMDS = [ + "ln -s google-cloud-sdk/bin/gcloud gcloud", + "ln -s google-cloud-sdk/bin/gsutil gsutil", + "ln -s google-cloud-sdk/bin/bq bq", + "ln -s google-cloud-sdk/bin/git-credential-gcloud.sh git-credential-gcloud", +] + def tool_deps(): + "Repository rules to fetch third party tooling used for dev purposes" + # Docsite # http_file( name = "docsite_darwin_amd64", @@ -82,3 +95,27 @@ def tool_deps(): url = "https://storage.googleapis.com/universal_ctags/x86_64-linux/dist/universal-ctags-{0}".format(CTAGS_VERSION), executable = True, ) + + http_archive( + name = "gcloud-darwin-arm64", + build_file_content = GCLOUD_BUILDFILE, + patch_cmds = GCLOUD_PATCH_CMDS, + sha256 = "974ed4f37f8bde2f7a9731eba90b033f7c97d24d835ecc62b58eee87c8f29776", + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-{}-darwin-arm.tar.gz".format(GCLOUD_VERSION), + ) + + http_archive( + name = "gcloud-darwin-amd64", + build_file_content = GCLOUD_BUILDFILE, + patch_cmds = GCLOUD_PATCH_CMDS, + sha256 = "f05cc45ffc6c1f3ff73854989f3ea3d6bee40287d23047917e4c845aeb027f98", + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-{}-darwin-x86_64.tar.gz".format(GCLOUD_VERSION), + ) + + http_archive( + name = "gcloud-linux-amd64", + build_file_content = GCLOUD_BUILDFILE, + patch_cmds = GCLOUD_PATCH_CMDS, + sha256 = "5f9ed1862a82f393be3b16634309e9e8edb6da13a8704952be9c4c59963f9cd4", + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-{}-linux-x86_64.tar.gz".format(GCLOUD_VERSION), + ) diff --git a/dev/tools/BUILD.bazel b/dev/tools/BUILD.bazel index 94f3aeea54ed1..05d42731e848b 100644 --- a/dev/tools/BUILD.bazel +++ b/dev/tools/BUILD.bazel @@ -27,3 +27,23 @@ sh_binary( }), visibility = ["//visibility:public"], ) + +sh_binary( + name = "gcloud", + srcs = select({ + "@bazel_tools//src/conditions:darwin_x86_64": ["@gcloud-darwin-amd64//:gcloud"], + "@bazel_tools//src/conditions:darwin_arm64": ["@gcloud-darwin-arm64//:gcloud"], + "@bazel_tools//src/conditions:linux_x86_64": ["@gcloud-linux-amd64//:gcloud"], + }), + visibility = ["//visibility:public"], +) + +sh_binary( + name = "gsutil", + srcs = select({ + "@bazel_tools//src/conditions:darwin_x86_64": ["@gcloud-darwin-amd64//:gsutil"], + "@bazel_tools//src/conditions:darwin_arm64": ["@gcloud-darwin-arm64//:gsutil"], + "@bazel_tools//src/conditions:linux_x86_64": ["@gcloud-linux-amd64//:gsutil"], + }), + visibility = ["//visibility:public"], +) diff --git a/dev/write_generated_to_source_files.bzl b/dev/write_generated_to_source_files.bzl index 76a5babb30d4f..94b6e81aa55c2 100644 --- a/dev/write_generated_to_source_files.bzl +++ b/dev/write_generated_to_source_files.bzl @@ -1,10 +1,8 @@ load("@aspect_bazel_lib//lib:directory_path.bzl", "make_directory_path") load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") -load("@aspect_bazel_lib//lib:utils.bzl", "file_exists") -load("@bazel_skylib//lib:paths.bzl", "paths") -def write_generated_to_source_files(name, target, output_files, verbose_copy=False, **kwargs): +def write_generated_to_source_files(name, target, output_files, verbose_copy = False, **kwargs): for dest, orig in output_files.items(): if dest == orig: fail("{} and {} must differ so we can detect source files needing to be regenerated".format(dest, orig)) @@ -29,5 +27,5 @@ def write_generated_to_source_files(name, target, output_files, verbose_copy=Fal }, suggested_update_target = "//dev:write_all_generated", visibility = ["//visibility:public"], - **kwargs, + **kwargs ) diff --git a/doc/BUILD.bazel b/doc/BUILD.bazel index 527bfdff3e003..8e5533eb447ca 100644 --- a/doc/BUILD.bazel +++ b/doc/BUILD.bazel @@ -1,7 +1,7 @@ sh_test( name = "test", size = "small", - timeout = "moderate", + timeout = "long", srcs = ["test.sh"], args = ["$(location //dev/tools:docsite)"], data = [ diff --git a/doc/_resources/templates/root.html b/doc/_resources/templates/root.html index fe9883cc0d31d..4ab0487486c3e 100644 --- a/doc/_resources/templates/root.html +++ b/doc/_resources/templates/root.html @@ -250,7 +250,6 @@

    Sections

    External

    @@ -275,12 +274,11 @@

    External

    diff --git a/doc/admin/config/batch_changes.md b/doc/admin/config/batch_changes.md index f104e001804e8..ca7e15923eea0 100644 --- a/doc/admin/config/batch_changes.md +++ b/doc/admin/config/batch_changes.md @@ -190,7 +190,7 @@ Gerrit | API call | βœ— | βœ“ | Requires ["delete own changes" permission](https Sourcegraph 5.1+ -Sourcegraph can be configured to sign commits pushed to GitHub using a GitHub App. Commit signing prevents tampering by unauthorized parties and provides a way to ensure that commits pushed to branches created by Batch Changes actually do come from Sourcegraph. Enabling commit signing for Batch Changes can also help pass checks in build systems or CI/CD pipelines that require that all commits are signed and verified before they can be merged. +Sourcegraph can be configured to [sign commits pushed to GitHub](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification) using a GitHub App. Commit signing prevents tampering by unauthorized parties and provides a way to ensure that commits pushed to branches created by Batch Changes actually do come from Sourcegraph. Enabling commit signing for Batch Changes can also help pass checks in build systems or CI/CD pipelines that require that all commits are signed and verified before they can be merged. At present, only GitHub code hosts (both Cloud and Enterprise) are supported, and only GitHub App signing is supported. Support for other code hosts and signing methods may be added in the future. @@ -282,7 +282,20 @@ Batch Changes uses the tokens from GitHub Apps in the following ways: Installation access tokens are short-lived, non-refreshable tokens that give Sourcegraph access to the repositories the GitHub App has been given access to. Sourcegraph uses these tokens to read and write commits to repository branches. These tokens expire after 1 hour. -### Custom Certificates +### Rejecting Unverified Commits + +Sourcegraph 5.2.4+ + +Admins can configure Batch Changes to error when it creates commits that are not signed. This can be done by enabling the `batchChanges.rejectUnverifiedCommits` setting in the site configuration: + +```json +{ + ..., + "batchChanges.rejectUnverifiedCommits": true +} +``` + +## Custom Certificates Sourcegraph 5.1.5+ @@ -301,7 +314,7 @@ in the **Site configuration** with your certificate(s). } ``` -### Ownership +## Ownership When a user is deleted, their Batch Changes become inaccessible in the UI but the data is not permanently deleted. This allows recovering the Batch Changes if the user is restored. diff --git a/doc/admin/deploy/docker-compose/aws.md b/doc/admin/deploy/docker-compose/aws.md index e5e77425aa28e..ef10a94ca6a19 100644 --- a/doc/admin/deploy/docker-compose/aws.md +++ b/doc/admin/deploy/docker-compose/aws.md @@ -69,7 +69,7 @@ set -euxo pipefail ############################################################################### # Please read the notes below the script if you are cloning a private repository DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git' -DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.2' +DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.3' ##################### NO CHANGES REQUIRED BELOW THIS LINE ##################### DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/home/ec2-user/deploy-sourcegraph-docker' DOCKER_COMPOSE_VERSION='1.29.2' diff --git a/doc/admin/deploy/docker-compose/azure.md b/doc/admin/deploy/docker-compose/azure.md index f2ff34f3407ac..1670991098922 100644 --- a/doc/admin/deploy/docker-compose/azure.md +++ b/doc/admin/deploy/docker-compose/azure.md @@ -77,7 +77,7 @@ set -euxo pipefail ############################################################################### # Please read the notes below the script if you are cloning a private repository DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git' -DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.2' +DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.3' ##################### NO CHANGES REQUIRED BELOW THIS LINE ##################### DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/root/deploy-sourcegraph-docker' DOCKER_COMPOSE_VERSION='1.29.2' diff --git a/doc/admin/deploy/docker-compose/digitalocean.md b/doc/admin/deploy/docker-compose/digitalocean.md index 2681ed6af15a8..b247c7527571a 100644 --- a/doc/admin/deploy/docker-compose/digitalocean.md +++ b/doc/admin/deploy/docker-compose/digitalocean.md @@ -60,7 +60,7 @@ set -euxo pipefail ############################################################################### # Please read the notes below the script if you are cloning a private repository DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git' -DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.2' +DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.3' ##################### NO CHANGES REQUIRED BELOW THIS LINE ##################### DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/root/deploy-sourcegraph-docker' DOCKER_DATA_ROOT='/mnt/docker-data' diff --git a/doc/admin/deploy/docker-compose/google_cloud.md b/doc/admin/deploy/docker-compose/google_cloud.md index 88b2a11682117..80c24386f8123 100644 --- a/doc/admin/deploy/docker-compose/google_cloud.md +++ b/doc/admin/deploy/docker-compose/google_cloud.md @@ -56,7 +56,7 @@ set -euxo pipefail ############################################################################### # Please read the notes below the script if you are cloning a private repository DEPLOY_SOURCEGRAPH_DOCKER_FORK_CLONE_URL='https://github.com/sourcegraph/deploy-sourcegraph-docker.git' -DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.2' +DEPLOY_SOURCEGRAPH_DOCKER_FORK_REVISION='v5.2.3' ##################### NO CHANGES REQUIRED BELOW THIS LINE ##################### # IMPORTANT: DO NOT MAKE ANY CHANGES FROM THIS POINT ONWARD DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT='/root/deploy-sourcegraph-docker' diff --git a/doc/admin/deploy/docker-compose/index.md b/doc/admin/deploy/docker-compose/index.md index 37b56d8d54296..72d36a5fe72bb 100644 --- a/doc/admin/deploy/docker-compose/index.md +++ b/doc/admin/deploy/docker-compose/index.md @@ -118,7 +118,7 @@ Continue with the following steps *after* you have created a public or private c ```bash # Specify the version you want to install - export SOURCEGRAPH_VERSION="v5.2.2" + export SOURCEGRAPH_VERSION="v5.2.3" # Check out the selected version for use, in a new branch called "release" git checkout $SOURCEGRAPH_VERSION -b release ``` diff --git a/doc/admin/deploy/docker-single-container/aws.md b/doc/admin/deploy/docker-single-container/aws.md index da176f77f706a..dfd2d5a51b5b1 100644 --- a/doc/admin/deploy/docker-single-container/aws.md +++ b/doc/admin/deploy/docker-single-container/aws.md @@ -33,7 +33,7 @@ This tutorial shows you how to deploy [single-container Sourcegraph with Docker] - usermod -a -G docker ec2-user # Install and run Sourcegraph. Restart the container upon subsequent reboots - - [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 127.0.0.1:3370:3370 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.2' ] + - [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 127.0.0.1:3370:3370 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.3' ] ``` - Select **Next: ...** until you get to the **Configure Security Group** page. Then add the following rules: diff --git a/doc/admin/deploy/docker-single-container/digitalocean.md b/doc/admin/deploy/docker-single-container/digitalocean.md index a65e506a22f29..76659af778156 100644 --- a/doc/admin/deploy/docker-single-container/digitalocean.md +++ b/doc/admin/deploy/docker-single-container/digitalocean.md @@ -17,7 +17,7 @@ This tutorial shows you how to deploy [single-container Sourcegraph with Docker] 1. Run the Sourcegraph Docker image as a daemon: ``` - docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.2 + docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.3 ``` 1. Navigate to the droplet's IP address to finish initializing Sourcegraph. If you have configured a DNS entry for the IP, configure `externalURL` to reflect that. diff --git a/doc/admin/deploy/docker-single-container/google_cloud.md b/doc/admin/deploy/docker-single-container/google_cloud.md index cf6c8783942fd..47a9eda48743c 100644 --- a/doc/admin/deploy/docker-single-container/google_cloud.md +++ b/doc/admin/deploy/docker-single-container/google_cloud.md @@ -23,7 +23,7 @@ This tutorial shows you how to deploy [single-container Sourcegraph with Docker] sudo apt-get install -y docker-ce mkdir -p /root/.sourcegraph/config mkdir -p /root/.sourcegraph/data - docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.2 + docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.3 ``` - Create your VM, then navigate to its public IP address. diff --git a/doc/admin/deploy/docker-single-container/index.md b/doc/admin/deploy/docker-single-container/index.md index 8bc7c9bb51601..353c15748b519 100644 --- a/doc/admin/deploy/docker-single-container/index.md +++ b/doc/admin/deploy/docker-single-container/index.md @@ -14,7 +14,7 @@ It takes less than a minute to run and install Sourcegraph using Docker: This uses line breaks that are rendered but not copy-pasted to the clipboard. --> -
    docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.2
    +
    docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.3
    Once the server is ready (logo is displayed in the terminal), navigate to the hostname or IP address on port `7080`. Create the admin account, then you'll be guided through setting up Sourcegraph for code searching and navigation. @@ -46,7 +46,7 @@ For example, to mount a `.gitconfig`, create a file `/mnt/sourcegraph/config/git Alternatively you can create a new Docker image which inherits from Sourcegraph and then mutates the environment: ```dockerfile -FROM sourcegraph/server:5.2.2 +FROM sourcegraph/server:5.2.3 COPY gitconfig /etc/gitconfig COPY ssh /root/.ssh @@ -87,7 +87,7 @@ This is required to [collect debug data](../../pprof.md). The docker run command for single-container Sourcegraph needs an additional publish flag to expose the debug port: ```sh -$ docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --publish 127.0.0.1:6060:6060 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.2 +$ docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --publish 127.0.0.1:6060:6060 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:5.2.3 ``` If Sourcegraph is deployed to a remote server, then access via an SSH tunnel using a tool @@ -105,7 +105,7 @@ Add the following to your docker run command: ```sh $ docker run [...] -e (YOUR CODE) -sourcegraph/server:5.2.2 +sourcegraph/server:5.2.3 ``` ## Operation @@ -254,7 +254,7 @@ Sourcegraph can be **tested** on Windows 10 using roughly the same steps provide 1. [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/) 2. Using a command prompt, follow the same [installation steps provided above](#install-sourcegraph-with-docker) but remove the `--volume` arguments. For example by pasting this: -
    docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm sourcegraph/server:5.2.2
    +
    docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm sourcegraph/server:5.2.3
    ### Low resource environments diff --git a/doc/admin/deploy/index.md b/doc/admin/deploy/index.md index 51e1de466642f..fc74dfac8a17e 100644 --- a/doc/admin/deploy/index.md +++ b/doc/admin/deploy/index.md @@ -24,7 +24,7 @@ Carefully consider your organization's needs and technical expertise when select ### [Sourcegraph Cloud](https://about.sourcegraph.com/get-started?t=enterprise) -**For Enterprises looking for a Cloud solution.** +**For Enterprises looking for a managed Cloud solution.** A cloud instance hosted and maintained by Sourcegraph @@ -43,7 +43,7 @@ A cloud instance hosted and maintained by Sourcegraph ### [Machine Images](machine-images/index.md) -**For Enterprises looking for a self-hosted solution on Cloud.** +**For Enterprises looking for a self-hosted solution on the Cloud infrastructure of their choice.** An option to run Sourcegraph on your own infrastructure using pre-configured machine images. diff --git a/doc/admin/deploy/kubernetes/configure.md b/doc/admin/deploy/kubernetes/configure.md index ea2abdc043163..7f864ef58e4f5 100644 --- a/doc/admin/deploy/kubernetes/configure.md +++ b/doc/admin/deploy/kubernetes/configure.md @@ -106,7 +106,7 @@ RBAC must be enabled in your cluster for the frontend to communicate with other This will allow the frontend service to discover endpoints for each service replica and communicate with them through the Kubernetes API. Note that this component should only be added if RBAC is enabled in your cluster. ### Embeddings Service -By default the Embeddings service which is used to handle embeddings searches is disabled. To enable it the following must be commented out. By default the Embeddings service stores indexes in `blobstore`. Use the [embeddings-backend](./configure.md#external-embeddings-object-storage) patch to configure an external object store. +By default, the Embeddings service which is used to handle embeddings searches is disabled. To enable it the following must be commented out. By default, the Embeddings service stores indexes in `blobstore`. Use the [embeddings-backend](./configure.md#external-embeddings-object-storage) patch to configure an external object store. ```yaml # instances/$INSTANCE_NAME/kustomization.yaml components: @@ -117,7 +117,7 @@ components: ## Monitoring stack -The monitoring stack for Sourcegraph, similar to the main stack, does not include RBAC (Role-Based Access Control) resources by default. As a result, some dashboards may not display any data unless cAdvisor is deployed seperately with privileged access. +The monitoring stack for Sourcegraph, similar to the main stack, does not include RBAC (Role-Based Access Control) resources by default. As a result, some dashboards may not display any data unless cAdvisor is deployed separately with privileged access. To deploy the monitoring stack, add the monitoring resources to the resources-list: @@ -290,7 +290,7 @@ Some resources and components (e.g. [Prometheus](#prometheus-targets)) are pre-c ### Set namespace -To set a namespace for all your Sourcegraph resources, update the `namespace` field to an exisiting namespace in your cluster: +To set a namespace for all your Sourcegraph resources, update the `namespace` field to an existing namespace in your cluster: ```yaml # instances/$INSTANCE_NAME/kustomization.yaml @@ -377,7 +377,7 @@ Here is an example on how to adjust the storage sizes for different services: > WARNING: Only available in version 4.5.0 or above -In cases where adjusting resource allocation (e.g. replica count, resource limits, etc) is necessary, it is important to follow the instructions provided below. +In cases where adjusting resource allocation (e.g. replica count, resource limits, etc.) is necessary, it is important to follow the instructions provided below. > NOTE: The built-in [replica transformer](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/replicas/) is currently not supported unless being used as a component. @@ -503,7 +503,7 @@ The component takes care of creating a new storage class named `sourcegraph` wit - Provisioner: pd.csi.storage.gke.io - SSD: types: pd-ssd -It also update the storage class name for all resources to `sourcegraph`. +It also updates the storage class name for all resources to `sourcegraph`. [Additional documentation](https://cloud.google.com/kubernetes-engine/docs/how-to/persistent-volumes/gce-pd-csi-driver) for more information. @@ -530,7 +530,7 @@ It also update the storage class name for all resources to `sourcegraph`. ### Azure -> WARNING: If you are deploying on Azure, you **must** ensure that your cluster is created with support for CSI storage drivers [(link)](https://docs.microsoft.com/en-us/azure/aks/csi-storage-drivers)). This **can not** be enabled after the fact +> WARNING: If you are deploying on Azure, you **must** ensure that your cluster is created with support for CSI storage drivers [(link)](https://docs.microsoft.com/en-us/azure/aks/csi-storage-drivers). This **can not** be enabled after the fact **Step 1**: Follow the [official instructions](https://docs.microsoft.com/en-us/azure/aks/csi-storage-drivers) to deploy the [Container Storage Interface (CSI) drivers](https://learn.microsoft.com/en-us/azure/aks/csi-storage-drivers). @@ -894,7 +894,7 @@ $ cp components/patches/frontend-ingress-annotations.yaml instances/$INSTANCE_NA - patch: patches/frontend-ingress.annotations.yaml ``` -This will add the annotations specified in your copy of the [frontend-ingress-annotations.yaml](https://github.com/sourcegraph/deploy-sourcegraph-k8s/blob/master/base/frontend/sourcegraph-frontend.Ingress.yaml) file to the sourcegraph-frontend ingress resource. For more information on [ingress-nginx annotations](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/), refer to the [NGINX Configuration documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/). +This will add the annotations specified in your copy of the [frontend-ingress-annotations.yaml](https://github.com/sourcegraph/deploy-sourcegraph-k8s/blob/master/base/sourcegraph/frontend/sourcegraph-frontend.Ingress.yaml) file to the sourcegraph-frontend ingress resource. For more information on [ingress-nginx annotations](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/), refer to the [NGINX Configuration documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/). ### NetworkPolicy @@ -1010,7 +1010,7 @@ configMapGenerator: These values will be automatically merged with the environment variables currently listed in the ConfigMap for frontend. -> WARNING: You must restart frontend for the updated values to be activiated +> WARNING: You must restart frontend for the updated values to be activated ### Gitserver @@ -1102,7 +1102,7 @@ To connect Sourcegraph to an existing PostgreSQL instance, add the relevant envi - PGPORT=NEW_PGPORT ``` -> WARNING: You must restart frontend for the updated values to be activiated +> WARNING: You must restart frontend for the updated values to be activated ### External Redis @@ -1142,7 +1142,7 @@ This adds the new environment variables for redis to the services listed above. REDIS_STORE_ENDPOINT: REDIS_STORE_DSN ``` -> WARNING: You must restart frontend for the updated values to be activiated +> WARNING: You must restart frontend for the updated values to be activated ### External Embeddings Object Storage @@ -1195,14 +1195,14 @@ To mount the files through Kustomize: - configs/known_hosts ``` -**Step 3:** Include the following component to mount the [secret as a volume](https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-files-from-a-pod) in [gitserver.StatefulSet.yaml](https://github.com/sourcegraph/deploy-sourcegraph-k8s/blob/master/base/gitserver/gitserver.StatefulSet.yaml). +**Step 3:** Include the following component to mount the [secret as a volume](https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-files-from-a-pod) in [gitserver.StatefulSet.yaml](https://github.com/sourcegraph/deploy-sourcegraph-k8s/blob/master/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml). ```yaml # instances/$INSTANCE_NAME/kustomization.yaml components: - # Enable SSH to clon repositories as non-root user (default) + # Enable SSH to clone repositories as non-root user (default) - ../../components/enable/ssh/non-root - # Enable SSH to clon repositories as root user + # Enable SSH to clone repositories as root user - ../../components/enable/ssh/root ``` @@ -1281,7 +1281,7 @@ This will cause Prometheus to drop all metrics *from cAdvisor* that are not serv ## Private registry -**Step 1:** To update all image names with your private registry, eg. `index.docker.io/sourcegraph/service_name` to `your.private.registry.com/sourcegraph/service_name`, include the `private-registry` component: +**Step 1:** To update all image names with your private registry, e.g. `index.docker.io/sourcegraph/service_name` to `your.private.registry.com/sourcegraph/service_name`, include the `private-registry` component: ```yaml # instances/$INSTANCE_NAME/kustomization.yaml @@ -1367,7 +1367,7 @@ After transferring ownerships, you can redeploy the instance with non-privileged ## Outbound Traffic -When working with an [Internet Gateway](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Internet_Gateway.html) or VPC it may be necessary to expose ports for outbound network traffic. Sourcegraph must open port 443 for outbound traffic to codehosts, and to enable [telemetry](https://docs.sourcegraph.com/admin/pings) with Sourcegraph.com. Port 22 must also be opened to enable git SSH cloning by Sourcegraph. In addition, please make sure to apply other required changes to secure your cluster in a manner that meets your organization's security requirements. +When working with an [Internet Gateway](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Internet_Gateway.html) or VPC it may be necessary to expose ports for outbound network traffic. Sourcegraph must open port 443 for outbound traffic to code hosts, and to enable [telemetry](https://docs.sourcegraph.com/admin/pings) with Sourcegraph.com. Port 22 must also be opened to enable git SSH cloning by Sourcegraph. In addition, please make sure to apply other required changes to secure your cluster in a manner that meets your organization's security requirements. --- diff --git a/doc/admin/deploy/kubernetes/helm.md b/doc/admin/deploy/kubernetes/helm.md index 1dded821d8112..c425687154a41 100644 --- a/doc/admin/deploy/kubernetes/helm.md +++ b/doc/admin/deploy/kubernetes/helm.md @@ -54,7 +54,7 @@ $ helm repo add sourcegraph https://helm.sourcegraph.com/release Install the Sourcegraph chart using default values: ```sh -$ helm install --version 5.2.2 sourcegraph sourcegraph/sourcegraph +$ helm install --version 5.2.3 sourcegraph sourcegraph/sourcegraph ``` Sourcegraph should now be available via the address set. Browsing to the url should now provide access to the Sourcegraph UI to create the initial administrator account. @@ -81,7 +81,7 @@ Example overrides can be found in the [examples](https://github.com/sourcegraph/ Providing the override file to Helm is done with the inclusion of the values flag and the name of the file: ```sh -$ helm upgrade --install --values ./override.yaml --version 5.2.2 sourcegraph sourcegraph/sourcegraph +$ helm upgrade --install --values ./override.yaml --version 5.2.3 sourcegraph sourcegraph/sourcegraph ``` When making configuration changes, it's recommended to review the changes that will be appliedβ€”see [Reviewing Changes](#reviewing-changes). @@ -575,7 +575,7 @@ The override file includes a [BackendConfig] CRD. This is necessary to instruct **2** – Install the chart ```sh -$ helm upgrade --install --values ./override.yaml --version 5.2.2 sourcegraph sourcegraph/sourcegraph +$ helm upgrade --install --values ./override.yaml --version 5.2.3 sourcegraph sourcegraph/sourcegraph ``` It will take around 10 minutes for the load balancer to be fully ready, you may check on the status and obtain the load balancer IP using the following command: @@ -694,7 +694,7 @@ storageClass: **2** – Install the chart ```sh -$ helm upgrade --install --values ./override.yaml --version 5.2.2 sourcegraph sourcegraph/sourcegraph +$ helm upgrade --install --values ./override.yaml --version 5.2.3 sourcegraph sourcegraph/sourcegraph ``` It will take some time for the load balancer to be fully ready, use the following to check on the status and obtain the load balancer address (once available): @@ -779,7 +779,7 @@ storageClass: **2** – Install the chart ```sh -$ helm upgrade --install --values ./override.yaml --version 5.2.2 sourcegraph sourcegraph/sourcegraph +$ helm upgrade --install --values ./override.yaml --version 5.2.3 sourcegraph sourcegraph/sourcegraph ``` It will take some time for the load balancer to be fully ready, you can check on the status and obtain the load balancer address (when ready) using: @@ -865,7 +865,7 @@ storageClass: **2** – Install the chart ```sh -$ helm upgrade --install --values ./override.yaml --version 5.2.2 sourcegraph sourcegraph/sourcegraph +$ helm upgrade --install --values ./override.yaml --version 5.2.3 sourcegraph sourcegraph/sourcegraph ``` It may take some time before your ingress is up and ready to proceed. Depending on how your Ingress Controller works, you may be able to check on its status and obtain the public address of your Ingress using: @@ -965,7 +965,7 @@ $ helm repo update sourcegraph 4. Install the new version: ```sh -$ helm upgrade --install -f override.yaml --version 5.2.2 sourcegraph sourcegraph/sourcegraph +$ helm upgrade --install -f override.yaml --version 5.2.3 sourcegraph sourcegraph/sourcegraph ``` 5. Verify the installation has started: @@ -1025,7 +1025,7 @@ If you are upgrading to **Sourcegraph 5.1 or later**, we encourage you to perfor **Example:** ```sh - $ helm upgrade --install -n sourcegraph --set "migrator.args={upgrade,--from=3.41.0,--to=4.5.1}" sourcegraph-migrator sourcegraph/sourcegraph-migrator --version 5.2.2 + $ helm upgrade --install -n sourcegraph --set "migrator.args={upgrade,--from=3.41.0,--to=4.5.1}" sourcegraph-migrator sourcegraph/sourcegraph-migrator --version 5.2.3 Release "sourcegraph-migrator" has been upgraded. Happy Helming! NAME: sourcegraph-migrator LAST DEPLOYED: Tue Mar 7 18:23:56 2023 diff --git a/doc/admin/deploy/machine-images/gce.md b/doc/admin/deploy/machine-images/gce.md index bd4c36b9f713a..c2a27411dc005 100644 --- a/doc/admin/deploy/machine-images/gce.md +++ b/doc/admin/deploy/machine-images/gce.md @@ -147,7 +147,7 @@ SSH into the VM as user `sourcegraph` and run the following command: ```bash # Please update the version number according to the upgrade notes -helm upgrade -i -f /home/sourcegraph/deploy/install/override.yaml --version 5.2.2 sourcegraph sourcegraph/sourcegraph +helm upgrade -i -f /home/sourcegraph/deploy/install/override.yaml --version 5.2.3 sourcegraph sourcegraph/sourcegraph # Note: /home/sourcegraph/deploy/install/override.yaml is the override file for your instance size ``` diff --git a/doc/admin/executors/deploy_executors_kubernetes.md b/doc/admin/executors/deploy_executors_kubernetes.md index 6a08b6ae24936..d881c444a2218 100644 --- a/doc/admin/executors/deploy_executors_kubernetes.md +++ b/doc/admin/executors/deploy_executors_kubernetes.md @@ -8,7 +8,7 @@

    We're very much looking for input and feedback on this feature. You can either contact us directly, file an issue, or tweet at us.

    -> NOTE: This feature is available in Sourcegraph 5.2.2 and later. +> NOTE: This feature is available in Sourcegraph 5.2.3 and later. [Kubernetes manifests](https://github.com/sourcegraph/deploy-sourcegraph-k8s) are provided to deploy Sourcegraph Executors on a running Kubernetes cluster. If you are deploying Sourcegraph with helm, charts are available [here](https://github.com/sourcegraph/deploy-sourcegraph-helm). @@ -77,6 +77,7 @@ set on the Executor `Deployment` and will configure the `Job`s that it spawns. | KUBERNETES_JOB_ANNOTATIONS | N/A | The JSON encoded annotations to add to the Kubernetes Jobs. e.g. `{"foo": "bar", "faz": "baz"}` | | KUBERNETES_JOB_POD_ANNOTATIONS | N/A | The JSON encoded annotations to add to the Kubernetes Job Pods. e.g. `{"foo": "bar", "faz": "baz"}` | | KUBERNETES_IMAGE_PULL_SECRETS | N/A | The names of Kubernetes image pull secrets to use for pulling images. e.g. my-secret,my-other-secret | +> Note: `EXECUTOR_KUBERNETES_NAMESPACE` should be set to either "default" or the specific namespace where your Executor is deployed. -
    docker run [...] -e PGHOST=psql1.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=require -e CODEINTEL_PGHOST=psql2.mycompany.org -e CODEINTEL_PGUSER=sourcegraph -e CODEINTEL_PGPASSWORD=secret -e CODEINTEL_PGDATABASE=sourcegraph-codeintel -e CODEINTEL_PGSSLMODE=require sourcegraph/server:5.2.2
    +
    docker run [...] -e PGHOST=psql1.mycompany.org -e PGUSER=sourcegraph -e PGPASSWORD=secret -e PGDATABASE=sourcegraph -e PGSSLMODE=require -e CODEINTEL_PGHOST=psql2.mycompany.org -e CODEINTEL_PGUSER=sourcegraph -e CODEINTEL_PGPASSWORD=secret -e CODEINTEL_PGDATABASE=sourcegraph-codeintel -e CODEINTEL_PGSSLMODE=require sourcegraph/server:5.2.3
    ### Docker Compose @@ -193,7 +193,7 @@ When [PgBouncer] is used, we need to include `statement_cache_mode=describe` in Add the following to your `docker run` command: -
    docker run [...] -e PGDATASOURCE="postgres://username:password@sourcegraph-pgbouncer.mycompany.com:5432/sg?statement_cache_mode=describe" -e CODEINSIGHTS_PGDATASOURCE="postgres://username:password@sourcegraph-codeintel-pgbouncer.mycompany.com:5432/sg?statement_cache_mode=describe" sourcegraph/server:5.2.2
    +
    docker run [...] -e PGDATASOURCE="postgres://username:password@sourcegraph-pgbouncer.mycompany.com:5432/sg?statement_cache_mode=describe" -e CODEINSIGHTS_PGDATASOURCE="postgres://username:password@sourcegraph-codeintel-pgbouncer.mycompany.com:5432/sg?statement_cache_mode=describe" sourcegraph/server:5.2.3
    ### Docker Compose diff --git a/doc/admin/external_services/redis.md b/doc/admin/external_services/redis.md index 0eff04f7b2178..7638bde8e2c90 100644 --- a/doc/admin/external_services/redis.md +++ b/doc/admin/external_services/redis.md @@ -13,7 +13,7 @@ or follow the [IANA specification for Redis URLs](https://www.iana.org/assignmen We want line breaks for readability, but backslashes to escape them do not work cross-platform. This uses line breaks that are rendered but not copy-pasted to the clipboard. --> -
    docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:5.2.2
    +
    docker run [...]   -e REDIS_ENDPOINT=redis.mycompany.org:6379   sourcegraph/server:5.2.3
    > NOTE: On Mac/Windows, if trying to connect to a Redis server on the same host machine, remember that Sourcegraph is running inside a Docker container inside of the Docker virtual machine. You may need to specify your actual machine IP address and not `localhost` or `127.0.0.1` as that refers to the Docker VM itself. diff --git a/doc/admin/http_https_configuration.md b/doc/admin/http_https_configuration.md index 39ad106fdc5f2..ac3d2f955ffba 100644 --- a/doc/admin/http_https_configuration.md +++ b/doc/admin/http_https_configuration.md @@ -37,7 +37,7 @@ docker container run \ \ --volume ~/.sourcegraph/config:/etc/sourcegraph \ --volume ~/.sourcegraph/data:/var/opt/sourcegraph \ - sourcegraph/server:5.2.2 + sourcegraph/server:5.2.3 ``` ### Sourcegraph Cluster (Kubernetes) diff --git a/doc/admin/observability/alerts.md b/doc/admin/observability/alerts.md index f10e5f7bbadd4..9642fcb851005 100644 --- a/doc/admin/observability/alerts.md +++ b/doc/admin/observability/alerts.md @@ -1,6 +1,6 @@ # Alerts reference - + This document contains a complete reference of all alerts in Sourcegraph's monitoring, and next steps for when you find alerts that are firing. If your alert isn't mentioned here, or if the next steps don't help, [contact us](mailto:support@sourcegraph.com) for assistance. @@ -1662,7 +1662,7 @@ Generated query for critical alert: `max((max(max_over_time(src_conf_client_time ] ``` -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -1927,103 +1927,6 @@ Generated query for critical alert: `min((sum by (app) (up{app=~".*gitserver"})
    -## github: src_githubcom_concurrency_lock_waiting_requests - -

    number of requests waiting on the global mutex

    - -**Descriptions** - -- warning github: 100+ number of requests waiting on the global mutex for 5m0s - -**Next steps** - -- - **Check container logs for network connection issues and log entries from the githubcom-concurrency-limiter logger. - - **Check redis-store health. - - **Check GitHub status. -- Learn more about the related dashboard panel in the [dashboards reference](./dashboards.md#github-src-githubcom-concurrency-lock-waiting-requests). -- **Silence this alert:** If you are aware of this alert and want to silence notifications for it, add the following to your site configuration and set a reminder to re-evaluate the alert: - -```json -"observability.silenceAlerts": [ - "warning_github_src_githubcom_concurrency_lock_waiting_requests" -] -``` - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Generated query for warning alert: `max((max(src_githubcom_concurrency_lock_waiting_requests)) >= 100)` - -
    - -
    - -## github: src_githubcom_concurrency_lock_failed_lock_requests - -

    number of lock failures

    - -**Descriptions** - -- warning github: 100+ number of lock failures for 5m0s - -**Next steps** - -- - **Check container logs for network connection issues and log entries from the githubcom-concurrency-limiter logger. - - **Check redis-store health. -- Learn more about the related dashboard panel in the [dashboards reference](./dashboards.md#github-src-githubcom-concurrency-lock-failed-lock-requests). -- **Silence this alert:** If you are aware of this alert and want to silence notifications for it, add the following to your site configuration and set a reminder to re-evaluate the alert: - -```json -"observability.silenceAlerts": [ - "warning_github_src_githubcom_concurrency_lock_failed_lock_requests" -] -``` - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Generated query for warning alert: `max((sum(rate(src_githubcom_concurrency_lock_failed_lock_requests[5m]))) >= 100)` - -
    - -
    - -## github: src_githubcom_concurrency_lock_failed_unlock_requests - -

    number of unlock failures

    - -**Descriptions** - -- warning github: 100+ number of unlock failures for 5m0s - -**Next steps** - -- - **Check container logs for network connection issues and log entries from the githubcom-concurrency-limiter logger. - - **Check redis-store health. -- Learn more about the related dashboard panel in the [dashboards reference](./dashboards.md#github-src-githubcom-concurrency-lock-failed-unlock-requests). -- **Silence this alert:** If you are aware of this alert and want to silence notifications for it, add the following to your site configuration and set a reminder to re-evaluate the alert: - -```json -"observability.silenceAlerts": [ - "warning_github_src_githubcom_concurrency_lock_failed_unlock_requests" -] -``` - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Generated query for warning alert: `max((sum(rate(src_githubcom_concurrency_lock_failed_unlock_requests[5m]))) >= 100)` - -
    - -
    - ## postgres: connections

    active connections

    @@ -4797,7 +4700,7 @@ Generated query for warning alert: `max((sum by (category) (increase(src_fronten ] ``` -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -8081,7 +7984,7 @@ Generated query for critical alert: `max((max(max_over_time(src_conf_client_time ] ``` -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details diff --git a/doc/admin/observability/dashboards.md b/doc/admin/observability/dashboards.md index 40278baaeb50f..75a970936d3bc 100644 --- a/doc/admin/observability/dashboards.md +++ b/doc/admin/observability/dashboards.md @@ -1,6 +1,6 @@ # Dashboards reference - + This document contains a complete reference on Sourcegraph's available dashboards, as well as details on how to interpret the panels and metrics. @@ -7629,7 +7629,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101400` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -7648,7 +7648,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101401` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -7667,7 +7667,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101410` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -7686,7 +7686,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101411` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -7705,7 +7705,7 @@ Refer to the [alerts reference](./alerts.md#gitserver-mean-blocked-seconds-per-c To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101420` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -7724,7 +7724,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101430` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -7743,7 +7743,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101431` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -7762,7 +7762,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/gitserver/gitserver?viewPanel=101432` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -8031,113 +8031,6 @@ Query: `sum by(app) (up{app=~".*gitserver"}) / count by (app) (up{app=~".*gitser
    -## GitHub - -

    Dashboard to track requests and global concurrency locks for talking to github.com.

    - -To see this dashboard, visit `/-/debug/grafana/d/github/github` on your Sourcegraph instance. - -### GitHub: GitHub API monitoring - -#### github: src_githubcom_concurrency_lock_waiting_requests - -

    Number of requests waiting on the global mutex

    - -Refer to the [alerts reference](./alerts.md#github-src-githubcom-concurrency-lock-waiting-requests) for 1 alert related to this panel. - -To see this panel, visit `/-/debug/grafana/d/github/github?viewPanel=100000` on your Sourcegraph instance. - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Query: `max(src_githubcom_concurrency_lock_waiting_requests)` - -
    - -
    - -#### github: src_githubcom_concurrency_lock_failed_lock_requests - -

    Number of lock failures

    - -Refer to the [alerts reference](./alerts.md#github-src-githubcom-concurrency-lock-failed-lock-requests) for 1 alert related to this panel. - -To see this panel, visit `/-/debug/grafana/d/github/github?viewPanel=100010` on your Sourcegraph instance. - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Query: `sum(rate(src_githubcom_concurrency_lock_failed_lock_requests[5m]))` - -
    - -
    - -#### github: src_githubcom_concurrency_lock_failed_unlock_requests - -

    Number of unlock failures

    - -Refer to the [alerts reference](./alerts.md#github-src-githubcom-concurrency-lock-failed-unlock-requests) for 1 alert related to this panel. - -To see this panel, visit `/-/debug/grafana/d/github/github?viewPanel=100011` on your Sourcegraph instance. - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Query: `sum(rate(src_githubcom_concurrency_lock_failed_unlock_requests[5m]))` - -
    - -
    - -#### github: src_githubcom_concurrency_lock_requests - -

    Number of locks taken global mutex

    - -A high number of locks indicates heavy usage of the GitHub API. This might not be a problem, but you should check if request counts are expected. - -This panel has no related alerts. - -To see this panel, visit `/-/debug/grafana/d/github/github?viewPanel=100020` on your Sourcegraph instance. - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Query: `sum(rate(src_githubcom_concurrency_lock_requests[5m]))` - -
    - -
    - -#### github: src_githubcom_concurrency_lock_acquire_duration_seconds_latency_p75 - -

    75 percentile latency of src_githubcom_concurrency_lock_acquire_duration_seconds

    - -99 percentile latency of acquiring the global GitHub concurrency lock. - -This panel has no related alerts. - -To see this panel, visit `/-/debug/grafana/d/github/github?viewPanel=100021` on your Sourcegraph instance. - -*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).* - -
    -Technical details - -Query: `histogram_quantile(0.75, sum(rate(src_githubcom_concurrency_lock_acquire_duration_seconds_bucket[5m])) by (le))` - -
    - -
    - ## Postgres

    Postgres metrics, exported from postgres_exporter (not available on server).

    @@ -15945,7 +15838,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101300` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -15964,7 +15857,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101301` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -15983,7 +15876,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101310` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -16002,7 +15895,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101311` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -16021,7 +15914,7 @@ Refer to the [alerts reference](./alerts.md#repo-updater-mean-blocked-seconds-pe To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101320` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -16040,7 +15933,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101330` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -16059,7 +15952,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101331` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -16078,7 +15971,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/repo-updater/repo-updater?viewPanel=101332` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Source team](https://handbook.sourcegraph.com/departments/engineering/teams/source).*
    Technical details @@ -22673,64 +22566,6 @@ Query: `increase(prometheus_target_scrapes_sample_duplicate_timestamp_total[10m]
    -### Prometheus: Google Managed Prometheus (only available for `sourcegraph/prometheus-gcp`) - -#### prometheus: samples_exported - -

    Samples exported to GMP every 5m

    - -A high value indicates that large numbers of samples are being exported, potentially impacting costs. -In [Sourcegraph Cloud centralized observability](https://handbook.sourcegraph.com/departments/cloud/technical-docs/observability/), high values can be investigated by: - -- going to per-instance self-hosted dashboards for Prometheus in (Internals -> Metrics cardinality). -- querying for `monitoring_googleapis_com:billing_samples_ingested`, for example: - -``` -topk(10, sum by(metric_type, project_id) (rate(monitoring_googleapis_com:billing_samples_ingested[1h]))) -``` - -This is required because GMP does not allow queries aggregating on `__name__` - -See [Anthos metrics](https://cloud.google.com/monitoring/api/metrics_anthos) for more details about `gcm_export_samples_sent_total`. - -This panel has no related alerts. - -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100300` on your Sourcegraph instance. - -*Managed by the [Sourcegraph Cloud team](https://handbook.sourcegraph.com/departments/cloud).* - -
    -Technical details - -Query: `rate(gcm_export_samples_sent_total[5m])` - -
    - -
    - -#### prometheus: pending_exports - -

    Samples pending export to GMP per minute

    - -A high value indicates exports are taking a long time. - -See [`gmc_*` Anthos metrics](https://cloud.google.com/monitoring/api/metrics_anthos) for more details about `gcm_export_pending_requests`. - -This panel has no related alerts. - -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100301` on your Sourcegraph instance. - -*Managed by the [Sourcegraph Cloud team](https://handbook.sourcegraph.com/departments/cloud).* - -
    -Technical details - -Query: `sum_over_time(gcm_export_pending_requests[1m])` - -
    - -
    - ### Prometheus: Container monitoring (not available on server) #### prometheus: container_missing @@ -22749,7 +22584,7 @@ value change independent of deployment events (such as an upgrade), it could ind This panel has no related alerts. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100400` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100300` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22768,7 +22603,7 @@ Query: `count by(name) ((time() - container_last_seen{name=~"^prometheus.*"}) > Refer to the [alerts reference](./alerts.md#prometheus-container-cpu-usage) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100401` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100301` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22787,7 +22622,7 @@ Query: `cadvisor_container_cpu_usage_percentage_total{name=~"^prometheus.*"}` Refer to the [alerts reference](./alerts.md#prometheus-container-memory-usage) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100402` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100302` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22809,7 +22644,7 @@ When extremely high, this can indicate a resource usage problem, or can cause pr This panel has no related alerts. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100403` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100303` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22830,7 +22665,7 @@ Query: `sum by(name) (rate(container_fs_reads_total{name=~"^prometheus.*"}[1h]) Refer to the [alerts reference](./alerts.md#prometheus-provisioning-container-cpu-usage-long-term) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100500` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100400` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22849,7 +22684,7 @@ Query: `quantile_over_time(0.9, cadvisor_container_cpu_usage_percentage_total{na Refer to the [alerts reference](./alerts.md#prometheus-provisioning-container-memory-usage-long-term) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100501` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100401` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22868,7 +22703,7 @@ Query: `max_over_time(cadvisor_container_memory_usage_percentage_total{name=~"^p Refer to the [alerts reference](./alerts.md#prometheus-provisioning-container-cpu-usage-short-term) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100510` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100410` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22887,7 +22722,7 @@ Query: `max_over_time(cadvisor_container_cpu_usage_percentage_total{name=~"^prom Refer to the [alerts reference](./alerts.md#prometheus-provisioning-container-memory-usage-short-term) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100511` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100411` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22909,7 +22744,7 @@ When it occurs frequently, it is an indicator of underprovisioning. Refer to the [alerts reference](./alerts.md#prometheus-container-oomkill-events-total) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100512` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100412` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -22930,7 +22765,7 @@ Query: `max by (name) (container_oom_events_total{name=~"^prometheus.*"})` Refer to the [alerts reference](./alerts.md#prometheus-pods-available-percentage) for 1 alert related to this panel. -To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100600` on your Sourcegraph instance. +To see this panel, visit `/-/debug/grafana/d/prometheus/prometheus?viewPanel=100500` on your Sourcegraph instance. *Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* @@ -31900,7 +31735,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100100` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details @@ -31919,7 +31754,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100101` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details @@ -31938,7 +31773,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100110` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details @@ -31957,7 +31792,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100111` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details @@ -31976,7 +31811,7 @@ Refer to the [alerts reference](./alerts.md#embeddings-mean-blocked-seconds-per- To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100120` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details @@ -31995,7 +31830,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100130` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details @@ -32014,7 +31849,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100131` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details @@ -32033,7 +31868,7 @@ This panel has no related alerts. To see this panel, visit `/-/debug/grafana/d/embeddings/embeddings?viewPanel=100132` on your Sourcegraph instance. -*Managed by the [Sourcegraph Cloud DevOps team](https://handbook.sourcegraph.com/departments/engineering/teams/devops).* +*Managed by the [Sourcegraph Cody team](https://handbook.sourcegraph.com/departments/engineering/teams/cody).*
    Technical details diff --git a/doc/admin/ssl_https_self_signed_cert_nginx.md b/doc/admin/ssl_https_self_signed_cert_nginx.md index 52c0001aaa1f8..c55a9698c786e 100644 --- a/doc/admin/ssl_https_self_signed_cert_nginx.md +++ b/doc/admin/ssl_https_self_signed_cert_nginx.md @@ -91,7 +91,7 @@ docker container run \ \ --volume ~/.sourcegraph/config:/etc/sourcegraph \ --volume ~/.sourcegraph/data:/var/opt/sourcegraph \ - sourcegraph/server:5.2.2 + sourcegraph/server:5.2.3 ``` > NOTE: We recommend removing `--publish 7080:7080` as it's not needed and traffic sent to that port is un-encrypted. diff --git a/doc/admin/telemetry/index.md b/doc/admin/telemetry/index.md index fd693957a51af..fc93c2f5fa516 100644 --- a/doc/admin/telemetry/index.md +++ b/doc/admin/telemetry/index.md @@ -12,6 +12,9 @@ If you have any questions about telemetry collection, please reach out to your S Sourcegraph 5.2.1+ +> WARNING: This section refers to a new system for collecting telemetry introduced in Sourcegraph 5.2.1, and only applies to telemetry that has been migrated to use this new system. +> Certain Sourcegraph components - namely [Cody editor extensions](../../cody/index.md) - will continue to use a legacy mechanism for reporting telemetry directly to Sourcegraph.com until the migration is complete. + Sourcegraph instances 5.2.1 and later collect telemetry events to understand usage patterns and help improve the product. Telemetry events can be generated when certain user actions occur, like opening files or performing searches. This data helps us provide the highest level of support to Sourcegraph's customers. Sensitive data/PII exfiltration, intentional or not, is a significant concern to Sourcegraph that we take very seriously. diff --git a/doc/admin/updates/docker_compose.md b/doc/admin/updates/docker_compose.md index ce2e8362fc509..a2241056b99ac 100644 --- a/doc/admin/updates/docker_compose.md +++ b/doc/admin/updates/docker_compose.md @@ -17,6 +17,10 @@ For upgrade procedures or general info about sourcegraph versioning see the link +## v5.2.2 βž” v5.2.3 + +#### Notes: + ## v5.2.1 βž” v5.2.2 #### Notes: diff --git a/doc/admin/updates/pure_docker.md b/doc/admin/updates/pure_docker.md index 69223e17e7de0..0b140243b6fa2 100644 --- a/doc/admin/updates/pure_docker.md +++ b/doc/admin/updates/pure_docker.md @@ -12,6 +12,15 @@ Each section comprehensively describes the changes needed in Docker images, envi +## v5.2.2 βž” v5.2.3 + +As a template, perform the same actions as the following diff in your own deployment: [`Upgrade to v5.2.3`](https://github.com/sourcegraph/deploy-sourcegraph-docker/compare/v5.2.2...v5.2.3) + +For non-standard replica builds: +- [`Customer Replica 1: βž” v5.2.3`](https://github.com/sourcegraph/deploy-sourcegraph-docker-customer-replica-1/compare/v5.2.2...v5.2.3) + +#### Notes: + ## v5.2.1 βž” v5.2.2 As a template, perform the same actions as the following diff in your own deployment: [`Upgrade to v5.2.2`](https://github.com/sourcegraph/deploy-sourcegraph-docker/compare/v5.2.1...v5.2.2) diff --git a/doc/admin/updates/server.md b/doc/admin/updates/server.md index 069bc64d70235..d3b8cbb09f430 100644 --- a/doc/admin/updates/server.md +++ b/doc/admin/updates/server.md @@ -17,6 +17,10 @@ For upgrade procedures or general info about sourcegraph versioning see the link +## v5.2.2 βž” v5.2.3 + +#### Notes: + ## v5.2.1 βž” v5.2.2 #### Notes: diff --git a/doc/api/graphql/index.md b/doc/api/graphql/index.md index 169b8ef165167..b30763ed157f3 100644 --- a/doc/api/graphql/index.md +++ b/doc/api/graphql/index.md @@ -9,7 +9,7 @@ The Sourcegraph GraphQL API supports the following types of queries: - Repository and user metadata > NOTE: The API is under active development. Backwards compatibility will be maintained in most -> cases, and backwards-incompatible changes will be documented in the +> cases, and backwards-incompatible changes will be documented in the > [changelog](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/CHANGELOG.md). ## Quickstart @@ -93,3 +93,27 @@ i.e. you just need to send the `Authorization` header and a JSON object like `{" ## Examples See "[Sourcegraph GraphQL API examples](examples.md)". + +## Cost Limits + +To ensure system performance and stability, configurable GraphQL query cost limitations have been implemented. This feature is crucial for preventing resource exhaustion due to extensive or overly complex queries. The default configuration looks as follows, and can be modified in site configuration: + +``` + "rateLimits": { + "graphQLMaxAliases": 500, + "graphQLMaxDepth": 30, + "graphQLMaxFieldCount": 500000 + }, +``` + +### GraphQLMaxDepth +- **Default Value**: 30 +- Limits the maximum depth of nested objects in GraphQL queries, preventing deep queries that consume excessive resources. + +### GraphQLMaxFieldCount +- **Default Value**: 500,000 +- Restricts the number of fields in a GraphQL response to avoid overly broad queries. Use pagination where available to manage large data sets effectively. + +### GraphQLMaxAliases +- **Default Value**: 500 +- Sets a cap on the number of aliases in a single GraphQL query, mitigating the risk of resource-intensive queries due to excessive aliasing. diff --git a/doc/batch_changes/explanations/permissions_in_batch_changes.md b/doc/batch_changes/explanations/permissions_in_batch_changes.md index 84a5811531eea..dfbf16dff83c5 100644 --- a/doc/batch_changes/explanations/permissions_in_batch_changes.md +++ b/doc/batch_changes/explanations/permissions_in_batch_changes.md @@ -17,7 +17,14 @@ Users have admin permissions on the batch changes they created and read access t ### Namespaces -Batch changes can be created either under the user's or an organization's namespace. If placed under an organization namespace, all users of the organization have admin access on the batch change. +A batch change can be created under either a user or organization namespace: + +- User namespace: Only the user who created the batch change has admin access. Other users have read access. + +- Organization namespace: + - By default, all members of the organization have read access. + - If the `orgs.allMembersBatchChangesAdmin` setting is enabled, all organization members also have admin access. + - If that setting is disabled, only the user who created the batch change has admin access. Other organization members have read access. ### Batch Change access for each permission level @@ -28,7 +35,7 @@ View burndown chart (aggregate changeset statuses over time) | ⬀ | ⬀ View list of patches and changesets | ⬀ | ⬀ View diffstat (aggregate count of added/changed/deleted lines) | ⬀ | ⬀ View error messages (related to creating or syncing changesets) | | ⬀ -Edit batch change name, description, and branch name | | ⬀ +Edit batch spec | | ⬀ Update batch change patches (and changesets on code hosts) | | ⬀ Publish changesets to code host | | ⬀ Add/remove existing changesets to/from batch change | | ⬀ diff --git a/doc/batch_changes/references/faq.md b/doc/batch_changes/references/faq.md index eeb6659aab2b3..c31ae053f366d 100644 --- a/doc/batch_changes/references/faq.md +++ b/doc/batch_changes/references/faq.md @@ -134,3 +134,15 @@ Sourcegraph search shows you results on any repositories that you have read acce ### Why is my batch change preview hanging? When working with `src`, there are occurences where applying your batch spec might get stuck on a particular step. More so in the `Determining workspace type` step. The `Determining workspace type` is a simple step that decides if bind or volume modes should be used based on the command line flags, and the OS and architecture. If volume mode is used (which is default on Mac OS), then `src` will attempt to pull the `sourcegraph/src-batch-change-volume-workspace` Docker image from docker hub since that's required for the batch spec to be executed. The "hanging" is typically is caused by the local machine's CLI state. Restarting your computer and applying the batch spec again should fix this. + +### Can I create a batch change and use a team's namespace so that the team owns the batch change? + +Yes, you can create a batch change under a team's namespace so that the team owns and manages the batch change. Here are the steps to achieve this: + +1. Create an [organization](../../admin/organizations.md) on Sourcegraph for your team. +1. Add all members of your team to the organization. +1. When creating the batch change, select the organization's namespace instead of your personal namespace. This can be done via the UI or using the `-namespace` flag with `src batch preview/apply`. +1. The batch change will now be created under the organization's namespace. +1. All members of the organization (your team) will have admin permissions to manage the batch change. + +So by using an organization's namespace, you can create a batch change that is owned and editable by the entire team, not just yourself. \ No newline at end of file diff --git a/doc/batch_changes/references/troubleshooting.md b/doc/batch_changes/references/troubleshooting.md index 2a40279915e92..e456d48eb4fe8 100644 --- a/doc/batch_changes/references/troubleshooting.md +++ b/doc/batch_changes/references/troubleshooting.md @@ -176,6 +176,20 @@ If not, please update to the latest version of [Docker Desktop](https://docs.doc If you're experiencing `src-cli` hanging at the "Determining Workspace Type" step of the Batch Change we have found that clearing the Docker build cache using `docker builder prune` and restarting the Docker Daemon has resolved the issue. Please contact support if this does not resolve your issue. +### Using Rancher Desktop or Colima? + +If you encounter the error `docker: Error response from daemon: invalid mount config for type 'bind': bind source path does not exist`, try configuring the env var SRC_BATCH_TMP_DIR to reference an accessible directory. + +For Colima: +``` +export SRC_BATCH_TMP_DIR=/tmp/colima/batchchange +``` + +For Rancher Desktop: +``` +export SRC_BATCH_TMP_DIR=/tmp/rancher-desktop/batchchange +``` + ## Publishing changesets ### Do you have the right credentials? diff --git a/doc/code_search/explanations/search_details.md b/doc/code_search/explanations/search_details.md index 078b55b589f67..43c9bc7d43678 100644 --- a/doc/code_search/explanations/search_details.md +++ b/doc/code_search/explanations/search_details.md @@ -87,3 +87,28 @@ shards are then considered for future merge operations. Shard merging can be monitored via the "Compound shards" panel in Zoekt's Grafana dashboard. +## RE2 Regular Expressions + +The Sourcegraph search language supports [RE2](https://golang.org/s/re2syntax) syntax. If you're used to tools like Perl which uses [PCRE syntax](https://www.pcre.org/original/doc/html/pcresyntax.html), you may notice that there are some features that are missing from RE2 like backreferences and lookarounds. We choose to use RE2 for a few reasons: +* It makes it possible to build [worst-case linear](https://swtch.com/~rsc/regexp/regexp1.html) evaluation engines, which is very desirable for building a production-ready regex search engine. +* It's well-supported in Go, allowing us to take advantage of a rich ecosystem (notably including [Zoekt](https://github.com/sourcegraph/zoekt)) +* Our API and tooling makes it straightforward to use Sourcegraph with other tools that provide facilities not built in to the search language. + +As an example of how you can use Sourcegraph tooling with other tools, we can use `jq` (which supports Perl regexes) along with `src` to post-filter search results. In this case, we want to use backreferences to find go functions take a single pointer argument and return a non-pointer of the same type as the input. + +```bash +re2_regex='func \w+\(\w+ \*\w+\) \w+' +pcre2_regex='func \w+\(\w+ \*(\w+)\) \1' + +src search --json --stream -- "/$re2_regex/" \ + | jq ' + # Filter to only content events + select(.type == "content") + + # Flatten to a single object per match + | {content: .chunkMatches[].content} + del(.chunkMatches) + + # Select only matches that match the PCRE regex + | select(.content | test($ARGS.positional[0])) + ' --args "$pcre2_regex" +``` diff --git a/doc/code_search/how-to/search-jobs.md b/doc/code_search/how-to/search-jobs.md index 1b82a13949207..372d967e9539a 100644 --- a/doc/code_search/how-to/search-jobs.md +++ b/doc/code_search/how-to/search-jobs.md @@ -79,7 +79,7 @@ To use Search Jobs, you need to: Search Jobs supports queries of `type:file` and it automatically appends this to the search query. Other result types (like `diff`, `commit`, `path`, and `repo`) will be ignored. However, there are some limitations on the supported query syntax. These include: - `OR`, `AND` operators -- `has.content` or `has.file` predicates +- file predicates, such as `file:has.content`, `file:has.owner`, `file:has.contributor`, `file:contains.content` - `.*` regexp search - Multiple `rev` filters - Queries with `index: filter` diff --git a/doc/code_search/index.md b/doc/code_search/index.md index 39352fe5f5224..52fc751fd3f5f 100644 --- a/doc/code_search/index.md +++ b/doc/code_search/index.md @@ -19,7 +19,7 @@ Sourcegraph code search helps developers perform these tasks more quickly and ef ## Recommended
    - +

    Get Sourcegraph on your code.

    A single-tenant instance managed by Sourcegraph.

    diff --git a/doc/code_search/reference/language.md b/doc/code_search/reference/language.md index 66a035b6d1cf1..8ff3ec8a22dd6 100644 --- a/doc/code_search/reference/language.md +++ b/doc/code_search/reference/language.md @@ -159,7 +159,7 @@ A pattern to search. By default, the pattern is searched literally. The kind of **Example:** [`foo.*bar.*baz` β†—](https://sourcegraph.com/search?q=foo.*bar.*baz&patternType=regexp) [`"foo bar"` β†—](https://sourcegraph.com/search?q=%22foo+bar%22&patternType=regexp) - Perform a structural search. See our [dedicated documentation](queries.md#structural-search) to learn more about structural search. + Perform a structural search. See our [dedicated documentation](queries.md#structural-search) to learn more about structural search. **Example:** [`fmt.Sprintf(":[format]", :[args])` β†—](https://sourcegraph.com/search?q=repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+fmt.Sprintf%28%22:%5Bformat%5D%22%2C+:%5Bargs%5D%29&patternType=structural) @@ -545,8 +545,7 @@ Set whether the pattern should run a literal search, regular expression search, -### Repo has +### Repo has meta
    Site configuration** (`/site-admin/configuration "fastChatModel": "", "completionModel": "", "endpoint": "", - "accessToken": "" + "accessToken": "" } } ``` +For the access token, you can either: + +- As of 5.2.4 the access token can be left empty and it will rely on Environmental, Workload Identity or Managed Identity credentials configured for the `frontend` and `worker` services +- Set it to `` if directly configuring the credentials using the API key specified in the Azure portal + + ### Anthropic Claude through AWS Bedrock -First, make sure you can access AWS Bedrock (currently in beta). Then, request access to the Anthropic Claude models in Bedrock. +First, make sure you can access AWS Bedrock. Then, request access to the Anthropic Claude models in Bedrock. This may take some time to provision. Next, create an IAM user with programmatic access in your AWS account. Depending on your AWS setup, different ways may be required to provide access. All completion requests are made from the `frontend` service, so this service needs to be able to access AWS. You can use instance role bindings or directly configure the IAM user credentials in the configuration. diff --git a/doc/cody/overview/index.md b/doc/cody/overview/index.md index 236b644100c76..f3d8c799a999b 100644 --- a/doc/cody/overview/index.md +++ b/doc/cody/overview/index.md @@ -162,6 +162,10 @@ You can start using Cody with one of the following clients:
  • + +

    Cody for WebCody for Web

    +

    Use Cody in the Sourcegraph web app.

    +

    Cody AppCody for Desktop

    Free desktop app to try Cody with your local codebase.

    diff --git a/doc/cody/overview/install-vscode.md b/doc/cody/overview/install-vscode.md index 7b5983385fcc7..b044e4e006914 100644 --- a/doc/cody/overview/install-vscode.md +++ b/doc/cody/overview/install-vscode.md @@ -166,12 +166,11 @@ In addition, to support customization and advanced use cases, you can create Cus ## Enable code graph context for context-aware answers (Optional) -After connecting Cody with VS Code, you can optionally use and configure [Code Graph Context](./../core-concepts/code-graph.md) to improve Cody's context of existing code. +After connecting Cody extension to Sourcegraph.com, you can optionally use [Code Graph Context](./../core-concepts/code-graph.md) to improve Cody's context of existing code. Note that Code Graph Context is only available for public repositories on Sourcegraph.com, which have embeddings. -Learn more about how to: +You can view the [list of repositories with embeddings here](../embedded-repos.md). To add any of these to your dev environment, contact a Sourcegraph team member via [Discord](https://discord.gg/8wJF5EdAyA) to get help with the access and setup. -- [Configure code graph context for Sourcegraph.com][cody-with-sourcegraph-config-graph] -- [Configure code graph context for Sourcegraph Enterprise][enable-cody-enterprise-config-graph] +To use Cody with code graph on private code, it's recommended to [enable Cody for Enterprise](enable-cody-enterprise.md). ### Configure Code Graph Context @@ -182,6 +181,11 @@ The `Cody: Codebase` setting in VS Code enables codebase-aware answers for the C - Enter the repository name - For example: `github.com/sourcegraph/sourcegraph` without the `https` protocol +Learn more about how to: + +- [Configure code graph context for Sourcegraph.com][cody-with-sourcegraph-config-graph] +- [Configure code graph context for Sourcegraph Enterprise][enable-cody-enterprise-config-graph] + ## Updating the extension VS Code will typically notify you when updates are available for installed extensions. Follow the prompts to update the Cody AI extension to the latest version. diff --git a/doc/cody/quickstart.md b/doc/cody/quickstart.md index d2abf50eb3809..ef5f6df35d3d1 100644 --- a/doc/cody/quickstart.md +++ b/doc/cody/quickstart.md @@ -16,8 +16,6 @@ After installing the extension, the side activity bar will display an icon for **Cody**. Click this icon, and Cody's `Chat` panel will open. This interface is used to ask Cody questions and paste in code snippets. -![Cody icon in side activity bar ](https://storage.googleapis.com/sourcegraph-assets/Docs/cody-quickstart/cody-icon.png) - Cody also supports `Commands` with VS Code. These are quick, ready-to-use prompt actions that you can apply to any code or text-based snippet you've highlighted. You can run a command in 3 ways: 1. Type `/` in the chat bar, and Cody will suggest a list of commands diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 58dc68318ab4d..06d73dc99634b 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -564,3 +564,9 @@ :why: :versions: [] :when: 2023-09-06 22:04:27.722891000 Z +- - :ignore + - "./lib/managedservicesplatform" + - :who: + :why: Internal module + :versions: [] + :when: 2023-09-23 22:04:27.722891000 Z diff --git a/doc/dev/background-information/bazel/faq.md b/doc/dev/background-information/bazel/faq.md index 5bcc9245d4196..132e75fb75072 100644 --- a/doc/dev/background-information/bazel/faq.md +++ b/doc/dev/background-information/bazel/faq.md @@ -2,6 +2,18 @@ ## General +### `bazel configure` prints out a warning about TSConfig + +Everytime you run `bazel configure`, you'll see a warning: + +``` +$ bazel configure +Updating BUILD files for protobuf, go, javascript +2023/11/16 12:32:52 Failed to load base tsconfig file @sourcegraph/tsconfig: open /Users/thorstenball/work/sourcegraph/@sourcegraph/tsconfig: no such file or directory +``` + +The warning can be ignored, and [is a known bug](https://github.com/aspect-build/aspect-cli/issues/524). + ### The analysis cache is being busted because of `--action_env` Typically you'll see this (in CI or locally): diff --git a/doc/dev/background-information/observability/cadvisor.md b/doc/dev/background-information/observability/cadvisor.md index fa9614ddbfa82..6f122f95ae220 100644 --- a/doc/dev/background-information/observability/cadvisor.md +++ b/doc/dev/background-information/observability/cadvisor.md @@ -35,3 +35,4 @@ Support is generally poorly documented, but a search through the [cAdvisor repos - Metrics issues - `disk` metrics are not available in `containerd`: [cadvisor#2785](https://github.com/google/cadvisor/issues/2785) - `diskIO` metrics do not seem to be available in Kubernetes: [sourcegraph#12163](https://github.com/sourcegraph/sourcegraph/issues/12163) +- When using a Kustomize non-privileged overlay in a deployment, cAdvisor is disabled by default and hence cannot scrape container metrics for visualization in Grafana. cAdvisor requires elevated privileges to collect this data and hence will not work with this overlay. diff --git a/doc/dev/background-information/sg/reference.md b/doc/dev/background-information/sg/reference.md index 014639648c23c..8cf4bd44abc7d 100644 --- a/doc/dev/background-information/sg/reference.md +++ b/doc/dev/background-information/sg/reference.md @@ -28,7 +28,7 @@ Global flags: Use this to start your Sourcegraph environment! -Available comamndsets in `sg.config.yaml`: +Available commandsets in `sg.config.yaml`: * api-only * app diff --git a/doc/dev/background-information/telemetry/architecture.md b/doc/dev/background-information/telemetry/architecture.md index d5498f3851bb4..a6223fba872cb 100644 --- a/doc/dev/background-information/telemetry/architecture.md +++ b/doc/dev/background-information/telemetry/architecture.md @@ -10,6 +10,8 @@ In the [lifecycle of an event](./index.md#event-lifecycle), events are first [st See [testing events](./index.md#testing-events) for a summary of how to observe your events during development. +> WARNING: This page primarily pertains to the new telemetry system introduced in Sourcegraph 5.2.1 - refer to [DEPRECATED: Telemetry](deprecated.md) for the legacy system which may still be in use if a callsite has not been migrated yet. + ## Storing events Once [recorded](./index.md#recording-events), telemetry events are stored in two places: diff --git a/doc/dev/background-information/telemetry/index.md b/doc/dev/background-information/telemetry/index.md index efb0d16ad5813..5c182c5c93d30 100644 --- a/doc/dev/background-information/telemetry/index.md +++ b/doc/dev/background-information/telemetry/index.md @@ -12,6 +12,8 @@ There are currently two ways to log product telemetry: All usages of old telemetry mechanisms should be migrated to the new framework. +> WARNING: This page primarily pertains to the new system introduced in Sourcegraph 5.2.1 - refer to [DEPRECATED: Telemetry](deprecated.md) for the legacy system which may still be in use if a callsite has not been migrated yet. + - [Why a new framework and APIs?](#why-a-new-framework-and-apis) - [Event lifecycle](#event-lifecycle) - [Recording events](#recording-events) @@ -28,7 +30,7 @@ All usages of old telemetry mechanisms should be migrated to the new framework. The new telemetry framework and API aims to address the following issues: -- The existing `event_logs` parameters are arbitrarily shaped - to provide stronger guarantees against accidentally exporting sensitive data, the new APIs enforce stricter requirements - see [recording events](#recording-events) for more details. +- The existing `event_logs` parameters are arbitrarily shaped - to provide stronger guarantees against accidentally exporting sensitive data, the new APIs enforce stricter requirements, such as numeric metadata - see [recording events](#recording-events) for more details. - The shape of existing `event_logs` have grown organically over time without a clear structured schema. Callsites must construct full events on their own, and we cannot easily prune event objects of potentially [sensitive attributes](#sensitive-attributes) before export. @@ -49,22 +51,42 @@ See [telemetry export architecture](./architecture.md) for more details. ## Recording events -Note that recording APIs are intentionally stricter and have a smaller surface area than [the full events we end up exporting](#exported-event-schema). -This is to help prevent accidental export of sensitive data, and to make it clear what properties should be injected in a uniform manner instead of being constructed ad-hoc by callers - see [event lifecycle](#event-lifecycle) for details. +Recording events can be done via recording APIs available on each of the platforms documented below: + +- [Clients](#clients): web app, extensions, etc. +- [Backend services](#backend-services) + +Note that: + +- Recording APIs are intentionally stricter and have a smaller surface area than [the full events we end up exporting](#exported-event-schema). This make it clear what properties should be injected in a uniform manner serverside instead of being constructed ad-hoc by callers - see [event lifecycle](#event-lifecycle) for details. +- Metadata that gets exported by default only accepts numeric values. This offers a guard against accidentally exporting sensitive data. Arbitrarily shaped metadata can be collected, but not exported, via the `additionalMetadata` parameter - see [sensitive attributes](#sensitive-attributes). +- An escape hatch to export arbitrarily shaped metadata is available via an instance-side allowlist - see [sensitive attributes](#sensitive-attributes). ### Clients Clients (web apps, extensions, etc) should use [`@sourcegraph/telemetry`](https://github.com/sourcegraph/telemetry), providing client-specific metadata and implementation for exporting to a Sourcegraph instance's `mutation { telemetry { recordEvent(...) }}` GraphQL mutation. [sourcegraph/cody#1192](https://github.com/sourcegraph/cody/pull/1192) is a pull request demonstrating how to integrate `@sourcegraph/telemetry` into a client by extending specific classes and providing backing implementations for various interfaces. -#### VS Code +#### Cody extensions + +##### VS Code Event-recording development documentation for the VS Code extension is available in [`sourcegraph/cody/vscode/CONTRIBUTING.md`'s "Telemetry events" section](https://github.com/sourcegraph/cody/blob/main/vscode/CONTRIBUTING.md#telemetry-events). -#### Sourcegraph web app +##### Cody Agent > WARNING: Not yet available, coming soon! +#### Sourcegraph web app + +A shared event recorder for web app components is available in the platform context type, under `(PlatformContext).telemetryRecorder`: + +```ts +import type { PlatformContext } from '@sourcegraph/shared/src/platform/context' +``` + +In the web app, if a component has `PlatformContext` available, the `telemetryRecorder` instance can be used directly - otherwise, it can be prop-drilled in from the closest parent component with `PlatformContext` available. + ### Backend services In the backend, events are recorded using `EventRecorder` instances created from the `internal/telemetry/telemetryrecorder` package. For example: @@ -134,7 +156,6 @@ There are two core attributes in events that are considered potentially sensitiv - Certain events may be allowlisted to have this field exported - this is defined in [`internal/telemetry/sensitiviemetadataallowlist`](https://github.com/sourcegraph/sourcegraph/blob/main/internal/telemetry/sensitivemetadataallowlist/sensitiviemetadataallowlist.go). Adding events to this list requires review and approval from Legal. - `marketingTracking`: this field tracks a lot of properties around URLs visited and marketing tracking that may contain sensitive data. This is only exported from the [Sourcegraph.com](https://sourcegraph.com/search) instance. - ## Testing events In summary, when adding your events in the new telemetry framework, you can verify events are being recorded by: diff --git a/doc/dev/background-information/telemetry/protocol.md b/doc/dev/background-information/telemetry/protocol.md index b4a1e1f0c5870..cfcb70515c169 100644 --- a/doc/dev/background-information/telemetry/protocol.md +++ b/doc/dev/background-information/telemetry/protocol.md @@ -8,6 +8,8 @@ This page contains generated documentation for telemetry event data that gets exported to Sourcegraph from individual Sourcegraph instances. +> WARNING: This page primarily pertains to the new telemetry system introduced in Sourcegraph 5.2.1 - refer to [DEPRECATED: Telemetry](deprecated.md) for the legacy system which may still be in use if a callsite has not been migrated yet. + ## Table of Contents - [telemetrygateway/v1/telemetrygateway.proto](#telemetrygateway_v1_telemetrygateway-proto) @@ -16,8 +18,10 @@ This page contains generated documentation for telemetry event data that gets ex - [EventFeatureFlags](#telemetrygateway-v1-EventFeatureFlags) - [EventFeatureFlags.FlagsEntry](#telemetrygateway-v1-EventFeatureFlags-FlagsEntry) - [EventInteraction](#telemetrygateway-v1-EventInteraction) + - [EventInteraction.Geolocation](#telemetrygateway-v1-EventInteraction-Geolocation) - [EventMarketingTracking](#telemetrygateway-v1-EventMarketingTracking) - [EventParameters](#telemetrygateway-v1-EventParameters) + - [EventParameters.LegacyMetadataEntry](#telemetrygateway-v1-EventParameters-LegacyMetadataEntry) - [EventParameters.MetadataEntry](#telemetrygateway-v1-EventParameters-MetadataEntry) - [EventSource](#telemetrygateway-v1-EventSource) - [EventSource.Client](#telemetrygateway-v1-EventSource-Client) @@ -124,6 +128,23 @@ This page contains generated documentation for telemetry event data that gets ex | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | trace_id | [string](#string) | optional |

    OpenTelemetry trace ID representing the interaction associated with the event.

    | +| interaction_id | [string](#string) | optional |

    Custom interaction ID representing the interaction associated with the event.

    | +| geolocation | [EventInteraction.Geolocation](#telemetrygateway-v1-EventInteraction-Geolocation) | optional |

    Geolocation associated with the interaction, typically inferred from the

    originating client's IP address (which we do not collect).

    | + + + + + + +     + +### EventInteraction.Geolocation + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| country_code | [string](#string) | |

    Inferred ISO 3166-1 alpha-2 or alpha-3 country code

    | @@ -165,6 +186,7 @@ Sourcegraph.com instance. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | version | [int32](#int32) | |

    Version of the event parameters, used for indicating the "shape" of this

    event's metadata, beginning at 0. Useful for denoting if the shape of

    metadata has changed in any way.

    | +| legacy_metadata | [EventParameters.LegacyMetadataEntry](#telemetrygateway-v1-EventParameters-LegacyMetadataEntry) | repeated |

    Legacy metadata format that only accepted int64 - use the new metadata

    field instead, which accepts float values. Values sent through this proto

    field will be merged into the new metadata attributes.

    We don't use a [deprecated = true] tag because we use this field to handle

    accepting exporters sending metadata in this format.

    | | metadata | [EventParameters.MetadataEntry](#telemetrygateway-v1-EventParameters-MetadataEntry) | repeated |

    Strictly typed metadata, restricted to integer values to avoid accidentally

    exporting sensitive or private data.

    | | private_metadata | [google.protobuf.Struct](#google-protobuf-Struct) | optional |

    Additional potentially sensitive metadata - i.e. not restricted to integer

    values.

    🚨 SECURITY: This metadata is NOT exported from instances by default, as it

    can contain arbitrarily-shaped data that may accidentally contain sensitive

    or private contents.

    This metadata is only exported on an allowlist basis based on terms of

    use agreements and combinations of event feature and action, alongside

    careful audit of callsites.

    | | billing_metadata | [EventBillingMetadata](#telemetrygateway-v1-EventBillingMetadata) | optional |

    Optional billing-related metadata.

    | @@ -174,6 +196,22 @@ Sourcegraph.com instance. + + +### EventParameters.LegacyMetadataEntry + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| key | [string](#string) | |

    | +| value | [int64](#int64) | |

    | + + + + + + ### EventParameters.MetadataEntry @@ -183,7 +221,7 @@ Sourcegraph.com instance. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | key | [string](#string) | |

    | -| value | [int64](#int64) | |

    | +| value | [double](#double) | |

    | diff --git a/doc/getting-started/index.md b/doc/getting-started/index.md index 09b5275d232e6..4cbb7a9dbc264 100644 --- a/doc/getting-started/index.md +++ b/doc/getting-started/index.md @@ -8,7 +8,7 @@ Sourcegraph is a code intelligence platform that helps devs answer questions in ## Who should use Sourcegraph? -In addition to the [companies listed on about.sourcegraph.com](https://about.sourcegraph.com), companies with a few hundred developers all the way up to those with more than 40,000 use Sourcegraph daily. +In addition to the [companies listed on sourcegraph.com](https://sourcegraph.com), companies with a few hundred developers all the way up to those with more than 40,000 use Sourcegraph daily. More specifically, Sourcegraph is great for all developers, except: diff --git a/doc/index.md b/doc/index.md index 9c353e78312cb..8a657af401bb3 100644 --- a/doc/index.md +++ b/doc/index.md @@ -32,8 +32,8 @@ Sourcegraph makes it easy to read, write, and fix codeβ€”even in big, complex co ## Community -* [Blog](https://about.sourcegraph.com/blog/) +* [Blog](https://sourcegraph.com/blog/) * [Discord](https://discord.gg/s2qDtYGnAE) * [Twitter](https://twitter.com/sourcegraph) * [Issue tracker](https://github.com/sourcegraph/sourcegraph/issues) -* [Contact us](https://about.sourcegraph.com/contact) +* [Contact us](https://sourcegraph.com/contact) diff --git a/doc/integration/bitbucket_server.md b/doc/integration/bitbucket_server.md index b6bdc00c7a198..7f2dd367e5b3a 100644 --- a/doc/integration/bitbucket_server.md +++ b/doc/integration/bitbucket_server.md @@ -18,9 +18,9 @@ Site admins can [add Bitbucket Server / Bitbucket Data Center repositories to So Site admins can [configure Sourcegraph to respect Bitbucket Server / Bitbucket Data Center's repository access permissions](../admin/external_service/bitbucket_server.md#repository-permissions). -## Sourcegraph Bitbucket Server Plugin +## Sourcegraph Bitbucket Plugin -We recommend installing the [Sourcegraph Bitbucket Server plugin](https://github.com/sourcegraph/bitbucket-server-plugin/tree/master) which adds the following features to your Bitbucket Server / Bitbucket Data Center instance: +We recommend installing the Sourcegraph Bitbucket plugin which adds the following features to your Bitbucket Server / Bitbucket Data Center instance: - **Native code navigation**: users don't need to install the [Sourcegraph browser extension](#browser-extension) to get hover tooltips, go-to-definition, find-references, and code search while browsing files and viewing pull requests on Bitbucket Server / Bitbucket Data Center. - **Fast permission syncing** between Sourcegraph and Bitbucket Server / Bitbucket Data Center @@ -30,7 +30,7 @@ We recommend installing the [Sourcegraph Bitbucket Server plugin](https://github ### Installation and requirements -See the [bitbucket-server-plugin](https://github.com/sourcegraph/bitbucket-server-plugin) repository for instructions on how to install the plugin on your Bitbucket Server / Bitbucket Data Center instance. +Install the Sourcegraph plugin for Bitbucket from the [Atlassian Marketplace](https://marketplace.atlassian.com/apps/1231975/sourcegraph-for-bitbucket?tab=overview&hosting=datacenter) or see the [bitbucket-server-plugin](https://github.com/sourcegraph/bitbucket-server-plugin) repository for instructions on how to manually install the plugin on your Bitbucket Server / Bitbucket Data Center instance. For the Bitbucket Server plugin to then communicate with the Sourcegraph instance, the Sourcegraph site configuration must be updated to include the [`corsOrigin` property](../admin/config/site_config.md) with the Bitbucket Server / Bitbucket Data Center URL diff --git a/doc/integration/vscode/index.md b/doc/integration/vscode/index.md index fdff79162dc63..f7f2e3a8a9e95 100644 --- a/doc/integration/vscode/index.md +++ b/doc/integration/vscode/index.md @@ -1,4 +1,4 @@ # VS Code extension -- See user docs at [client/vscode/README.md](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/client/vscode/README.md) -- See dev docs at [client/vscode/CONTRIBUTING.md](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/client/vscode/CONTRIBUTING.md) +- See user docs at [cody/vscode/README.md](https://sourcegraph.com/github.com/sourcegraph/cody/-/tree/vscode/README.md) +- See dev docs at [cody/vscode/CONTRIBUTING.md](https://sourcegraph.com/github.com/sourcegraph/cody/-/tree/vscode/CONTRIBUTING.md) diff --git a/doc/sidebar.md b/doc/sidebar.md index 26b6ed83452f9..2374e0291eb89 100644 --- a/doc/sidebar.md +++ b/doc/sidebar.md @@ -31,8 +31,8 @@ Keep it as a single list with at most 2 levels. (Anything else may not render co - [Cody for VS Code](cody/overview/install-vscode.md) - [Cody for JetBrains](cody/overview/install-jetbrains.md) - [Cody for Neovim](cody/overview/install-neovim.md) + - [Cody for Web](cody/overview/cody-with-sourcegraph.md) - [Cody Desktop App](cody/overview/app/index.md) - - [Cody with Sourcegraph](cody/overview/cody-with-sourcegraph.md) - [Cody Enterprise](cody/overview/enable-cody-enterprise.md) - [Quickstart](cody/quickstart.md) - [Capabilities](cody/capabilities.md) diff --git a/docker-images/codeinsights-db/BUILD.bazel b/docker-images/codeinsights-db/BUILD.bazel index bc5f700cbc344..c91c1dc379a8b 100644 --- a/docker-images/codeinsights-db/BUILD.bazel +++ b/docker-images/codeinsights-db/BUILD.bazel @@ -1,7 +1,6 @@ -load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball") +load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball") load("@container_structure_test//:defs.bzl", "container_structure_test") load("@rules_pkg//:pkg.bzl", "pkg_tar") -load("//dev:oci_defs.bzl", "image_repository") filegroup( name = "config", diff --git a/docker-images/codeintel-db/BUILD.bazel b/docker-images/codeintel-db/BUILD.bazel index 550182917857d..3c650906f773b 100644 --- a/docker-images/codeintel-db/BUILD.bazel +++ b/docker-images/codeintel-db/BUILD.bazel @@ -1,6 +1,5 @@ -load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball") +load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball") load("@container_structure_test//:defs.bzl", "container_structure_test") -load("//dev:oci_defs.bzl", "image_repository") oci_image( name = "image", diff --git a/docker-images/postgres-12-alpine/BUILD.bazel b/docker-images/postgres-12-alpine/BUILD.bazel index 7031aad82df9a..30ae27fd702af 100644 --- a/docker-images/postgres-12-alpine/BUILD.bazel +++ b/docker-images/postgres-12-alpine/BUILD.bazel @@ -1,7 +1,6 @@ -load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball") +load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball") load("@rules_pkg//:pkg.bzl", "pkg_tar") load("@container_structure_test//:defs.bzl", "container_structure_test") -load("//dev:oci_defs.bzl", "image_repository") filegroup( name = "config", diff --git a/docker-images/prometheus-gcp/BUILD.bazel b/docker-images/prometheus-gcp/BUILD.bazel deleted file mode 100644 index 18f92ce4c2d52..0000000000000 --- a/docker-images/prometheus-gcp/BUILD.bazel +++ /dev/null @@ -1,56 +0,0 @@ -load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball") -load("@rules_pkg//:pkg.bzl", "pkg_tar") -load("//dev:oci_defs.bzl", "image_repository") -load("@container_structure_test//:defs.bzl", "container_structure_test") - -pkg_tar( - name = "config_tar", - srcs = [ - "//dev/prometheus:prometheus_targets_linux", - "//docker-images/prometheus:startup_scripts", - "//docker-images/prometheus/cmd/prom-wrapper", - "//docker-images/prometheus/config:base_config", - "//monitoring:generate_config", - ], - remap_paths = { - # TODO: This underscore is required - fix - "docker-images/prometheus/cmd/prom-wrapper/prom-wrapper_/prom-wrapper": "/bin/prom-wrapper", - "monitoring/outputs/prometheus": "/sg_config_prometheus", - "/dev/prometheus/linux": "/sg_prometheus_add_ons", - "docker-images/prometheus/alertmanager.sh": "/alertmanager.sh", - "docker-images/prometheus/prometheus.sh": "/prometheus.sh", - }, - strip_prefix = ".", -) - -oci_image( - name = "image", - base = "@wolfi_prometheus_gcp_base", - entrypoint = ["/bin/prom-wrapper"], - tars = [":config_tar"], - user = "sourcegraph", -) - -oci_tarball( - name = "image_tarball", - image = ":image", - repo_tags = ["prometheus-gcp:candidate"], -) - -container_structure_test( - name = "image_test", - timeout = "short", - configs = ["image_test.yaml"], - driver = "docker", - image = ":image", - tags = [ - "exclusive", - "requires-network", - ], -) - -oci_push( - name = "candidate_push", - image = ":image", - repository = image_repository("prometheus-gcp"), -) diff --git a/docker-images/prometheus-gcp/Dockerfile b/docker-images/prometheus-gcp/Dockerfile deleted file mode 100644 index c4a3d0fe43b05..0000000000000 --- a/docker-images/prometheus-gcp/Dockerfile +++ /dev/null @@ -1,74 +0,0 @@ -# sourcegraph/prometheus-gcp - learn more about this image in https://docs.sourcegraph.com/dev/background-information/observability/prometheus - -FROM gke.gcr.io/prometheus-engine/prometheus:v2.35.0-gmp.2-gke.0 AS prom_upstream -FROM prom/alertmanager:v0.25.0@sha256:db8303fa05341f5dc6b19b36a97325cd1b8307254ed9042a2c554af71f3c0284 AS am_upstream - -# Prepare final image -# hadolint ignore=DL3007 -FROM quay.io/prometheus/busybox-linux-amd64:latest - -# Should reflect versions above -LABEL com.sourcegraph.prometheus.version=v2.38.0 -LABEL com.sourcegraph.alertmanager.version=v0.24.0 - -ARG COMMIT_SHA="unknown" -ARG DATE="unknown" -ARG VERSION="unknown" - -LABEL org.opencontainers.image.revision=${COMMIT_SHA} -LABEL org.opencontainers.image.created=${DATE} -LABEL org.opencontainers.image.version=${VERSION} -LABEL org.opencontainers.image.url=https://sourcegraph.com/ -LABEL org.opencontainers.image.source=https://github.com/sourcegraph/sourcegraph/ -LABEL org.opencontainers.image.documentation=https://docs.sourcegraph.com/ - -# Prometheus - extended from https://github.com/prometheus/prometheus/blob/VERSION/Dockerfile -# Check the upstream image (replacing VERSION with the appropriate Prometheus version) when upgrading -COPY --from=prom_upstream /bin/prometheus /bin/prometheus -COPY --from=prom_upstream /bin/promtool /bin/promtool -COPY --from=prom_upstream /etc/prometheus/prometheus.yml /etc/prometheus/prometheus.yml -COPY --from=prom_upstream /usr/share/prometheus/console_libraries/ /usr/share/prometheus/console_libraries/ -COPY --from=prom_upstream /usr/share/prometheus/consoles/ /usr/share/prometheus/consoles/ -COPY --from=prom_upstream /LICENSE /LICENSE -COPY --from=prom_upstream /NOTICE /NOTICE -# hadolint ignore=DL3010 -COPY --from=prom_upstream /npm_licenses.tar.bz2 /npm_licenses.tar.bz2 - -# Alertmanager - extended from https://github.com/prometheus/alertmanager/blob/VERSION/Dockerfile -# Check the upstream image (replacing VERSION with the appropriate Prometheus version) when upgrading -COPY --from=am_upstream /bin/alertmanager /bin/alertmanager - -RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/ - -# TODO(uwe): remove "USER root" line once https://github.com/prometheus/prometheus/issues/3441 is resolved -# -# This is needed currently because the upstream image has us running as "nobody" -# which cannot create the sourcegraph user below. -USER root -# Add the sourcegraph group, user, and create the home directory. -# -# We use a static GID/UID assignment to ensure files can be chown'd to this -# user on the host machine (where this user does not exist). -# See https://github.com/sourcegraph/sourcegraph/issues/1884 -# -# Note: This mirrors what we do in e.g. our base alpine image: https://github.com/sourcegraph/sourcegraph/blob/main/docker-images/alpine/Dockerfile#L10-L15 -RUN addgroup -g 101 -S sourcegraph && adduser -u 100 -S -G sourcegraph -h /home/sourcegraph sourcegraph -RUN mkdir -p /prometheus && chown -R sourcegraph:sourcegraph /prometheus -RUN mkdir -p /alertmanager && chown -R sourcegraph:sourcegraph /alertmanager - -COPY ./prom-wrapper /bin/prom-wrapper -COPY ./prometheus.sh /prometheus.sh -COPY ./alertmanager.sh /alertmanager.sh - -# Copy config -COPY sg_config_prometheus /sg_config_prometheus/ -RUN chmod -R 0777 /sg_config_prometheus/ - -USER sourcegraph - -ENTRYPOINT ["/bin/prom-wrapper"] -# Note that upstream's 'VOLUME' directive was deliberately removed. Including it makes it impossible -# to chmod the directory to our 'sourcegraph' user. -WORKDIR /prometheus -# Prometheus is reverse-proxied from 9092 to 9090 -EXPOSE 9090 diff --git a/docker-images/prometheus-gcp/README.md b/docker-images/prometheus-gcp/README.md deleted file mode 100644 index 42dcbb3a25e97..0000000000000 --- a/docker-images/prometheus-gcp/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# `prometheus-gcp` - -This is a patched version of Sourcegraoh's Prometheus image using an alternative base image provided by GCP to allow automatically shipping metrics to the Google Cloud Managed Prometheus Service. - -Please note: using this image will automatically begin shipping Prometheus metrics to the Google Cloud Managed Prometheus Service and may incur additional cloud hosting costs. - -This image is built by calling the [`build.sh` script in `prometheus`](../prometheus/build.sh) with some additional parameters. - -For more details about Google's forked Prometheus server, see: https://cloud.google.com/stackdriver/docs/managed-prometheus/setup-unmanaged#run-gmp diff --git a/docker-images/prometheus-gcp/build.sh b/docker-images/prometheus-gcp/build.sh deleted file mode 100755 index dfc35f6a75794..0000000000000 --- a/docker-images/prometheus-gcp/build.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -# This a legacy build script /!\ - -set -ex - -cd "$(dirname "${BASH_SOURCE[0]}")/../.." - -BUILDDIR=$(mktemp -d -t sgdockerbuild_XXXXXXX) -TMP=$(mktemp -d -t sgprom_tmp_XXXXXXX) - -cleanup() { - rm -rf "$BUILDDIR" - rm -rf "$TMP" -} -trap cleanup EXIT - -./dev/ci/bazel.sh build //docker-images/prometheus/cmd/prom-wrapper //monitoring:generate_config_zip -out=$(./dev/ci/bazel.sh cquery //docker-images/prometheus/cmd/prom-wrapper --output=files) -cp "$out" "$BUILDDIR" -monitoring_cfg=$(./dev/ci/bazel.sh cquery //monitoring:generate_config_zip --output=files) -cp "$monitoring_cfg" "$TMP/" -pushd "$TMP" -unzip "monitoring.zip" -popd - -cp -r docker-images/prometheus/config "$BUILDDIR/sg_config_prometheus" -cp docker-images/prometheus/*.sh "$BUILDDIR/" -cp -r "$TMP/monitoring/prometheus"/* "$BUILDDIR/sg_config_prometheus" -mkdir "$BUILDDIR/sg_prometheus_add_ons" -cp dev/prometheus/linux/prometheus_targets.yml "$BUILDDIR/sg_prometheus_add_ons" - -docker build -f docker-images/prometheus-gcp/Dockerfile -t "${IMAGE:-sourcegraph/prometheus-gcp}" "$BUILDDIR" \ - --platform linux/amd64 \ - --progress=plain \ - --build-arg BASE_IMAGE \ - --build-arg COMMIT_SHA \ - --build-arg DATE \ - --build-arg VERSION diff --git a/docker-images/prometheus-gcp/image_test.yaml b/docker-images/prometheus-gcp/image_test.yaml deleted file mode 100644 index 8f7061d0c3d8d..0000000000000 --- a/docker-images/prometheus-gcp/image_test.yaml +++ /dev/null @@ -1,67 +0,0 @@ -schemaVersion: "2.0.0" - -commandTests: - - name: "prometheus is runnable" - command: "prometheus" - args: - - --version - - name: "promtool is runnable" - command: "promtool" - args: - - --version - - name: "alertmanager is runnable" - command: "alertmanager" - args: - - --version - - - name: "not running as root" - command: "/usr/bin/id" - args: - - -u - excludedOutput: ["^0"] - exitCode: 0 - -fileExistenceTests: -- name: '/prometheus' - path: '/prometheus' - shouldExist: true - uid: 100 - gid: 101 - permissions: 'drwxr-xr-x' -- name: '/alertmanager' - path: '/alertmanager' - shouldExist: true - uid: 100 - gid: 101 - permissions: 'drwxr-xr-x' -- name: '/prometheus.sh' - path: '/prometheus.sh' - shouldExist: true - uid: 0 - gid: 0 - permissions: '-r-xr-xr-x' -- name: '/alertmanager.sh' - path: '/alertmanager.sh' - shouldExist: true - uid: 0 - gid: 0 - permissions: '-r-xr-xr-x' -# /sg_config_prometheus configuration -- name: '/sg_config_prometheus/prometheus.yml' - path: '/sg_config_prometheus/prometheus.yml' - shouldExist: true - uid: 0 - gid: 0 - permissions: '-rwxrwxrwx' -- name: '/sg_config_prometheus/alertmanager.yml' - path: '/sg_config_prometheus/alertmanager.yml' - shouldExist: true - uid: 0 - gid: 0 - permissions: '-rwxrwxrwx' -- name: '/sg_config_prometheus/prometheus_alert_rules.yml' - path: '/sg_config_prometheus/prometheus_alert_rules.yml' - shouldExist: true - uid: 0 - gid: 0 - permissions: '-r-xr-xr-x' diff --git a/docker-images/syntax-highlighter/.cargo/config.toml b/docker-images/syntax-highlighter/.cargo/config.toml index 7169f4d8e2562..cbbeb32c5299e 100644 --- a/docker-images/syntax-highlighter/.cargo/config.toml +++ b/docker-images/syntax-highlighter/.cargo/config.toml @@ -3,12 +3,3 @@ rustflags = ["-Clink-arg=-Wl,--dynamic-linker=/lib/ld-musl-aarch64.so.1"] [target.x86_64-unknown-linux-musl] rustflags = ["-Ctarget-feature=-crt-static"] - -[registry] -default = "crates-io" - -[registries.crates-io] -index = "https://crates.io" -protocol = "sparse" -# The sparse protocol cuts down on registry + crate fetching -# time from about 1m30s to 21s. diff --git a/docker-images/syntax-highlighter/BUILD.bazel b/docker-images/syntax-highlighter/BUILD.bazel index 65fca2251e7b9..9d5c6dce8e329 100644 --- a/docker-images/syntax-highlighter/BUILD.bazel +++ b/docker-images/syntax-highlighter/BUILD.bazel @@ -53,6 +53,27 @@ rust_binary( ], ) +pkg_tar( + name = "tar_scip-ctags", + srcs = [":scip-ctags"], +) + +# We are shipping a minimal scip-ctags container, which is used for testing purposes +# in the zoekt repository, so we can test it against it instead of scip-ctags, +# reflecting better real production usage. +oci_image( + name = "scip-ctags_image", + base = "@wolfi_base", + entrypoint = ["/scip-ctags"], + tars = [":tar_scip-ctags"], +) + +oci_tarball( + name = "scip-ctags_image_tarball", + image = ":scip-ctags_image", + repo_tags = ["scip-ctags:candidate"], +) + pkg_tar( name = "tar_syntect_server", srcs = [":syntect_server"], @@ -118,3 +139,9 @@ oci_push( image = ":image", repository = image_repository("syntax-highlighter"), ) + +oci_push( + name = "scip-ctags_candidate_push", + image = ":scip-ctags_image", + repository = image_repository("scip-ctags"), +) diff --git a/docker-images/syntax-highlighter/Cargo.Bazel.lock b/docker-images/syntax-highlighter/Cargo.Bazel.lock index 455a833f09f25..991c1e084d0ad 100644 --- a/docker-images/syntax-highlighter/Cargo.Bazel.lock +++ b/docker-images/syntax-highlighter/Cargo.Bazel.lock @@ -1,5 +1,5 @@ { - "checksum": "e8670a8d1bf3edf6c13fc81ee2c1695bbae724f4187e852b2c1feb848b4d13e3", + "checksum": "11f7d9a0b9555b34f58c199ad41741442c4c6c493eb30b0cdb798b46612bff41", "crates": { "addr2line 0.20.0": { "name": "addr2line", @@ -70,6 +70,81 @@ }, "license": "0BSD OR MIT OR Apache-2.0" }, + "ahash 0.7.7": { + "name": "ahash", + "version": "0.7.7", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/ahash/0.7.7/download", + "sha256": "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" + } + }, + "targets": [ + { + "Library": { + "crate_name": "ahash", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + }, + { + "BuildScript": { + "crate_name": "build_script_build", + "crate_root": "build.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "ahash", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "ahash 0.7.7", + "target": "build_script_build" + } + ], + "selects": { + "cfg(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\"))": [ + { + "id": "getrandom 0.2.10", + "target": "getrandom" + } + ], + "cfg(not(all(target_arch = \"arm\", target_os = \"none\")))": [ + { + "id": "once_cell 1.18.0", + "target": "once_cell" + } + ] + } + }, + "edition": "2018", + "version": "0.7.7" + }, + "build_script_attrs": { + "data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "version_check 0.9.4", + "target": "version_check" + } + ], + "selects": {} + } + }, + "license": "MIT OR Apache-2.0" + }, "aho-corasick 1.0.4": { "name": "aho-corasick", "version": "1.0.4", @@ -1928,6 +2003,56 @@ }, "license": "MIT OR Apache-2.0" }, + "colored 2.0.4": { + "name": "colored", + "version": "2.0.4", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/colored/2.0.4/download", + "sha256": "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" + } + }, + "targets": [ + { + "Library": { + "crate_name": "colored", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "colored", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "is-terminal 0.4.9", + "target": "is_terminal" + }, + { + "id": "lazy_static 1.4.0", + "target": "lazy_static" + } + ], + "selects": { + "cfg(windows)": [ + { + "id": "windows-sys 0.48.0", + "target": "windows_sys" + } + ] + } + }, + "edition": "2021", + "version": "2.0.4" + }, + "license": "MPL-2.0" + }, "console 0.15.7": { "name": "console", "version": "0.15.7", @@ -4402,6 +4527,52 @@ }, "license": "MIT OR Apache-2.0" }, + "hashbrown 0.11.2": { + "name": "hashbrown", + "version": "0.11.2", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/hashbrown/0.11.2/download", + "sha256": "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + } + }, + "targets": [ + { + "Library": { + "crate_name": "hashbrown", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "hashbrown", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "ahash", + "inline-more" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "ahash 0.7.7", + "target": "ahash" + } + ], + "selects": {} + }, + "edition": "2018", + "version": "0.11.2" + }, + "license": "Apache-2.0/MIT" + }, "hashbrown 0.12.3": { "name": "hashbrown", "version": "0.12.3", @@ -10338,8 +10509,18 @@ "name": "scip-treesitter-cli", "version": "0.1.0", "repository": null, - "targets": [], - "library_target_name": null, + "targets": [ + { + "Library": { + "crate_name": "scip_treesitter_cli", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "scip_treesitter_cli", "common_attrs": { "compile_data_glob": [ "**" @@ -10358,6 +10539,10 @@ "id": "clap 4.3.23", "target": "clap" }, + { + "id": "colored 2.0.4", + "target": "colored" + }, { "id": "indicatif 0.17.7", "target": "indicatif" @@ -10381,6 +10566,22 @@ { "id": "scip 0.3.2", "target": "scip" + }, + { + "id": "serde 1.0.164", + "target": "serde" + }, + { + "id": "serde_json 1.0.99", + "target": "serde_json" + }, + { + "id": "string-interner 0.14.0", + "target": "string_interner" + }, + { + "id": "walkdir 2.3.3", + "target": "walkdir" } ], "selects": {} @@ -11432,6 +11633,64 @@ }, "license": "BSL-1.0" }, + "string-interner 0.14.0": { + "name": "string-interner", + "version": "0.14.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/string-interner/0.14.0/download", + "sha256": "91e2531d8525b29b514d25e275a43581320d587b86db302b9a7e464bac579648" + } + }, + "targets": [ + { + "Library": { + "crate_name": "string_interner", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "string_interner", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "backends", + "default", + "inline-more", + "serde", + "serde-1", + "std" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "cfg-if 1.0.0", + "target": "cfg_if" + }, + { + "id": "hashbrown 0.11.2", + "target": "hashbrown" + }, + { + "id": "serde 1.0.164", + "target": "serde" + } + ], + "selects": {} + }, + "edition": "2021", + "version": "0.14.0" + }, + "license": "MIT/Apache-2.0" + }, "strsim 0.10.0": { "name": "strsim", "version": "0.10.0", @@ -17057,6 +17316,33 @@ "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": [ "x86_64-pc-windows-msvc" ], + "cfg(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\"))": [ + "aarch64-apple-darwin", + "aarch64-apple-ios", + "aarch64-apple-ios-sim", + "aarch64-fuchsia", + "aarch64-linux-android", + "aarch64-pc-windows-msvc", + "aarch64-unknown-linux-gnu", + "arm-unknown-linux-gnueabi", + "armv7-linux-androideabi", + "armv7-unknown-linux-gnueabi", + "i686-apple-darwin", + "i686-linux-android", + "i686-pc-windows-msvc", + "i686-unknown-freebsd", + "i686-unknown-linux-gnu", + "powerpc-unknown-linux-gnu", + "s390x-unknown-linux-gnu", + "wasm32-wasi", + "x86_64-apple-darwin", + "x86_64-apple-ios", + "x86_64-fuchsia", + "x86_64-linux-android", + "x86_64-pc-windows-msvc", + "x86_64-unknown-freebsd", + "x86_64-unknown-linux-gnu" + ], "cfg(any(target_pointer_width = \"8\", target_pointer_width = \"16\", target_pointer_width = \"32\"))": [ "arm-unknown-linux-gnueabi", "armv7-linux-androideabi", @@ -17098,6 +17384,37 @@ "x86_64-unknown-linux-gnu" ], "cfg(loom)": [], + "cfg(not(all(target_arch = \"arm\", target_os = \"none\")))": [ + "aarch64-apple-darwin", + "aarch64-apple-ios", + "aarch64-apple-ios-sim", + "aarch64-fuchsia", + "aarch64-linux-android", + "aarch64-pc-windows-msvc", + "aarch64-unknown-linux-gnu", + "arm-unknown-linux-gnueabi", + "armv7-linux-androideabi", + "armv7-unknown-linux-gnueabi", + "i686-apple-darwin", + "i686-linux-android", + "i686-pc-windows-msvc", + "i686-unknown-freebsd", + "i686-unknown-linux-gnu", + "powerpc-unknown-linux-gnu", + "riscv32imc-unknown-none-elf", + "riscv64gc-unknown-none-elf", + "s390x-unknown-linux-gnu", + "wasm32-unknown-unknown", + "wasm32-wasi", + "x86_64-apple-darwin", + "x86_64-apple-ios", + "x86_64-fuchsia", + "x86_64-linux-android", + "x86_64-pc-windows-msvc", + "x86_64-unknown-freebsd", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-none" + ], "cfg(not(any(windows, target_os = \"hermit\", target_os = \"unknown\")))": [ "aarch64-apple-darwin", "aarch64-apple-ios", diff --git a/docker-images/syntax-highlighter/Cargo.lock b/docker-images/syntax-highlighter/Cargo.lock index dea7c87d01152..284578eb33b2f 100644 --- a/docker-images/syntax-highlighter/Cargo.lock +++ b/docker-images/syntax-highlighter/Cargo.lock @@ -17,6 +17,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "1.0.4" @@ -375,6 +386,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "colored" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +dependencies = [ + "is-terminal", + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "console" version = "0.15.7" @@ -817,6 +839,15 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1892,6 +1923,7 @@ dependencies = [ "anyhow", "assert_cmd", "clap 4.3.23", + "colored", "indicatif", "insta", "lazy_static", @@ -1902,6 +1934,10 @@ dependencies = [ "scip-syntax", "scip-treesitter", "scip-treesitter-languages", + "serde", + "serde_json", + "string-interner", + "walkdir", ] [[package]] @@ -2102,6 +2138,17 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +[[package]] +name = "string-interner" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e2531d8525b29b514d25e275a43581320d587b86db302b9a7e464bac579648" +dependencies = [ + "cfg-if", + "hashbrown 0.11.2", + "serde", +] + [[package]] name = "strsim" version = "0.10.0" @@ -2168,7 +2215,6 @@ dependencies = [ "scip", "scip-syntax", "scip-treesitter", - "scip-treesitter-cli", "scip-treesitter-languages", "serde", "serde_json", diff --git a/docker-images/syntax-highlighter/Cargo.toml b/docker-images/syntax-highlighter/Cargo.toml index 1fc8c7dd978dc..6f0d2c8c56908 100644 --- a/docker-images/syntax-highlighter/Cargo.toml +++ b/docker-images/syntax-highlighter/Cargo.toml @@ -23,7 +23,6 @@ base64 = "0.13.0" sg-syntax = { path = "./crates/sg-syntax" } scip-treesitter = { path = "./crates/scip-treesitter" } scip-treesitter-languages = { path = "./crates/scip-treesitter-languages" } -scip-treesitter-cli = { path = "./crates/scip-treesitter-cli" } scip-syntax = { path = "./crates/scip-syntax" } # March 20, 2023 - Pinned explicitly with features that match the features # required by rocket. Once bazel rules correctly roll up all the features, @@ -58,16 +57,16 @@ rocket = { version = "0.5.0-rc.1", features = ["json"] } # See https://stackoverflow.com/questions/76905691/bazel-unable-to-build-external-rust-dependency-with-feature-serde1 serde = { version = "=1.0.164", features = ["derive"] } serde_json = "1.0" +string-interner = "0.14.0" # Since there is no version tag, we pin the dependency to a specific revision syntect = { git = "https://github.com/sourcegraph/syntect", rev = "7e02c5b4085e6d935b960b8106cdd85da04532d2" } tree-sitter = "0.20.9" tree-sitter-highlight = "0.20.1" +walkdir = "2" scip = "0.3.2" protobuf = "3" - - [profile.release] # Enabled debug symbols in release build, so if we have a crash # we can inspect the coredump. diff --git a/docker-images/syntax-highlighter/README.md b/docker-images/syntax-highlighter/README.md index 7dc470ea2bbc9..f424df0e3d11d 100644 --- a/docker-images/syntax-highlighter/README.md +++ b/docker-images/syntax-highlighter/README.md @@ -40,7 +40,7 @@ See [API](./docs/api.md) ## Configuration -By default on startup, `syntect_server` will list all features (themes + file types) it supports. This can be disabled by setting `QUIET=true` in the environment. +By default on startup, `syntect_server` will list all file types it supports. This can be disabled by setting `QUIET=true` in the environment. ## Development @@ -64,15 +64,6 @@ Once published, the image version will need to be updated in the following locat Additionally, it's worth doing a [search](https://sourcegraph.com/search?q=repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+sourcegraph/syntect_server:&patternType=literal) for other uses in case this list is stale. -## Adding themes - -TODO: Maybe we can just remove themes entirely. I think they are u - -- Copy a `.tmTheme` file anywhere under `./syntect/testdata` (make a new dir if needed) [in our fork](https://github.com/slimsag/syntect). -- `cd syntect && make assets` -- In this repo, `cargo update -p syntect`. -- Build a new binary. - ## Adding languages (tree-sitter): See [scip-treesitter-languages](./crates/scip-treesitter-languages/README.md) @@ -100,4 +91,4 @@ $ cargo update -p syntect ## Supported languages: -Run: `cargo run --bin syntect_server` to see supported languages and themes. +Run: `cargo run --bin syntect_server` to see supported languages. diff --git a/docker-images/syntax-highlighter/crates/scip-syntax/Cargo.toml b/docker-images/syntax-highlighter/crates/scip-syntax/Cargo.toml index a9a934b6293f3..54c8092485a24 100644 --- a/docker-images/syntax-highlighter/crates/scip-syntax/Cargo.toml +++ b/docker-images/syntax-highlighter/crates/scip-syntax/Cargo.toml @@ -14,13 +14,13 @@ scip.workspace = true tree-sitter.workspace = true serde.workspace = true serde_json.workspace = true +walkdir.workspace = true scip-macros = { path = "../scip-macros" } scip-treesitter = { path = "../scip-treesitter" } scip-treesitter-languages = { path = "../scip-treesitter-languages" } rustc-hash = "1.1.0" -walkdir = "2" insta = "*" once_cell = "1.17.1" bitvec = "1.0.1" diff --git a/docker-images/syntax-highlighter/crates/scip-syntax/src/locals.rs b/docker-images/syntax-highlighter/crates/scip-syntax/src/locals.rs index 03ef5b1bc9f2f..b26659f431078 100644 --- a/docker-images/syntax-highlighter/crates/scip-syntax/src/locals.rs +++ b/docker-images/syntax-highlighter/crates/scip-syntax/src/locals.rs @@ -29,7 +29,7 @@ impl<'a> PartialEq for Scope<'a> { impl<'a> PartialOrd for Scope<'a> { fn partial_cmp(&self, other: &Self) -> Option { - self.range.partial_cmp(&other.range) + Some(self.cmp(other)) } } diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/BUILD.bazel b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/BUILD.bazel index 0d615483f507b..2ed763229b2d1 100644 --- a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/BUILD.bazel +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/BUILD.bazel @@ -1,9 +1,9 @@ load("@crate_index//:defs.bzl", "aliases", "all_crate_deps") -load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test") rust_binary( name = "scip-treesitter-cli", - srcs = ["src/main.rs"], + srcs = glob(["src/main.rs"]), aliases = aliases(), proc_macro_deps = all_crate_deps( proc_macro = True, @@ -12,30 +12,68 @@ rust_binary( deps = all_crate_deps( normal = True, ) + [ - "//docker-images/syntax-highlighter/crates/scip-syntax", - "//docker-images/syntax-highlighter/crates/scip-treesitter", - "//docker-images/syntax-highlighter/crates/scip-treesitter-languages", + ":scip-treesitter-cli-lib", ], ) +WORKSPACE_DEPS = [ + "//docker-images/syntax-highlighter/crates/scip-syntax", + "//docker-images/syntax-highlighter/crates/scip-treesitter", + "//docker-images/syntax-highlighter/crates/scip-treesitter-languages", +] + +# This separate library target is needed so that the integration +# test can re-use some of the code in the CLI. +rust_library( + name = "scip-treesitter-cli-lib", + srcs = glob( + [ + "src/*.rs", + ], + allow_empty = False, + exclude = ["src/main.rs"], + ), + aliases = aliases(), + crate_name = "scip_treesitter_cli", + crate_root = "src/lib.rs", + proc_macro_deps = all_crate_deps( + proc_macro = True, + ), + visibility = [":__subpackages__"], + deps = all_crate_deps(normal = True) + WORKSPACE_DEPS, +) + rust_test( name = "unit_test", - srcs = ["src/main.rs"], + size = "small", + srcs = glob(["src/*.rs"]), + proc_macro_deps = all_crate_deps( + proc_macro = True, + ), + deps = all_crate_deps(normal = True) + WORKSPACE_DEPS, +) + +# This separate integration test is needed because in Cargo, +# unit tests don't have an implicit dependency on the binary +# target, but integration tests do. +# +# https://users.rust-lang.org/t/cargo-how-do-i-make-a-integration-test-a-depend-on-binary-b/9821 +# +# This extra target makes sure that Bazel & Cargo have the +# same configuration. +rust_test( + name = "integration_test", + size = "small", + srcs = glob(["tests/*.rs"]), compile_data = glob( [ "testdata/**", ], allow_empty = False, ), - # Make sure this name matches the crate name in cargo configuration - # This is to ensure that snapshots produced by Bazel tests and - # ones produced by `cargo test` command - otherwise insta testing will fail! - crate = ":scip-treesitter-cli", - data = glob( - ["testdata/**"], - ) + [":scip-treesitter-cli"] + + data = [":scip-treesitter-cli"] + glob( - ["src/snapshots/**"], + ["tests/snapshots/**"], allow_empty = False, ), env = { @@ -46,8 +84,7 @@ rust_test( deps = all_crate_deps( normal = True, ) + [ - "//docker-images/syntax-highlighter/crates/scip-syntax", - "//docker-images/syntax-highlighter/crates/scip-treesitter", - "//docker-images/syntax-highlighter/crates/scip-treesitter-languages", - ], + ":scip-treesitter-cli", + ":scip-treesitter-cli-lib", + ] + WORKSPACE_DEPS, ) diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/Cargo.toml b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/Cargo.toml index 1f596c0f829f8..9bf2848bea94d 100644 --- a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/Cargo.toml +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/Cargo.toml @@ -12,11 +12,16 @@ assert_cmd = "2.0.12" predicates = "3.0.4" insta = "1.34.0" indicatif = "0.17.7" +colored = "2.0.4" protobuf = { workspace = true } scip = { workspace = true } anyhow = { workspace = true } clap = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +string-interner = { workspace = true } +walkdir = { workspace = true } scip-syntax = { path = "../scip-syntax" } scip-treesitter-languages = { path = "../scip-treesitter-languages" } diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/README.md b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/README.md index 7f0d1286fc77f..53f88f6c05d22 100644 --- a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/README.md +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/README.md @@ -1,28 +1,77 @@ # scip-treesitter-cli -A command line tool that uses other scip-* crates to produce a SCIP file containing -global and local symbols discovered during analysis. + +- [scip-treesitter-cli](#scip-treesitter-cli) + - [Usage](#usage) + - [Indexing](#indexing) + - [Evaluation](#evaluation) + - [Contributing](#contributing) + + +A command line tool that uses other scip-* crates to either + +- produce a SCIP file containing global and local symbols discovered during analysis. +- evaluate one SCIP file against another, producing precision/recall summary ## Usage -**Indexing** (`index --help` for more details) +### Indexing -``` +Index a list of files: + +```bash scip-treesitter-cli index --language java --out ./index.scip file1.java file2.java ... ``` -## Contributing +Index a folder recursively: + +```bash +scip-treesitter-cli index --language java --out ./index.scip --workspace +``` +### Evaluation + +```bash +scip-treesitter-cli evaluate --candidate index-tree-sitter.scip --ground-truth index.scip +``` + +## Development This is a standard Rust CLI project, with a single runnable entry point - the CLI itself. -1. Run tests: `cargo test` +The CI uses Bazel for building and testing, +but Cargo usage is also supported for convenience. - We use Insta for snapshot testing, if you're changing the output produced by the CLI, - run `cargo test` and then `cargo insta review` to accept/reject changes in symbols +### Running tests -2. Run CLI: `cargo run -- index --language java --out ./index.scip file1.java file2.java ...` +```bash +cargo test +``` -On CI, Bazel is used instead of Cargo. +```bash +bazel test //docker-images/syntax-highlighter/crates/scip-treesitter-cli:all +``` -1. Run tests: `bazel test //docker-images/syntax-highlighter/crates/scip-treesitter-cli:unit_test` -2. Build CLI: `bazel build //docker-images/syntax-highlighter/crates/scip-treesitter-cli:scip-treesitter-cli` +We use [Insta](https://insta.rs/) for snapshot testing. +If you're changing the output produced by the CLI, +run `cargo test` and then `cargo insta review` +to accept/reject changes in snapshots. + +### Build the CLI for local testing + +```bash +cargo build +``` + +```bash +bazel build //docker-images/syntax-highlighter/crates/scip-treesitter-cli +``` + +### Run the locally built CLI + +```bash +cargo run -- index --language java --out ./index.scip file1.java file2.java ... +``` + +```bash +bazel run //docker-images/syntax-highlighter/crates/scip-treesitter-cli -- index --language java --out ./index.scip file1.java file2.java ... +``` diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/evaluate.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/evaluate.rs new file mode 100644 index 0000000000000..8b44ad5a44c75 --- /dev/null +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/evaluate.rs @@ -0,0 +1,724 @@ +#![allow(clippy::type_complexity)] +#![allow(clippy::needless_lifetimes)] + +use std::{ + collections::{HashMap, HashSet}, + marker::PhantomData, + path::PathBuf, +}; + +use anyhow::*; +use colored::Colorize; +use scip::types::Index; +use scip_treesitter::types::PackedRange; +use string_interner::{symbol::SymbolU32, StringInterner, Symbol}; + +use crate::{io::read_index_from_file, progress::*}; + +pub fn evaluate_command(candidate: PathBuf, ground_truth: PathBuf, options: ScipEvaluateOptions) { + Evaluator::default() + .evaluate_files(candidate, ground_truth, options) + .unwrap() + .print_summary() +} + +fn validate_index(idx: &Index) -> Result<()> { + let mut occs = 0; + + for doc in &idx.documents { + occs += doc.occurrences.len(); + } + + if occs == 0 { + Err(anyhow!( + "Index contains no occurrences and cannot be used for evaluation" + )) + } else { + Ok(()) + } +} +// These unfortunately don't help the typesafety and are only here to aid readability +// TODO: newtype https://doc.rust-lang.org/book/ch19-03-advanced-traits.html#using-the-newtype-pattern-to-implement-external-traits-on-external-types + +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] +struct PathId { + value: SymbolU32, +} + +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] +struct SymbolId { + value: SymbolU32, + _marker: PhantomData, +} + +impl SymbolId { + fn into_any(self) -> SymbolId { + SymbolId { + value: self.value, + _marker: PhantomData, + } + } +} + +/// Phantom marker for SymbolId +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] // https://github.com/rust-lang/rust/issues/26925 +struct GroundTruth; + +/// Phantom marker for SymbolId +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] // https://github.com/rust-lang/rust/issues/26925 +struct Candidate; + +/// Phantom marker for SymbolId +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] // https://github.com/rust-lang/rust/issues/26925 +struct Any; + +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] +struct SymbolPair { + ground_truth: SymbolId, + candidate: SymbolId, +} + +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] +struct LocationInFile { + rng: PackedRange, + path_id: PathId, +} + +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] +pub struct SymbolOccurrence { + location: LocationInFile, + symbol: SymbolId, +} + +impl SymbolOccurrence { + fn range(&self) -> &PackedRange { + &self.location.rng + } +} + +#[derive(Eq, Hash, PartialEq, Clone, Debug)] +struct Overlap { + /// Total number of occurrence of a symbol from ground truth + total: u32, + /// Number of common occurrences between a ground truth symbol and a candidate + common: u32, +} + +impl Overlap { + fn jaccard(&self) -> f32 { + self.common as f32 / self.total as f32 + } +} + +#[derive(Debug, PartialEq)] +enum Mark { + TruePositive { weight: f32 }, + FalsePositive { weight: f32 }, + FalseNegative { weight: f32 }, +} + +#[derive(Debug, PartialEq)] +struct ClassifiedLocation { + location: LocationInFile, + symbol: SymbolId, + mark: Mark, +} + +#[derive(Clone, Copy, Default, Debug)] +pub struct ScipEvaluateOptions { + pub print_mapping: bool, + pub print_true_positives: bool, + pub print_false_positives: bool, + pub print_false_negatives: bool, +} + +#[derive(serde::Serialize, Debug)] +pub struct EvaluationSummary { + pub precision_percent: f32, + pub recall_percent: f32, + pub true_positives: f32, + pub false_positives: f32, + pub false_negatives: f32, +} + +#[derive(Debug)] +pub struct EvaluationResult<'e> { + evaluator: &'e Evaluator, + summary: EvaluationSummary, + true_positives: Vec, + false_positives: Vec, + false_negatives: Vec, + // What options were used for this evaluation + options: ScipEvaluateOptions, +} + +impl<'e> EvaluationResult<'e> { + fn new<'a>( + evaluator: &'a Evaluator, + classified: Vec, + options: ScipEvaluateOptions, + ) -> EvaluationResult<'a> { + let mut true_positives_occurrences: Vec = Vec::new(); + let mut false_positives_occurrences: Vec = Vec::new(); + let mut false_negatives_occurrences: Vec = Vec::new(); + + let mut true_positives = 0 as f32; + let mut false_positives = 0 as f32; + let mut false_negatives = 0 as f32; + + for classified_location in classified { + let symbol_occurrence = SymbolOccurrence { + location: classified_location.location, + symbol: classified_location.symbol, + }; + match classified_location.mark { + Mark::TruePositive { weight } => { + true_positives_occurrences.push(symbol_occurrence); + true_positives += weight + } + Mark::FalseNegative { weight } => { + false_negatives_occurrences.push(symbol_occurrence); + false_negatives += weight + } + Mark::FalsePositive { weight } => { + false_positives_occurrences.push(symbol_occurrence); + false_positives += weight + } + } + } + + let precision = 100.0 * true_positives / (true_positives + false_positives); + let recall = 100.0 * true_positives / (true_positives + false_negatives); + + EvaluationResult { + evaluator, + summary: EvaluationSummary { + precision_percent: precision, + recall_percent: recall, + true_positives, + false_positives, + false_negatives, + }, + true_positives: true_positives_occurrences, + false_positives: false_positives_occurrences, + false_negatives: false_negatives_occurrences, + options, + } + } +} + +impl<'e> EvaluationResult<'e> { + pub fn print_summary(&self) { + println!("{}", serde_json::to_string(&self.summary).unwrap()); + + let print_occ = |occ: &SymbolOccurrence| { + eprintln!( + "{}: L{} C{} -- {}", + self.evaluator.display_path(occ.location.path_id), + occ.range().start_line, + occ.range().start_col, + self.evaluator.display_symbol(occ.symbol), + ); + }; + + if self.options.print_false_negatives { + eprintln!(); + + eprintln!( + "{}: {}", + "False negatives".red(), + self.false_negatives.len().to_string().bold() + ); + eprintln!( + "{}", + "How many actual occurrences we DIDN'T find compared to compiler?".italic() + ); + + for symbol_occurrence in &self.false_negatives { + print_occ(symbol_occurrence); + } + } + + if self.options.print_false_positives { + eprintln!(); + eprintln!( + "{}: {}", + "False positives".red(), + self.false_positives.len().to_string().bold() + ); + eprintln!( + "{}", + "How many extra occurrences we reported compared to compiler?".italic() + ); + + for symbol_occurrence in &self.false_positives { + print_occ(symbol_occurrence); + } + } + + if self.options.print_true_positives { + eprintln!(); + eprintln!( + "{}: {}", + "True positives".green(), + self.true_positives.len().to_string().bold() + ); + + for symbol_occurrence in &self.true_positives { + let file = self + .evaluator + .display_path(symbol_occurrence.location.path_id); + let rng = symbol_occurrence.range(); + let header = format!("{file}: L{} C{} -- ", rng.start_line, rng.start_col); + + eprintln!( + "{} {}", + header.yellow(), + self.evaluator.display_symbol(symbol_occurrence.symbol) + ); + } + } + } +} + +#[derive(Default, Debug)] +pub struct Evaluator { + interner: StringInterner, +} + +// Public API +impl Evaluator { + pub fn evaluate_files<'e>( + &'e mut self, + candidate: PathBuf, + ground_truth: PathBuf, + options: ScipEvaluateOptions, + ) -> Result> { + self.evaluate_indexes( + &read_index_from_file(candidate), + &read_index_from_file(ground_truth), + options, + ) + } + + pub fn evaluate_indexes<'e>( + &'e mut self, + candidate: &Index, + ground_truth: &Index, + options: ScipEvaluateOptions, + ) -> Result> { + validate_index(candidate)?; + validate_index(ground_truth)?; + + let bar = create_spinner(); + bar.set_message("Indexing candidate symbols by location"); + let candidate_occurrences: HashMap> = + self.index_occurrences(candidate); + bar.tick(); + + bar.set_message("Indexing ground truth symbols by location"); + let ground_truth_occurrences: HashMap> = + self.index_occurrences(ground_truth); + bar.tick(); + + // For each symbol pair we maintain an Overlap instance + let mut overlaps: HashMap = HashMap::new(); + + // Lookup table where key is ground truth symbol, and the value + // is all the symbol pairs. + // Each symbol from ground truth dataset can be mapped to any number of + // symbols from the candidate set + let mut ground_truth_alternatives: HashMap, HashSet> = + HashMap::new(); + + bar.set_message("Analysing occurrences in candidate SCIP"); + for (&candidate_loc, &candidate_symbol) in candidate_occurrences.iter() { + // At given location from the candidate SCIP, see + // if ground truth dataset contains any symbol at same location + match ground_truth_occurrences.get(&candidate_loc) { + // If ground truth dataset doesn't have any symbol at this location, + // we treat it as a false positive, to be handled later + None => {} + Some(&ground_truth_symbol) => { + let pair = SymbolPair { + ground_truth: ground_truth_symbol, + candidate: candidate_symbol, + }; + + // See if we already have a lookup entry for this ground truth symbol + match ground_truth_alternatives.get_mut(&ground_truth_symbol) { + None => { + // If this is the first time we're seeing this symbol, + // create a lookup entry and put a single pair in there + ground_truth_alternatives + .insert(ground_truth_symbol, HashSet::from([pair])); + } + Some(s) => { + // Otherwise, add the symbol pair to the set (it might already be there) + s.insert(pair); + } + } + + // As we are currently iterating over candidate occurrences, + // we don't know how many occurrences there are in total in the + // ground truth dataset. + // That's why here we only manage the number of occurrences + // the datasets have in common + match overlaps.get_mut(&pair) { + None => { + overlaps.insert( + pair, + Overlap { + total: 0, + common: 1, + }, + ); + } + Some(overlap) => overlap.common += 1, + } + } + } + } + bar.tick(); + + bar.set_message("Computing overlap with ground truth SCIP occurrences"); + for ground_truth_symbol in ground_truth_occurrences.values() { + // now that we're iterating over all the ground truth occurrences, + // we can update the `total` counter for each symbol pair + // associated with that ground truth symbol + ground_truth_alternatives + .get(ground_truth_symbol) + .into_iter() + .for_each(|pairs| { + for pair in pairs { + if let Some(overlap) = overlaps.get_mut(pair) { + overlap.total += 1 + } + } + }); + } + bar.tick(); + + // For each candidate symbol we collect all possible ground truth symbols + // it can be mapped to + let candidate_mapping: HashMap< + SymbolId, + HashMap, Overlap>, + > = { + let mut result: HashMap, HashMap, Overlap>> = + HashMap::new(); + + for (symbol_pair, overlap) in overlaps { + match result.get_mut(&symbol_pair.candidate) { + None => { + result.insert( + symbol_pair.candidate, + HashMap::from([(symbol_pair.ground_truth, overlap)]), + ); + } + Some(map) => { + map.insert(symbol_pair.ground_truth, overlap); + } + } + } + + result + }; + + // We have produced the final counts for all symbol pairs - + // it's time to produce final weights + let symbol_pair_weight: HashMap = { + let mut result: HashMap = HashMap::new(); + + for (&candidate_symbol, alternatives) in &candidate_mapping { + let total_weight: f32 = alternatives.values().map(|i| i.jaccard()).sum(); + + for (&ground_truth_symbol, overlap) in alternatives { + let weight = overlap.jaccard(); + + let adjusted_weight = weight / total_weight; + + result.insert( + SymbolPair { + candidate: candidate_symbol, + ground_truth: ground_truth_symbol, + }, + adjusted_weight, + ); + } + } + + result + }; + + if options.print_mapping { + let mut candidate_mapping_vec: Vec<( + SymbolId, + HashMap, Overlap>, + )> = candidate_mapping.into_iter().collect(); + + candidate_mapping_vec.sort_by_key(|(sym, _)| *sym); + + for (candidate_symbol, alternatives) in candidate_mapping_vec.into_iter() { + let candidate = self.try_strip_package_details(candidate_symbol); + let mut alternatives_vec: Vec<(SymbolId, Overlap)> = + alternatives.into_iter().collect(); + alternatives_vec.sort_by_key(|(sym, _)| *sym); + + eprintln!("{}", self.display_symbol(candidate).red()); + + for (ground_truth_symbol, overlap) in &alternatives_vec { + let ground_truth = self.try_strip_package_details(*ground_truth_symbol); + let adjusted_weight = symbol_pair_weight + .get(&SymbolPair { + candidate: candidate_symbol, + ground_truth: *ground_truth_symbol, + }) + .unwrap(); + + eprintln!( + " {:.2} {} [{}/{} occurrences]", + adjusted_weight, + self.display_symbol(ground_truth).green(), + overlap.common, + overlap.total + ); + } + + eprintln!(); + } + } + + let mut classified_locations: Vec = Vec::new(); + + bar.set_message("Classifying occurrences into false negatives and true positives"); + // Now that the mapping is fully built, iterate over all ground truth occurrences + // and see if the canidate contains it. + // By iterating over ground_truth_occurrences we can only identify false negatives + // and true positives. + // False negatives are counted later + for (&ground_truth_location, &ground_truth_symbol) in ground_truth_occurrences.iter() { + match candidate_occurrences.get(&ground_truth_location) { + // if this location is not marked in the candidate dataset, + // this is a false negative - with full weight 1.0, as + // there's no ambiguity to speak of - this location *should* contain + // some symbol but doesn't + None => classified_locations.push(ClassifiedLocation { + location: ground_truth_location, + symbol: ground_truth_symbol.into_any(), + mark: Mark::FalseNegative { weight: 1.0 }, + }), + Some(candidate_symbol) => { + let pair = SymbolPair { + ground_truth: ground_truth_symbol, + candidate: *candidate_symbol, + }; + + match symbol_pair_weight.get(&pair) { + // At this location we found both the ground truth + // and candidate occurrence. We want to reward it - but with a + // weight indicating how precisely we matched candidate symbols to + // ground truth symbols - this weight comes from mapping we constructed earlier. + Some(weight) => classified_locations.push(ClassifiedLocation { + location: ground_truth_location, + symbol: ground_truth_symbol.into_any(), + mark: Mark::TruePositive { weight: *weight }, + }), + // This is an impossible situation by construction + None => panic!( + "Couldn't find a mapping for symbol {}", + self.display_symbol(ground_truth_symbol).red() + ), + } + } + } + } + + bar.set_message("Identifying false positives"); + for (candidate_location, candidate_symbol) in &candidate_occurrences { + // If there are occurrences present in candidate dataset, but + // not present in the ground truth, we treat it as a false positive + // and penalise it will full strength. + // + // Technically this may be a mistake, in case the indexer + // that produces ground truth has bugs in it. + // But for simplicity we assume that scip-* indexers + // are "perfect" + if !ground_truth_occurrences.contains_key(candidate_location) { + classified_locations.push(ClassifiedLocation { + location: *candidate_location, + symbol: candidate_symbol.into_any(), + mark: Mark::FalsePositive { weight: 1.0 }, + }); + } + } + + bar.finish_and_clear(); + + Ok(EvaluationResult::new(self, classified_locations, options)) + } +} + +// Private API +impl Evaluator { + fn make_symbol_id(&mut self, s: &str) -> SymbolId { + SymbolId { + value: self.interner.get_or_intern(s), + _marker: PhantomData, + } + } + + fn make_path_id(&mut self, s: &str) -> PathId { + PathId { + value: self.interner.get_or_intern(s), + } + } + + fn display_symbol(&self, s: SymbolId) -> &str { + self.interner.resolve(s.value).unwrap() + } + + fn display_path(&self, s: PathId) -> &str { + self.interner.resolve(s.value).unwrap() + } + + fn try_strip_package_details(&mut self, sym: SymbolId) -> SymbolId { + let s = self.display_symbol(sym); + if s.as_bytes().iter().filter(|&c| *c == b' ').count() != 5 { + return sym; + } + let parts: Vec<&str> = s.splitn(5, ' ').collect(); + let scheme = parts[0]; + let _manager = parts[1]; + let _package_name = parts[2]; + let _version = parts[3]; + let descriptor = parts[4]; + self.make_symbol_id(&format!("{scheme} . . . {descriptor}")) + } +} + +impl Evaluator { + fn index_occurrences(&mut self, index: &Index) -> HashMap> { + let mut out: HashMap> = HashMap::new(); + + for doc in &index.documents { + let path_id = self.make_path_id(&doc.relative_path); + out.reserve(doc.occurrences.len()); + for occ in &doc.occurrences { + let rng = PackedRange::from_vec(&occ.range).unwrap(); + let sym_id: SymbolId; + if let Some(prefix) = occ.symbol.strip_prefix("local ") { + sym_id = self.make_symbol_id(&format!( + "local doc-{}-{}", + path_id.value.to_usize(), + prefix + )); + } else { + sym_id = self.make_symbol_id(&occ.symbol); + } + let loc = LocationInFile { rng, path_id }; + out.insert(loc, sym_id); + } + } + + out + } +} + +#[cfg(test)] +mod tests { + use scip::types::*; + + use crate::evaluate::Evaluator; + + fn occurrence(n: i32, symbol: &str) -> Occurrence { + let mut occ = Occurrence::new(); + occ.range = vec![n, 5, 10]; + occ.symbol = symbol.to_string(); + occ + } + + fn document(path: &str, occs: Vec) -> Document { + let mut doc = Document::new(); + doc.relative_path = path.to_string(); + doc.occurrences.extend(occs); + doc + } + + fn index(documents: Vec) -> Index { + let mut idx = Index::new(); + idx.documents.extend(documents); + idx + } + + #[test] + fn evaluation_fundamentals() { + let doc1 = document( + "document1.java", + vec![occurrence(1, "sym1"), occurrence(2, "sym2")], + ); + + let doc2 = document( + "document2.java", + vec![occurrence(1, "sym1"), occurrence(2, "sym2")], + ); + + let ground_truth = index(vec![doc1, doc2]); + + let mut evaluator = Evaluator::default(); + + // Evaluating index against itself should yield 100% precision and 100% recall + { + let evaluate_with_self = evaluator + .evaluate_indexes(&ground_truth, &ground_truth, Default::default()) + .unwrap(); + assert_eq!(evaluate_with_self.summary.precision_percent, 100.0); + assert_eq!(evaluate_with_self.summary.recall_percent, 100.0); + assert_eq!(evaluate_with_self.summary.true_positives, 4.0); + assert_eq!(evaluate_with_self.summary.false_positives, 0.0); + assert_eq!(evaluate_with_self.summary.false_negatives, 0.0); + } + + // This has no overlap at all with the ground truth + // Should yield 0% precision, 0% recall + { + let evaluate_disjoint = evaluator + .evaluate_indexes( + &index(vec![ + document( + "bla/document1.java", + vec![occurrence(1, "sym1"), occurrence(2, "sym2")], + ), + document( + "bla/document2.java", + vec![occurrence(1, "sym1"), occurrence(2, "sym2")], + ), + ]), + &ground_truth, + Default::default(), + ) + .unwrap(); + assert_eq!(evaluate_disjoint.summary.precision_percent, 0.0); + assert_eq!(evaluate_disjoint.summary.recall_percent, 0.0); + assert_eq!(evaluate_disjoint.summary.true_positives, 0.0); + assert_eq!(evaluate_disjoint.summary.false_positives, 4.0); + assert_eq!(evaluate_disjoint.summary.false_negatives, 4.0); + } + + let empty_index = index(vec![document("bla.java", vec![])]); + + // Evaluating empty index is an error + { + let evaluate_empty = + evaluator.evaluate_indexes(&empty_index, &ground_truth, Default::default()); + assert!(evaluate_empty.is_err()); + } + + // Evaluating against an empty index is an error + { + let evaluate_against_empty = + evaluator.evaluate_indexes(&ground_truth, &empty_index, Default::default()); + assert!(evaluate_against_empty.is_err()); + } + } +} diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/index.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/index.rs new file mode 100644 index 0000000000000..6365a9b9ed227 --- /dev/null +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/index.rs @@ -0,0 +1,204 @@ +use std::path::PathBuf; + +use anyhow::Result; +use clap::ValueEnum; +use scip::{types::Document, write_message_to_file}; +use scip_syntax::{get_locals, get_symbols}; +use scip_treesitter_languages::parsers::BundledParser; +use walkdir::DirEntry; + +use crate::{ + evaluate::Evaluator, + io::read_index_from_file, + progress::{create_progress_bar, create_spinner}, +}; + +pub struct IndexOptions { + pub analysis_mode: AnalysisMode, + /// When true, fail on first encountered error + /// Otherwise errors are logged but they don't + /// interrupt the process + pub fail_fast: bool, +} + +#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)] +pub enum AnalysisMode { + /// Only extract occurrences of local definitions + Locals, + /// Only extract globally-accessible symbols + Globals, + /// Locals + Globals, extract everything + Full, +} + +impl AnalysisMode { + fn locals(self) -> bool { + self == AnalysisMode::Locals || self == AnalysisMode::Full + } + fn globals(self) -> bool { + self == AnalysisMode::Globals || self == AnalysisMode::Full + } +} + +pub enum IndexMode { + /// Index only this list of files, without checking file extensions + Files { list: Vec }, + /// Discover all files that can be handled by the chosen language + /// in the passed location (which has to be a directory) + Workspace { location: PathBuf }, +} + +pub fn index_command( + language: String, + index_mode: IndexMode, + out: PathBuf, + project_root: PathBuf, + evaluate_against: Option, + options: IndexOptions, +) { + let p = BundledParser::get_parser(&language).unwrap(); + let project_root = { + match index_mode { + IndexMode::Files { .. } => project_root, + IndexMode::Workspace { ref location } => location.clone(), + } + }; + + let canonical_project_root = project_root + .canonicalize() + .expect("Failed to canonicalize project root"); + + let mut index = scip::types::Index { + metadata: Some(scip::types::Metadata { + tool_info: Some(scip::types::ToolInfo { + name: "scip-treesitter-cli".to_string(), + version: clap::crate_version!().to_string(), + arguments: vec![], + ..Default::default() + }) + .into(), + project_root: format!("file://{}", canonical_project_root.display()), + ..Default::default() + }) + .into(), + ..Default::default() + }; + + let mut index_file = |filepath: &PathBuf| { + let contents = std::fs::read(filepath).unwrap(); + let relative_path = filepath + .strip_prefix(canonical_project_root.clone()) + .expect("Failed to strip project root prefix"); + + match index_content(contents, p, &options) { + Ok(mut document) => { + document.relative_path = relative_path.display().to_string(); + index.documents.push(document); + } + Err(error) => { + if options.fail_fast { + panic!("Failed to index {}: {:?}", filepath.display(), error); + } else { + eprintln!("Failed to index {}: {:?}", filepath.display(), error) + } + } + } + }; + + match index_mode { + IndexMode::Files { list } => { + let bar = create_progress_bar(list.len() as u64); + for filename in list { + let filepath = PathBuf::from(filename).canonicalize().unwrap(); + bar.set_message(filepath.display().to_string()); + index_file(&filepath); + bar.inc(1); + } + + bar.finish(); + } + IndexMode::Workspace { location } => { + let extensions = BundledParser::get_language_extensions(&p); + let is_valid = |entry: &DirEntry| { + entry.file_type().is_dir() + || entry + .file_name() + .to_str() + .map(|s| { + s.split('.') + .last() + .filter(|ext| extensions.contains(ext)) + .is_some() + }) + .unwrap_or(false) + }; + + let bar = create_spinner(); + + for entry in walkdir::WalkDir::new(location) + .into_iter() + .filter_entry(is_valid) + { + let entry = entry.unwrap(); + if !entry.file_type().is_dir() { + bar.set_message(entry.path().display().to_string()); + index_file(&entry.into_path()); + bar.tick(); + } + } + } + } + + eprintln!(); + + eprintln!( + "Writing index for {} documents into {}", + index.documents.len(), + out.display() + ); + + if let Some(file) = evaluate_against { + eprintln!("Evaluating built index against {}", file.display()); + + let ground_truth = read_index_from_file(file); + + let mut evaluator = Evaluator::default(); + evaluator + .evaluate_indexes(&index, &ground_truth, Default::default()) + .unwrap() + .print_summary(); + } + + write_message_to_file(out, index).expect("to write the file"); +} + +fn index_content( + contents: Vec, + parser: BundledParser, + options: &IndexOptions, +) -> Result { + let mut document: Document; + + if options.analysis_mode.globals() { + document = get_symbols(parser, &contents).unwrap(); + } else { + document = Document::new(); + } + + if options.analysis_mode.locals() { + let locals = get_locals(parser, &contents); + + match locals { + Some(Ok(occurrences)) => { + for occ in occurrences { + document.occurrences.push(occ); + } + } + + Some(Err(e)) => return Err(e), + None => {} + } + } + + Ok(document) +} diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/io.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/io.rs new file mode 100644 index 0000000000000..07a74b8134ab4 --- /dev/null +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/io.rs @@ -0,0 +1,15 @@ +use std::{fs::File, io::BufReader, path::PathBuf}; + +use protobuf::{CodedInputStream, Message}; + +pub fn read_index_from_file(file: PathBuf) -> scip::types::Index { + let mut candidate_idx = scip::types::Index::new(); + let candidate_f = File::open(file).unwrap(); + + let mut reader = BufReader::new(candidate_f); + let mut cis = CodedInputStream::from_buf_read(&mut reader); + + candidate_idx.merge_from(&mut cis).unwrap(); + + candidate_idx +} diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/lib.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/lib.rs new file mode 100644 index 0000000000000..b725a33bef93b --- /dev/null +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/lib.rs @@ -0,0 +1,4 @@ +pub mod evaluate; +pub mod index; +pub mod io; +pub mod progress; diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/main.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/main.rs index 7b4dca7f69a88..493c7c80099a9 100644 --- a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/main.rs +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/main.rs @@ -1,11 +1,8 @@ -use clap::{Parser, Subcommand, ValueEnum}; -use indicatif::{ProgressBar, ProgressStyle}; -use protobuf::Message; -use scip::types::Document; -use scip_syntax::{get_locals, get_symbols}; -use scip_treesitter_languages::parsers::BundledParser; - -use anyhow::Result; +use clap::{Parser, Subcommand}; +use scip_treesitter_cli::{ + evaluate::ScipEvaluateOptions, + index::{index_command, AnalysisMode, IndexMode, IndexOptions}, +}; use std::path::PathBuf; #[derive(Parser)] @@ -16,31 +13,12 @@ struct Cli { command: Commands, } -#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)] -enum AnalysisMode { - /// Only extract occurrences of local definitions - Locals, - /// Only extract globally-accessible symbols - Globals, - /// Locals + Globals, extract everything - Full, -} - -impl AnalysisMode { - fn locals(self) -> bool { - self == AnalysisMode::Locals || self == AnalysisMode::Full - } - fn globals(self) -> bool { - self == AnalysisMode::Globals || self == AnalysisMode::Full - } -} - #[derive(Subcommand)] enum Commands { /// Index source files using Tree Sitter parser for a given language /// and produce a SCIP file Index { - /// + /// Which language parser to use to process the files #[arg(short, long)] language: String, @@ -48,6 +26,12 @@ enum Commands { #[arg(short, long, default_value = "./index.scip")] out: String, + /// Folder to index - will be chosen as project root, + /// and files will be discovered according to + /// configured extensions for the selected language + #[arg(long)] + workspace: Option, + /// List of files to analyse filenames: Vec, @@ -62,15 +46,38 @@ enum Commands { /// Project root to write to SCIP index #[arg(short, long, default_value = "./")] project_root: String, + + /// Evaluate the build index against an index from a file + #[arg(long)] + evaluate: Option, }, -} -struct Options { - analysis_mode: AnalysisMode, - /// When true, fail on first encountered error - /// Otherwise errors are logged but they don't - /// interrupt the process - fail_fast: bool, + /// Fuzzily evaluate candidate SCIP index against known ground truth + ScipEvaluate { + /// SCIP file to evaluate (refered to as "candidate") + #[arg(long)] + candidate: String, + + /// SCIP file to be used as the source of truth (referred to as "ground truth") + #[arg(long)] + ground_truth: String, + + /// Print to stdout the mapping between candidate symbols and groun truth symbols + #[arg(long)] + print_mapping: bool, + + /// Print all occurrences in candidate SCIP that are matching occurrences in ground truth SCIP + #[arg(long)] + print_true_positives: bool, + + /// Print all occurrences in candidate SCIP that don't match any occurrences in ground truth SCIP + #[arg(long)] + print_false_positives: bool, + + /// Print all occurrences in ground truth SCIP that don't match any occurrences in candidate SCIP + #[arg(long)] + print_false_negatives: bool, + }, } pub fn main() { @@ -81,233 +88,56 @@ pub fn main() { language, out, filenames, + workspace, mode, fail_fast, project_root, - } => index_command( - language, - filenames, - PathBuf::from(out), - PathBuf::from(project_root), - Options { - analysis_mode: mode, - fail_fast, - }, - ), - } -} - -fn index_command( - language: String, - filenames: Vec, - out: PathBuf, - project_root: PathBuf, - options: Options, -) { - let p = BundledParser::get_parser(&language).unwrap(); - - let mut index = scip::types::Index { - metadata: Some(scip::types::Metadata { - tool_info: Some(scip::types::ToolInfo { - name: "scip-treesitter-cli".to_string(), - version: clap::crate_version!().to_string(), - arguments: vec![], - ..Default::default() - }) - .into(), - project_root: format!( - "file://{}", - project_root - .canonicalize() - .expect("Failed to canonicalize project root") - .display() - ), - ..Default::default() - }) - .into(), - ..Default::default() - }; - - let bar = ProgressBar::new(filenames.len() as u64); - - bar.set_style( - ProgressStyle::with_template( - "[{elapsed_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7}\n {msg}", - ) - .unwrap() - .progress_chars("##-"), - ); - - for (_, filename) in filenames.iter().enumerate() { - let contents = std::fs::read(filename).unwrap(); - bar.set_message(filename.clone()); - bar.inc(1); - match index_content(contents, p, &options) { - Ok(mut document) => { - document.relative_path = filename.to_string(); - index.documents.push(document); - } - Err(error) => { - if options.fail_fast { - panic!("Failed to index {filename}: {:?}", error); - } else { - eprintln!("Failed to index {filename}: {:?}", error) - } - } - } - } - - bar.finish(); - - eprintln!(); - - eprintln!( - "Writing index for {} documents into {}", - index.documents.len(), - out.display() - ); - - write_message_to_file(out, index).expect("to write the file"); -} - -fn index_content(contents: Vec, parser: BundledParser, options: &Options) -> Result { - let mut document: Document; - - if options.analysis_mode.globals() { - document = get_symbols(parser, &contents).unwrap(); - } else { - document = Document::new(); - } - - if options.analysis_mode.locals() { - let locals = get_locals(parser, &contents); - - match locals { - Some(Ok(occurrences)) => { - for occ in occurrences { - document.occurrences.push(occ); + evaluate, + } => { + let index_mode = { + match workspace { + None => IndexMode::Files { list: filenames }, + Some(location) => { + if !filenames.is_empty() { + panic!("--workspace option cannot be combined with a list of files"); + } else { + IndexMode::Workspace { + location: location.into(), + } + } + } } - } - Some(Err(e)) => return Err(e), - None => {} + }; + + index_command( + language, + index_mode, + PathBuf::from(out), + PathBuf::from(project_root), + evaluate.map(PathBuf::from), + IndexOptions { + analysis_mode: mode, + fail_fast, + }, + ) } - } - - Ok(document) -} - -fn write_message_to_file

    (path: P, msg: impl Message) -> Result<(), Box> -where - P: AsRef, -{ - use std::io::Write; - - let res = msg.write_to_bytes()?; - let output = std::fs::File::create(path)?; - let mut writer = std::io::BufWriter::new(output); - writer.write_all(&res)?; - - Ok(()) -} - -#[cfg(test)] -mod tests { - use assert_cmd::cargo::cargo_bin; - use assert_cmd::prelude::*; - use protobuf::{CodedInputStream, Message}; - use std::collections::HashMap; - use std::fs::File; - use std::io::BufReader; - use std::path::Path; - use std::process::Command; - use std::{env::temp_dir, path::PathBuf}; - - lazy_static::lazy_static! { - static ref BINARY_LOCATION: PathBuf = { - match std::env::var("SCIP_CLI_LOCATION") { - Ok(va) => std::env::current_dir().unwrap().join(va), - _ => cargo_bin("scip-treesitter-cli"), - } - }; - } - - use scip_treesitter::snapshot::{dump_document_with_config, EmitSymbol, SnapshotOptions}; - - fn read_index_from_file(file: PathBuf) -> scip::types::Index { - let mut candidate_idx = scip::types::Index::new(); - let candidate_f = File::open(file).unwrap(); - - let mut reader = BufReader::new(candidate_f); - let mut cis = CodedInputStream::from_buf_read(&mut reader); - - candidate_idx.merge_from(&mut cis).unwrap(); - candidate_idx - } - fn snapshot_syntax_document(doc: &scip::types::Document, source: &str) -> String { - dump_document_with_config( - doc, - source, - SnapshotOptions { - emit_symbol: EmitSymbol::All, - ..Default::default() + Commands::ScipEvaluate { + candidate, + ground_truth, + print_mapping, + print_true_positives, + print_false_positives, + print_false_negatives, + } => scip_treesitter_cli::evaluate::evaluate_command( + PathBuf::from(candidate), + PathBuf::from(ground_truth), + ScipEvaluateOptions { + print_mapping, + print_true_positives, + print_false_positives, + print_false_negatives, }, - ) - .expect("dump document") - } - - #[test] - fn java_e2e() { - let out_dir = temp_dir(); - let setup = HashMap::from([( - PathBuf::from("globals.java"), - include_str!("../testdata/globals.java").to_string(), - )]); - - run_index(&out_dir, &setup, vec!["--language", "java"]); - - let index = read_index_from_file(out_dir.join("index.scip")); - - for doc in &index.documents { - let path = &doc.relative_path; - let dumped = - snapshot_syntax_document(doc, setup.get(&PathBuf::from(&path)).expect("??")); - - insta::assert_snapshot!(path.clone(), dumped); - } - } - - fn prepare(temp: &Path, files: &HashMap) { - for (path, contents) in files.iter() { - let file_path = temp.join(path); - write_file(&file_path, contents); - } - } - - fn run_index(location: &PathBuf, files: &HashMap, extra_arguments: Vec<&str>) { - prepare(location, files); - - let mut base_args = vec!["index"]; - base_args.extend(extra_arguments); - - let mut cmd = Command::new(BINARY_LOCATION.to_str().unwrap()); - - cmd.args(base_args); - - for (path, _) in files.iter() { - cmd.arg(path.to_str().unwrap()); - } - - cmd.current_dir(location); - - cmd.assert().success(); - } - - fn write_file(path: &PathBuf, contents: &String) { - use std::io::Write; - - let output = std::fs::File::create(path).unwrap(); - let mut writer = std::io::BufWriter::new(output); - writer.write_all(contents.as_bytes()).unwrap(); + ), } } diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/progress.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/progress.rs new file mode 100644 index 0000000000000..2a9d4801affd6 --- /dev/null +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/progress.rs @@ -0,0 +1,35 @@ +use indicatif::{ProgressBar, ProgressStyle}; + +pub fn create_spinner() -> ProgressBar { + let bar = ProgressBar::new_spinner(); + + bar.set_style( + ProgressStyle::with_template("{spinner:.blue} {msg}") + .unwrap() + .tick_strings(&[ + "β–Ήβ–Ήβ–Ήβ–Ήβ–Ή", + "β–Έβ–Ήβ–Ήβ–Ήβ–Ή", + "β–Ήβ–Έβ–Ήβ–Ήβ–Ή", + "β–Ήβ–Ήβ–Έβ–Ήβ–Ή", + "β–Ήβ–Ήβ–Ήβ–Έβ–Ή", + "β–Ήβ–Ήβ–Ήβ–Ήβ–Έ", + "β–ͺβ–ͺβ–ͺβ–ͺβ–ͺ", + ]), + ); + + bar +} + +pub fn create_progress_bar(len: u64) -> ProgressBar { + let bar = ProgressBar::new(len); + + bar.set_style( + ProgressStyle::with_template( + "[{elapsed_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7}\n {msg}", + ) + .unwrap() + .progress_chars("##-"), + ); + + bar +} diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/tests/integration_test.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/tests/integration_test.rs new file mode 100644 index 0000000000000..1947b0df87a2d --- /dev/null +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/tests/integration_test.rs @@ -0,0 +1,86 @@ +use std::collections::HashMap; +use std::path::Path; +use std::process::Command; +use std::{env::temp_dir, path::PathBuf}; + +use assert_cmd::cargo::cargo_bin; +use assert_cmd::prelude::*; + +use scip_treesitter_cli::io::read_index_from_file; + +lazy_static::lazy_static! { + static ref BINARY_LOCATION: PathBuf = { + match std::env::var("SCIP_CLI_LOCATION") { + Ok(va) => std::env::current_dir().unwrap().join(va), + _ => cargo_bin("scip-treesitter-cli"), + } + }; +} + +use scip_treesitter::snapshot::{dump_document_with_config, EmitSymbol, SnapshotOptions}; + +fn snapshot_syntax_document(doc: &scip::types::Document, source: &str) -> String { + dump_document_with_config( + doc, + source, + SnapshotOptions { + emit_symbol: EmitSymbol::All, + ..Default::default() + }, + ) + .expect("dump document") +} + +#[test] +fn java_e2e_indexing() { + let out_dir = temp_dir(); + let setup = HashMap::from([( + PathBuf::from("globals.java"), + include_str!("../testdata/globals.java").to_string(), + )]); + + run_index(&out_dir, &setup, vec!["--language", "java"]); + + let index = read_index_from_file(out_dir.join("index.scip")); + + for doc in &index.documents { + let path = &doc.relative_path; + let dumped = snapshot_syntax_document(doc, setup.get(&PathBuf::from(&path)).expect("??")); + + insta::assert_snapshot!(path.clone(), dumped); + } +} + +fn prepare(temp: &Path, files: &HashMap) { + for (path, contents) in files.iter() { + let file_path = temp.join(path); + write_file(&file_path, contents); + } +} + +fn run_index(location: &PathBuf, files: &HashMap, extra_arguments: Vec<&str>) { + prepare(location, files); + + let mut base_args = vec!["index"]; + base_args.extend(extra_arguments); + + let mut cmd = Command::new(BINARY_LOCATION.to_str().unwrap()); + + cmd.args(base_args); + + for (path, _) in files.iter() { + cmd.arg(path.to_str().unwrap()); + } + + cmd.current_dir(location); + + cmd.assert().success(); +} + +fn write_file(path: &PathBuf, contents: &String) { + use std::io::Write; + + let output = std::fs::File::create(path).unwrap(); + let mut writer = std::io::BufWriter::new(output); + writer.write_all(contents.as_bytes()).unwrap(); +} diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/snapshots/scip_treesitter_cli__tests__globals.java.snap b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/tests/snapshots/integration_test__globals.java.snap similarity index 98% rename from docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/snapshots/scip_treesitter_cli__tests__globals.java.snap rename to docker-images/syntax-highlighter/crates/scip-treesitter-cli/tests/snapshots/integration_test__globals.java.snap index fb8a7c2a6b711..34027a9afdb55 100644 --- a/docker-images/syntax-highlighter/crates/scip-treesitter-cli/src/snapshots/scip_treesitter_cli__tests__globals.java.snap +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-cli/tests/snapshots/integration_test__globals.java.snap @@ -1,5 +1,5 @@ --- -source: crates/scip-treesitter-cli/src/main.rs +source: crates/scip-treesitter-cli/tests/integration_test.rs expression: dumped --- package MyPackage; diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter-languages/src/parsers.rs b/docker-images/syntax-highlighter/crates/scip-treesitter-languages/src/parsers.rs index 1cd8c4c855632..de0f91556cc4b 100644 --- a/docker-images/syntax-highlighter/crates/scip-treesitter-languages/src/parsers.rs +++ b/docker-images/syntax-highlighter/crates/scip-treesitter-languages/src/parsers.rs @@ -1,3 +1,5 @@ +use std::collections::HashSet; + use tree_sitter::Language; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] @@ -108,6 +110,21 @@ impl BundledParser { } } + pub fn get_language_extensions(&self) -> HashSet<&str> { + let ar = { + match self { + BundledParser::Go => vec!["go"], + BundledParser::Java => vec!["java"], + BundledParser::Javascript => vec!["js"], + BundledParser::Typescript => vec!["ts"], + BundledParser::Python => vec!["py"], + _ => vec![], + } + }; + + HashSet::from_iter(ar) + } + // TODO(SuperAuguste): language detection library pub fn get_parser_from_extension(name: &str) -> Option { match name { diff --git a/docker-images/syntax-highlighter/crates/scip-treesitter/src/types.rs b/docker-images/syntax-highlighter/crates/scip-treesitter/src/types.rs index dbaec91e69c10..23155c7d4442c 100644 --- a/docker-images/syntax-highlighter/crates/scip-treesitter/src/types.rs +++ b/docker-images/syntax-highlighter/crates/scip-treesitter/src/types.rs @@ -1,6 +1,6 @@ use tree_sitter::Node; -#[derive(Debug, PartialEq, Eq, Default)] +#[derive(Debug, PartialEq, Eq, Default, Hash, Copy, Clone)] pub struct PackedRange { pub start_line: i32, pub start_col: i32, @@ -69,11 +69,7 @@ impl PackedRange { impl PartialOrd for PackedRange { fn partial_cmp(&self, other: &Self) -> Option { - (self.start_line, self.end_line, self.start_col).partial_cmp(&( - other.start_line, - other.end_line, - other.start_col, - )) + Some(self.cmp(other)) } } diff --git a/docker-images/syntax-highlighter/crates/sg-syntax/src/lib.rs b/docker-images/syntax-highlighter/crates/sg-syntax/src/lib.rs index 8e4ad0f743ef0..135ba2fbdb1a6 100644 --- a/docker-images/syntax-highlighter/crates/sg-syntax/src/lib.rs +++ b/docker-images/syntax-highlighter/crates/sg-syntax/src/lib.rs @@ -5,8 +5,7 @@ use rocket::serde::json::{json, Value as JsonValue}; use serde::Deserialize; use sg_treesitter::jsonify_err; use syntect::{ - highlighting::ThemeSet, - html::{highlighted_html_for_string, ClassStyle}, + html::ClassStyle, parsing::{SyntaxReference, SyntaxSet}, }; @@ -28,9 +27,6 @@ thread_local! { pub(crate) static SYNTAX_SET: SyntaxSet = SyntaxSet::load_defaults_newlines(); } -lazy_static::lazy_static! { - static ref THEME_SET: ThemeSet = ThemeSet::load_defaults(); -} /// Struct from: internal/gosyntect/gosyntect.go /// @@ -56,16 +52,8 @@ pub struct SourcegraphQuery { // default empty string value for backwards compat with clients who do not specify this field. pub filetype: Option, - // If css is set, the highlighted code will be returned as a HTML table with CSS classes - // annotating the highlighted types. - #[serde(default)] - pub css: bool, - // line_length_limit is ignored if css is false pub line_length_limit: Option, - - // theme is ignored if css is true - pub theme: String, } // NOTE: Keep in sync: internal/gosyntect/gosyntect.go @@ -223,14 +211,6 @@ pub fn determine_language<'a>( } pub fn list_features() { - // List embedded themes. - println!("## Embedded themes:"); - println!(); - for t in THEME_SET.themes.keys() { - println!("- `{}`", t); - } - println!(); - // List supported file extensions. SYNTAX_SET.with(|syntax_set| { println!("## Supported file extensions:"); @@ -250,35 +230,16 @@ pub fn syntect_highlight(q: SourcegraphQuery) -> JsonValue { Err(e) => return e, }; - if q.css { - let output = ClassedTableGenerator::new( - syntax_set, - syntax_def, - &q.code, - q.line_length_limit, - ClassStyle::SpacedPrefixed { prefix: "hl-" }, - ) - .generate(); + let output = ClassedTableGenerator::new( + syntax_set, + syntax_def, + &q.code, + q.line_length_limit, + ClassStyle::SpacedPrefixed { prefix: "hl-" }, + ) + .generate(); - json!({ "data": output, "plaintext": syntax_def.name == "Plain Text", }) - } else { - // TODO(slimsag): return the theme's background color (and other info??) to caller? - // https://github.com/trishume/syntect/blob/c8b47758a3872d478c7fc740782cd468b2c0a96b/examples/synhtml.rs#L24 - - // Determine theme to use. - // - // TODO(slimsag): We could let the query specify the theme file's actual - // bytes? e.g. via `load_from_reader`. - let theme = match THEME_SET.themes.get(&q.theme) { - Some(v) => v, - None => return json!({"error": "invalid theme", "code": "invalid_theme"}), - }; - - json!({ - "data": highlighted_html_for_string(&q.code, syntax_set, syntax_def, theme), - "plaintext": syntax_def.name == "Plain Text", - }) - } + json!({ "data": output, "plaintext": syntax_def.name == "Plain Text", }) }) } @@ -289,9 +250,7 @@ pub fn scip_highlight(q: ScipHighlightQuery) -> Result { extension: "".to_string(), filepath: q.filepath.clone(), filetype: q.filetype.clone(), - css: true, line_length_limit: None, - theme: Default::default(), code: q.code.clone(), }; @@ -342,10 +301,8 @@ mod tests { filepath: "foo.cls".to_string(), filetype: None, code: "%".to_string(), - css: false, line_length_limit: None, extension: String::new(), - theme: String::new(), }; let result = determine_language(&query, &syntax_set); assert_eq!(result.unwrap().name, "TeX"); @@ -358,10 +315,8 @@ mod tests { filepath: "foo.cls".to_string(), filetype: None, code: "/**".to_string(), - css: false, line_length_limit: None, extension: String::new(), - theme: String::new(), }; let result = determine_language(&query, &syntax_set); assert_eq!(result.unwrap().name, "Apex"); diff --git a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_sciptect.rs b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_sciptect.rs index ef8f44be7b6c6..8f1aa313a82a7 100644 --- a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_sciptect.rs +++ b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_sciptect.rs @@ -604,9 +604,7 @@ mod test { extension: filepath.extension().unwrap().to_str().unwrap().to_string(), filepath: filepath.to_str().unwrap().to_string(), filetype: None, - css: false, line_length_limit: None, - theme: "".to_string(), code: contents.clone(), }; let syntax_def = determine_language(&q, &ss).unwrap(); diff --git a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs index a974732c6cc26..76590d8566fca 100644 --- a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs +++ b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_syntect.rs @@ -250,8 +250,6 @@ mod tests { code: "package main\n".to_string(), line_length_limit: None, extension: String::new(), - theme: String::new(), - css: true, }; let expected = "\ \ @@ -280,8 +278,6 @@ mod tests { code: "
    test
    ".to_string(), line_length_limit: Some(10), extension: String::new(), - theme: String::new(), - css: true, }; let expected = "
    \ \ @@ -304,8 +300,6 @@ mod tests { code: "package main\n".to_string(), line_length_limit: Some(5), extension: String::new(), - theme: String::new(), - css: true, }; let expected = "
    \ \ @@ -329,8 +323,6 @@ mod tests { .to_string(), line_length_limit: None, extension: String::new(), - theme: String::new(), - css: true, }; let expected = "
    \ \ @@ -411,8 +403,6 @@ mod tests { .to_string(), line_length_limit: None, extension: String::new(), - theme: String::new(), - css: true, }; let expected = "
    function setupPythonIfNeeded()\n
    \n
    % Python setup is only supported in R2019a (ver 9.6) and later\n
    \n
    if verLessThan('matlab','9.6')\n
    \n
    error("setupPythonIfNeeded:unsupportedVersion","Only version R2019a and later are supported")\n
    \n
    end\n
    \n
    end
    "; diff --git a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_treesitter.rs b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_treesitter.rs index ed22daa81df76..89766be041f3f 100644 --- a/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_treesitter.rs +++ b/docker-images/syntax-highlighter/crates/sg-syntax/src/sg_treesitter.rs @@ -85,7 +85,7 @@ pub fn index_language_with_config( // TODO: Could probably write this in a much better way. let mut local_occs = scip_syntax::get_locals(parser, code.as_bytes()) .unwrap_or(Ok(vec![])) - .unwrap_or(vec![]); + .unwrap_or_default(); // Get ranges in reverse order, because we're going to pop off the back of the list. // (that's why we're sorting the opposite way of the document occurrences above). @@ -343,9 +343,7 @@ SELECT * FROM my_table extension: filepath.extension().unwrap().to_str().unwrap().to_string(), filepath: filepath.to_str().unwrap().to_string(), filetype: None, - css: false, line_length_limit: None, - theme: "".to_string(), code: contents.clone(), }); @@ -400,9 +398,7 @@ SELECT * FROM my_table extension: filepath.extension().unwrap().to_str().unwrap().to_string(), filepath: filepath.to_str().unwrap().to_string(), filetype: None, - css: false, line_length_limit: None, - theme: "".to_string(), code: contents.clone(), }); diff --git a/docker-images/syntax-highlighter/docs/api.md b/docker-images/syntax-highlighter/docs/api.md index 77a03388c5bfb..0b769f8655595 100644 --- a/docker-images/syntax-highlighter/docs/api.md +++ b/docker-images/syntax-highlighter/docs/api.md @@ -11,7 +11,6 @@ - `data` string with syntax highlighted response. The input `code` string [is properly escaped](https://github.com/sourcegraph/syntect_server/blob/ee3810f70e5701b961b7249393dbac8914c162ce/syntect/src/html.rs#L6) and as such can be directly rendered in the browser safely. - `plaintext` boolean indicating whether a syntax could not be found for the file and instead it was rendered as plain text. - An error response (`error` field), one of: - - `{"error": "invalid theme", "code": "invalid_theme"}` - `{"error": "resource not found", "code": "resource_not_found"}` - `GET` to `/health` to receive an `OK` health check response / ensure the service is alive. diff --git a/docker-images/syntax-highlighter/src/bin/scip-dump-response.rs b/docker-images/syntax-highlighter/src/bin/scip-dump-response.rs index bfd5d315dbaf0..bb82fe5719189 100644 --- a/docker-images/syntax-highlighter/src/bin/scip-dump-response.rs +++ b/docker-images/syntax-highlighter/src/bin/scip-dump-response.rs @@ -46,9 +46,7 @@ fn main() -> Result<(), std::io::Error> { code: contents.clone(), filepath: "".to_string(), filetype: None, - css: false, line_length_limit: None, - theme: "".to_string(), }); println!(" filetype: {:?}", filetype); diff --git a/go.mod b/go.mod index 7d35f4069e9df..f07c8d1808bf6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/sourcegraph/sourcegraph -go 1.19 +go 1.21 // Permanent replace directives // ============================ @@ -20,6 +20,11 @@ replace ( // We publish 'lib' as a package for import in other tooling. // When developing Sourcegraph itself, this replace uses the local package instead of a pushed version. github.com/sourcegraph/sourcegraph/lib => ./lib + // We publish 'lib/managedservicesplatform' as a sub-package for import + // private services developed in other repositories, and to avoid bloating + // the more lightweight 'lib' package. + // When developing Sourcegraph itself, this replace uses the local package instead of a pushed version. + github.com/sourcegraph/sourcegraph/lib/managedservicesplatform => ./lib/managedservicesplatform // We publish 'monitoring' as a package for import in other tooling. // When developing Sourcegraph itself, this replace uses the local package instead of a pushed version. github.com/sourcegraph/sourcegraph/monitoring => ./monitoring @@ -55,12 +60,12 @@ replace ( ) require ( - cloud.google.com/go/bigquery v1.55.0 - cloud.google.com/go/kms v1.15.2 - cloud.google.com/go/monitoring v1.16.0 + cloud.google.com/go/bigquery v1.57.1 + cloud.google.com/go/kms v1.15.5 + cloud.google.com/go/monitoring v1.16.3 cloud.google.com/go/profiler v0.3.1 cloud.google.com/go/pubsub v1.33.0 - cloud.google.com/go/secretmanager v1.11.1 + cloud.google.com/go/secretmanager v1.11.4 cloud.google.com/go/storage v1.30.1 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.41.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.17.0 @@ -116,7 +121,7 @@ require ( github.com/gomodule/redigo v2.0.0+incompatible github.com/google/go-cmp v0.6.0 github.com/google/go-querystring v1.1.0 - github.com/google/uuid v1.3.1 + github.com/google/uuid v1.4.0 github.com/gorilla/context v1.1.1 github.com/gorilla/mux v1.8.0 github.com/gorilla/schema v1.2.0 @@ -131,8 +136,8 @@ require ( github.com/hexops/valast v1.4.3 github.com/honeycombio/libhoney-go v1.15.8 github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac - github.com/jackc/pgconn v1.12.1 - github.com/jackc/pgx/v4 v4.16.1 + github.com/jackc/pgconn v1.14.0 + github.com/jackc/pgx/v4 v4.18.1 github.com/joho/godotenv v1.4.0 github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible github.com/json-iterator/go v1.1.12 @@ -164,7 +169,7 @@ require ( github.com/rjeczalik/notify v0.9.3 github.com/russellhaering/gosaml2 v0.9.1 github.com/russellhaering/goxmldsig v1.3.0 - github.com/schollz/progressbar/v3 v3.8.5 + github.com/schollz/progressbar/v3 v3.13.1 github.com/segmentio/fasthash v1.0.3 github.com/segmentio/ksuid v1.0.4 github.com/sergi/go-diff v1.3.1 @@ -182,7 +187,7 @@ require ( github.com/sourcegraph/run v0.12.0 github.com/sourcegraph/scip v0.3.1-0.20230627154934-45df7f6d33fc github.com/sourcegraph/sourcegraph/dev/ci/images v0.0.0-20220203145655-4d2a39d3038a - github.com/sourcegraph/sourcegraph/lib v0.0.0-20230810200548-f8a32bcbd9e3 + github.com/sourcegraph/sourcegraph/lib v0.0.0-20231122233253-1f857814717c github.com/stretchr/testify v1.8.4 github.com/temoto/robotstxt v1.1.2 github.com/throttled/throttled/v2 v2.12.0 @@ -223,18 +228,18 @@ require ( go.uber.org/automaxprocs v1.5.2 go.uber.org/ratelimit v0.2.0 go.uber.org/zap v1.26.0 - golang.org/x/crypto v0.14.0 - golang.org/x/net v0.17.0 - golang.org/x/oauth2 v0.10.0 - golang.org/x/sync v0.3.0 - golang.org/x/sys v0.13.0 - golang.org/x/time v0.3.0 + golang.org/x/crypto v0.15.0 + golang.org/x/net v0.18.0 + golang.org/x/oauth2 v0.14.0 + golang.org/x/sync v0.5.0 + golang.org/x/sys v0.14.0 + golang.org/x/time v0.4.0 // golang.org/x/tools should not be upgraded until https://github.com/bazelbuild/bazel-gazelle/issues/1579 // is resolved. - golang.org/x/tools v0.10.0 + golang.org/x/tools v0.15.0 gonum.org/v1/gonum v0.13.0 - google.golang.org/api v0.132.0 - google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect + google.golang.org/api v0.150.0 + google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/protobuf v1.31.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v2 v2.4.0 @@ -249,6 +254,9 @@ require ( ) require ( + github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai v0.3.0 + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 github.com/aws/constructs-go/constructs/v10 v10.2.69 github.com/aws/jsii-runtime-go v1.84.0 github.com/dghubble/gologin/v2 v2.4.0 @@ -265,6 +273,7 @@ require ( github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa github.com/mitchellh/go-homedir v1.1.0 github.com/mroth/weightedrand/v2 v2.0.1 + github.com/oschwald/maxminddb-golang v1.12.0 github.com/pkoukk/tiktoken-go v0.1.5 github.com/prometheus/statsd_exporter v0.22.7 github.com/qdrant/go-client v1.4.1 @@ -272,18 +281,23 @@ require ( github.com/sourcegraph/managed-services-platform-cdktf/gen/google v0.0.0-20230822024612-edb48c530722 github.com/sourcegraph/managed-services-platform-cdktf/gen/google_beta v0.0.0-20231106184355-f739cf8e1d49 github.com/sourcegraph/managed-services-platform-cdktf/gen/random v0.0.0-20230822024612-edb48c530722 + github.com/sourcegraph/sourcegraph/lib/managedservicesplatform v0.0.0-00010101000000-000000000000 github.com/vektah/gqlparser/v2 v2.4.5 go.opentelemetry.io/collector/config/confighttp v0.81.0 go.opentelemetry.io/collector/config/configtelemetry v0.81.0 go.opentelemetry.io/collector/config/configtls v0.81.0 go.opentelemetry.io/otel/exporters/prometheus v0.39.0 - google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 + google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 + gorm.io/gorm v1.25.5 ) require ( + cloud.google.com/go/cloudsqlconn v1.5.1 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect - cloud.google.com/go/trace v1.10.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.16.1 // indirect + cloud.google.com/go/trace v1.10.4 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.41.0 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/agnivade/levenshtein v1.1.1 // indirect @@ -308,16 +322,18 @@ require ( github.com/emicklei/go-restful/v3 v3.8.0 // indirect github.com/fullstorydev/grpcurl v1.8.6 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/goccy/go-json v0.9.11 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/google/flatbuffers v2.0.8+incompatible // indirect github.com/google/gnostic v0.5.7-v3refs // indirect - github.com/google/s2a-go v0.1.4 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/gosimple/slug v1.12.0 // indirect github.com/gosimple/unidecode v1.0.1 // indirect github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-hclog v1.2.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-slug v0.12.1 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect @@ -325,9 +341,14 @@ require ( github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d // indirect github.com/iancoleman/orderedmap v0.2.0 // indirect github.com/iancoleman/strcase v0.3.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.0 // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgx/v5 v5.5.0 // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/moby/sys/mountinfo v0.6.2 // indirect @@ -341,7 +362,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect github.com/prometheus/prometheus v0.40.5 // indirect github.com/shirou/gopsutil/v3 v3.23.5 // indirect - github.com/sirupsen/logrus v1.9.1 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/skeema/knownhosts v1.1.1 // indirect github.com/smartystreets/assertions v1.13.0 // indirect github.com/vbatts/tar-split v0.11.3 // indirect @@ -364,14 +385,14 @@ require ( go.opentelemetry.io/collector/processor v0.81.0 // indirect go.uber.org/goleak v1.2.1 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect ) require ( bitbucket.org/creachadair/shell v0.0.7 // indirect - cloud.google.com/go v0.110.8 // indirect - cloud.google.com/go/compute v1.23.0 // indirect - cloud.google.com/go/iam v1.1.2 // indirect + cloud.google.com/go v0.110.10 // indirect + cloud.google.com/go/compute v1.23.3 // indirect + cloud.google.com/go/iam v1.1.5 // indirect code.gitea.io/gitea v1.18.0 cuelang.org/go v0.4.3 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect @@ -416,7 +437,7 @@ require ( github.com/cockroachdb/redact v1.1.5 github.com/containerd/typeurl v1.0.2 // indirect github.com/coreos/go-iptables v0.6.0 - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect github.com/dave/jennifer v1.6.1 // indirect github.com/di-wu/xsd-datetime v1.0.0 github.com/djherbis/buffer v1.2.0 // indirect @@ -442,7 +463,7 @@ require ( github.com/go-git/go-billy/v5 v5.4.1 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.2.4 + github.com/go-logr/logr v1.3.0 github.com/go-logr/stdr v1.2.2 github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.3 // indirect @@ -458,7 +479,7 @@ require ( github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.1.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -468,7 +489,7 @@ require ( github.com/gopherjs/gopherwasm v1.1.0 // indirect github.com/gorilla/css v1.0.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.4 // indirect github.com/hashicorp/go-version v1.6.0 @@ -482,8 +503,8 @@ require ( github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect - github.com/jackc/pgtype v1.11.1-0.20220425133820-53266f029fbb + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgtype v1.14.0 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f // indirect @@ -532,9 +553,9 @@ require ( github.com/pkg/profile v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/client_model v0.4.0 + github.com/prometheus/client_model v0.5.0 github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/procfs v0.11.0 // indirect + github.com/prometheus/procfs v0.11.1 // indirect github.com/pseudomuto/protoc-gen-doc v1.5.1 github.com/pseudomuto/protokit v0.2.1 // indirect github.com/rivo/uniseg v0.4.3 // indirect @@ -545,9 +566,10 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/scim2/filter-parser/v2 v2.2.0 github.com/sourcegraph/conc v0.2.0 + github.com/sourcegraph/managed-services-platform-cdktf/gen/postgresql v0.0.0-20231121191755-214be625af21 github.com/sourcegraph/mountinfo v0.0.0-20231018142932-e00da332dac5 github.com/sourcegraph/sourcegraph/monitoring v0.0.0-20230124144931-b2d81b1accb6 - github.com/sourcegraph/zoekt v0.0.0-20231110161813-2355607d5ff8 + github.com/sourcegraph/zoekt v0.0.0-20231129132138-0d03621d45a3 github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect @@ -572,16 +594,17 @@ require ( go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 - golang.org/x/mod v0.12.0 - golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 + golang.org/x/mod v0.14.0 + golang.org/x/term v0.14.0 // indirect + golang.org/x/text v0.14.0 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/grpc v1.57.1 + google.golang.org/grpc v1.59.0 gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gorm.io/driver/postgres v1.5.4 gotest.tools v2.2.0+incompatible k8s.io/klog/v2 v2.80.0 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect diff --git a/go.sum b/go.sum index 60d095c27ac78..3e82e50ed2c46 100644 --- a/go.sum +++ b/go.sum @@ -21,32 +21,37 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= -cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= +cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y= +cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/bigquery v1.55.0 h1:hs44Xxov3XLWQiCx2J8lK5U/ihLqnpm4RVVl5fdtLLI= -cloud.google.com/go/bigquery v1.55.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/bigquery v1.57.1 h1:FiULdbbzUxWD0Y4ZGPSVCDLvqRSyCIO6zKV7E2nf5uA= +cloud.google.com/go/bigquery v1.57.1/go.mod h1:iYzC0tGVWt1jqSzBHqCr3lrRn0u13E8e+AqowBsDgug= +cloud.google.com/go/cloudsqlconn v1.5.1 h1:rMtPv66pkuk2K1ciCicjZY8Ma1DSyOYSoqwPUw/Timo= +cloud.google.com/go/cloudsqlconn v1.5.1/go.mod h1:DPWjhwD5Fhv43M0RP/+7J37xo4PByfNWCzMlKa9OBwE= +cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8= -cloud.google.com/go/datacatalog v1.17.1 h1:qGWrlYvWtK+8jD1jhwq5BsGoSr7S4/LOroV7LwXi00g= +cloud.google.com/go/datacatalog v1.19.0 h1:rbYNmHwvAOOwnW2FPXYkaK3Mf1MmGqRzK0mMiIEyLdo= +cloud.google.com/go/datacatalog v1.19.0/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= -cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= -cloud.google.com/go/kms v1.15.2 h1:lh6qra6oC4AyWe5fUUUBe/S27k12OHAleOOOw6KakdE= -cloud.google.com/go/kms v1.15.2/go.mod h1:3hopT4+7ooWRCjc2DxgnpESFxhIraaI2IpAVUEhbT/w= +cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= +cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= +cloud.google.com/go/kms v1.15.5 h1:pj1sRfut2eRbD9pFRjNnPNg/CzJPuQAzUujMIM1vVeM= +cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI= cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU= -cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= -cloud.google.com/go/monitoring v1.16.0 h1:rlndy4K8yknMY9JuGe2aK4SbCh21FXoCdX7SAGHmRgI= -cloud.google.com/go/monitoring v1.16.0/go.mod h1:Ptp15HgAyM1fNICAojDMoNc/wUmn67mLHQfyqbw+poY= +cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI= +cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg= +cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI= +cloud.google.com/go/monitoring v1.16.3 h1:mf2SN9qSoBtIgiMA4R/y4VADPWZA7VCNJA079qLaZQ8= +cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw= cloud.google.com/go/profiler v0.3.1 h1:b5got9Be9Ia0HVvyt7PavWxXEht15B9lWnigdvHtxOc= cloud.google.com/go/profiler v0.3.1/go.mod h1:GsG14VnmcMFQ9b+kq71wh3EKMZr3WRMgLzNiFRpW7tE= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -55,8 +60,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.33.0 h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g= cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= -cloud.google.com/go/secretmanager v1.11.1 h1:cLTCwAjFh9fKvU6F13Y4L9vPcx9yiWPyWXE4+zkuEQs= -cloud.google.com/go/secretmanager v1.11.1/go.mod h1:znq9JlXgTNdBeQk9TBW/FnR/W4uChEKGeqQWAJ8SXFw= +cloud.google.com/go/secretmanager v1.11.4 h1:krnX9qpG2kR2fJ+u+uNyNo+ACVhplIAS4Pu7u+4gd+k= +cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -64,17 +69,27 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= -cloud.google.com/go/trace v1.10.1 h1:EwGdOLCNfYOOPtgqo+D2sDLZmRCEO1AagRTJCU6ztdg= -cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXdOPAQTYk= +cloud.google.com/go/trace v1.10.4 h1:2qOAuAzNezwW3QN+t41BtkDJOG42HywL73q8x/f6fnM= +cloud.google.com/go/trace v1.10.4/go.mod h1:Nso99EDIK8Mj5/zmB+iGr9dosS/bzWCJ8wGmE6TXNWY= code.gitea.io/gitea v1.18.0 h1:qQXVeKHoFXywWVGGDmTOKxvzOK282EAPTw3qo2bgXAk= code.gitea.io/gitea v1.18.0/go.mod h1:A3dHVUUZ+9ULp0J8AjYF6XBgPsn/J7OZ0X73m7LVQGA= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= +contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= cuelang.org/go v0.4.3 h1:W3oBBjDTm7+IZfCKZAmC8uDG0eYfJL4Pp/xbbCMKaVo= cuelang.org/go v0.4.3/go.mod h1:7805vR9H+VoBNdWFdI7jyDR3QLUPp4+naHfbcgp55HI= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/99designs/gqlgen v0.17.2/go.mod h1:K5fzLKwtph+FFgh9j7nFbRUdBKvTcGnsta51fsMTn3o= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Azure/azure-sdk-for-go v56.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai v0.3.0 h1:x7fb22Q43h2DRFCvp9rAua8PoV3gwtl1bK5+pihnihA= +github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai v0.3.0/go.mod h1:zPJgGMjMheJJrYgrQ4W8NrNCWtWXAkjI3KWYFnTtwdA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= @@ -86,22 +101,27 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk= +github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.16.1 h1:/o9L4jKKshKO6U4q6e5oo0SkVtF5DDNLGK+liqsDt+w= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.16.1/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 h1:tk85AYGwOf6VNtoOQi8w/kVDi2vmPxp3/OU2FsUpdcA= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.41.0 h1:VahL5SjDdCas8mMKARolw2vvBsuLc5oV7XNSbxeMQP8= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.41.0/go.mod h1:T8qLlq6KznHWwp8FEbfw+p7mX/+dezSvUy3PXfTnp4c= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.17.0 h1:DwGeS/9k9xdpnvVQuJF+L9bYNFvBCmCWlDA8d8opoZY= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.17.0/go.mod h1:SUVNJAkkyRKeM3L46/NhFGIz+Kx1zetN09qUs1XbMx8= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.41.0 h1:ZJwvlTjB8GycSRpysdcRv3FztommLDUfgii0VUUp5ys= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.41.0/go.mod h1:Ei53Im4CWT7FHDaMBvmQzZ8p91+X1IAaifp7QF+ewQQ= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.41.0 h1:MWQ81b2TkSLbDpLINiKdZdoht1VMEHCKr4BSZpb/KQ8= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.41.0/go.mod h1:lz6DEePTxmjvYMtusOoS3qDAErC0STi/wmvqJucKY28= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= +github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Khan/genqlient v0.5.0 h1:TMZJ+tl/BpbmGyIBiXzKzUftDhw4ZWxQZ+1ydn0gyII= github.com/Khan/genqlient v0.5.0/go.mod h1:EpIvDVXYm01GP6AXzjA7dKriPTH6GmtpmvTAwUUqIX8= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -143,6 +163,7 @@ github.com/agnivade/levenshtein v1.1.0/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVb github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= github.com/alecthomas/assert/v2 v2.2.0 h1:f6L/b7KE2bfA+9O4FL3CM/xJccDEwPVYd5fALBiuwvw= +github.com/alecthomas/assert/v2 v2.2.0/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA= github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek= github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs= @@ -152,6 +173,7 @@ github.com/alecthomas/kingpin v2.2.6+incompatible h1:5svnBTFgJjZvGKyYBtMB0+m5wvr github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE= +github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -173,6 +195,7 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/v12 v12.0.0 h1:xtZE63VWl7qLdB0JObIXvvhGjoVNrQ9ciIHG2OK5cmc= github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg= @@ -186,6 +209,7 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= @@ -284,6 +308,7 @@ github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -353,6 +378,7 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE= @@ -383,11 +409,13 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4= github.com/crewjam/saml v0.4.13 h1:TYHggH/hwP7eArqiXSJUvtOPNzQDyQ7vwmwEqlFWhMc= github.com/crewjam/saml v0.4.13/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA= @@ -462,12 +490,14 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0= +github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/elimity-com/scim v0.0.0-20220121082953-15165b1a61c8 h1:6fUaAaX4Xe07LhVrHNmpfnlU41Nsto4skz4vhVqGwYk= github.com/elimity-com/scim v0.0.0-20220121082953-15165b1a61c8/go.mod h1:JkjcmqbLW+khwt2fmBPJFBhx2zGZ8XobRZ+O0VhlwWo= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw= +github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -527,6 +557,7 @@ github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmC github.com/gitchander/permutation v0.0.0-20210517125447-a5d73722e1b1 h1:FUKJibWQu771xr/AwLn2/PbVp9AsgqfkObByTf8kJnI= github.com/gitchander/permutation v0.0.0-20210517125447-a5d73722e1b1/go.mod h1:HMJdsfdGgnh5ncvocKE6H8ATmoIQDmBFAgjY+6u/dm0= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= +github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-enry/go-enry/v2 v2.8.4 h1:QrY3hx/RiqCJJRbdU0MOcjfTM1a586J0WSooqdlJIhs= @@ -541,6 +572,7 @@ github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmS github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4= github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= github.com/go-git/go-git/v5 v5.7.0 h1:t9AudWVLmqzlo+4bqdf7GY+46SUuRsx59SboFxkq2aE= github.com/go-git/go-git/v5 v5.7.0/go.mod h1:coJHKEOk5kUClpsNlXrUvPrDxY3w3gjHvhcZd8Fodw8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -560,8 +592,8 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -689,17 +721,20 @@ github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRf github.com/go-redis/redis/v8 v8.4.2/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M= github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Pxt6RJr792+w= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= +github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-redsync/redsync/v4 v4.8.1 h1:rq2RvdTI0obznMdxKUWGdmmulo7lS9yCzb8fgDKOlbM= github.com/go-redsync/redsync/v4 v4.8.1/go.mod h1:LmUAsQuQxhzZAoGY7JS6+dNhNmZyonMZiiEDY9plotM= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= +github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho= github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= @@ -737,8 +772,9 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.1.0-rc.5/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= @@ -759,11 +795,17 @@ github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= +github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= +github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f h1:16RtHeWGkJMc80Etb8RPCcKevXGldr57+LOyZt8zOlg= github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f/go.mod h1:ijRvpgDJDI262hYq/IQVYgf8hd8IHUs93Ol0kvMBAx4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -779,6 +821,7 @@ github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -852,6 +895,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -867,15 +911,15 @@ github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8I github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs= github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= -github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= @@ -933,8 +977,8 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0/go.mod h1:w9Y7gY31krpLmrV github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 h1:RoziI+96HlQWrbaVhgOOdFYUHtX81pwA6tCgDS9FNRo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1/go.mod h1:Rj8lEaVgLiPn1jTMVXEhATiZhuyXJq167bMYPbJM1CY= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -952,7 +996,8 @@ github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9 github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs= +github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= +github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= @@ -977,6 +1022,7 @@ github.com/hashicorp/go-tfe v1.32.1/go.mod h1:Js4M/3kv14oTBlvLxqh0bbrWfosmNsEb9a github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -1008,6 +1054,7 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hexops/autogold v0.8.1/go.mod h1:97HLDXyG23akzAoRYJh/2OBs3kd80eHyKPvZw0S5ZBY= github.com/hexops/autogold v1.3.1 h1:YgxF9OHWbEIUjhDbpnLhgVsjUDsiHDTyDfy2lrfdlzo= +github.com/hexops/autogold v1.3.1/go.mod h1:sQO+mQUCVfxOKPht+ipDSkJ2SCJ7BNJVHZexsXqWMx4= github.com/hexops/autogold/v2 v2.1.0 h1:5s9J6CROngFPkgowSkV20bIflBrImSdDqIpoXJeZSkU= github.com/hexops/autogold/v2 v2.1.0/go.mod h1:cYVc0tJn6v9Uf9xMOHvmH6scuTxsVJSxGcKR/yOVPzY= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= @@ -1052,8 +1099,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.12.1 h1:rsDFzIpRk7xT4B8FufgpCCeyjdNpKyghZeSefViE5W8= -github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono= +github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= +github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa h1:s+4MhCQ6YrzisK6hFJUX53drDT4UsSW3DEhKn0ifuHw= github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= @@ -1071,27 +1118,31 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.3.0 h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y= -github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= -github.com/jackc/pgtype v1.11.1-0.20220425133820-53266f029fbb h1:MRSWOsXwvdLExF8roCltbid5ADD917dy1S3fgI+OHVE= -github.com/jackc/pgtype v1.11.1-0.20220425133820-53266f029fbb/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y= -github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ= +github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= +github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/pgx/v5 v5.5.0 h1:NxstgwndsTRy7eq9/kqYc/BZh5w2hHJV86wjvO+1xPw= +github.com/jackc/pgx/v5 v5.5.0/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a h1:d4+I1YEKVmWZrgkt6jpXBnLgV2ZjO0YxEtLDdfIZfH4= @@ -1107,6 +1158,10 @@ github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuT github.com/jhump/protoreflect v1.12.0/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753 h1:uFlcJKZPLQd7rmOY/RrvBuUaYmAFnlFHKLivhO6cOy8= github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -1190,6 +1245,7 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -1244,6 +1300,7 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= @@ -1262,6 +1319,8 @@ github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rf github.com/microcosm-cc/bluemonday v1.0.17/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY= github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4= +github.com/microsoft/go-mssqldb v1.6.0 h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67NNNpc= +github.com/microsoft/go-mssqldb v1.6.0/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= @@ -1385,6 +1444,8 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.13 h1:nV98dkBpqaYbDnhefmOQ+Rn4hE+jD6AtjYHXaU5WyJI= github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.13/go.mod h1:4OjcxgwdXzezqytxN534MooNmrxRD50geWZxTD7845s= +github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs= +github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY= github.com/pandatix/go-cvss v0.5.2 h1:9441i+Sn/P/TP9kNBl3kI7mwYtNYFr1eN8JdsiybiMM= github.com/pandatix/go-cvss v0.5.2/go.mod h1:u4HcNBqA9IY6PZHuH8Pac4VaGv5iAMyiXMex/FIfxcg= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -1406,6 +1467,7 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= @@ -1429,6 +1491,7 @@ github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:Om github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= @@ -1440,8 +1503,8 @@ github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1: github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= @@ -1451,14 +1514,15 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= -github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/prometheus/prometheus v0.40.5 h1:wmk5yNrQlkQ2OvZucMhUB4k78AVfG34szb1UtopS8Vc= github.com/prometheus/prometheus v0.40.5/go.mod h1:bxgdmtoSNLmmIVPGmeTJ3OiP67VmuY4yalE4ZP6L/j8= github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc h1:gSVONBi2HWMFXCa9jFdYvYk7IwW/mTLxWOF7rXS4LO0= +github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc/go.mod h1:KbKfKPy2I6ecOIGA9apfheFv14+P3RSmmQvshofQyMY= github.com/pseudomuto/protoc-gen-doc v1.5.1 h1:Ah259kcrio7Ix1Rhb6u8FCaOkzf9qRBqXnvAufg061w= github.com/pseudomuto/protoc-gen-doc v1.5.1/go.mod h1:XpMKYg6zkcpgfpCfQ8GcWBDRtRxOmMR5w7pz4Xo+dYM= github.com/pseudomuto/protokit v0.2.1 h1:kCYpE3thoR6Esm0CUvd5xbrDTOZPvQPTDeyXpZfrJdk= @@ -1512,8 +1576,8 @@ github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIH github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/schollz/progressbar/v3 v3.8.5 h1:VcmmNRO+eFN3B0m5dta6FXYXY+MEJmXdWoIS+jjssQM= -github.com/schollz/progressbar/v3 v3.8.5/go.mod h1:ewO25kD7ZlaJFTvMeOItkOZa8kXu1UvFs379htE8HMQ= +github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE= +github.com/schollz/progressbar/v3 v3.13.1/go.mod h1:xvrbki8kfT1fzWzBT/UZd9L6GA+jdL7HAgq2RFnO6fQ= github.com/scim2/filter-parser/v2 v2.2.0 h1:QGadEcsmypxg8gYChRSM2j1edLyE/2j72j+hdmI4BJM= github.com/scim2/filter-parser/v2 v2.2.0/go.mod h1:jWnkDToqX/Y0ugz0P5VvpVEUKcWcyHHj+X+je9ce5JA= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= @@ -1543,8 +1607,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/sirupsen/logrus v1.9.1 h1:Ou41VVR3nMWWmTiEUnj0OlsgOSCUFgsPAOl6jRIcVtQ= -github.com/sirupsen/logrus v1.9.1/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/skeema/knownhosts v1.1.1 h1:MTk78x9FPgDFVFkDLTrsnnfCJl7g1C/nnKvePgrIngE= github.com/skeema/knownhosts v1.1.1/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo= github.com/slack-go/slack v0.10.1 h1:BGbxa0kMsGEvLOEoZmYs8T1wWfoZXwmQFBb6FgYCXUA= @@ -1587,6 +1651,8 @@ github.com/sourcegraph/managed-services-platform-cdktf/gen/google v0.0.0-2023082 github.com/sourcegraph/managed-services-platform-cdktf/gen/google v0.0.0-20230822024612-edb48c530722/go.mod h1:P1liUcPEczidOp1kyPvi2eqil4243IuPJ+tCOASCHEk= github.com/sourcegraph/managed-services-platform-cdktf/gen/google_beta v0.0.0-20231106184355-f739cf8e1d49 h1:3rJiF4VGyStWXrqJtVlXBJnpe82Q1k9k74dElVPolR8= github.com/sourcegraph/managed-services-platform-cdktf/gen/google_beta v0.0.0-20231106184355-f739cf8e1d49/go.mod h1:/z34dv4NLXti+0VQsUoRTXBeH6n7OWtPv/iWFX6z5dg= +github.com/sourcegraph/managed-services-platform-cdktf/gen/postgresql v0.0.0-20231121191755-214be625af21 h1:7TTODwd/f0hhqmZhbQcKXSkoxSx9OczTWgWPBTxVOrA= +github.com/sourcegraph/managed-services-platform-cdktf/gen/postgresql v0.0.0-20231121191755-214be625af21/go.mod h1:lQ1E8rSHgTmL8GmtcQFXS75rqQrCmuQRXZWh7A+Fp6s= github.com/sourcegraph/managed-services-platform-cdktf/gen/random v0.0.0-20230822024612-edb48c530722 h1:N0OxHqeujHxvVU666KQY9whauLyw4s3BJGBLxx6gKR0= github.com/sourcegraph/managed-services-platform-cdktf/gen/random v0.0.0-20230822024612-edb48c530722/go.mod h1:TiUqRvYs/Gah8bGw/toyVWCaP3dnCB4tBh3jf5HGdo0= github.com/sourcegraph/mountinfo v0.0.0-20231018142932-e00da332dac5 h1:2lUb58rz1bq77wL3hb6OBT58uBVtlNs1o23Kahfj/kU= @@ -1599,8 +1665,8 @@ github.com/sourcegraph/tiktoken-go v0.0.0-20230905173153-caab340cf008 h1:Wu8W50q github.com/sourcegraph/tiktoken-go v0.0.0-20230905173153-caab340cf008/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/sourcegraph/zoekt v0.0.0-20231110161813-2355607d5ff8 h1:6+khC/kBCn1Am0TX4ne4fwqKGdY02BZgm/gKNKppNnA= -github.com/sourcegraph/zoekt v0.0.0-20231110161813-2355607d5ff8/go.mod h1:WVDDy51tFgeKy8zXtujTSbqzgyJrqhrLC9sjWiEfAII= +github.com/sourcegraph/zoekt v0.0.0-20231129132138-0d03621d45a3 h1:nhxLVoE/muGcygm76NwutJC4fQ1IVgkNXY7xOLGnDI8= +github.com/sourcegraph/zoekt v0.0.0-20231129132138-0d03621d45a3/go.mod h1:bWvtH95V0T8hHKS3wWyo5aYDXiDKlObq5kC7nltqXqk= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v0.0.0-20170901052352-ee1bd8ee15a1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -1750,6 +1816,7 @@ github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= +github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= @@ -1834,6 +1901,7 @@ go.opentelemetry.io/collector/receiver v0.81.0/go.mod h1:q80JkMxVLnk0vWxoTRY2J7F go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 h1:ewVbfATnAeQkwFK3r0dpFKCXcTb8HJKX4AixUioRt+c= go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0/go.mod h1:LGuSMVdOq5Zq+CEHF9YBHMaOIUZrzqW7DQGqo9g0dJA= go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw= +go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= go.opentelemetry.io/contrib/detectors/gcp v1.17.0 h1:SsuF2+gqrnmTKSz+KLXcx3A4A7PZXqbuRZbm4I6HcX0= go.opentelemetry.io/contrib/detectors/gcp v1.17.0/go.mod h1:kYzEwPGh9npjtpbJ+Qq/gN7ARi2PkvkvYARA/kWqkMs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= @@ -1926,14 +1994,13 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1977,8 +2044,8 @@ golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2045,8 +2112,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2061,8 +2128,8 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= -golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= +golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0= +golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2079,8 +2146,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2182,8 +2249,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -2191,8 +2258,8 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= +golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2208,14 +2275,14 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= +golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2293,8 +2360,8 @@ golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= -golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= +golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= +golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2329,8 +2396,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.132.0 h1:8t2/+qZ26kAOGSmOiHwVycqVaDg7q3JDILrNi/Z6rvc= -google.golang.org/api v0.132.0/go.mod h1:AeTBC6GpJnJSRJjktDcPX0QwtS8pGYZOV6MSuSCusw0= +google.golang.org/api v0.150.0 h1:Z9k22qD289SZ8gCJrk4DrWXkNjtfvKAUo/l1ma8eBYE= +google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2384,12 +2451,12 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 h1:vlzZttNJGVqTsRFU9AmdnrcO1Znh8Ew9kCD//yjigk0= -google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= -google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 h1:U7+wNaVuSTaUqNvK2+osJ9ejEZxbjHHk8F2b6Hpx0AE= -google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:RdyHbowztCGQySiCvQPgWQWgWhGnouTdCflKoDBt32U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b h1:tdhlmiMZNpc5p2W5qqKgRrOubaMZ3c85uG/GJtGgL98= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4 h1:W12Pwm4urIbRdGhMEg2NM9O3TWKjNcxQhs46V0ypf/k= +google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= +google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 h1:ZcOkrmX74HbKFYnpPY8Qsw93fC29TbJXspYKaBkSXDQ= +google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -2416,9 +2483,8 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0-dev.0.20220218222403-011544f72939/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg= -google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -2479,9 +2545,14 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/postgres v1.5.4 h1:Iyrp9Meh3GmbSuyIAGyjkN+n9K+GHX9b9MqsTL4EJCo= +gorm.io/driver/postgres v1.5.4/go.mod h1:Bgo89+h0CRcdA33Y6frlaHHVuTdOf87pmyzwW9C/BH0= +gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= +gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/accesstoken/personal_access_token.go b/internal/accesstoken/personal_access_token.go index 6b7bc21589e02..ffbd1fc3ec6c1 100644 --- a/internal/accesstoken/personal_access_token.go +++ b/internal/accesstoken/personal_access_token.go @@ -39,7 +39,7 @@ func ParsePersonalAccessToken(token string) (string, error) { // GeneratePersonalAccessToken generates a new personal access token. // It returns the full token string, and the byte representation of the access token. // Personal access tokens have the form: sgp__ -func GeneratePersonalAccessToken(includeInstanceIdentifier bool, licenseKey string, isDevInstance bool) (string, [20]byte, error) { +func GeneratePersonalAccessToken(licenseKey string, isDevInstance bool) (string, [20]byte, error) { var b [20]byte if _, err := rand.Read(b[:]); err != nil { return "", b, err @@ -48,17 +48,15 @@ func GeneratePersonalAccessToken(includeInstanceIdentifier bool, licenseKey stri // Include part of the hashed license key in the token, to allow us to tie tokens back to an instance // If no license key is set or this is a dev instance, use a placeholder value var instanceIdentifier string - if includeInstanceIdentifier { - if isDevInstance || licenseKey == "" { - instanceIdentifier = LocalInstanceIdentifier - } else { - h := hmac.New(sha256.New, []byte(InstanceIdentifierHmacKey)) - h.Write([]byte(licenseKey)) + if isDevInstance || licenseKey == "" { + instanceIdentifier = LocalInstanceIdentifier + } else { + h := hmac.New(sha256.New, []byte(InstanceIdentifierHmacKey)) + h.Write([]byte(licenseKey)) - instanceIdentifier = hex.EncodeToString(h.Sum(nil))[:InstanceIdentifierLength] - } - instanceIdentifier = instanceIdentifier + "_" + instanceIdentifier = hex.EncodeToString(h.Sum(nil))[:InstanceIdentifierLength] } + instanceIdentifier = instanceIdentifier + "_" token := fmt.Sprintf("%s%s%s", PersonalAccessTokenPrefix, instanceIdentifier, hex.EncodeToString(b[:])) diff --git a/internal/accesstoken/personal_access_token_test.go b/internal/accesstoken/personal_access_token_test.go index 4a9b36f135c46..de8ce573e246d 100644 --- a/internal/accesstoken/personal_access_token_test.go +++ b/internal/accesstoken/personal_access_token_test.go @@ -93,9 +93,8 @@ func TestParsePersonalAccessToken(t *testing.T) { func TestGeneratePersonalAccessToken(t *testing.T) { type args struct { - licenseKey string - isDevInstance bool - includeInstanceIdentifier bool + licenseKey string + isDevInstance bool } tests := []struct { name string @@ -108,9 +107,8 @@ func TestGeneratePersonalAccessToken(t *testing.T) { { name: "valid token generation 1", args: args{ - licenseKey: "abcdef1234abcdef1234abcdef1234abcdef1234", - isDevInstance: false, - includeInstanceIdentifier: true, + licenseKey: "abcdef1234abcdef1234abcdef1234abcdef1234", + isDevInstance: false, }, wantTokenPrefix: "sgp_5e37db464e9301ea_", wantTokenLength: 61, @@ -119,9 +117,8 @@ func TestGeneratePersonalAccessToken(t *testing.T) { { name: "valid token generation 2", args: args{ - licenseKey: "foobar", - isDevInstance: false, - includeInstanceIdentifier: true, + licenseKey: "foobar", + isDevInstance: false, }, wantTokenPrefix: "sgp_8844b0e0e754ec66_", wantTokenLength: 61, @@ -130,51 +127,17 @@ func TestGeneratePersonalAccessToken(t *testing.T) { { name: "valid token generation, dev instance", args: args{ - licenseKey: "abcdef1234abcdef1234abcdef1234abcdef1234", - isDevInstance: true, - includeInstanceIdentifier: true, + licenseKey: "abcdef1234abcdef1234abcdef1234abcdef1234", + isDevInstance: true, }, wantTokenPrefix: "sgp_local_", wantTokenLength: 50, wantErr: false, }, - { - name: "valid token generation, no identifier", - args: args{ - licenseKey: "abcdef1234abcdef1234abcdef1234abcdef1234", - isDevInstance: false, - includeInstanceIdentifier: false, - }, - wantTokenPrefix: "sgp_", - wantTokenLength: 44, - wantErr: false, - }, - { - name: "valid token generation, no identifier", - args: args{ - licenseKey: "", - isDevInstance: false, - includeInstanceIdentifier: false, - }, - wantTokenPrefix: "sgp_", - wantTokenLength: 44, - wantErr: false, - }, - { - name: "valid token generation, no identifier", - args: args{ - licenseKey: "", - isDevInstance: true, - includeInstanceIdentifier: false, - }, - wantTokenPrefix: "sgp_", - wantTokenLength: 44, - wantErr: false, - }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - token, _, err := GeneratePersonalAccessToken(tt.args.includeInstanceIdentifier, tt.args.licenseKey, tt.args.isDevInstance) + token, _, err := GeneratePersonalAccessToken(tt.args.licenseKey, tt.args.isDevInstance) if (err != nil) != tt.wantErr { t.Errorf("GeneratePersonalAccessToken() error = %v, wantErr %v", err, tt.wantErr) return diff --git a/internal/actor/http.go b/internal/actor/http.go index a008fc64df464..fc301947bba4e 100644 --- a/internal/actor/http.go +++ b/internal/actor/http.go @@ -60,6 +60,8 @@ var ( // // 🚨 SECURITY: Wherever possible, prefer to act in the context of a specific user rather // than as an internal actor, which can grant a lot of access in some cases. +// +// TODO(@bobheadxi): Migrate to httpcli.Doer and httpcli.Middleware type HTTPTransport struct { RoundTripper http.RoundTripper } @@ -72,6 +74,10 @@ func (t *HTTPTransport) RoundTrip(req *http.Request) (*http.Response, error) { t.RoundTripper = http.DefaultTransport } + // RoundTripper should not modify original request. All the code paths + // below set a header, so we clone the request immediately. + req = req.Clone(req.Context()) + actor := FromContext(req.Context()) path := getCondensedURLPath(req.URL.Path) switch { diff --git a/internal/api/internalapi/BUILD.bazel b/internal/api/internalapi/BUILD.bazel index 12d602c3e2386..cabf8db6d3c3e 100644 --- a/internal/api/internalapi/BUILD.bazel +++ b/internal/api/internalapi/BUILD.bazel @@ -14,7 +14,6 @@ go_library( "//internal/env", "//internal/grpc/defaults", "//internal/httpcli", - "//internal/syncx", "//lib/errors", "@com_github_prometheus_client_golang//prometheus", "@com_github_prometheus_client_golang//prometheus/promauto", diff --git a/internal/api/internalapi/client.go b/internal/api/internalapi/client.go index f465876d59bc7..b9f31635f2f8d 100644 --- a/internal/api/internalapi/client.go +++ b/internal/api/internalapi/client.go @@ -10,6 +10,7 @@ import ( "net/url" "strconv" "strings" + "sync" "time" "github.com/prometheus/client_golang/prometheus" @@ -24,7 +25,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/grpc/defaults" "github.com/sourcegraph/sourcegraph/internal/httpcli" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -53,7 +53,7 @@ type internalClient struct { var Client = &internalClient{ URL: frontendInternal.String(), - getConfClient: syncx.OnceValues(func() (proto.ConfigServiceClient, error) { + getConfClient: sync.OnceValues(func() (proto.ConfigServiceClient, error) { logger := log.Scoped("internalapi") conn, err := defaults.Dial(frontendInternal.Host, logger) if err != nil { diff --git a/internal/api/internalapi/v1/BUILD.bazel b/internal/api/internalapi/v1/BUILD.bazel index befdd6dc6c678..93f28f292228d 100644 --- a/internal/api/internalapi/v1/BUILD.bazel +++ b/internal/api/internalapi/v1/BUILD.bazel @@ -1,7 +1,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@rules_proto//proto:defs.bzl", "proto_library") -load("//dev:proto.bzl", "write_proto_stubs_to_source") exports_files(["buf.gen.yaml"]) diff --git a/internal/apptoken/apptoken.go b/internal/apptoken/apptoken.go index 91adce7e2189c..88640a884f742 100644 --- a/internal/apptoken/apptoken.go +++ b/internal/apptoken/apptoken.go @@ -73,7 +73,8 @@ func isExistingAppTokenPresent(ctx context.Context, db database.DB, appTokenFile } // Validate the token to confirm that it will be accepted by the API. - subjectUserId, err := db.AccessTokens().Lookup(ctx, payload.Token, appTokenScope) + subjectUserId, err := db.AccessTokens().Lookup(ctx, payload.Token, + database.TokenLookupOpts{RequiredScope: appTokenScope}) if err != nil { return false } @@ -103,7 +104,7 @@ func createAppTokenFile(ctx context.Context, db database.DB, appTokenFilePath st return err } - err = os.WriteFile(appTokenFilePath, appTokenFileBody, 0644) + err = os.WriteFile(appTokenFilePath, appTokenFileBody, 0o644) if err != nil { return err } diff --git a/internal/auth/userpasswd/app.go b/internal/auth/userpasswd/app.go index 9cee619fb1041..55285624f9756 100644 --- a/internal/auth/userpasswd/app.go +++ b/internal/auth/userpasswd/app.go @@ -13,7 +13,6 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" - sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/apptoken" "github.com/sourcegraph/sourcegraph/internal/conf/deploy" "github.com/sourcegraph/sourcegraph/internal/database" @@ -97,11 +96,7 @@ func AppSignInMiddleware(db database.DB, handler func(w http.ResponseWriter, r * return errors.Wrap(err, "Failed to find admin account") } - // Write the session cookie - actor := sgactor.Actor{ - UID: user.ID, - } - if err := session.SetActor(w, r, &actor, 0, user.CreatedAt); err != nil { + if _, err := session.SetActorFromUser(r.Context(), w, r, user, 0); err != nil { return errors.Wrap(err, "Could not create new user session") } diff --git a/internal/auth/userpasswd/handlers.go b/internal/auth/userpasswd/handlers.go index 4a26626b24962..901990aabfdda 100644 --- a/internal/auth/userpasswd/handlers.go +++ b/internal/auth/userpasswd/handlers.go @@ -12,7 +12,6 @@ import ( "github.com/gorilla/mux" "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf/deploy" "github.com/sourcegraph/sourcegraph/internal/lazyregexp" "github.com/sourcegraph/sourcegraph/internal/security" @@ -109,7 +108,8 @@ func checkEmailAbuse(ctx context.Context, db database.DB, addr string) (abused b // 🚨 SECURITY: Any change to this function could introduce security exploits // and/or break sign up / initial admin account creation. Be careful. func handleSignUp(logger log.Logger, db database.DB, eventRecorder *telemetry.EventRecorder, - w http.ResponseWriter, r *http.Request, failIfNewUserIsNotInitialSiteAdmin bool) { + w http.ResponseWriter, r *http.Request, failIfNewUserIsNotInitialSiteAdmin bool, +) { if r.Method != "POST" { http.Error(w, fmt.Sprintf("unsupported method %s", r.Method), http.StatusBadRequest) return @@ -125,10 +125,8 @@ func handleSignUp(logger log.Logger, db database.DB, eventRecorder *telemetry.Ev return } - // Write the session cookie - a := &sgactor.Actor{UID: usr.ID} - if err := session.SetActor(w, r, a, 0, usr.CreatedAt); err != nil { - httpLogError(logger.Error, w, "Could not create new user session", http.StatusInternalServerError, log.Error(err)) + if _, err := session.SetActorFromUser(r.Context(), w, r, usr, 0); err != nil { + httpLogError(logger.Error, w, fmt.Sprintf("Could not create new user session: %s", err.Error()), http.StatusInternalServerError, log.Error(err)) } // Track user data @@ -373,17 +371,10 @@ func HandleSignIn(logger log.Logger, db database.DB, store LockoutStore, recorde return } - // We are now an authenticated actor - act := sgactor.Actor{ - UID: user.ID, - } - - // Make sure we're in the context of our newly signed in user - ctx = actor.WithActor(ctx, &act) - // Write the session cookie - if err := session.SetActor(w, r, &act, 0, user.CreatedAt); err != nil { - httpLogError(logger.Error, w, "Could not create new user session", http.StatusInternalServerError, log.Error(err)) + ctx, err = session.SetActorFromUser(ctx, w, r, &user, 0) + if err != nil { + httpLogError(logger.Error, w, fmt.Sprintf("Could not create new user session: %s", err.Error()), http.StatusInternalServerError, log.Error(err)) return } diff --git a/internal/authz/perms.go b/internal/authz/perms.go index b1ee88d1a1820..5251d45235c7c 100644 --- a/internal/authz/perms.go +++ b/internal/authz/perms.go @@ -1,6 +1,7 @@ package authz import ( + "cmp" "fmt" "strings" "time" @@ -199,7 +200,7 @@ type UserPendingPermissions struct { // GenerateSortedIDsSlice returns a sorted slice of the IDs set. func (p *UserPendingPermissions) GenerateSortedIDsSlice() []int32 { - return p.IDs.Sorted(collections.NaturalCompare[int32]) + return p.IDs.Sorted(cmp.Less[int32]) } func (p *UserPendingPermissions) Attrs() []attribute.KeyValue { diff --git a/internal/authz/providers/BUILD.bazel b/internal/authz/providers/BUILD.bazel index ba16261bbfda1..d866e38bb8162 100644 --- a/internal/authz/providers/BUILD.bazel +++ b/internal/authz/providers/BUILD.bazel @@ -19,6 +19,7 @@ go_library( "//internal/conf/conftypes", "//internal/database", "//internal/extsvc", + "//internal/httpcli", "//internal/licensing", "//internal/types", "//lib/errors", diff --git a/internal/authz/providers/authz.go b/internal/authz/providers/authz.go index 4873fa5ce53a7..f0a64f6b377ed 100644 --- a/internal/authz/providers/authz.go +++ b/internal/authz/providers/authz.go @@ -19,6 +19,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -166,7 +167,7 @@ func ProvidersFromConfig( initResult.Append(perforce.NewAuthzProviders(perforceConns)) initResult.Append(bitbucketcloud.NewAuthzProviders(db, bitbucketCloudConns, cfg.SiteConfig().AuthProviders)) initResult.Append(gerrit.NewAuthzProviders(gerritConns, cfg.SiteConfig().AuthProviders)) - initResult.Append(azuredevops.NewAuthzProviders(db, azuredevopsConns)) + initResult.Append(azuredevops.NewAuthzProviders(db, azuredevopsConns, httpcli.ExternalClient)) return allowAccessByDefault, initResult.Providers, initResult.Problems, initResult.Warnings, initResult.InvalidConnections } diff --git a/internal/authz/providers/authz_test.go b/internal/authz/providers/authz_test.go index af0cae4acd4a3..3d5cb2cad30bb 100644 --- a/internal/authz/providers/authz_test.go +++ b/internal/authz/providers/authz_test.go @@ -1098,6 +1098,16 @@ func TestValidateExternalServiceConfig(t *testing.T) { }`, assert: equals(""), }, + { + kind: extsvc.KindBitbucketCloud, + desc: "valid with url, accessToken", + config: ` + { + "url": "https://bitbucket.org/", + "accessToken": "access-token" + }`, + assert: equals(""), + }, { kind: extsvc.KindBitbucketCloud, desc: "valid with url, username, appPassword, teams", @@ -1112,12 +1122,10 @@ func TestValidateExternalServiceConfig(t *testing.T) { }, { kind: extsvc.KindBitbucketCloud, - desc: "without url, username nor appPassword", + desc: "without url", config: `{}`, assert: includes( "url is required", - "username is required", - "appPassword is required", ), }, { diff --git a/internal/authz/providers/azuredevops/BUILD.bazel b/internal/authz/providers/azuredevops/BUILD.bazel index e21819ac0297e..ee75c1628bc90 100644 --- a/internal/authz/providers/azuredevops/BUILD.bazel +++ b/internal/authz/providers/azuredevops/BUILD.bazel @@ -35,6 +35,7 @@ go_test( "//internal/database/dbmocks", "//internal/extsvc", "//internal/extsvc/azuredevops", + "//internal/httpcli", "//internal/licensing", "//internal/ratelimit", "//internal/rcache", diff --git a/internal/authz/providers/azuredevops/provider.go b/internal/authz/providers/azuredevops/provider.go index baaa87447c0c4..5102b74807466 100644 --- a/internal/authz/providers/azuredevops/provider.go +++ b/internal/authz/providers/azuredevops/provider.go @@ -9,6 +9,7 @@ import ( "time" "github.com/sourcegraph/log" + "github.com/sourcegraph/sourcegraph/internal/authz" authztypes "github.com/sourcegraph/sourcegraph/internal/authz/types" "github.com/sourcegraph/sourcegraph/internal/database" @@ -23,7 +24,7 @@ import ( var mockServerURL string -func NewAuthzProviders(db database.DB, conns []*types.AzureDevOpsConnection) *authztypes.ProviderInitResult { +func NewAuthzProviders(db database.DB, conns []*types.AzureDevOpsConnection, httpClient *http.Client) *authztypes.ProviderInitResult { orgs, projects := map[string]struct{}{}, map[string]struct{}{} authorizedConnections := []*types.AzureDevOpsConnection{} @@ -57,7 +58,7 @@ func NewAuthzProviders(db database.DB, conns []*types.AzureDevOpsConnection) *au return initResults } - p, err := newAuthzProvider(db, authorizedConnections, orgs, projects) + p, err := newAuthzProvider(db, authorizedConnections, orgs, projects, httpClient) if err != nil { initResults.InvalidConnections = append(initResults.InvalidConnections, extsvc.TypeAzureDevOps) initResults.Problems = append(initResults.Problems, err.Error()) @@ -68,7 +69,7 @@ func NewAuthzProviders(db database.DB, conns []*types.AzureDevOpsConnection) *au return initResults } -func newAuthzProvider(db database.DB, conns []*types.AzureDevOpsConnection, orgs, projects map[string]struct{}) (*Provider, error) { +func newAuthzProvider(db database.DB, conns []*types.AzureDevOpsConnection, orgs, projects map[string]struct{}, httpClient *http.Client) (*Provider, error) { if err := licensing.Check(licensing.FeatureACLs); err != nil { return nil, err } @@ -79,12 +80,13 @@ func newAuthzProvider(db database.DB, conns []*types.AzureDevOpsConnection, orgs } return &Provider{ - db: db, - urn: "azuredevops:authzprovider", - conns: conns, - codeHost: extsvc.NewCodeHost(u, extsvc.TypeAzureDevOps), - orgs: orgs, - projects: projects, + db: db, + urn: "azuredevops:authzprovider", + conns: conns, + codeHost: extsvc.NewCodeHost(u, extsvc.TypeAzureDevOps), + orgs: orgs, + projects: projects, + httpClient: httpClient, }, nil } @@ -99,7 +101,8 @@ type Provider struct { // orgs is the set of orgs as configured across all the code host connections. orgs map[string]struct{} // projects is the set of projects as configured across all the code host connections. - projects map[string]struct{} + projects map[string]struct{} + httpClient *http.Client } func (p *Provider) FetchAccount(_ context.Context, _ *types.User, _ []*extsvc.Account, _ []string) (*extsvc.Account, error) { @@ -144,7 +147,7 @@ func (p *Provider) FetchUserPerms(ctx context.Context, account *extsvc.Account, p.ServiceID(), apiURL, oauthToken, - nil, + p.httpClient, ) if err != nil { return nil, errors.Wrapf( @@ -291,7 +294,7 @@ func (p *Provider) ValidateConnection(ctx context.Context) error { Username: conn.Username, Password: conn.Token, }, - nil, + p.httpClient, ) if err != nil { allErrors = append(allErrors, fmt.Sprintf("%s:%s", conn.URN, err.Error())) diff --git a/internal/authz/providers/azuredevops/provider_test.go b/internal/authz/providers/azuredevops/provider_test.go index b795d96ffad00..fda0a8b3d14b3 100644 --- a/internal/authz/providers/azuredevops/provider_test.go +++ b/internal/authz/providers/azuredevops/provider_test.go @@ -16,6 +16,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/extsvc/azuredevops" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/internal/rcache" @@ -117,7 +118,7 @@ func TestProvider_NewAuthzProviders(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { licensing.MockCheckFeature = tc.mockCheckFeature - result := NewAuthzProviders(db, tc.connections) + result := NewAuthzProviders(db, tc.connections, httpcli.TestExternalClient) if diff := cmp.Diff(tc.expectedInvalidConnections, result.InvalidConnections); diff != "" { t.Errorf("mismatched InvalidConnections (-want, +got)\n%s", diff) @@ -642,7 +643,7 @@ func TestProvider_FetchUserPerms(t *testing.T) { URN: "", AzureDevOpsConnection: tc.connection, }, - }) + }, httpcli.TestExternalClient) // We don't need to test for the inner type yet. Asserting the length is sufficient. if len(expectedProviders) != len(result.Providers) { @@ -729,7 +730,7 @@ func TestProvider_FetchUserPerms(t *testing.T) { Projects: []string{"solar/system", "milky/way"}, }, }, - }) + }, httpcli.TestExternalClient) if len(result.Providers) == 0 { t.Fatal("No providers found, expected one") @@ -894,7 +895,7 @@ func Test_ValidateConnection(t *testing.T) { Projects: []string{"solar/system", "milky/way"}, }, }, - }) + }, httpcli.TestExternalClient) if len(result.Providers) == 0 { fmt.Println(result) diff --git a/internal/batches/graphql/BUILD.bazel b/internal/batches/graphql/BUILD.bazel index edf6ac706dde2..60edef1f20020 100644 --- a/internal/batches/graphql/BUILD.bazel +++ b/internal/batches/graphql/BUILD.bazel @@ -9,8 +9,6 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/internal/batches/graphql", visibility = ["//:__subpackages__"], deps = [ - "//internal/api", - "//lib/errors", "@com_github_graph_gophers_graphql_go//:graphql-go", "@com_github_graph_gophers_graphql_go//relay", ], diff --git a/internal/batches/graphql/ids.go b/internal/batches/graphql/ids.go index 77b0b480dcfeb..7fecd7210cf85 100644 --- a/internal/batches/graphql/ids.go +++ b/internal/batches/graphql/ids.go @@ -3,9 +3,6 @@ package graphql import ( "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - - "github.com/sourcegraph/sourcegraph/internal/api" - "github.com/sourcegraph/sourcegraph/lib/errors" ) const batchChangeIDKind = "BatchChange" @@ -19,29 +16,3 @@ const changesetIDKind = "Changeset" func MarshalChangesetID(id int64) graphql.ID { return relay.MarshalID(changesetIDKind, id) } - -const orgIDKind = "Org" - -func MarshalNamespaceID(userID, orgID int32) (graphql.ID, error) { - // This is essentially a reimplementation of code in - // cmd/frontend/graphqlbackend to keep our import tree at least a little - // clean. - if userID != 0 { - return MarshalUserID(userID), nil - } else if orgID != 0 { - return relay.MarshalID(orgIDKind, orgID), nil - } - return "", errors.New("cannot marshal namespace ID: neither user nor org ID provided") -} - -const repoIDKind = "Repo" - -func MarshalRepoID(id api.RepoID) graphql.ID { - return relay.MarshalID(repoIDKind, int32(id)) -} - -const userIDKind = "User" - -func MarshalUserID(id int32) graphql.ID { - return relay.MarshalID(userIDKind, id) -} diff --git a/internal/batches/reconciler/BUILD.bazel b/internal/batches/reconciler/BUILD.bazel index af8b31150edb1..77f1137a821a7 100644 --- a/internal/batches/reconciler/BUILD.bazel +++ b/internal/batches/reconciler/BUILD.bazel @@ -18,6 +18,7 @@ go_library( "//internal/batches/store", "//internal/batches/types", "//internal/batches/webhooks", + "//internal/conf", "//internal/database", "//internal/errcode", "//internal/gitserver", diff --git a/internal/batches/reconciler/executor.go b/internal/batches/reconciler/executor.go index a81646489ff45..c11785da13b96 100644 --- a/internal/batches/reconciler/executor.go +++ b/internal/batches/reconciler/executor.go @@ -18,6 +18,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/batches/webhooks" + "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/errcode" "github.com/sourcegraph/sourcegraph/internal/gitserver" @@ -644,6 +645,8 @@ func (e *executor) pushCommit(ctx context.Context, opts protocol.CreateCommitFro } func (e *executor) runAfterCommit(ctx context.Context, css sources.ChangesetSource, resp *protocol.CreateCommitFromPatchResponse, remoteRepo *types.Repo, opts protocol.CreateCommitFromPatchRequest) (err error) { + rejectUnverifiedCommit := conf.RejectUnverifiedCommit() + // If we're pushing to a GitHub code host, we should check if a GitHub App is // configured for Batch Changes to sign commits on this code host with. if _, ok := css.(*sources.GitHubSource); ok { @@ -652,11 +655,15 @@ func (e *executor) runAfterCommit(ctx context.Context, css sources.ChangesetSour if err != nil { switch err { case sources.ErrNoGitHubAppConfigured: + if rejectUnverifiedCommit { + return errors.New("no GitHub App configured to sign commit, rejecting unverified commit") + } // If we didn't find any GitHub Apps configured for this code host, it's a // noop; commit signing is not set up for this code host. - break default: - // We shouldn't block on this error, but we should still log it. + if rejectUnverifiedCommit { + return errors.Wrap(err, "failed to get GitHub App for commit verification") + } log15.Error("Failed to get GitHub App authenticated ChangesetSource", "err", err) } } else { @@ -684,6 +691,9 @@ func (e *executor) runAfterCommit(ctx context.Context, css sources.ChangesetSour return errors.Wrap(err, "failed to update changeset with commit verification") } } else { + if rejectUnverifiedCommit { + return errors.Wrap(err, "commit created with GitHub App was not signed, rejecting unverified commit") + } log15.Warn("Commit created with GitHub App was not signed", "changeset", e.ch.ID, "commit", newCommit.SHA) } } diff --git a/internal/batches/sources/azuredevops_test.go b/internal/batches/sources/azuredevops_test.go index 7698c1b41449a..13a1cf2a6528b 100644 --- a/internal/batches/sources/azuredevops_test.go +++ b/internal/batches/sources/azuredevops_test.go @@ -24,7 +24,7 @@ var ( testProjectName = "testproject" testOrgName = "testorg" testPRID = "42" - testRepository = azuredevops.Repository{ID: "testrepoid", Name: testRepoName, Project: azuredevops.Project{ID: "testprojectid", Name: testProjectName}, APIURL: fmt.Sprintf("https://dev.azure.com/%s/%s/_git/%s", testOrgName, testProjectName, testRepoName), CloneURL: fmt.Sprintf("https://dev.azure.com/%s/%s/_git/%s", testOrgName, testProjectName, testRepoName)} + testRepository = azuredevops.Repository{ID: "testrepoid", Name: testRepoName, Project: azuredevops.Project{ID: "testprojectid", Name: testProjectName}, APIURL: fmt.Sprintf("https://dev.azure.com/%s/%s/_git/%s", testOrgName, testProjectName, testRepoName), RemoteURL: fmt.Sprintf("https://dev.azure.com/%s/%s/_git/%s", testOrgName, testProjectName, testRepoName)} testCommonPullRequestArgs = azuredevops.PullRequestCommonArgs{Org: testOrgName, Project: testProjectName, RepoNameOrID: testRepoName, PullRequestID: testPRID} testOrgProjectRepoArgs = azuredevops.OrgProjectRepoArgs{Org: testOrgName, Project: testProjectName, RepoNameOrID: testRepoName} ) diff --git a/internal/batches/sources/bitbucketcloud.go b/internal/batches/sources/bitbucketcloud.go index 55b218dca21aa..2e0dba913113c 100644 --- a/internal/batches/sources/bitbucketcloud.go +++ b/internal/batches/sources/bitbucketcloud.go @@ -23,9 +23,7 @@ type BitbucketCloudSource struct { client bitbucketcloud.Client } -var ( - _ ForkableChangesetSource = BitbucketCloudSource{} -) +var _ ForkableChangesetSource = BitbucketCloudSource{} func NewBitbucketCloudSource(ctx context.Context, svc *types.ExternalService, cf *httpcli.Factory) (*BitbucketCloudSource, error) { rawConfig, err := svc.Config.Decrypt(ctx) diff --git a/internal/batches/sources/github_test.go b/internal/batches/sources/github_test.go index 6fed97c11f8ec..9a239e5362957 100644 --- a/internal/batches/sources/github_test.go +++ b/internal/batches/sources/github_test.go @@ -115,7 +115,6 @@ func TestGithubSource_CreateChangeset(t *testing.T) { } func TestGithubSource_CreateChangeset_CreationLimit(t *testing.T) { - github.SetupForTest(t) cli := new(mockDoer) // Version lookup versionMatchedBy := func(req *http.Request) bool { @@ -888,7 +887,6 @@ func setup(t *testing.T, ctx context.Context, tName string) (src *GitHubSource, // The GithubSource uses the github.Client under the hood, which uses rcache, a // caching layer that uses Redis. We need to clear the cache before we run the tests rcache.SetupForTest(t) - github.SetupForTest(t) cf, save := newClientFactory(t, tName) diff --git a/internal/batches/sources/testing/fake.go b/internal/batches/sources/testing/fake.go index bcaefcb805720..ee2618a8d4b94 100644 --- a/internal/batches/sources/testing/fake.go +++ b/internal/batches/sources/testing/fake.go @@ -217,6 +217,7 @@ func (s *FakeChangesetSource) ExternalServices() types.ExternalServices { return types.ExternalServices{s.Svc} } + func (s *FakeChangesetSource) LoadChangeset(ctx context.Context, c *sources.Changeset) error { s.LoadChangesetCalled = true @@ -239,12 +240,6 @@ func (s *FakeChangesetSource) LoadChangeset(ctx context.Context, c *sources.Chan return nil } -type noReposErr struct{ name string } - -func (e noReposErr) Error() string { - return "no " + e.name + " repository set on Changeset" -} - func (s *FakeChangesetSource) CloseChangeset(ctx context.Context, c *sources.Changeset) error { s.CloseChangesetCalled = true @@ -324,3 +319,9 @@ func (s *FakeChangesetSource) BuildCommitOpts(repo *types.Repo, _ *btypes.Change s.BuildCommitOptsCalled = true return sources.BuildCommitOptsCommon(repo, spec, cfg) } + +type noReposErr struct{ name string } + +func (e noReposErr) Error() string { + return "no " + e.name + " repository set on Changeset" +} diff --git a/internal/bytesize/BUILD.bazel b/internal/bytesize/BUILD.bazel new file mode 100644 index 0000000000000..a638a601eaca8 --- /dev/null +++ b/internal/bytesize/BUILD.bazel @@ -0,0 +1,17 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") +load("//dev:go_defs.bzl", "go_test") + +go_library( + name = "bytesize", + srcs = ["bytesize.go"], + importpath = "github.com/sourcegraph/sourcegraph/internal/bytesize", + visibility = ["//:__subpackages__"], + deps = ["//lib/errors"], +) + +go_test( + name = "bytesize_test", + srcs = ["bytesize_test.go"], + embed = [":bytesize"], + deps = ["@com_github_stretchr_testify//require"], +) diff --git a/internal/bytesize/bytesize.go b/internal/bytesize/bytesize.go new file mode 100644 index 0000000000000..e9eb112036cf2 --- /dev/null +++ b/internal/bytesize/bytesize.go @@ -0,0 +1,98 @@ +// package bytesize provides utilities to work with bytes in human-readable +// form. +package bytesize + +import ( + "strconv" + "strings" + + "github.com/sourcegraph/sourcegraph/lib/errors" +) + +// Bytes represents an amount of bytes. +type Bytes int64 + +const ( + maxSize Bytes = 1<<63 - 1 +) + +const ( + B Bytes = 1 + KB = 1_000 * B + KiB = 1_024 * B + MB = 1_000 * KB + MiB = 1_024 * KiB + GB = 1_000 * MB + GiB = 1_024 * MiB +) + +// Parse parses string that represents an amount of bytes and returns the +// amount in Bytes. +// +// Only positive amounts are supported. +// +// Bytes are represented as int64. If the value overflows, an error is +// returned. +// +// Example inputs: "3 MB", "4 GiB", "172 KiB". See the tests for more examples. +func Parse(str string) (Bytes, error) { + str = strings.TrimSpace(str) + + num, unitIndex, err := readNumber(str) + if err != nil { + return 0, errors.Newf("failed to parse %q into number: %s", str[:unitIndex], err) + } + + if unitIndex == 0 { + return 0, errors.Newf("missing number at start of string: %s", str) + } + + unit, err := parseUnit(str[unitIndex:]) + if err != nil { + return 0, err + } + + result := Bytes(num) * unit + if result < 0 { + return 0, errors.Newf("value overflows max size of %d bytes", maxSize) + } + + return result, nil +} + +func readNumber(str string) (int, int, error) { + for i, c := range str { + if isDigit(c) { + continue + } + if i == 0 { + return 0, 0, nil + } + number, err := strconv.Atoi(str[0:i]) + return number, i, err + } + return 0, 0, nil +} + +func isDigit(ch rune) bool { return '0' <= ch && ch <= '9' } + +func parseUnit(unit string) (Bytes, error) { + switch strings.TrimSpace(unit) { + case "B", "b": + return B, nil + case "kB", "KB": + return KB, nil + case "kiB", "KiB": + return KiB, nil + case "MiB": + return MiB, nil + case "MB": + return MB, nil + case "GiB": + return GiB, nil + case "GB": + return GB, nil + default: + return 0, errors.Newf("unknown unit: %s", unit) + } +} diff --git a/internal/bytesize/bytesize_test.go b/internal/bytesize/bytesize_test.go new file mode 100644 index 0000000000000..b0df5aa56577a --- /dev/null +++ b/internal/bytesize/bytesize_test.go @@ -0,0 +1,124 @@ +package bytesize + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestParse(t *testing.T) { + tests := []struct { + input string + want Bytes + }{ + // Happy paths + {"1 B", 1}, + + {"1 KB", 1000}, + {"1 KiB", 1024}, + + {"1 MB", 1_000_000}, + {"1 MiB", 1024 * 1024}, + + {"1 GB", 1_000_000_000}, + {"1 GiB", 1024 * 1024 * 1024}, + + // Whitespace + {" 1 B", 1}, + {" 100 KB", 100_000}, + + // Various + {"100 B", 100}, + {"1024 B", 1024}, + + {"12 KB", 12_000}, + {"72 KiB", 73_728}, + + {"3 MB", 3000000}, + {"3 MiB", 3145728}, + + {"7 GB", 7_000_000_000}, + {"7 GiB", 7_516_192_768}, + } + + for _, tt := range tests { + got, err := Parse(tt.input) + if err != nil { + t.Errorf("FromString(%q), got error: %s", tt.input, err) + } + + if got != tt.want { + t.Errorf("FromString(%q) = %d, want %d", tt.input, got, tt.want) + } + } + + invalid := []string{ + " ", + "aaa", + "1", + "1 count", + "1 megabyte", + "10 horses", + "1324 k b", + } + for _, tt := range invalid { + _, err := Parse(tt) + if err == nil { + t.Errorf("Parse(%q) expected error but got nil", tt) + } + } +} + +func TestParseOverflow(t *testing.T) { + input := fmt.Sprintf("%d KB", (maxSize / 2)) + _, err := Parse(input) + if err == nil { + t.Errorf("Parse(%q) expected error, but got none", input) + } +} + +func TestReadNumber(t *testing.T) { + tests := []struct { + input string + want int + len int + }{ + {"1234 foobar", 1234, 4}, + {"1234foobar", 1234, 4}, + {"12 34", 12, 2}, + {"1f", 1, 1}, + {"foobar", 0, 0}, + } + + for _, tt := range tests { + num, numLen, err := readNumber(tt.input) + require.NoError(t, err) + + if num != tt.want { + t.Errorf("readNumber(%q) = %d, want %d", tt.input, num, tt.want) + } + if numLen != tt.len { + t.Errorf("readNumber(%q) length = %d, want %d", tt.input, numLen, tt.len) + } + } +} + +func TestMultiplication(t *testing.T) { + tests := []struct { + inputNumber int + inputUnit Bytes + want Bytes + }{ + {10, B, 10}, + {25, KB, 25_000}, + {25_000, KB, 25_000_000}, + } + + for _, tt := range tests { + got := Bytes(tt.inputNumber) * tt.inputUnit + if got != tt.want { + t.Errorf("FromUnit(%d, %v) = %d, want %d", tt.inputNumber, tt.inputUnit, got, tt.want) + } + } +} diff --git a/internal/cmd/tracking-issue/api.go b/internal/cmd/tracking-issue/api.go index a841a98899df5..2813bc2d648f5 100644 --- a/internal/cmd/tracking-issue/api.go +++ b/internal/cmd/tracking-issue/api.go @@ -3,6 +3,7 @@ package main import ( "context" "fmt" + "slices" "sort" "strings" @@ -39,7 +40,7 @@ func LoadTrackingIssues(ctx context.Context, cli *graphql.Client, org string, tr issuesMap := map[string]*Issue{} for _, v := range issues { - if !contains(v.Labels, "tracking") { + if !slices.Contains(v.Labels, "tracking") { issuesMap[v.ID] = v } } @@ -79,7 +80,7 @@ func makeQueries(org string, trackingIssues []*Issue) (queries []string) { properSuperset := func(a, b []string) bool { for _, term := range b { - if !contains(a, term) { + if !slices.Contains(a, term) { return false } } diff --git a/internal/cmd/tracking-issue/context.go b/internal/cmd/tracking-issue/context.go index f2a058fa0face..01f233d9a184f 100644 --- a/internal/cmd/tracking-issue/context.go +++ b/internal/cmd/tracking-issue/context.go @@ -1,6 +1,9 @@ package main -import "strings" +import ( + "slices" + "strings" +) // IssueContext tracks a visible set of issues, tracking issues, and pull requests // with respect to a given tracking issue. The visible set of issues and pull requests @@ -65,7 +68,7 @@ func matchingTrackingIssues(trackingIssue *Issue, issues []*Issue, pullRequests } for _, pullRequest := range matchingPullRequests(pullRequests, matcher) { for _, issue := range pullRequest.TrackedBy { - if contains(issue.Labels, "tracking") { + if slices.Contains(issue.Labels, "tracking") { stack = append(stack, issue) } else { stack = append(stack, issue.TrackedBy...) diff --git a/internal/cmd/tracking-issue/emoji.go b/internal/cmd/tracking-issue/emoji.go index 6b0eb72d4e17c..7bef37941d432 100644 --- a/internal/cmd/tracking-issue/emoji.go +++ b/internal/cmd/tracking-issue/emoji.go @@ -1,6 +1,7 @@ package main import ( + "slices" "sort" "strings" @@ -45,7 +46,7 @@ var customerMatcher = regexp.MustCompile(`https://app\.hubspot\.com/contacts/276 // categorizeCustomerIssue adds a customer emoji if the repository matches sourcegraph/customer or if // the issue contains a hubspot URL. func categorizeCustomerIssue(labels []string, repository, body string, categories map[string]string) { - if repository == "sourcegraph/customer" || contains(labels, "customer") { + if repository == "sourcegraph/customer" || slices.Contains(labels, "customer") { if customer := customerMatcher.FindString(body); customer != "" { categories["customer"] = "[πŸ‘©](" + customer + ")" } else { diff --git a/internal/cmd/tracking-issue/labels.go b/internal/cmd/tracking-issue/labels.go index ee6c86124518a..d372dceadf14a 100644 --- a/internal/cmd/tracking-issue/labels.go +++ b/internal/cmd/tracking-issue/labels.go @@ -2,16 +2,6 @@ package main import "strings" -func contains(haystack []string, needle string) bool { - for _, candidate := range haystack { - if candidate == needle { - return true - } - } - - return false -} - func redactLabels(labels []string) (redacted []string) { for _, label := range labels { if strings.HasPrefix(label, "estimate/") || strings.HasPrefix(label, "planned/") { diff --git a/internal/cmd/tracking-issue/matcher.go b/internal/cmd/tracking-issue/matcher.go index 12d2a48aaed9e..901fae9b3aee0 100644 --- a/internal/cmd/tracking-issue/matcher.go +++ b/internal/cmd/tracking-issue/matcher.go @@ -1,6 +1,9 @@ package main -import "fmt" +import ( + "fmt" + "slices" +) type Matcher struct { labels []string @@ -23,7 +26,7 @@ func NewMatcher(labels []string, milestone string, assignee string, noAssignee b // with the tracking issue will never be matched. func (m *Matcher) Issue(issue *Issue) bool { return testAll( - !contains(issue.Labels, "tracking"), + !slices.Contains(issue.Labels, "tracking"), m.testAssignee(issue.Assignees...), m.testLabels(issue.Labels), m.testMilestone(issue.Milestone, issue.Labels), @@ -50,14 +53,14 @@ func (m *Matcher) testAssignee(assignees ...string) bool { return true } - return contains(assignees, m.assignee) + return slices.Contains(assignees, m.assignee) } // testLabels returns true if every label that this matcher was configured with exists // in the given label list. func (m *Matcher) testLabels(labels []string) bool { for _, label := range m.labels { - if !contains(labels, label) { + if !slices.Contains(labels, label) { return false } } @@ -69,7 +72,7 @@ func (m *Matcher) testLabels(labels []string) bool { // was configured with, if the given labels contains a planned/{milestone} label, or // the milestone on the tracking issue is not restricted. func (m *Matcher) testMilestone(milestone string, labels []string) bool { - return m.milestone == "" || milestone == m.milestone || contains(labels, fmt.Sprintf("planned/%s", m.milestone)) + return m.milestone == "" || milestone == m.milestone || slices.Contains(labels, fmt.Sprintf("planned/%s", m.milestone)) } // testAll returns true if all of the given values are true. diff --git a/internal/cmd/tracking-issue/render.go b/internal/cmd/tracking-issue/render.go index 2b2202c4425e5..946f6c5c285bd 100644 --- a/internal/cmd/tracking-issue/render.go +++ b/internal/cmd/tracking-issue/render.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "slices" "sort" "strconv" "strings" @@ -440,7 +441,7 @@ func (ar *AssigneeRenderer) resetDisplayFlags() { // doRenderIssue returns the given issue rendered in markdown. func (ar *AssigneeRenderer) doRenderIssue(issue *Issue, milestone string) string { url := issue.URL - if issue.Milestone != milestone && contains(issue.Labels, fmt.Sprintf("planned/%s", milestone)) { + if issue.Milestone != milestone && slices.Contains(issue.Labels, fmt.Sprintf("planned/%s", milestone)) { // deprioritized url = fmt.Sprintf("~%s~", url) } diff --git a/internal/codeintel/codenav/transport/graphql/root_resolver_implementations.go b/internal/codeintel/codenav/transport/graphql/root_resolver_implementations.go index 6f0f266645725..550404c8e093c 100644 --- a/internal/codeintel/codenav/transport/graphql/root_resolver_implementations.go +++ b/internal/codeintel/codenav/transport/graphql/root_resolver_implementations.go @@ -2,8 +2,6 @@ package graphql import ( "context" - "encoding/base64" - "encoding/json" "fmt" "strings" "time" @@ -133,29 +131,3 @@ func (r *gitBlobLSIFDataResolver) Prototypes(ctx context.Context, args *resolver return newLocationConnectionResolver(prototypes, pointers.NonZeroPtr(nextCursor), r.locationResolver), nil } - -// -// - -// decodeCursor is the inverse of encodeCursor. If the given encoded string is empty, then -// a fresh cursor is returned. -func decodeImplementationsCursor(rawEncoded string) (codenav.ImplementationsCursor, error) { - if rawEncoded == "" { - return codenav.ImplementationsCursor{Phase: "local"}, nil - } - - raw, err := base64.RawURLEncoding.DecodeString(rawEncoded) - if err != nil { - return codenav.ImplementationsCursor{}, err - } - - var cursor codenav.ImplementationsCursor - err = json.Unmarshal(raw, &cursor) - return cursor, err -} - -// encodeCursor returns an encoding of the given cursor suitable for a URL or a GraphQL token. -func encodeImplementationsCursor(cursor codenav.ImplementationsCursor) string { - rawEncoded, _ := json.Marshal(cursor) - return base64.RawURLEncoding.EncodeToString(rawEncoded) -} diff --git a/internal/codeintel/codenav/transport/graphql/root_resolver_references.go b/internal/codeintel/codenav/transport/graphql/root_resolver_references.go index 056251ba81db6..94caec410b694 100644 --- a/internal/codeintel/codenav/transport/graphql/root_resolver_references.go +++ b/internal/codeintel/codenav/transport/graphql/root_resolver_references.go @@ -96,29 +96,3 @@ func encodeTraversalCursor(cursor codenav.Cursor) string { rawEncoded, _ := json.Marshal(cursor) return base64.RawURLEncoding.EncodeToString(rawEncoded) } - -// -// - -// decodeReferencesCursor is the inverse of encodeCursor. If the given encoded string is empty, then -// a fresh cursor is returned. -func decodeReferencesCursor(rawEncoded string) (codenav.ReferencesCursor, error) { - if rawEncoded == "" { - return codenav.ReferencesCursor{Phase: "local"}, nil - } - - raw, err := base64.RawURLEncoding.DecodeString(rawEncoded) - if err != nil { - return codenav.ReferencesCursor{}, err - } - - var cursor codenav.ReferencesCursor - err = json.Unmarshal(raw, &cursor) - return cursor, err -} - -// encodeReferencesCursor returns an encoding of the given cursor suitable for a URL or a GraphQL token. -func encodeReferencesCursor(cursor codenav.ReferencesCursor) string { - rawEncoded, _ := json.Marshal(cursor) - return base64.RawURLEncoding.EncodeToString(rawEncoded) -} diff --git a/internal/codeintel/uploads/internal/background/processor/BUILD.bazel b/internal/codeintel/uploads/internal/background/processor/BUILD.bazel index 150a5f1e0f1e0..bd5b4ac7a02f7 100644 --- a/internal/codeintel/uploads/internal/background/processor/BUILD.bazel +++ b/internal/codeintel/uploads/internal/background/processor/BUILD.bazel @@ -33,6 +33,7 @@ go_library( "//lib/codeintel/pathexistence", "//lib/codeintel/precise", "//lib/errors", + "//lib/pointers", "@com_github_jackc_pgconn//:pgconn", "@com_github_keegancsmith_sqlf//:sqlf", "@com_github_prometheus_client_golang//prometheus", diff --git a/internal/codeintel/uploads/internal/background/processor/job_worker_handler.go b/internal/codeintel/uploads/internal/background/processor/job_worker_handler.go index 75ea9cf487157..d396a9d972cb8 100644 --- a/internal/codeintel/uploads/internal/background/processor/job_worker_handler.go +++ b/internal/codeintel/uploads/internal/background/processor/job_worker_handler.go @@ -30,6 +30,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker" dbworkerstore "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" "github.com/sourcegraph/sourcegraph/lib/errors" + "github.com/sourcegraph/sourcegraph/lib/pointers" ) func NewUploadProcessorWorker( @@ -143,29 +144,21 @@ func (h *handler) PreDequeue(_ context.Context, _ log.Logger) (bool, any, error) } func (h *handler) PreHandle(_ context.Context, _ log.Logger, upload uploadsshared.Upload) { - uncompressedSize := h.getUploadSize(upload.UncompressedSize) + uncompressedSize := pointers.DerefZero(upload.UncompressedSize) h.uploadSizeGauge.Add(float64(uncompressedSize)) - gzipSize := h.getUploadSize(upload.UploadSize) + gzipSize := pointers.DerefZero(upload.UploadSize) atomic.AddInt64(&h.budgetRemaining, -gzipSize) } func (h *handler) PostHandle(_ context.Context, _ log.Logger, upload uploadsshared.Upload) { - uncompressedSize := h.getUploadSize(upload.UncompressedSize) + uncompressedSize := pointers.DerefZero(upload.UncompressedSize) h.uploadSizeGauge.Sub(float64(uncompressedSize)) - gzipSize := h.getUploadSize(upload.UploadSize) + gzipSize := pointers.DerefZero(upload.UploadSize) atomic.AddInt64(&h.budgetRemaining, +gzipSize) } -func (h *handler) getUploadSize(field *int64) int64 { - if field != nil { - return *field - } - - return 0 -} - func createLogFields(upload uploadsshared.Upload) []attribute.KeyValue { attrs := []attribute.KeyValue{ attribute.Int("uploadID", upload.ID), diff --git a/internal/codeintel/uploads/internal/store/summary.go b/internal/codeintel/uploads/internal/store/summary.go index 3cf6e8a62d977..b0392814d411f 100644 --- a/internal/codeintel/uploads/internal/store/summary.go +++ b/internal/codeintel/uploads/internal/store/summary.go @@ -20,34 +20,49 @@ func (s *store) GetIndexers(ctx context.Context, opts shared.GetIndexersOptions) }}) defer endObservation(1, observation.Args{}) - var conds []*sqlf.Query - if opts.RepositoryID != 0 { - conds = append(conds, sqlf.Sprintf("u.repository_id = %s", opts.RepositoryID)) + if opts.RepositoryID == 0 { + return basestore.ScanStrings(s.db.Query(ctx, sqlf.Sprintf(getGlobalIndexersQuery))) } authzConds, err := database.AuthzQueryConds(ctx, database.NewDBWith(s.logger, s.db)) if err != nil { return nil, err } - conds = append(conds, authzConds) - return basestore.ScanStrings(s.db.Query(ctx, sqlf.Sprintf(getIndexersQuery, sqlf.Join(conds, "AND")))) + return basestore.ScanStrings(s.db.Query(ctx, sqlf.Sprintf(getIndexersForRepositoryQuery, opts.RepositoryID, authzConds))) } -const getIndexersQuery = ` +const getGlobalIndexersQuery = ` WITH combined_indexers AS ( - SELECT u.indexer, u.repository_id FROM lsif_uploads u - UNION - SELECT u.indexer, u.repository_id FROM lsif_indexes u + SELECT DISTINCT u.indexer FROM lsif_uploads u + UNION ALL + SELECT DISTINCT u.indexer FROM lsif_indexes u ) SELECT DISTINCT u.indexer FROM combined_indexers u -JOIN repo ON repo.id = u.repository_id -WHERE - %s AND - repo.deleted_at IS NULL AND - repo.blocked IS NULL +ORDER BY u.indexer +` + +const getIndexersForRepositoryQuery = ` +WITH +repo_candidate AS ( + SELECT repo.id + FROM repo + WHERE + repo.id = %s AND + %s AND + repo.deleted_at IS NULL AND + repo.blocked IS NULL +), +combined_indexers AS ( + SELECT DISTINCT u.indexer FROM lsif_uploads u JOIN repo_candidate r ON r.id = u.repository_id + UNION ALL + SELECT DISTINCT u.indexer FROM lsif_indexes u JOIN repo_candidate r ON r.id = u.repository_id +) +SELECT DISTINCT u.indexer +FROM combined_indexers u +ORDER BY u.indexer ` // GetRecentUploadsSummary returns a set of "interesting" uploads for the repository with the given identifeir. diff --git a/internal/codemonitors/background/BUILD.bazel b/internal/codemonitors/background/BUILD.bazel index 087ae185a8031..ea6ad7d4152a9 100644 --- a/internal/codemonitors/background/BUILD.bazel +++ b/internal/codemonitors/background/BUILD.bazel @@ -67,6 +67,7 @@ go_test( "//internal/conf", "//internal/database", "//internal/database/dbtest", + "//internal/httpcli", "//internal/search/result", "//internal/txemail", "//schema", diff --git a/internal/codemonitors/background/webhook.go b/internal/codemonitors/background/webhook.go index 5358304d0ceff..d5956597864f5 100644 --- a/internal/codemonitors/background/webhook.go +++ b/internal/codemonitors/background/webhook.go @@ -53,7 +53,7 @@ func SendTestWebhook(ctx context.Context, doer httpcli.Doer, description string, MonitorDescription: description, Query: "test query", } - return postWebhook(ctx, httpcli.ExternalDoer, u, generateWebhookPayload(args)) + return postWebhook(ctx, doer, u, generateWebhookPayload(args)) } type webhookPayload struct { diff --git a/internal/codemonitors/background/webhook_test.go b/internal/codemonitors/background/webhook_test.go index ab58c4dd3af7d..2eb0840c73ebd 100644 --- a/internal/codemonitors/background/webhook_test.go +++ b/internal/codemonitors/background/webhook_test.go @@ -12,6 +12,7 @@ import ( "github.com/hexops/autogold/v2" "github.com/stretchr/testify/require" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/search/result" ) @@ -37,8 +38,7 @@ func TestWebhook(t *testing.T) { })) defer s.Close() - client := s.Client() - err := postWebhook(context.Background(), client, s.URL, generateWebhookPayload(action)) + err := postWebhook(context.Background(), s.Client(), s.URL, generateWebhookPayload(action)) require.NoError(t, err) }) @@ -63,8 +63,7 @@ func TestWebhook(t *testing.T) { })) defer s.Close() - client := s.Client() - err := postWebhook(context.Background(), client, s.URL, generateWebhookPayload(action)) + err := postWebhook(context.Background(), s.Client(), s.URL, generateWebhookPayload(action)) require.Error(t, err) }) } @@ -78,7 +77,6 @@ func TestTriggerTestWebhookAction(t *testing.T) { })) defer s.Close() - client := s.Client() - err := SendTestWebhook(context.Background(), client, "My test monitor", s.URL) + err := SendTestWebhook(context.Background(), httpcli.TestExternalDoer, "My test monitor", s.URL) require.NoError(t, err) } diff --git a/internal/codycontext/context.go b/internal/codycontext/context.go index 75d87eb7787c7..5704e012dd8b9 100644 --- a/internal/codycontext/context.go +++ b/internal/codycontext/context.go @@ -3,7 +3,6 @@ package context import ( "context" "fmt" - "math" "strconv" "strings" "sync" @@ -394,27 +393,3 @@ func fileMatchToContextMatches(fm *result.FileMatch) []FileChunkContext { EndLine: endLine, }} } - -func max(vals ...int) int { - res := math.MinInt32 - for _, val := range vals { - if val > res { - res = val - } - } - return res -} - -func min(vals ...int) int { - res := math.MaxInt32 - for _, val := range vals { - if val < res { - res = val - } - } - return res -} - -func truncate[T any](input []T, size int) []T { - return input[:min(len(input), size)] -} diff --git a/internal/codygateway/consts.go b/internal/codygateway/consts.go index a1aaf3de04276..276d0909e838d 100644 --- a/internal/codygateway/consts.go +++ b/internal/codygateway/consts.go @@ -15,12 +15,13 @@ const CompletionsEventFeatureEmbeddings = "embeddings" type EventName string const ( - EventNameUnauthorized EventName = "Unauthorized" - EventNameAccessDenied EventName = "AccessDenied" - EventNameRateLimited EventName = "RateLimited" - EventNameCompletionsFinished EventName = "CompletionsFinished" - EventNameEmbeddingsFinished EventName = "EmbeddingsFinished" - EventNameRequestBlocked EventName = "RequestBlocked" + EventNameUnauthorized EventName = "Unauthorized" + EventNameAccessDenied EventName = "AccessDenied" + EventNameRateLimited EventName = "RateLimited" + EventNameCompletionsFinished EventName = "CompletionsFinished" + EventNameEmbeddingsFinished EventName = "EmbeddingsFinished" + EventNameRequestBlocked EventName = "RequestBlocked" + EventNameCodeCompletionLogged EventName = "CodeCompletionLogged" ) const FeatureHeaderName = "X-Sourcegraph-Feature" diff --git a/internal/collections/set_test.go b/internal/collections/set_test.go index 2c537100cb2ff..f491e2177cafa 100644 --- a/internal/collections/set_test.go +++ b/internal/collections/set_test.go @@ -1,6 +1,7 @@ package collections import ( + "cmp" "testing" "github.com/grafana/regexp" @@ -11,7 +12,7 @@ func TestSet(t *testing.T) { a := NewSet(1, 2, 3) b := NewSet(2, 3, 4) - cmp := NaturalCompare[int] + cmp := cmp.Less[int] t.Run("Set can be created from another Set", func(t *testing.T) { c := NewSet(a.Values()...) diff --git a/internal/collections/slice_utils.go b/internal/collections/slice_utils.go index 8b22a301d5aab..e43cd6530a7d7 100644 --- a/internal/collections/slice_utils.go +++ b/internal/collections/slice_utils.go @@ -6,14 +6,6 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" ) -// Returns minimum of 2 numbers -func Min[T constraints.Ordered](a T, b T) T { - if a < b { - return a - } - return b -} - // NaturalCompare is a comparator function that will help sort numbers in natural order // when used in sort.Slice. // For example, 1, 2, 3, 10, 11, 12, 20, 21, 22, 100, 101, 102, 200, 201, 202, ... @@ -26,10 +18,10 @@ func SplitIntoChunks[T any](slice []T, size int) ([][]T, error) { if size < 1 { return nil, errors.Newf("size must be greater than 1") } - numChunks := Min(1+(len(slice)-1)/size, len(slice)) + numChunks := min(1+(len(slice)-1)/size, len(slice)) chunks := make([][]T, numChunks) for i := 0; i < numChunks; i++ { - maxIndex := Min((i+1)*size, len(slice)) + maxIndex := min((i+1)*size, len(slice)) chunks[i] = slice[i*size : maxIndex] } return chunks, nil diff --git a/internal/collections/slice_utils_test.go b/internal/collections/slice_utils_test.go index 9cf907091635b..72b6c516d2a1d 100644 --- a/internal/collections/slice_utils_test.go +++ b/internal/collections/slice_utils_test.go @@ -1,55 +1,12 @@ package collections import ( - "math" "testing" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" ) -func Test_Min(t *testing.T) { - t.Run("Returns first int that is smaller", func(t *testing.T) { - got := Min(1, 2) - want := 1 - if got != want { - t.Errorf("got %v, want %v", got, want) - } - }) - - t.Run("Returns second int that is smaller", func(t *testing.T) { - got := Min(2, 1) - want := 1 - if got != want { - t.Errorf("got %v, want %v", got, want) - } - }) - - t.Run("Works with a float as well", func(t *testing.T) { - got := Min(1.5, 1.52) - want := 1.5 - if got != want { - t.Errorf("got %v, want %v", got, want) - } - }) - - t.Run("Works with infinity", func(t *testing.T) { - got := Min(1.5, math.Inf(1)) - want := 1.5 - if got != want { - t.Errorf("got %v, want %v", got, want) - } - }) - - t.Run("Works with negative infinity", func(t *testing.T) { - got := Min(1.5, math.Inf(-1)) - want := math.Inf(-1) - if got != want { - t.Errorf("got %v, want %v", got, want) - } - }) -} - func Test_SplitIntoChunks(t *testing.T) { t.Run("Splits a slice into chunks of size 3", func(t *testing.T) { got, err := SplitIntoChunks([]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 3) diff --git a/internal/completions/client/BUILD.bazel b/internal/completions/client/BUILD.bazel index 5735358e118f8..59b32f3e5d5c5 100644 --- a/internal/completions/client/BUILD.bazel +++ b/internal/completions/client/BUILD.bazel @@ -1,4 +1,3 @@ -load("//dev:go_defs.bzl", "go_test") load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( diff --git a/internal/completions/client/azureopenai/BUILD.bazel b/internal/completions/client/azureopenai/BUILD.bazel index f1a98b1924085..df50f53417880 100644 --- a/internal/completions/client/azureopenai/BUILD.bazel +++ b/internal/completions/client/azureopenai/BUILD.bazel @@ -7,10 +7,11 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/internal/completions/client/azureopenai", visibility = ["//:__subpackages__"], deps = [ - "//internal/completions/client/openai", "//internal/completions/types", - "//internal/httpcli", "//lib/errors", + "@com_github_azure_azure_sdk_for_go_sdk_ai_azopenai//:azopenai", + "@com_github_azure_azure_sdk_for_go_sdk_azcore//:azcore", + "@com_github_azure_azure_sdk_for_go_sdk_azidentity//:azidentity", ], ) @@ -20,6 +21,9 @@ go_test( embed = [":azureopenai"], deps = [ "//internal/completions/types", + "//lib/errors", + "@com_github_azure_azure_sdk_for_go_sdk_ai_azopenai//:azopenai", + "@com_github_azure_azure_sdk_for_go_sdk_azcore//:azcore", "@com_github_hexops_autogold_v2//:autogold", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", diff --git a/internal/completions/client/azureopenai/openai.go b/internal/completions/client/azureopenai/openai.go index d569a3c8e91c7..b989012139707 100644 --- a/internal/completions/client/azureopenai/openai.go +++ b/internal/completions/client/azureopenai/openai.go @@ -1,32 +1,81 @@ package azureopenai import ( - "bytes" "context" - "encoding/json" - "fmt" + "io" "net/http" - "net/url" - "strings" + "sync" + + "github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai" + "github.com/Azure/azure-sdk-for-go/sdk/azcore" + "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "github.com/sourcegraph/sourcegraph/internal/completions/client/openai" "github.com/sourcegraph/sourcegraph/internal/completions/types" - "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/lib/errors" ) -func NewClient(cli httpcli.Doer, endpoint, accessToken string) types.CompletionsClient { - return &azureCompletionClient{ - cli: cli, - accessToken: accessToken, - endpoint: endpoint, +// We want to reuse the client because when using the DefaultAzureCredential +// it will acquire a short lived token and reusing the client +// prevents acquiring a new token on every request. +// The client will refresh the token as needed. + +var apiClient completionsClient + +type completionsClient struct { + mu sync.RWMutex + accessToken string + endpoint string + client *azopenai.Client +} + +type CompletionsClient interface { + GetCompletionsStream(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsStreamOptions) (azopenai.GetCompletionsStreamResponse, error) + GetCompletions(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsOptions) (azopenai.GetCompletionsResponse, error) + GetChatCompletions(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsOptions) (azopenai.GetChatCompletionsResponse, error) + GetChatCompletionsStream(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsStreamOptions) (azopenai.GetChatCompletionsStreamResponse, error) +} + +func GetAPIClient(endpoint, accessToken string) (CompletionsClient, error) { + apiClient.mu.RLock() + if apiClient.client != nil && apiClient.endpoint == endpoint && apiClient.accessToken == accessToken { + apiClient.mu.RUnlock() + return apiClient.client, nil + } + apiClient.mu.RUnlock() + apiClient.mu.Lock() + defer apiClient.mu.Unlock() + var err error + if accessToken != "" { + credential, credErr := azopenai.NewKeyCredential(accessToken) + if credErr != nil { + return nil, credErr + } + apiClient.client, err = azopenai.NewClientWithKeyCredential(endpoint, credential, nil) + } else { + credential, credErr := azidentity.NewDefaultAzureCredential(nil) + if credErr != nil { + return nil, credErr + } + apiClient.client, err = azopenai.NewClient(endpoint, credential, nil) + } + return apiClient.client, err + +} + +type GetCompletionsAPIClientFunc func(accessToken, endpoint string) (CompletionsClient, error) + +func NewClient(getClient GetCompletionsAPIClientFunc, accessToken, endpoint string) (types.CompletionsClient, error) { + client, err := getClient(accessToken, endpoint) + if err != nil { + return nil, err } + return &azureCompletionClient{ + client: client, + }, nil } type azureCompletionClient struct { - cli httpcli.Doer - accessToken string - endpoint string + client CompletionsClient } func (c *azureCompletionClient) Complete( @@ -34,35 +83,56 @@ func (c *azureCompletionClient) Complete( feature types.CompletionsFeature, requestParams types.CompletionRequestParameters, ) (*types.CompletionResponse, error) { - var resp *http.Response - var err error - defer (func() { - if resp != nil { - resp.Body.Close() - } - })() - if feature == types.CompletionsFeatureCode { - resp, err = c.makeCompletionRequest(ctx, requestParams, false) - } else { - resp, err = c.makeRequest(ctx, requestParams, false) + + switch feature { + case types.CompletionsFeatureCode: + return completeAutocomplete(ctx, c.client, requestParams) + case types.CompletionsFeatureChat: + return completeChat(ctx, c.client, requestParams) + default: + return nil, errors.New("invalid completions feature") } +} + +func completeAutocomplete( + ctx context.Context, + client CompletionsClient, + requestParams types.CompletionRequestParameters, +) (*types.CompletionResponse, error) { + options, err := getCompletionsOptions(requestParams) if err != nil { return nil, err } - - var response openaiResponse - if err := json.NewDecoder(resp.Body).Decode(&response); err != nil { - return nil, err + response, err := client.GetCompletions(ctx, options, nil) + if err != nil { + return nil, toStatusCodeError(err) } - if len(response.Choices) == 0 { - // Empty response. + // Text and FinishReason are documented as REQUIRED but checking just to be safe + if !hasValidFirstCompletionsChoice(response.Choices) { return &types.CompletionResponse{}, nil } + return &types.CompletionResponse{ + Completion: *response.Choices[0].Text, + StopReason: string(*response.Choices[0].FinishReason), + }, nil +} +func completeChat( + ctx context.Context, + client CompletionsClient, + requestParams types.CompletionRequestParameters, +) (*types.CompletionResponse, error) { + response, err := client.GetChatCompletions(ctx, getChatOptions(requestParams), nil) + if err != nil { + return nil, toStatusCodeError(err) + } + if !hasValidFirstChatChoice(response.Choices) { + return &types.CompletionResponse{}, nil + } return &types.CompletionResponse{ - Completion: response.Choices[0].Text, - StopReason: response.Choices[0].FinishReason, + Completion: *response.Choices[0].Delta.Content, + StopReason: string(*response.Choices[0].FinishReason), }, nil } @@ -72,239 +142,184 @@ func (c *azureCompletionClient) Stream( requestParams types.CompletionRequestParameters, sendEvent types.SendCompletionEvent, ) error { - var resp *http.Response - var err error - - defer (func() { - if resp != nil { - resp.Body.Close() - } - })() - if feature == types.CompletionsFeatureCode { - resp, err = c.makeCompletionRequest(ctx, requestParams, true) - } else { - resp, err = c.makeRequest(ctx, requestParams, true) + switch feature { + case types.CompletionsFeatureCode: + return streamAutocomplete(ctx, c.client, requestParams, sendEvent) + case types.CompletionsFeatureChat: + return streamChat(ctx, c.client, requestParams, sendEvent) + default: + return errors.New("invalid completions feature") } +} + +func streamAutocomplete( + ctx context.Context, + client CompletionsClient, + requestParams types.CompletionRequestParameters, + sendEvent types.SendCompletionEvent, +) error { + options, err := getCompletionsOptions(requestParams) if err != nil { return err } + resp, err := client.GetCompletionsStream(ctx, options, nil) + if err != nil { + return toStatusCodeError(err) + } + defer resp.CompletionsStream.Close() - dec := openai.NewDecoder(resp.Body) + // Azure sends incremental deltas for each message in a chat stream + // build up the full message content over multiple responses var content string - for dec.Scan() { - if ctx.Err() != nil && ctx.Err() == context.Canceled { + for { + entry, err := resp.CompletionsStream.Read() + // stream is done + if errors.Is(err, io.EOF) { return nil } + // some other error has occured + if err != nil { + return err + } - data := dec.Data() - // Gracefully skip over any data that isn't JSON-like. - if !bytes.HasPrefix(data, []byte("{")) { - continue + // hasValidFirstCompletionsChoice checks for a valid 1st choice which has text + if hasValidFirstCompletionsChoice(entry.Choices) { + content += *entry.Choices[0].Text + finish := "" + if entry.Choices[0].FinishReason != nil { + finish = string(*entry.Choices[0].FinishReason) + } + ev := types.CompletionResponse{ + Completion: content, + StopReason: finish, + } + err := sendEvent(ev) + if err != nil { + return err + } } + } +} - var event openaiResponse - if err := json.Unmarshal(data, &event); err != nil { - return errors.Errorf("failed to decode event payload: %w - body: %s", err, string(data)) +func streamChat( + ctx context.Context, + client CompletionsClient, + requestParams types.CompletionRequestParameters, + sendEvent types.SendCompletionEvent, +) error { + + resp, err := client.GetChatCompletionsStream(ctx, getChatOptions(requestParams), nil) + if err != nil { + return toStatusCodeError(err) + } + defer resp.ChatCompletionsStream.Close() + + // Azure sends incremental deltas for each message in a chat stream + // build up the full message content over multiple responses + var content string + for { + entry, err := resp.ChatCompletionsStream.Read() + // stream is done + if errors.Is(err, io.EOF) { + return nil + } + // some other error has occurred + if err != nil { + return err } - if len(event.Choices) > 0 { - if feature == types.CompletionsFeatureCode { - content += event.Choices[0].Text - } else { - content += event.Choices[0].Delta.Content + if hasValidFirstChatChoice(entry.Choices) { + // hasValidFirstChatChoice checks that Delta.Content isn't null + // it is marked as REQUIRED in docs despite being a pointer + content += *entry.Choices[0].Delta.Content + + finish := "" + // FinishReason is marked as REQUIRED but it's nil until the end + if entry.Choices[0].FinishReason != nil { + finish = string(*entry.Choices[0].FinishReason) } ev := types.CompletionResponse{ Completion: content, - StopReason: event.Choices[0].FinishReason, + StopReason: finish, } - err = sendEvent(ev) + err := sendEvent(ev) if err != nil { return err } } } +} - return dec.Err() +// hasValidChatChoice checks to ensure there is a choice and the first one contains non-nil values +func hasValidFirstChatChoice(choices []azopenai.ChatChoice) bool { + return len(choices) > 0 && + choices[0].Delta != nil && + choices[0].Delta.Content != nil } -func (c *azureCompletionClient) makeRequest(ctx context.Context, requestParams types.CompletionRequestParameters, stream bool) (*http.Response, error) { - if requestParams.TopK < 0 { - requestParams.TopK = 0 - } - if requestParams.TopP < 0 { - requestParams.TopP = 0 - } +// hasValidChatChoice checks to ensure there is a choice and the first one contains non-nil values +func hasValidFirstCompletionsChoice(choices []azopenai.Choice) bool { + return len(choices) > 0 && + choices[0].Text != nil +} - payload := azureChatCompletionsRequestParameters{ - Temperature: requestParams.Temperature, - TopP: requestParams.TopP, - N: 1, - Stream: stream, - MaxTokens: requestParams.MaxTokensToSample, - Stop: requestParams.StopSequences, - } - for _, m := range requestParams.Messages { - var role string +func getChatMessages(messages []types.Message) []azopenai.ChatMessage { + azureMessages := make([]azopenai.ChatMessage, len(messages)) + for i, m := range messages { + var role azopenai.ChatRole + message := m.Text switch m.Speaker { case types.HUMAN_MESSAGE_SPEAKER: - role = "user" + role = azopenai.ChatRoleUser case types.ASISSTANT_MESSAGE_SPEAKER: - role = "assistant" - default: - role = strings.ToLower(role) + role = azopenai.ChatRoleAssistant + } + azureMessages[i] = azopenai.ChatMessage{ + Content: &message, + Role: &role, } - payload.Messages = append(payload.Messages, message{ - Role: role, - Content: m.Text, - }) - } - - reqBody, err := json.Marshal(payload) - if err != nil { - return nil, err - } - - url, err := url.Parse(c.endpoint) - if err != nil { - return nil, errors.Wrap(err, "failed to parse configured endpoint") } - q := url.Query() - q.Add("api-version", "2023-05-15") - url.RawQuery = q.Encode() - url.Path = fmt.Sprintf("/openai/deployments/%s/chat/completions", requestParams.Model) + return azureMessages +} - req, err := http.NewRequestWithContext(ctx, "POST", url.String(), bytes.NewReader(reqBody)) - if err != nil { - return nil, err +func getChatOptions(requestParams types.CompletionRequestParameters) azopenai.ChatCompletionsOptions { + if requestParams.TopK < 0 { + requestParams.TopK = 0 } - - req.Header.Set("Content-Type", "application/json") - req.Header.Set("api-key", c.accessToken) - - resp, err := c.cli.Do(req) - if err != nil { - return nil, err + if requestParams.TopP < 0 { + requestParams.TopP = 0 } - - if resp.StatusCode != http.StatusOK { - return nil, types.NewErrStatusNotOK("AzureOpenAI", resp) + return azopenai.ChatCompletionsOptions{ + Messages: getChatMessages(requestParams.Messages), + Temperature: &requestParams.Temperature, + TopP: &requestParams.TopP, + N: intToInt32Ptr(1), + Stop: requestParams.StopSequences, + MaxTokens: intToInt32Ptr(requestParams.MaxTokensToSample), + Deployment: requestParams.Model, } - - return resp, nil } -func (c *azureCompletionClient) makeCompletionRequest(ctx context.Context, requestParams types.CompletionRequestParameters, stream bool) (*http.Response, error) { +func getCompletionsOptions(requestParams types.CompletionRequestParameters) (azopenai.CompletionsOptions, error) { if requestParams.TopK < 0 { requestParams.TopK = 0 } if requestParams.TopP < 0 { requestParams.TopP = 0 } - prompt, err := getPrompt(requestParams.Messages) if err != nil { - return nil, err + return azopenai.CompletionsOptions{}, err } - - payload := azureCompletionsRequestParameters{ - Temperature: requestParams.Temperature, - TopP: requestParams.TopP, - N: 1, - Stream: stream, - MaxTokens: requestParams.MaxTokensToSample, + return azopenai.CompletionsOptions{ + Prompt: []string{prompt}, + Temperature: &requestParams.Temperature, + TopP: &requestParams.TopP, + N: intToInt32Ptr(1), Stop: requestParams.StopSequences, - Prompt: prompt, - } - - reqBody, err := json.Marshal(payload) - if err != nil { - return nil, err - } - url, err := url.Parse(c.endpoint) - if err != nil { - return nil, errors.Wrap(err, "failed to parse configured endpoint") - } - q := url.Query() - q.Add("api-version", "2023-05-15") - url.RawQuery = q.Encode() - url.Path = fmt.Sprintf("/openai/deployments/%s/completions", requestParams.Model) - - req, err := http.NewRequestWithContext(ctx, "POST", url.String(), bytes.NewReader(reqBody)) - if err != nil { - return nil, err - } - - req.Header.Set("Content-Type", "application/json") - req.Header.Set("api-key", c.accessToken) - - resp, err := c.cli.Do(req) - if err != nil { - return nil, err - } - - if resp.StatusCode != http.StatusOK { - return nil, types.NewErrStatusNotOK("AzureOpenAI", resp) - } - - return resp, nil -} - -type azureChatCompletionsRequestParameters struct { - Messages []message `json:"messages"` - Temperature float32 `json:"temperature,omitempty"` - TopP float32 `json:"top_p,omitempty"` - N int `json:"n,omitempty"` - Stream bool `json:"stream,omitempty"` - Stop []string `json:"stop,omitempty"` - MaxTokens int `json:"max_tokens,omitempty"` - PresencePenalty float32 `json:"presence_penalty,omitempty"` - FrequencyPenalty float32 `json:"frequency_penalty,omitempty"` - LogitBias map[string]float32 `json:"logit_bias,omitempty"` - User string `json:"user,omitempty"` -} - -type azureCompletionsRequestParameters struct { - Prompt string `json:"prompt"` - Temperature float32 `json:"temperature,omitempty"` - TopP float32 `json:"top_p,omitempty"` - N int `json:"n,omitempty"` - Stream bool `json:"stream,omitempty"` - Stop []string `json:"stop,omitempty"` - MaxTokens int `json:"max_tokens,omitempty"` - PresencePenalty float32 `json:"presence_penalty,omitempty"` - FrequencyPenalty float32 `json:"frequency_penalty,omitempty"` - LogitBias map[string]float32 `json:"logit_bias,omitempty"` - Suffix string `json:"suffix,omitempty"` - User string `json:"user,omitempty"` -} - -type message struct { - Role string `json:"role"` - Content string `json:"content"` -} - -type azure struct { - PromptTokens int `json:"prompt_tokens"` - CompletionTokens int `json:"completion_tokens"` - TotalTokens int `json:"total_tokens"` -} - -type openaiChoiceDelta struct { - Content string `json:"content"` -} - -type openaiChoice struct { - Delta openaiChoiceDelta `json:"delta"` - Role string `json:"role"` - Text string `json:"text"` - FinishReason string `json:"finish_reason"` -} - -type openaiResponse struct { - // Usage is only available for non-streaming requests. - Usage azure `json:"usage"` - Model string `json:"model"` - Choices []openaiChoice `json:"choices"` + MaxTokens: intToInt32Ptr(requestParams.MaxTokensToSample), + Deployment: requestParams.Model, + }, nil } func getPrompt(messages []types.Message) (string, error) { @@ -314,3 +329,21 @@ func getPrompt(messages []types.Message) (string, error) { return messages[0].Text, nil } + +func intToInt32Ptr(i int) *int32 { + v := int32(i) + return &v +} + +// toStatusCodeError converts Azure SDK ResponseError to a ErrStatusNotOK error +// when the status code is not OK. This allows the request handler to return the +// appropriate status code to the calling client which is especially important for rate limits. +func toStatusCodeError(err error) error { + var responseError *azcore.ResponseError + if errors.As(err, &responseError) { + if responseError.StatusCode != http.StatusOK { + return types.NewErrStatusNotOK("AzureOpenAI", responseError.RawResponse) + } + } + return err +} diff --git a/internal/completions/client/azureopenai/openai_test.go b/internal/completions/client/azureopenai/openai_test.go index ed842fa1d5313..1f4c850490507 100644 --- a/internal/completions/client/azureopenai/openai_test.go +++ b/internal/completions/client/azureopenai/openai_test.go @@ -5,39 +5,83 @@ import ( "context" "io" "net/http" + "net/url" "testing" + "github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai" + "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/hexops/autogold/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/sourcegraph/sourcegraph/internal/completions/types" + "github.com/sourcegraph/sourcegraph/lib/errors" ) -type mockDoer struct { - do func(*http.Request) (*http.Response, error) +type mockAzureClient struct { + getCompletionsStream func(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsStreamOptions) (azopenai.GetCompletionsStreamResponse, error) + getCompletions func(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsOptions) (azopenai.GetCompletionsResponse, error) + getChatCompletions func(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsOptions) (azopenai.GetChatCompletionsResponse, error) + getChatCompletionsStream func(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsStreamOptions) (azopenai.GetChatCompletionsStreamResponse, error) } -func (c *mockDoer) Do(r *http.Request) (*http.Response, error) { - return c.do(r) +func (c *mockAzureClient) GetCompletionsStream(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsStreamOptions) (azopenai.GetCompletionsStreamResponse, error) { + return c.getCompletionsStream(ctx, body, options) +} + +func (c *mockAzureClient) GetCompletions(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsOptions) (azopenai.GetCompletionsResponse, error) { + return c.getCompletions(ctx, body, options) +} + +func (c *mockAzureClient) GetChatCompletions(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsOptions) (azopenai.GetChatCompletionsResponse, error) { + return c.getChatCompletions(ctx, body, options) +} + +func (c *mockAzureClient) GetChatCompletionsStream(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsStreamOptions) (azopenai.GetChatCompletionsStreamResponse, error) { + return c.getChatCompletionsStream(ctx, body, options) +} + +func getNewMockAzureAPIClient(mock *mockAzureClient) func(accessToken, endpoint string) (CompletionsClient, error) { + return func(accessToken, endpoint string) (CompletionsClient, error) { + return mock, nil + } +} + +func azure429ResponseError() *azcore.ResponseError { + return &azcore.ResponseError{ + StatusCode: http.StatusTooManyRequests, + ErrorCode: "429", + RawResponse: &http.Response{ + Request: &http.Request{Method: "GET", URL: &url.URL{}, Header: http.Header(map[string][]string{})}, + StatusCode: http.StatusTooManyRequests, + Body: io.NopCloser(bytes.NewReader([]byte("too many requests"))), + }, + } } func TestErrStatusNotOK(t *testing.T) { - mockClient := NewClient(&mockDoer{ - func(r *http.Request) (*http.Response, error) { - return &http.Response{ - StatusCode: http.StatusTooManyRequests, - Body: io.NopCloser(bytes.NewReader([]byte("oh no, please slow down!"))), - }, nil + getAzureAPIClient := getNewMockAzureAPIClient(&mockAzureClient{ + getCompletionsStream: func(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsStreamOptions) (azopenai.GetCompletionsStreamResponse, error) { + return azopenai.GetCompletionsStreamResponse{}, azure429ResponseError() + }, + getCompletions: func(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsOptions) (azopenai.GetCompletionsResponse, error) { + return azopenai.GetCompletionsResponse{}, azure429ResponseError() + }, + getChatCompletions: func(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsOptions) (azopenai.GetChatCompletionsResponse, error) { + return azopenai.GetChatCompletionsResponse{}, azure429ResponseError() }, - }, "", "") + getChatCompletionsStream: func(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsStreamOptions) (azopenai.GetChatCompletionsStreamResponse, error) { + return azopenai.GetChatCompletionsStreamResponse{}, azure429ResponseError() + }, + }) + mockClient, _ := NewClient(getAzureAPIClient, "", "") t.Run("Complete", func(t *testing.T) { resp, err := mockClient.Complete(context.Background(), types.CompletionsFeatureChat, types.CompletionRequestParameters{}) require.Error(t, err) assert.Nil(t, resp) - autogold.Expect("AzureOpenAI: unexpected status code 429: oh no, please slow down!").Equal(t, err.Error()) + autogold.Expect("AzureOpenAI: unexpected status code 429: too many requests").Equal(t, err.Error()) _, ok := types.IsErrStatusNotOK(err) assert.True(t, ok) }) @@ -46,8 +90,45 @@ func TestErrStatusNotOK(t *testing.T) { err := mockClient.Stream(context.Background(), types.CompletionsFeatureChat, types.CompletionRequestParameters{}, func(event types.CompletionResponse) error { return nil }) require.Error(t, err) - autogold.Expect("AzureOpenAI: unexpected status code 429: oh no, please slow down!").Equal(t, err.Error()) + autogold.Expect("AzureOpenAI: unexpected status code 429: too many requests").Equal(t, err.Error()) _, ok := types.IsErrStatusNotOK(err) assert.True(t, ok) }) } + +func TestGenericErr(t *testing.T) { + getAzureAPIClient := getNewMockAzureAPIClient(&mockAzureClient{ + getCompletionsStream: func(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsStreamOptions) (azopenai.GetCompletionsStreamResponse, error) { + return azopenai.GetCompletionsStreamResponse{}, errors.New("error") + }, + getCompletions: func(ctx context.Context, body azopenai.CompletionsOptions, options *azopenai.GetCompletionsOptions) (azopenai.GetCompletionsResponse, error) { + return azopenai.GetCompletionsResponse{}, errors.New("error") + }, + getChatCompletions: func(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsOptions) (azopenai.GetChatCompletionsResponse, error) { + return azopenai.GetChatCompletionsResponse{}, errors.New("error") + }, + getChatCompletionsStream: func(ctx context.Context, body azopenai.ChatCompletionsOptions, options *azopenai.GetChatCompletionsStreamOptions) (azopenai.GetChatCompletionsStreamResponse, error) { + return azopenai.GetChatCompletionsStreamResponse{}, errors.New("error") + }, + }) + + mockClient, _ := NewClient(getAzureAPIClient, "", "") + t.Run("Complete", func(t *testing.T) { + resp, err := mockClient.Complete(context.Background(), types.CompletionsFeatureChat, types.CompletionRequestParameters{}) + require.Error(t, err) + assert.Nil(t, resp) + + autogold.Expect("error").Equal(t, err.Error()) + _, ok := types.IsErrStatusNotOK(err) + assert.False(t, ok) + }) + + t.Run("Stream", func(t *testing.T) { + err := mockClient.Stream(context.Background(), types.CompletionsFeatureChat, types.CompletionRequestParameters{}, func(event types.CompletionResponse) error { return nil }) + require.Error(t, err) + + autogold.Expect("error").Equal(t, err.Error()) + _, ok := types.IsErrStatusNotOK(err) + assert.False(t, ok) + }) +} diff --git a/internal/completions/client/client.go b/internal/completions/client/client.go index 98fa0b2c652d2..ad392e7ad2649 100644 --- a/internal/completions/client/client.go +++ b/internal/completions/client/client.go @@ -33,17 +33,17 @@ func Get( func getBasic(endpoint string, provider conftypes.CompletionsProviderName, accessToken string) (types.CompletionsClient, error) { switch provider { case conftypes.CompletionsProviderNameAnthropic: - return anthropic.NewClient(httpcli.ExternalDoer, endpoint, accessToken), nil + return anthropic.NewClient(httpcli.UncachedExternalDoer, endpoint, accessToken), nil case conftypes.CompletionsProviderNameOpenAI: - return openai.NewClient(httpcli.ExternalDoer, endpoint, accessToken), nil + return openai.NewClient(httpcli.UncachedExternalDoer, endpoint, accessToken), nil case conftypes.CompletionsProviderNameAzureOpenAI: - return azureopenai.NewClient(httpcli.ExternalDoer, endpoint, accessToken), nil + return azureopenai.NewClient(azureopenai.GetAPIClient, endpoint, accessToken) case conftypes.CompletionsProviderNameSourcegraph: - return codygateway.NewClient(httpcli.ExternalDoer, endpoint, accessToken) + return codygateway.NewClient(httpcli.UncachedExternalDoer, endpoint, accessToken) case conftypes.CompletionsProviderNameFireworks: - return fireworks.NewClient(httpcli.ExternalDoer, endpoint, accessToken), nil + return fireworks.NewClient(httpcli.UncachedExternalDoer, endpoint, accessToken), nil case conftypes.CompletionsProviderNameAWSBedrock: - return awsbedrock.NewClient(httpcli.ExternalDoer, endpoint, accessToken), nil + return awsbedrock.NewClient(httpcli.UncachedExternalDoer, endpoint, accessToken), nil default: return nil, errors.Newf("unknown completion stream provider: %s", provider) } diff --git a/internal/completions/client/codygateway/codygateway.go b/internal/completions/client/codygateway/codygateway.go index 463ba41938367..d5f83fd7bee50 100644 --- a/internal/completions/client/codygateway/codygateway.go +++ b/internal/completions/client/codygateway/codygateway.go @@ -123,7 +123,7 @@ func gatewayDoer(upstream httpcli.Doer, feature types.CompletionsFeature, gatewa // but it doesn't seem to work. resp, err := (&actor.HTTPTransport{ RoundTripper: roundTripperFunc(func(r *http.Request) (*http.Response, error) { - return upstream.Do(req) + return upstream.Do(r) }), }).RoundTrip(req) diff --git a/internal/completions/client/fireworks/fireworks.go b/internal/completions/client/fireworks/fireworks.go index c307c75f36e8f..d16665c48c31b 100644 --- a/internal/completions/client/fireworks/fireworks.go +++ b/internal/completions/client/fireworks/fireworks.go @@ -187,7 +187,7 @@ type fireworksResponse struct { Text string `json:"text"` Index int `json:"index"` FinishReason string `json:"finish_reason"` - Logprobs *types.Logprobs `json:logprobs"` + Logprobs *types.Logprobs `json:"logprobs"` } `json:"choices"` Usage struct { PromptTokens int `json:"prompt_tokens"` diff --git a/internal/completions/client/observe.go b/internal/completions/client/observe.go index 40574562fa163..3be655429896f 100644 --- a/internal/completions/client/observe.go +++ b/internal/completions/client/observe.go @@ -44,7 +44,7 @@ func (o *observedClient) Stream(ctx context.Context, feature types.CompletionsFe o.events.Record(ctx, "cody.completions", "stream", &telemetry.EventParameters{ Metadata: telemetry.EventMetadata{ - "feature": int64(feature.ID()), + "feature": float64(feature.ID()), }, PrivateMetadata: map[string]any{ "stop_reason": event.StopReason, @@ -69,7 +69,7 @@ func (o *observedClient) Complete(ctx context.Context, feature types.Completions defer o.events.Record(ctx, "cody.completions", "complete", &telemetry.EventParameters{ Metadata: telemetry.EventMetadata{ - "feature": int64(feature.ID()), + "feature": float64(feature.ID()), }, }) diff --git a/internal/completions/httpapi/BUILD.bazel b/internal/completions/httpapi/BUILD.bazel index 5ba6e69f323ce..df0c5da050793 100644 --- a/internal/completions/httpapi/BUILD.bazel +++ b/internal/completions/httpapi/BUILD.bazel @@ -13,14 +13,17 @@ go_library( visibility = ["//:__subpackages__"], deps = [ "//cmd/frontend/envvar", + "//internal/accesstoken", "//internal/actor", "//internal/auth", + "//internal/authz", "//internal/cody", "//internal/completions/client", "//internal/completions/types", "//internal/conf", "//internal/conf/conftypes", "//internal/database", + "//internal/featureflag", "//internal/honey", "//internal/redispool", "//internal/requestclient", diff --git a/internal/completions/httpapi/chat.go b/internal/completions/httpapi/chat.go index d33e88829fd30..ff15cb4f39a66 100644 --- a/internal/completions/httpapi/chat.go +++ b/internal/completions/httpapi/chat.go @@ -1,6 +1,7 @@ package httpapi import ( + "context" "net/http" "github.com/sourcegraph/log" @@ -24,7 +25,7 @@ func NewChatCompletionsStreamHandler(logger log.Logger, db database.DB) http.Han types.CompletionsFeatureChat, rl, "chat", - func(requestParams types.CodyCompletionRequestParameters, c *conftypes.CompletionsConfig) (string, error) { + func(_ context.Context, requestParams types.CodyCompletionRequestParameters, c *conftypes.CompletionsConfig) (string, error) { if isAllowedCustomChatModel(requestParams.Model) { return requestParams.Model, nil } @@ -46,6 +47,8 @@ func isAllowedCustomChatModel(model string) bool { switch model { case "anthropic/claude-2", + "anthropic/claude-2.0", + "anthropic/claude-2.1", "anthropic/claude-instant-1.2-cyan", "openai/gpt-3.5-turbo", "openai/gpt-4-1106-preview": diff --git a/internal/completions/httpapi/codecompletion.go b/internal/completions/httpapi/codecompletion.go index f0581cb787289..a1f73a09ae428 100644 --- a/internal/completions/httpapi/codecompletion.go +++ b/internal/completions/httpapi/codecompletion.go @@ -1,14 +1,15 @@ package httpapi import ( + "context" "net/http" "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/internal/completions/types" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/redispool" "github.com/sourcegraph/sourcegraph/internal/telemetry/telemetryrecorder" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -24,9 +25,10 @@ func NewCodeCompletionsHandler(logger log.Logger, db database.DB) http.Handler { types.CompletionsFeatureCode, rl, "code", - func(requestParams types.CodyCompletionRequestParameters, c *conftypes.CompletionsConfig) (string, error) { - if isAllowedCustomModel(requestParams.Model) { - return requestParams.Model, nil + func(ctx context.Context, requestParams types.CodyCompletionRequestParameters, c *conftypes.CompletionsConfig) (string, error) { + customModel := allowedCustomModel(ctx, requestParams.Model) + if customModel != "" { + return customModel, nil } if requestParams.Model != "" { return "", errors.New("Unsupported chat model") @@ -36,14 +38,29 @@ func NewCodeCompletionsHandler(logger log.Logger, db database.DB) http.Handler { ) } -// We only allow dotcom clients to select a custom code model and maintain an allowlist for which -// custom values we support -func isAllowedCustomModel(model string) bool { - if !(envvar.SourcegraphDotComMode()) { - return false - } - +func allowedCustomModel(ctx context.Context, model string) string { switch model { + // These special model strings allow the server to choose the model. This allows us to instantly + // route traffic from Fireworks multi-tenant cluster to our single-tenant cluster and + // vice-versa, without the client having to know about it + case "fireworks/starcoder-16b", + "fireworks/starcoder-7b": + + flags := featureflag.FromContext(ctx) + singleTenant := flags.GetBoolOr("cody-autocomplete-default-starcoder-hybrid-sourcegraph", false) + + if model == "fireworks/starcoder-16b" { + if singleTenant { + return "fireworks/accounts/sourcegraph/models/starcoder-16b" + } + return "fireworks/accounts/fireworks/models/starcoder-16b-w8a16" + } + + if singleTenant { + return "fireworks/accounts/sourcegraph/models/starcoder-7b" + } + return "fireworks/accounts/fireworks/models/starcoder-7b-w8a16" + case "fireworks/accounts/fireworks/models/starcoder-16b-w8a16", "fireworks/accounts/fireworks/models/starcoder-7b-w8a16", "fireworks/accounts/fireworks/models/starcoder-3b-w8a16", @@ -57,8 +74,8 @@ func isAllowedCustomModel(model string) bool { "fireworks/accounts/fireworks/models/mistral-7b-instruct-4k", "fireworks/accounts/fireworks/models/wizardcoder-15b", "anthropic/claude-instant-1.2-cyan": - return true + return model } - return false + return "" } diff --git a/internal/completions/httpapi/handler.go b/internal/completions/httpapi/handler.go index c709b7c276149..a45556634e84e 100644 --- a/internal/completions/httpapi/handler.go +++ b/internal/completions/httpapi/handler.go @@ -4,6 +4,10 @@ import ( "context" "encoding/json" "fmt" + "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" + "github.com/sourcegraph/sourcegraph/internal/accesstoken" + "github.com/sourcegraph/sourcegraph/internal/authz" + "github.com/sourcegraph/sourcegraph/internal/featureflag" "net/http" "strconv" "time" @@ -30,7 +34,7 @@ func newCompletionsHandler( feature types.CompletionsFeature, rl RateLimiter, traceFamily string, - getModel func(types.CodyCompletionRequestParameters, *conftypes.CompletionsConfig) (string, error), + getModel func(context.Context, types.CodyCompletionRequestParameters, *conftypes.CompletionsConfig) (string, error), ) http.Handler { responseHandler := newSwitchingResponseHandler(logger, feature) @@ -61,7 +65,7 @@ func newCompletionsHandler( // TODO: Model is not configurable but technically allowed in the request body right now. var err error - requestParams.Model, err = getModel(requestParams, completionsConfig) + requestParams.Model, err = getModel(ctx, requestParams, completionsConfig) if err != nil { http.Error(w, err.Error(), http.StatusBadRequest) return @@ -73,12 +77,32 @@ func newCompletionsHandler( Build() defer done() + // Use the user's access token for Cody Gateway on dotcom if PLG is enabled. + accessToken := completionsConfig.AccessToken + isCodyProEnabled := featureflag.FromContext(ctx).GetBoolOr("cody-pro", false) + isDotcom := envvar.SourcegraphDotComMode() + isProviderCodyGateway := completionsConfig.Provider == conftypes.CompletionsProviderNameSourcegraph + if isCodyProEnabled && isDotcom && isProviderCodyGateway { + apiToken, _, err := authz.ParseAuthorizationHeader(r.Header.Get("Authorization")) + if err != nil { + trace.Logger(ctx, logger).Info("Error parsing auth header", log.String("Authorization header", r.Header.Get("Authorization")), log.Error(err)) + http.Error(w, "Error parsing auth header", http.StatusUnauthorized) + return + } + accessToken, err = accesstoken.GenerateDotcomUserGatewayAccessToken(apiToken) + if err != nil { + trace.Logger(ctx, logger).Info("Access token generation failed", log.String("API token", apiToken), log.Error(err)) + http.Error(w, "Access token generation failed", http.StatusUnauthorized) + return + } + } + completionClient, err := client.Get( logger, events, completionsConfig.Endpoint, completionsConfig.Provider, - completionsConfig.AccessToken, + accessToken, ) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) @@ -108,13 +132,6 @@ func respondRateLimited(w http.ResponseWriter, err RateLimitExceededError) { http.Error(w, err.Error(), http.StatusTooManyRequests) } -func max(a, b int) int { - if a > b { - return a - } - return b -} - // newSwitchingResponseHandler handles requests to an LLM provider, and wraps the correct // handler based on the requestParams.Stream flag. func newSwitchingResponseHandler(logger log.Logger, feature types.CompletionsFeature) func(ctx context.Context, requestParams types.CompletionRequestParameters, cc types.CompletionsClient, w http.ResponseWriter) { diff --git a/internal/completions/httpapi/limiter.go b/internal/completions/httpapi/limiter.go index 660bc7befc226..a59bf00f065f7 100644 --- a/internal/completions/httpapi/limiter.go +++ b/internal/completions/httpapi/limiter.go @@ -194,10 +194,3 @@ func getConfiguredLimit(ctx context.Context, db database.DB, scope types.Complet return 0, nil } - -func min(a, b int) int { - if a < b { - return a - } - return b -} diff --git a/internal/conf/BUILD.bazel b/internal/conf/BUILD.bazel index ced5672a0c505..702921c386a8f 100644 --- a/internal/conf/BUILD.bazel +++ b/internal/conf/BUILD.bazel @@ -5,6 +5,7 @@ go_library( name = "conf", srcs = [ "auth.go", + "batch_changes.go", "client.go", "cody_validators.go", "computed.go", diff --git a/internal/conf/batch_changes.go b/internal/conf/batch_changes.go new file mode 100644 index 0000000000000..b200d734d66f0 --- /dev/null +++ b/internal/conf/batch_changes.go @@ -0,0 +1,11 @@ +package conf + +// RejectUnverifiedCommit returns a boolean indicating if unverified commits in changesets +// created by a Batch Change should result in an error. +func RejectUnverifiedCommit() bool { + cfg := Get().SiteConfig().BatchChangesRejectUnverifiedCommit + if cfg == nil { + return false + } + return *cfg +} diff --git a/internal/conf/client.go b/internal/conf/client.go index 5340636a8e146..be1cd9669048a 100644 --- a/internal/conf/client.go +++ b/internal/conf/client.go @@ -84,10 +84,6 @@ func SiteConfig() schema.SiteConfiguration { return Get().SiteConfiguration } -func ServiceConnections() conftypes.ServiceConnections { - return Get().ServiceConnections() -} - // Raw returns a copy of the raw configuration. func (c *client) Raw() conftypes.RawUnified { return c.store.Raw() diff --git a/internal/conf/computed.go b/internal/conf/computed.go index 98e12754a6d33..5fff081aa63d3 100644 --- a/internal/conf/computed.go +++ b/internal/conf/computed.go @@ -460,6 +460,29 @@ func PasswordPolicyEnabled() bool { return pc.Enabled } +func RateLimits() schema.RateLimits { + rl := schema.RateLimits{ + GraphQLMaxAliases: 500, + GraphQLMaxFieldCount: 500_000, + GraphQLMaxDepth: 30, + } + + configured := Get().RateLimits + + if configured != nil { + if configured.GraphQLMaxAliases <= 0 { + rl.GraphQLMaxAliases = configured.GraphQLMaxAliases + } + if configured.GraphQLMaxFieldCount <= 0 { + rl.GraphQLMaxFieldCount = configured.GraphQLMaxFieldCount + } + if configured.GraphQLMaxDepth <= 0 { + rl.GraphQLMaxDepth = configured.GraphQLMaxDepth + } + } + return rl +} + // By default, password reset links are valid for 4 hours. const defaultPasswordLinkExpiry = 14400 @@ -569,7 +592,7 @@ func GetCompletionsConfig(siteConfig schema.SiteConfiguration) (c *conftypes.Com if completionsConfig == nil { completionsConfig = &schema.Completions{ Provider: string(conftypes.CompletionsProviderNameSourcegraph), - ChatModel: "anthropic/claude-2", + ChatModel: "anthropic/claude-2.0", FastChatModel: "anthropic/claude-instant-1", CompletionModel: "anthropic/claude-instant-1", } @@ -609,7 +632,7 @@ func GetCompletionsConfig(siteConfig schema.SiteConfiguration) (c *conftypes.Com // Set a default chat model. if completionsConfig.ChatModel == "" { - completionsConfig.ChatModel = "anthropic/claude-2" + completionsConfig.ChatModel = "anthropic/claude-2.0" } // Set a default fast chat model. @@ -659,7 +682,7 @@ func GetCompletionsConfig(siteConfig schema.SiteConfiguration) (c *conftypes.Com // Set a default chat model. if completionsConfig.ChatModel == "" { - completionsConfig.ChatModel = "claude-2" + completionsConfig.ChatModel = "claude-2.0" } // Set a default fast chat model. @@ -677,11 +700,6 @@ func GetCompletionsConfig(siteConfig schema.SiteConfiguration) (c *conftypes.Com return nil } - // If not access token is set, we cannot talk to Azure OpenAI. Bail. - if completionsConfig.AccessToken == "" { - return nil - } - // If not chat model is set, we cannot talk to Azure OpenAI. Bail. if completionsConfig.ChatModel == "" { return nil @@ -778,6 +796,14 @@ func GetCompletionsConfig(siteConfig schema.SiteConfiguration) (c *conftypes.Com Endpoint: completionsConfig.Endpoint, PerUserDailyLimit: completionsConfig.PerUserDailyLimit, PerUserCodeCompletionsDailyLimit: completionsConfig.PerUserCodeCompletionsDailyLimit, + PerCommunityUserChatMonthlyLLMRequestLimit: completionsConfig.PerCommunityUserChatMonthlyLLMRequestLimit, + PerCommunityUserCodeCompletionsMonthlyLLMRequestLimit: completionsConfig.PerCommunityUserCodeCompletionsMonthlyLLMRequestLimit, + PerProUserChatDailyLLMRequestLimit: completionsConfig.PerProUserChatDailyLLMRequestLimit, + PerProUserCodeCompletionsDailyLLMRequestLimit: completionsConfig.PerProUserCodeCompletionsDailyLLMRequestLimit, + PerCommunityUserChatMonthlyInteractionLimit: completionsConfig.PerCommunityUserChatMonthlyInteractionLimit, + PerCommunityUserCodeCompletionsMonthlyInteractionLimit: completionsConfig.PerCommunityUserCodeCompletionsMonthlyInteractionLimit, + PerProUserChatDailyInteractionLimit: completionsConfig.PerProUserChatDailyInteractionLimit, + PerProUserCodeCompletionsDailyInteractionLimit: completionsConfig.PerProUserCodeCompletionsDailyInteractionLimit, } return computedConfig @@ -911,11 +937,6 @@ func GetEmbeddingsConfig(siteConfig schema.SiteConfiguration) *conftypes.Embeddi return nil } - // If not access token is set, we cannot talk to OpenAI. Bail. - if embeddingsConfig.AccessToken == "" { - return nil - } - // If no model is set, we cannot do anything here. if embeddingsConfig.Model == "" { return nil @@ -935,7 +956,7 @@ func GetEmbeddingsConfig(siteConfig schema.SiteConfiguration) *conftypes.Embeddi if embeddingsConfig.FileFilters != nil { includedFilePathPatterns = embeddingsConfig.FileFilters.IncludedFilePathPatterns excludedFilePathPatterns = append(excludedFilePathPatterns, embeddingsConfig.FileFilters.ExcludedFilePathPatterns...) - if embeddingsConfig.FileFilters.MaxFileSizeBytes >= 0 && embeddingsConfig.FileFilters.MaxFileSizeBytes <= embeddingsMaxFileSizeBytes { + if embeddingsConfig.FileFilters.MaxFileSizeBytes > 0 && embeddingsConfig.FileFilters.MaxFileSizeBytes <= embeddingsMaxFileSizeBytes { maxFileSizeLimit = embeddingsConfig.FileFilters.MaxFileSizeBytes } } @@ -1005,13 +1026,15 @@ func GetEmbeddingsConfig(siteConfig schema.SiteConfiguration) *conftypes.Embeddi Endpoint: embeddingsConfig.Endpoint, Dimensions: embeddingsConfig.Dimensions, // This is definitely set at this point. - Incremental: *embeddingsConfig.Incremental, - FileFilters: fileFilters, - MaxCodeEmbeddingsPerRepo: embeddingsConfig.MaxCodeEmbeddingsPerRepo, - MaxTextEmbeddingsPerRepo: embeddingsConfig.MaxTextEmbeddingsPerRepo, - PolicyRepositoryMatchLimit: embeddingsConfig.PolicyRepositoryMatchLimit, - ExcludeChunkOnError: pointers.Deref(embeddingsConfig.ExcludeChunkOnError, true), - Qdrant: computedQdrantConfig, + Incremental: *embeddingsConfig.Incremental, + FileFilters: fileFilters, + MaxCodeEmbeddingsPerRepo: embeddingsConfig.MaxCodeEmbeddingsPerRepo, + MaxTextEmbeddingsPerRepo: embeddingsConfig.MaxTextEmbeddingsPerRepo, + PolicyRepositoryMatchLimit: embeddingsConfig.PolicyRepositoryMatchLimit, + ExcludeChunkOnError: pointers.Deref(embeddingsConfig.ExcludeChunkOnError, true), + Qdrant: computedQdrantConfig, + PerCommunityUserEmbeddingsMonthlyLimit: embeddingsConfig.PerCommunityUserEmbeddingsMonthlyLimit, + PerProUserEmbeddingsMonthlyLimit: embeddingsConfig.PerProUserEmbeddingsMonthlyLimit, } d, err := time.ParseDuration(embeddingsConfig.MinimumInterval) if err != nil { @@ -1106,7 +1129,7 @@ func anthropicDefaultMaxPromptTokens(model string) int { return 100_000 } - if model == "claude-2" || model == "claude-v2" { + if model == "claude-2" || model == "claude-2.0" || model == "claude-2.1" || model == "claude-v2" { // TODO: Technically, v2 also uses a 100k window, but we should validate // that returning 100k here is the right thing to do. return 12_000 diff --git a/internal/conf/computed_test.go b/internal/conf/computed_test.go index 06f4eb79d06bc..bb0b562955657 100644 --- a/internal/conf/computed_test.go +++ b/internal/conf/computed_test.go @@ -317,7 +317,7 @@ func TestGetCompletionsConfig(t *testing.T) { licenseKey := "theasdfkey" licenseAccessToken := license.GenerateLicenseKeyBasedAccessToken(licenseKey) zeroConfigDefaultWithLicense := &conftypes.CompletionsConfig{ - ChatModel: "anthropic/claude-2", + ChatModel: "anthropic/claude-2.0", ChatModelMaxTokens: 12000, FastChatModel: "anthropic/claude-instant-1", FastChatModelMaxTokens: 9000, @@ -406,7 +406,7 @@ func TestGetCompletionsConfig(t *testing.T) { }, }, wantConfig: &conftypes.CompletionsConfig{ - ChatModel: "claude-2", + ChatModel: "claude-2.0", ChatModelMaxTokens: 12000, FastChatModel: "claude-instant-1", FastChatModelMaxTokens: 9000, @@ -616,7 +616,7 @@ func TestGetCompletionsConfig(t *testing.T) { }, wantConfig: &conftypes.CompletionsConfig{ AccessToken: "sgd_d796dd3efc6c5257694b80cba0537131457b1742b42d081a27aeaef091107bc4", - ChatModel: "anthropic/claude-2", + ChatModel: "anthropic/claude-2.0", ChatModelMaxTokens: 12000, FastChatModel: "anthropic/claude-instant-1", FastChatModelMaxTokens: 9000, @@ -834,6 +834,39 @@ func TestGetEmbeddingsConfig(t *testing.T) { Qdrant: defaultQdrantConfig, }, }, + { + name: "File filters w/o MaxFileSizeBytes", + siteConfig: schema.SiteConfiguration{ + CodyEnabled: pointers.Ptr(true), + LicenseKey: licenseKey, + Embeddings: &schema.Embeddings{ + Provider: "sourcegraph", + FileFilters: &schema.FileFilters{ + IncludedFilePathPatterns: []string{"*.go"}, + ExcludedFilePathPatterns: []string{"*.java"}, + }, + }, + }, + wantConfig: &conftypes.EmbeddingsConfig{ + Provider: "sourcegraph", + AccessToken: licenseAccessToken, + Model: "openai/text-embedding-ada-002", + Endpoint: "https://cody-gateway.sourcegraph.com/v1/embeddings", + Dimensions: 1536, + Incremental: true, + MinimumInterval: 24 * time.Hour, + MaxCodeEmbeddingsPerRepo: 3_072_000, + MaxTextEmbeddingsPerRepo: 512_000, + PolicyRepositoryMatchLimit: pointers.Ptr(5000), + FileFilters: conftypes.EmbeddingsFileFilters{ + MaxFileSizeBytes: embeddingsMaxFileSizeBytes, + IncludedFilePathPatterns: []string{"*.go"}, + ExcludedFilePathPatterns: []string{"*.java"}, + }, + ExcludeChunkOnError: true, + Qdrant: defaultQdrantConfig, + }, + }, { name: "Disable exclude failed chunk during indexing", siteConfig: schema.SiteConfiguration{ diff --git a/internal/conf/conftypes/consts.go b/internal/conf/conftypes/consts.go index b6461fadcda27..a57475beb7d32 100644 --- a/internal/conf/conftypes/consts.go +++ b/internal/conf/conftypes/consts.go @@ -12,11 +12,19 @@ type CompletionsConfig struct { CompletionModel string CompletionModelMaxTokens int - AccessToken string - Provider CompletionsProviderName - Endpoint string - PerUserDailyLimit int - PerUserCodeCompletionsDailyLimit int + AccessToken string + Provider CompletionsProviderName + Endpoint string + PerUserDailyLimit int + PerUserCodeCompletionsDailyLimit int + PerCommunityUserChatMonthlyLLMRequestLimit int + PerCommunityUserCodeCompletionsMonthlyLLMRequestLimit int + PerProUserChatDailyLLMRequestLimit int + PerProUserCodeCompletionsDailyLLMRequestLimit int + PerCommunityUserChatMonthlyInteractionLimit int + PerCommunityUserCodeCompletionsMonthlyInteractionLimit int + PerProUserChatDailyInteractionLimit int + PerProUserCodeCompletionsDailyInteractionLimit int } type CompletionsProviderName string @@ -31,19 +39,21 @@ const ( ) type EmbeddingsConfig struct { - Provider EmbeddingsProviderName - AccessToken string - Model string - Endpoint string - Dimensions int - Incremental bool - MinimumInterval time.Duration - FileFilters EmbeddingsFileFilters - MaxCodeEmbeddingsPerRepo int - MaxTextEmbeddingsPerRepo int - PolicyRepositoryMatchLimit *int - ExcludeChunkOnError bool - Qdrant QdrantConfig + Provider EmbeddingsProviderName + AccessToken string + Model string + Endpoint string + Dimensions int + Incremental bool + MinimumInterval time.Duration + FileFilters EmbeddingsFileFilters + MaxCodeEmbeddingsPerRepo int + MaxTextEmbeddingsPerRepo int + PolicyRepositoryMatchLimit *int + ExcludeChunkOnError bool + Qdrant QdrantConfig + PerCommunityUserEmbeddingsMonthlyLimit int + PerProUserEmbeddingsMonthlyLimit int } type QdrantConfig struct { diff --git a/internal/database/BUILD.bazel b/internal/database/BUILD.bazel index 6a50455dd58ae..edb2f9e2ba866 100644 --- a/internal/database/BUILD.bazel +++ b/internal/database/BUILD.bazel @@ -1,7 +1,6 @@ load("//dev:go_defs.bzl", "go_test") load("@io_bazel_rules_go//go:def.bzl", "go_library") load("//dev:migrations.bzl", "generate_schemas") -load("@bazel_skylib//rules:build_test.bzl", "build_test") load("//dev:write_generated_to_source_files.bzl", "write_generated_to_source_files") go_library( @@ -151,7 +150,6 @@ go_library( "//internal/trace", "//internal/types", "//internal/version", - "//internal/xcontext", "//lib/errors", "//lib/pointers", "//schema", diff --git a/internal/database/access_tokens.go b/internal/database/access_tokens.go index 28477690e7e6f..c58ef913cb0d2 100644 --- a/internal/database/access_tokens.go +++ b/internal/database/access_tokens.go @@ -16,7 +16,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database/basestore" - "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/hashutil" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -124,7 +123,7 @@ type AccessTokenStore interface { // // 🚨 SECURITY: This returns a user ID if and only if the token corresponds to a valid, // non-deleted access token. - Lookup(ctx context.Context, token, requiredScope string) (subjectUserID int32, err error) + Lookup(ctx context.Context, token string, opts TokenLookupOpts) (subjectUserID int32, err error) WithTransact(context.Context, func(AccessTokenStore) error) error With(basestore.ShareableStore) AccessTokenStore @@ -168,11 +167,6 @@ func (s *accessTokenStore) createToken(ctx context.Context, subjectUserID int32, return 0, "", errors.New("access tokens without scopes are not supported") } - // Feature flag new token format - // Disable by default until all Cody extensions support the new format - flags := featureflag.FromContext(ctx) - includeInstanceIdentifier := flags.GetBoolOr("access-tokens-include-instance-identifier", false) - config := conf.Get().SiteConfig() var isDevInstance bool @@ -183,7 +177,7 @@ func (s *accessTokenStore) createToken(ctx context.Context, subjectUserID int32, isDevInstance = licensing.IsLicensePublicKeyOverridden() } - token, b, err := accesstoken.GeneratePersonalAccessToken(includeInstanceIdentifier, config.LicenseKey, isDevInstance) + token, b, err := accesstoken.GeneratePersonalAccessToken(config.LicenseKey, isDevInstance) if err != nil { return 0, "", err } @@ -239,8 +233,36 @@ INSERT INTO access_tokens(subject_user_id, scopes, value_sha256, note, creator_u return id, token, nil } -func (s *accessTokenStore) Lookup(ctx context.Context, token, requiredScope string) (subjectUserID int32, err error) { - if requiredScope == "" { +type TokenLookupOpts struct { + OnlyAdmin bool + RequiredScope string +} + +func (o TokenLookupOpts) ToQuery() string { + query := ` +UPDATE access_tokens t SET last_used_at=now() +WHERE t.id IN ( + SELECT t2.id FROM access_tokens t2 + JOIN users subject_user ON t2.subject_user_id=subject_user.id AND subject_user.deleted_at IS NULL + JOIN users creator_user ON t2.creator_user_id=creator_user.id AND creator_user.deleted_at IS NULL + WHERE t2.value_sha256=$1 AND t2.deleted_at IS NULL AND + $2 = ANY (t2.scopes) + ` + + if o.OnlyAdmin { + query += "AND subject_user.site_admin" + } + + query += ` + ) +RETURNING t.subject_user_id +` + + return query +} + +func (s *accessTokenStore) Lookup(ctx context.Context, token string, opts TokenLookupOpts) (subjectUserID int32, err error) { + if opts.RequiredScope == "" { return 0, errors.New("no scope provided in access token lookup") } @@ -251,18 +273,8 @@ func (s *accessTokenStore) Lookup(ctx context.Context, token, requiredScope stri if err := s.Handle().QueryRowContext(ctx, // Ensure that subject and creator users still exist. - ` -UPDATE access_tokens t SET last_used_at=now() -WHERE t.id IN ( - SELECT t2.id FROM access_tokens t2 - JOIN users subject_user ON t2.subject_user_id=subject_user.id AND subject_user.deleted_at IS NULL - JOIN users creator_user ON t2.creator_user_id=creator_user.id AND creator_user.deleted_at IS NULL - WHERE t2.value_sha256=$1 AND t2.deleted_at IS NULL AND - $2 = ANY (t2.scopes) -) -RETURNING t.subject_user_id -`, - tokenHash, requiredScope, + opts.ToQuery(), + tokenHash, opts.RequiredScope, ).Scan(&subjectUserID); err != nil { if err == sql.ErrNoRows { return 0, ErrAccessTokenNotFound diff --git a/internal/database/access_tokens_test.go b/internal/database/access_tokens_test.go index 39d3e87d6d862..c7c674b94ff40 100644 --- a/internal/database/access_tokens_test.go +++ b/internal/database/access_tokens_test.go @@ -8,6 +8,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" @@ -37,6 +38,8 @@ func TestAccessTokens(t *testing.T) { t.Run("testAccessTokens_tokenSHA256Hash", testAccessTokens_tokenSHA256Hash) }) + // Don't run parallel as it's mocking an expired license + t.Run("testAccessToken_Lookup_expiredLicense", testAccessTokens_Lookup_expiredLicense) } // 🚨 SECURITY: This tests the routine that creates access tokens and returns the token secret value @@ -95,7 +98,7 @@ func testAccessTokens_Create(t *testing.T) { t.Errorf("got %q, want %q", got.Note, want) } - gotSubjectUserID, err := db.AccessTokens().Lookup(ctx, tv0, "a") + gotSubjectUserID, err := db.AccessTokens().Lookup(ctx, tv0, TokenLookupOpts{RequiredScope: "a"}) if err != nil { t.Fatal(err) } @@ -233,7 +236,6 @@ func testAccessTokens_CreateInternal_DoesNotCaptureSecurityEvent(t *testing.T) { t.Fatal(err) } assertSecurityEventCount(t, db, SecurityEventAccessTokenCreated, 0) - } // This test is run in TestAccessTokens @@ -353,7 +355,7 @@ func testAccessTokens_Lookup(t *testing.T) { } for _, scope := range []string{"a", "b"} { - gotSubjectUserID, err := db.AccessTokens().Lookup(ctx, tv0, scope) + gotSubjectUserID, err := db.AccessTokens().Lookup(ctx, tv0, TokenLookupOpts{RequiredScope: scope}) if err != nil { t.Fatal(err) } @@ -363,12 +365,12 @@ func testAccessTokens_Lookup(t *testing.T) { } // Lookup with a nonexistent scope and ensure it fails. - if _, err := db.AccessTokens().Lookup(ctx, tv0, "x"); err == nil { + if _, err := db.AccessTokens().Lookup(ctx, tv0, TokenLookupOpts{RequiredScope: "x"}); err == nil { t.Fatal(err) } // Lookup with an empty scope and ensure it fails. - if _, err := db.AccessTokens().Lookup(ctx, tv0, ""); err == nil { + if _, err := db.AccessTokens().Lookup(ctx, tv0, TokenLookupOpts{RequiredScope: ""}); err == nil { t.Fatal(err) } @@ -376,12 +378,12 @@ func testAccessTokens_Lookup(t *testing.T) { if err := db.AccessTokens().DeleteByID(ctx, tid0); err != nil { t.Fatal(err) } - if _, err := db.AccessTokens().Lookup(ctx, tv0, "a"); err == nil { + if _, err := db.AccessTokens().Lookup(ctx, tv0, TokenLookupOpts{RequiredScope: "a"}); err == nil { t.Fatal(err) } // Try to Lookup a token that was never created. - if _, err := db.AccessTokens().Lookup(ctx, "abcdefg" /* this token value was never created */, "a"); err == nil { + if _, err := db.AccessTokens().Lookup(ctx, "abcdefg" /* this token value was never created */, TokenLookupOpts{RequiredScope: "a"}); err == nil { t.Fatal(err) } } @@ -425,7 +427,7 @@ func testAccessTokens_Lookup_deletedUser(t *testing.T) { if err := db.Users().Delete(ctx, subject.ID); err != nil { t.Fatal(err) } - if _, err := db.AccessTokens().Lookup(ctx, tv0, "a"); err == nil { + if _, err := db.AccessTokens().Lookup(ctx, tv0, TokenLookupOpts{RequiredScope: "a"}); err == nil { t.Fatal("Lookup: want error looking up token for deleted subject user") } @@ -461,7 +463,7 @@ func testAccessTokens_Lookup_deletedUser(t *testing.T) { if err := db.Users().Delete(ctx, creator.ID); err != nil { t.Fatal(err) } - if _, err := db.AccessTokens().Lookup(ctx, tv0, "a"); err == nil { + if _, err := db.AccessTokens().Lookup(ctx, tv0, TokenLookupOpts{RequiredScope: "a"}); err == nil { t.Fatal("Lookup: want error looking up token for deleted creator user") } @@ -471,6 +473,55 @@ func testAccessTokens_Lookup_deletedUser(t *testing.T) { }) } +// 🚨 SECURITY: This tests that deleting the subject or creator user of an access token invalidates +// the token, and that no new access tokens may be created for deleted users. +// This test is run in TestAccessTokens +func testAccessTokens_Lookup_expiredLicense(t *testing.T) { + if testing.Short() { + t.Skip() + } + logger := logtest.Scoped(t) + db := NewDB(logger, dbtest.NewDB(t)) + ctx := context.Background() + + adminUser, err := db.Users().Create(ctx, NewUser{ + Email: "u1@example.com", + Username: "u1", + Password: "p1", + EmailVerificationCode: "c1", + }) + if err != nil { + t.Fatal(err) + } + require.NoError(t, db.Users().SetIsSiteAdmin(ctx, adminUser.ID, true)) + + regularUser, err := db.Users().Create(ctx, NewUser{ + Email: "u2@example.com", + Username: "u2", + Password: "p2", + EmailVerificationCode: "c2", + }) + if err != nil { + t.Fatal(err) + } + + _, adminToken, err := db.AccessTokens().Create(ctx, adminUser.ID, []string{"a"}, "n0", adminUser.ID) + if err != nil { + t.Fatal(err) + } + _, regularToken, err := db.AccessTokens().Create(ctx, regularUser.ID, []string{"a"}, "n0", regularUser.ID) + if err != nil { + t.Fatal(err) + } + + if _, err := db.AccessTokens().Lookup(ctx, adminToken, TokenLookupOpts{RequiredScope: "a", OnlyAdmin: true}); err != nil { + t.Fatal("Lookup: lookup should not fail for admin user") + } + if _, err := db.AccessTokens().Lookup(ctx, regularToken, TokenLookupOpts{RequiredScope: "a", OnlyAdmin: true}); err == nil { + t.Fatal("Lookup: lookup should fail for regular user") + } +} + // This test is run in TestAccessTokens func testAccessTokens_tokenSHA256Hash(t *testing.T) { testCases := []struct { diff --git a/internal/database/connections/live/BUILD.bazel b/internal/database/connections/live/BUILD.bazel index 0976a6ad9ff09..cd397a24b1a44 100644 --- a/internal/database/connections/live/BUILD.bazel +++ b/internal/database/connections/live/BUILD.bazel @@ -26,7 +26,7 @@ go_library( go_test( name = "live_test", - timeout = "moderate", + timeout = "long", srcs = ["migration_test.go"], embed = [":live"], tags = [ diff --git a/internal/database/dbconn/rds/BUILD.bazel b/internal/database/dbconn/rds/BUILD.bazel index 2f3dbcac373ac..29cb336e71cbe 100644 --- a/internal/database/dbconn/rds/BUILD.bazel +++ b/internal/database/dbconn/rds/BUILD.bazel @@ -7,7 +7,6 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/internal/database/dbconn/rds", visibility = ["//:__subpackages__"], deps = [ - "//internal/syncx", "//lib/errors", "@com_github_aws_aws_sdk_go//aws/session", "@com_github_aws_aws_sdk_go//service/rds/rdsutils", diff --git a/internal/database/dbconn/rds/rds.go b/internal/database/dbconn/rds/rds.go index 6ca4b2cc97a09..b8db7d2aca664 100644 --- a/internal/database/dbconn/rds/rds.go +++ b/internal/database/dbconn/rds/rds.go @@ -5,13 +5,13 @@ import ( "net/url" "strconv" "strings" + "sync" "time" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/rds/rdsutils" "github.com/jackc/pgx/v4" "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -40,7 +40,7 @@ func (u *Updater) Update(cfg *pgx.ConnConfig) (*pgx.ConnConfig, error) { logger := log.Scoped("rds") if cfg.Password != "" { // only output the warning once, or it will emit a new entry on every connection - syncx.OnceFunc(func() { + sync.OnceFunc(func() { logger.Warn("'PG_CONNECTION_UPDATER' is 'EC2_ROLE_CREDENTIALS', but 'PGPASSWORD' is also set. Ignoring 'PGPASSWORD'.") }) } diff --git a/internal/database/dbmocks/mocks_temp.go b/internal/database/dbmocks/mocks_temp.go index 95a10027c0479..b739f627ba80a 100644 --- a/internal/database/dbmocks/mocks_temp.go +++ b/internal/database/dbmocks/mocks_temp.go @@ -1269,7 +1269,7 @@ func NewMockAccessTokenStore() *MockAccessTokenStore { }, }, LookupFunc: &AccessTokenStoreLookupFunc{ - defaultHook: func(context.Context, string, string) (r0 int32, r1 error) { + defaultHook: func(context.Context, string, database.TokenLookupOpts) (r0 int32, r1 error) { return }, }, @@ -1341,7 +1341,7 @@ func NewStrictMockAccessTokenStore() *MockAccessTokenStore { }, }, LookupFunc: &AccessTokenStoreLookupFunc{ - defaultHook: func(context.Context, string, string) (int32, error) { + defaultHook: func(context.Context, string, database.TokenLookupOpts) (int32, error) { panic("unexpected invocation of MockAccessTokenStore.Lookup") }, }, @@ -2500,15 +2500,15 @@ func (c AccessTokenStoreListFuncCall) Results() []interface{} { // AccessTokenStoreLookupFunc describes the behavior when the Lookup method // of the parent MockAccessTokenStore instance is invoked. type AccessTokenStoreLookupFunc struct { - defaultHook func(context.Context, string, string) (int32, error) - hooks []func(context.Context, string, string) (int32, error) + defaultHook func(context.Context, string, database.TokenLookupOpts) (int32, error) + hooks []func(context.Context, string, database.TokenLookupOpts) (int32, error) history []AccessTokenStoreLookupFuncCall mutex sync.Mutex } // Lookup delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockAccessTokenStore) Lookup(v0 context.Context, v1 string, v2 string) (int32, error) { +func (m *MockAccessTokenStore) Lookup(v0 context.Context, v1 string, v2 database.TokenLookupOpts) (int32, error) { r0, r1 := m.LookupFunc.nextHook()(v0, v1, v2) m.LookupFunc.appendCall(AccessTokenStoreLookupFuncCall{v0, v1, v2, r0, r1}) return r0, r1 @@ -2517,7 +2517,7 @@ func (m *MockAccessTokenStore) Lookup(v0 context.Context, v1 string, v2 string) // SetDefaultHook sets function that is called when the Lookup method of the // parent MockAccessTokenStore instance is invoked and the hook queue is // empty. -func (f *AccessTokenStoreLookupFunc) SetDefaultHook(hook func(context.Context, string, string) (int32, error)) { +func (f *AccessTokenStoreLookupFunc) SetDefaultHook(hook func(context.Context, string, database.TokenLookupOpts) (int32, error)) { f.defaultHook = hook } @@ -2525,7 +2525,7 @@ func (f *AccessTokenStoreLookupFunc) SetDefaultHook(hook func(context.Context, s // Lookup method of the parent MockAccessTokenStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *AccessTokenStoreLookupFunc) PushHook(hook func(context.Context, string, string) (int32, error)) { +func (f *AccessTokenStoreLookupFunc) PushHook(hook func(context.Context, string, database.TokenLookupOpts) (int32, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -2534,19 +2534,19 @@ func (f *AccessTokenStoreLookupFunc) PushHook(hook func(context.Context, string, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. func (f *AccessTokenStoreLookupFunc) SetDefaultReturn(r0 int32, r1 error) { - f.SetDefaultHook(func(context.Context, string, string) (int32, error) { + f.SetDefaultHook(func(context.Context, string, database.TokenLookupOpts) (int32, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. func (f *AccessTokenStoreLookupFunc) PushReturn(r0 int32, r1 error) { - f.PushHook(func(context.Context, string, string) (int32, error) { + f.PushHook(func(context.Context, string, database.TokenLookupOpts) (int32, error) { return r0, r1 }) } -func (f *AccessTokenStoreLookupFunc) nextHook() func(context.Context, string, string) (int32, error) { +func (f *AccessTokenStoreLookupFunc) nextHook() func(context.Context, string, database.TokenLookupOpts) (int32, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -2587,7 +2587,7 @@ type AccessTokenStoreLookupFuncCall struct { Arg1 string // Arg2 is the value of the 3rd argument passed to this method // invocation. - Arg2 string + Arg2 database.TokenLookupOpts // Result0 is the value of the 1st result returned from this method // invocation. Result0 int32 @@ -22618,6 +22618,9 @@ type MockEventLogStore struct { // CodeIntelligenceWAUsFunc is an instance of a mock function object // controlling the behavior of the method CodeIntelligenceWAUs. CodeIntelligenceWAUsFunc *EventLogStoreCodeIntelligenceWAUsFunc + // CountBySQLFunc is an instance of a mock function object controlling + // the behavior of the method CountBySQL. + CountBySQLFunc *EventLogStoreCountBySQLFunc // CountByUserIDFunc is an instance of a mock function object // controlling the behavior of the method CountByUserID. CountByUserIDFunc *EventLogStoreCountByUserIDFunc @@ -22778,6 +22781,11 @@ func NewMockEventLogStore() *MockEventLogStore { return }, }, + CountBySQLFunc: &EventLogStoreCountBySQLFunc{ + defaultHook: func(context.Context, *sqlf.Query) (r0 int, r1 error) { + return + }, + }, CountByUserIDFunc: &EventLogStoreCountByUserIDFunc{ defaultHook: func(context.Context, int32) (r0 int, r1 error) { return @@ -22980,6 +22988,11 @@ func NewStrictMockEventLogStore() *MockEventLogStore { panic("unexpected invocation of MockEventLogStore.CodeIntelligenceWAUs") }, }, + CountBySQLFunc: &EventLogStoreCountBySQLFunc{ + defaultHook: func(context.Context, *sqlf.Query) (int, error) { + panic("unexpected invocation of MockEventLogStore.CountBySQL") + }, + }, CountByUserIDFunc: &EventLogStoreCountByUserIDFunc{ defaultHook: func(context.Context, int32) (int, error) { panic("unexpected invocation of MockEventLogStore.CountByUserID") @@ -23153,6 +23166,9 @@ func NewMockEventLogStoreFrom(i database.EventLogStore) *MockEventLogStore { CodeIntelligenceWAUsFunc: &EventLogStoreCodeIntelligenceWAUsFunc{ defaultHook: i.CodeIntelligenceWAUs, }, + CountBySQLFunc: &EventLogStoreCountBySQLFunc{ + defaultHook: i.CountBySQL, + }, CountByUserIDFunc: &EventLogStoreCountByUserIDFunc{ defaultHook: i.CountByUserID, }, @@ -24879,6 +24895,114 @@ func (c EventLogStoreCodeIntelligenceWAUsFuncCall) Results() []interface{} { return []interface{}{c.Result0, c.Result1} } +// EventLogStoreCountBySQLFunc describes the behavior when the CountBySQL +// method of the parent MockEventLogStore instance is invoked. +type EventLogStoreCountBySQLFunc struct { + defaultHook func(context.Context, *sqlf.Query) (int, error) + hooks []func(context.Context, *sqlf.Query) (int, error) + history []EventLogStoreCountBySQLFuncCall + mutex sync.Mutex +} + +// CountBySQL delegates to the next hook function in the queue and stores +// the parameter and result values of this invocation. +func (m *MockEventLogStore) CountBySQL(v0 context.Context, v1 *sqlf.Query) (int, error) { + r0, r1 := m.CountBySQLFunc.nextHook()(v0, v1) + m.CountBySQLFunc.appendCall(EventLogStoreCountBySQLFuncCall{v0, v1, r0, r1}) + return r0, r1 +} + +// SetDefaultHook sets function that is called when the CountBySQL method of +// the parent MockEventLogStore instance is invoked and the hook queue is +// empty. +func (f *EventLogStoreCountBySQLFunc) SetDefaultHook(hook func(context.Context, *sqlf.Query) (int, error)) { + f.defaultHook = hook +} + +// PushHook adds a function to the end of hook queue. Each invocation of the +// CountBySQL method of the parent MockEventLogStore instance invokes the +// hook at the front of the queue and discards it. After the queue is empty, +// the default hook function is invoked for any future action. +func (f *EventLogStoreCountBySQLFunc) PushHook(hook func(context.Context, *sqlf.Query) (int, error)) { + f.mutex.Lock() + f.hooks = append(f.hooks, hook) + f.mutex.Unlock() +} + +// SetDefaultReturn calls SetDefaultHook with a function that returns the +// given values. +func (f *EventLogStoreCountBySQLFunc) SetDefaultReturn(r0 int, r1 error) { + f.SetDefaultHook(func(context.Context, *sqlf.Query) (int, error) { + return r0, r1 + }) +} + +// PushReturn calls PushHook with a function that returns the given values. +func (f *EventLogStoreCountBySQLFunc) PushReturn(r0 int, r1 error) { + f.PushHook(func(context.Context, *sqlf.Query) (int, error) { + return r0, r1 + }) +} + +func (f *EventLogStoreCountBySQLFunc) nextHook() func(context.Context, *sqlf.Query) (int, error) { + f.mutex.Lock() + defer f.mutex.Unlock() + + if len(f.hooks) == 0 { + return f.defaultHook + } + + hook := f.hooks[0] + f.hooks = f.hooks[1:] + return hook +} + +func (f *EventLogStoreCountBySQLFunc) appendCall(r0 EventLogStoreCountBySQLFuncCall) { + f.mutex.Lock() + f.history = append(f.history, r0) + f.mutex.Unlock() +} + +// History returns a sequence of EventLogStoreCountBySQLFuncCall objects +// describing the invocations of this function. +func (f *EventLogStoreCountBySQLFunc) History() []EventLogStoreCountBySQLFuncCall { + f.mutex.Lock() + history := make([]EventLogStoreCountBySQLFuncCall, len(f.history)) + copy(history, f.history) + f.mutex.Unlock() + + return history +} + +// EventLogStoreCountBySQLFuncCall is an object that describes an invocation +// of method CountBySQL on an instance of MockEventLogStore. +type EventLogStoreCountBySQLFuncCall struct { + // Arg0 is the value of the 1st argument passed to this method + // invocation. + Arg0 context.Context + // Arg1 is the value of the 2nd argument passed to this method + // invocation. + Arg1 *sqlf.Query + // Result0 is the value of the 1st result returned from this method + // invocation. + Result0 int + // Result1 is the value of the 2nd result returned from this method + // invocation. + Result1 error +} + +// Args returns an interface slice containing the arguments of this +// invocation. +func (c EventLogStoreCountBySQLFuncCall) Args() []interface{} { + return []interface{}{c.Arg0, c.Arg1} +} + +// Results returns an interface slice containing the results of this +// invocation. +func (c EventLogStoreCountBySQLFuncCall) Results() []interface{} { + return []interface{}{c.Result0, c.Result1} +} + // EventLogStoreCountByUserIDFunc describes the behavior when the // CountByUserID method of the parent MockEventLogStore instance is invoked. type EventLogStoreCountByUserIDFunc struct { @@ -31117,6 +31241,9 @@ type MockExternalServiceStore struct { // CancelSyncJobFunc is an instance of a mock function object // controlling the behavior of the method CancelSyncJob. CancelSyncJobFunc *ExternalServiceStoreCancelSyncJobFunc + // CleanupSyncJobsFunc is an instance of a mock function object + // controlling the behavior of the method CleanupSyncJobs. + CleanupSyncJobsFunc *ExternalServiceStoreCleanupSyncJobsFunc // CountFunc is an instance of a mock function object controlling the // behavior of the method Count. CountFunc *ExternalServiceStoreCountFunc @@ -31195,6 +31322,11 @@ func NewMockExternalServiceStore() *MockExternalServiceStore { return }, }, + CleanupSyncJobsFunc: &ExternalServiceStoreCleanupSyncJobsFunc{ + defaultHook: func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) (r0 error) { + return + }, + }, CountFunc: &ExternalServiceStoreCountFunc{ defaultHook: func(context.Context, database.ExternalServicesListOptions) (r0 int, r1 error) { return @@ -31318,6 +31450,11 @@ func NewStrictMockExternalServiceStore() *MockExternalServiceStore { panic("unexpected invocation of MockExternalServiceStore.CancelSyncJob") }, }, + CleanupSyncJobsFunc: &ExternalServiceStoreCleanupSyncJobsFunc{ + defaultHook: func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error { + panic("unexpected invocation of MockExternalServiceStore.CleanupSyncJobs") + }, + }, CountFunc: &ExternalServiceStoreCountFunc{ defaultHook: func(context.Context, database.ExternalServicesListOptions) (int, error) { panic("unexpected invocation of MockExternalServiceStore.Count") @@ -31439,6 +31576,9 @@ func NewMockExternalServiceStoreFrom(i database.ExternalServiceStore) *MockExter CancelSyncJobFunc: &ExternalServiceStoreCancelSyncJobFunc{ defaultHook: i.CancelSyncJob, }, + CleanupSyncJobsFunc: &ExternalServiceStoreCleanupSyncJobsFunc{ + defaultHook: i.CleanupSyncJobs, + }, CountFunc: &ExternalServiceStoreCountFunc{ defaultHook: i.Count, }, @@ -31616,6 +31756,114 @@ func (c ExternalServiceStoreCancelSyncJobFuncCall) Results() []interface{} { return []interface{}{c.Result0} } +// ExternalServiceStoreCleanupSyncJobsFunc describes the behavior when the +// CleanupSyncJobs method of the parent MockExternalServiceStore instance is +// invoked. +type ExternalServiceStoreCleanupSyncJobsFunc struct { + defaultHook func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error + hooks []func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error + history []ExternalServiceStoreCleanupSyncJobsFuncCall + mutex sync.Mutex +} + +// CleanupSyncJobs delegates to the next hook function in the queue and +// stores the parameter and result values of this invocation. +func (m *MockExternalServiceStore) CleanupSyncJobs(v0 context.Context, v1 database.ExternalServicesCleanupSyncJobsOptions) error { + r0 := m.CleanupSyncJobsFunc.nextHook()(v0, v1) + m.CleanupSyncJobsFunc.appendCall(ExternalServiceStoreCleanupSyncJobsFuncCall{v0, v1, r0}) + return r0 +} + +// SetDefaultHook sets function that is called when the CleanupSyncJobs +// method of the parent MockExternalServiceStore instance is invoked and the +// hook queue is empty. +func (f *ExternalServiceStoreCleanupSyncJobsFunc) SetDefaultHook(hook func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error) { + f.defaultHook = hook +} + +// PushHook adds a function to the end of hook queue. Each invocation of the +// CleanupSyncJobs method of the parent MockExternalServiceStore instance +// invokes the hook at the front of the queue and discards it. After the +// queue is empty, the default hook function is invoked for any future +// action. +func (f *ExternalServiceStoreCleanupSyncJobsFunc) PushHook(hook func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error) { + f.mutex.Lock() + f.hooks = append(f.hooks, hook) + f.mutex.Unlock() +} + +// SetDefaultReturn calls SetDefaultHook with a function that returns the +// given values. +func (f *ExternalServiceStoreCleanupSyncJobsFunc) SetDefaultReturn(r0 error) { + f.SetDefaultHook(func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error { + return r0 + }) +} + +// PushReturn calls PushHook with a function that returns the given values. +func (f *ExternalServiceStoreCleanupSyncJobsFunc) PushReturn(r0 error) { + f.PushHook(func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error { + return r0 + }) +} + +func (f *ExternalServiceStoreCleanupSyncJobsFunc) nextHook() func(context.Context, database.ExternalServicesCleanupSyncJobsOptions) error { + f.mutex.Lock() + defer f.mutex.Unlock() + + if len(f.hooks) == 0 { + return f.defaultHook + } + + hook := f.hooks[0] + f.hooks = f.hooks[1:] + return hook +} + +func (f *ExternalServiceStoreCleanupSyncJobsFunc) appendCall(r0 ExternalServiceStoreCleanupSyncJobsFuncCall) { + f.mutex.Lock() + f.history = append(f.history, r0) + f.mutex.Unlock() +} + +// History returns a sequence of ExternalServiceStoreCleanupSyncJobsFuncCall +// objects describing the invocations of this function. +func (f *ExternalServiceStoreCleanupSyncJobsFunc) History() []ExternalServiceStoreCleanupSyncJobsFuncCall { + f.mutex.Lock() + history := make([]ExternalServiceStoreCleanupSyncJobsFuncCall, len(f.history)) + copy(history, f.history) + f.mutex.Unlock() + + return history +} + +// ExternalServiceStoreCleanupSyncJobsFuncCall is an object that describes +// an invocation of method CleanupSyncJobs on an instance of +// MockExternalServiceStore. +type ExternalServiceStoreCleanupSyncJobsFuncCall struct { + // Arg0 is the value of the 1st argument passed to this method + // invocation. + Arg0 context.Context + // Arg1 is the value of the 2nd argument passed to this method + // invocation. + Arg1 database.ExternalServicesCleanupSyncJobsOptions + // Result0 is the value of the 1st result returned from this method + // invocation. + Result0 error +} + +// Args returns an interface slice containing the arguments of this +// invocation. +func (c ExternalServiceStoreCleanupSyncJobsFuncCall) Args() []interface{} { + return []interface{}{c.Arg0, c.Arg1} +} + +// Results returns an interface slice containing the results of this +// invocation. +func (c ExternalServiceStoreCleanupSyncJobsFuncCall) Results() []interface{} { + return []interface{}{c.Result0} +} + // ExternalServiceStoreCountFunc describes the behavior when the Count // method of the parent MockExternalServiceStore instance is invoked. type ExternalServiceStoreCountFunc struct { @@ -37096,13 +37344,13 @@ type MockGitserverRepoStore struct { // HandleFunc is an instance of a mock function object controlling the // behavior of the method Handle. HandleFunc *GitserverRepoStoreHandleFunc - // IteratePurgeableReposFunc is an instance of a mock function object - // controlling the behavior of the method IteratePurgeableRepos. - IteratePurgeableReposFunc *GitserverRepoStoreIteratePurgeableReposFunc // IterateRepoGitserverStatusFunc is an instance of a mock function // object controlling the behavior of the method // IterateRepoGitserverStatus. IterateRepoGitserverStatusFunc *GitserverRepoStoreIterateRepoGitserverStatusFunc + // ListPurgeableReposFunc is an instance of a mock function object + // controlling the behavior of the method ListPurgeableRepos. + ListPurgeableReposFunc *GitserverRepoStoreListPurgeableReposFunc // ListReposWithLastErrorFunc is an instance of a mock function object // controlling the behavior of the method ListReposWithLastError. ListReposWithLastErrorFunc *GitserverRepoStoreListReposWithLastErrorFunc @@ -37177,13 +37425,13 @@ func NewMockGitserverRepoStore() *MockGitserverRepoStore { return }, }, - IteratePurgeableReposFunc: &GitserverRepoStoreIteratePurgeableReposFunc{ - defaultHook: func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) (r0 error) { + IterateRepoGitserverStatusFunc: &GitserverRepoStoreIterateRepoGitserverStatusFunc{ + defaultHook: func(context.Context, database.IterateRepoGitserverStatusOptions) (r0 []types.RepoGitserverStatus, r1 int, r2 error) { return }, }, - IterateRepoGitserverStatusFunc: &GitserverRepoStoreIterateRepoGitserverStatusFunc{ - defaultHook: func(context.Context, database.IterateRepoGitserverStatusOptions) (r0 []types.RepoGitserverStatus, r1 int, r2 error) { + ListPurgeableReposFunc: &GitserverRepoStoreListPurgeableReposFunc{ + defaultHook: func(context.Context, database.ListPurgableReposOptions) (r0 []api.RepoName, r1 error) { return }, }, @@ -37285,16 +37533,16 @@ func NewStrictMockGitserverRepoStore() *MockGitserverRepoStore { panic("unexpected invocation of MockGitserverRepoStore.Handle") }, }, - IteratePurgeableReposFunc: &GitserverRepoStoreIteratePurgeableReposFunc{ - defaultHook: func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error { - panic("unexpected invocation of MockGitserverRepoStore.IteratePurgeableRepos") - }, - }, IterateRepoGitserverStatusFunc: &GitserverRepoStoreIterateRepoGitserverStatusFunc{ defaultHook: func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { panic("unexpected invocation of MockGitserverRepoStore.IterateRepoGitserverStatus") }, }, + ListPurgeableReposFunc: &GitserverRepoStoreListPurgeableReposFunc{ + defaultHook: func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error) { + panic("unexpected invocation of MockGitserverRepoStore.ListPurgeableRepos") + }, + }, ListReposWithLastErrorFunc: &GitserverRepoStoreListReposWithLastErrorFunc{ defaultHook: func(context.Context) ([]api.RepoName, error) { panic("unexpected invocation of MockGitserverRepoStore.ListReposWithLastError") @@ -37381,12 +37629,12 @@ func NewMockGitserverRepoStoreFrom(i database.GitserverRepoStore) *MockGitserver HandleFunc: &GitserverRepoStoreHandleFunc{ defaultHook: i.Handle, }, - IteratePurgeableReposFunc: &GitserverRepoStoreIteratePurgeableReposFunc{ - defaultHook: i.IteratePurgeableRepos, - }, IterateRepoGitserverStatusFunc: &GitserverRepoStoreIterateRepoGitserverStatusFunc{ defaultHook: i.IterateRepoGitserverStatus, }, + ListPurgeableReposFunc: &GitserverRepoStoreListPurgeableReposFunc{ + defaultHook: i.ListPurgeableRepos, + }, ListReposWithLastErrorFunc: &GitserverRepoStoreListReposWithLastErrorFunc{ defaultHook: i.ListReposWithLastError, }, @@ -38080,37 +38328,37 @@ func (c GitserverRepoStoreHandleFuncCall) Results() []interface{} { return []interface{}{c.Result0} } -// GitserverRepoStoreIteratePurgeableReposFunc describes the behavior when -// the IteratePurgeableRepos method of the parent MockGitserverRepoStore -// instance is invoked. -type GitserverRepoStoreIteratePurgeableReposFunc struct { - defaultHook func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error - hooks []func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error - history []GitserverRepoStoreIteratePurgeableReposFuncCall +// GitserverRepoStoreIterateRepoGitserverStatusFunc describes the behavior +// when the IterateRepoGitserverStatus method of the parent +// MockGitserverRepoStore instance is invoked. +type GitserverRepoStoreIterateRepoGitserverStatusFunc struct { + defaultHook func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) + hooks []func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) + history []GitserverRepoStoreIterateRepoGitserverStatusFuncCall mutex sync.Mutex } -// IteratePurgeableRepos delegates to the next hook function in the queue -// and stores the parameter and result values of this invocation. -func (m *MockGitserverRepoStore) IteratePurgeableRepos(v0 context.Context, v1 database.IteratePurgableReposOptions, v2 func(repo api.RepoName) error) error { - r0 := m.IteratePurgeableReposFunc.nextHook()(v0, v1, v2) - m.IteratePurgeableReposFunc.appendCall(GitserverRepoStoreIteratePurgeableReposFuncCall{v0, v1, v2, r0}) - return r0 +// IterateRepoGitserverStatus delegates to the next hook function in the +// queue and stores the parameter and result values of this invocation. +func (m *MockGitserverRepoStore) IterateRepoGitserverStatus(v0 context.Context, v1 database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { + r0, r1, r2 := m.IterateRepoGitserverStatusFunc.nextHook()(v0, v1) + m.IterateRepoGitserverStatusFunc.appendCall(GitserverRepoStoreIterateRepoGitserverStatusFuncCall{v0, v1, r0, r1, r2}) + return r0, r1, r2 } // SetDefaultHook sets function that is called when the -// IteratePurgeableRepos method of the parent MockGitserverRepoStore +// IterateRepoGitserverStatus method of the parent MockGitserverRepoStore // instance is invoked and the hook queue is empty. -func (f *GitserverRepoStoreIteratePurgeableReposFunc) SetDefaultHook(hook func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error) { +func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) SetDefaultHook(hook func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error)) { f.defaultHook = hook } // PushHook adds a function to the end of hook queue. Each invocation of the -// IteratePurgeableRepos method of the parent MockGitserverRepoStore +// IterateRepoGitserverStatus method of the parent MockGitserverRepoStore // instance invokes the hook at the front of the queue and discards it. // After the queue is empty, the default hook function is invoked for any // future action. -func (f *GitserverRepoStoreIteratePurgeableReposFunc) PushHook(hook func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error) { +func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) PushHook(hook func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -38118,20 +38366,20 @@ func (f *GitserverRepoStoreIteratePurgeableReposFunc) PushHook(hook func(context // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *GitserverRepoStoreIteratePurgeableReposFunc) SetDefaultReturn(r0 error) { - f.SetDefaultHook(func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error { - return r0 +func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) SetDefaultReturn(r0 []types.RepoGitserverStatus, r1 int, r2 error) { + f.SetDefaultHook(func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { + return r0, r1, r2 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *GitserverRepoStoreIteratePurgeableReposFunc) PushReturn(r0 error) { - f.PushHook(func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error { - return r0 +func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) PushReturn(r0 []types.RepoGitserverStatus, r1 int, r2 error) { + f.PushHook(func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { + return r0, r1, r2 }) } -func (f *GitserverRepoStoreIteratePurgeableReposFunc) nextHook() func(context.Context, database.IteratePurgableReposOptions, func(repo api.RepoName) error) error { +func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) nextHook() func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -38144,85 +38392,88 @@ func (f *GitserverRepoStoreIteratePurgeableReposFunc) nextHook() func(context.Co return hook } -func (f *GitserverRepoStoreIteratePurgeableReposFunc) appendCall(r0 GitserverRepoStoreIteratePurgeableReposFuncCall) { +func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) appendCall(r0 GitserverRepoStoreIterateRepoGitserverStatusFuncCall) { f.mutex.Lock() f.history = append(f.history, r0) f.mutex.Unlock() } // History returns a sequence of -// GitserverRepoStoreIteratePurgeableReposFuncCall objects describing the -// invocations of this function. -func (f *GitserverRepoStoreIteratePurgeableReposFunc) History() []GitserverRepoStoreIteratePurgeableReposFuncCall { +// GitserverRepoStoreIterateRepoGitserverStatusFuncCall objects describing +// the invocations of this function. +func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) History() []GitserverRepoStoreIterateRepoGitserverStatusFuncCall { f.mutex.Lock() - history := make([]GitserverRepoStoreIteratePurgeableReposFuncCall, len(f.history)) + history := make([]GitserverRepoStoreIterateRepoGitserverStatusFuncCall, len(f.history)) copy(history, f.history) f.mutex.Unlock() return history } -// GitserverRepoStoreIteratePurgeableReposFuncCall is an object that -// describes an invocation of method IteratePurgeableRepos on an instance of -// MockGitserverRepoStore. -type GitserverRepoStoreIteratePurgeableReposFuncCall struct { +// GitserverRepoStoreIterateRepoGitserverStatusFuncCall is an object that +// describes an invocation of method IterateRepoGitserverStatus on an +// instance of MockGitserverRepoStore. +type GitserverRepoStoreIterateRepoGitserverStatusFuncCall struct { // Arg0 is the value of the 1st argument passed to this method // invocation. Arg0 context.Context // Arg1 is the value of the 2nd argument passed to this method // invocation. - Arg1 database.IteratePurgableReposOptions - // Arg2 is the value of the 3rd argument passed to this method - // invocation. - Arg2 func(repo api.RepoName) error + Arg1 database.IterateRepoGitserverStatusOptions // Result0 is the value of the 1st result returned from this method // invocation. - Result0 error + Result0 []types.RepoGitserverStatus + // Result1 is the value of the 2nd result returned from this method + // invocation. + Result1 int + // Result2 is the value of the 3rd result returned from this method + // invocation. + Result2 error } // Args returns an interface slice containing the arguments of this // invocation. -func (c GitserverRepoStoreIteratePurgeableReposFuncCall) Args() []interface{} { - return []interface{}{c.Arg0, c.Arg1, c.Arg2} +func (c GitserverRepoStoreIterateRepoGitserverStatusFuncCall) Args() []interface{} { + return []interface{}{c.Arg0, c.Arg1} } // Results returns an interface slice containing the results of this // invocation. -func (c GitserverRepoStoreIteratePurgeableReposFuncCall) Results() []interface{} { - return []interface{}{c.Result0} +func (c GitserverRepoStoreIterateRepoGitserverStatusFuncCall) Results() []interface{} { + return []interface{}{c.Result0, c.Result1, c.Result2} } -// GitserverRepoStoreIterateRepoGitserverStatusFunc describes the behavior -// when the IterateRepoGitserverStatus method of the parent -// MockGitserverRepoStore instance is invoked. -type GitserverRepoStoreIterateRepoGitserverStatusFunc struct { - defaultHook func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) - hooks []func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) - history []GitserverRepoStoreIterateRepoGitserverStatusFuncCall +// GitserverRepoStoreListPurgeableReposFunc describes the behavior when the +// ListPurgeableRepos method of the parent MockGitserverRepoStore instance +// is invoked. +type GitserverRepoStoreListPurgeableReposFunc struct { + defaultHook func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error) + hooks []func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error) + history []GitserverRepoStoreListPurgeableReposFuncCall mutex sync.Mutex } -// IterateRepoGitserverStatus delegates to the next hook function in the -// queue and stores the parameter and result values of this invocation. -func (m *MockGitserverRepoStore) IterateRepoGitserverStatus(v0 context.Context, v1 database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { - r0, r1, r2 := m.IterateRepoGitserverStatusFunc.nextHook()(v0, v1) - m.IterateRepoGitserverStatusFunc.appendCall(GitserverRepoStoreIterateRepoGitserverStatusFuncCall{v0, v1, r0, r1, r2}) - return r0, r1, r2 +// ListPurgeableRepos delegates to the next hook function in the queue and +// stores the parameter and result values of this invocation. +func (m *MockGitserverRepoStore) ListPurgeableRepos(v0 context.Context, v1 database.ListPurgableReposOptions) ([]api.RepoName, error) { + r0, r1 := m.ListPurgeableReposFunc.nextHook()(v0, v1) + m.ListPurgeableReposFunc.appendCall(GitserverRepoStoreListPurgeableReposFuncCall{v0, v1, r0, r1}) + return r0, r1 } -// SetDefaultHook sets function that is called when the -// IterateRepoGitserverStatus method of the parent MockGitserverRepoStore -// instance is invoked and the hook queue is empty. -func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) SetDefaultHook(hook func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error)) { +// SetDefaultHook sets function that is called when the ListPurgeableRepos +// method of the parent MockGitserverRepoStore instance is invoked and the +// hook queue is empty. +func (f *GitserverRepoStoreListPurgeableReposFunc) SetDefaultHook(hook func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error)) { f.defaultHook = hook } // PushHook adds a function to the end of hook queue. Each invocation of the -// IterateRepoGitserverStatus method of the parent MockGitserverRepoStore -// instance invokes the hook at the front of the queue and discards it. -// After the queue is empty, the default hook function is invoked for any -// future action. -func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) PushHook(hook func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error)) { +// ListPurgeableRepos method of the parent MockGitserverRepoStore instance +// invokes the hook at the front of the queue and discards it. After the +// queue is empty, the default hook function is invoked for any future +// action. +func (f *GitserverRepoStoreListPurgeableReposFunc) PushHook(hook func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -38230,20 +38481,20 @@ func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) PushHook(hook func(co // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) SetDefaultReturn(r0 []types.RepoGitserverStatus, r1 int, r2 error) { - f.SetDefaultHook(func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { - return r0, r1, r2 +func (f *GitserverRepoStoreListPurgeableReposFunc) SetDefaultReturn(r0 []api.RepoName, r1 error) { + f.SetDefaultHook(func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error) { + return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) PushReturn(r0 []types.RepoGitserverStatus, r1 int, r2 error) { - f.PushHook(func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { - return r0, r1, r2 +func (f *GitserverRepoStoreListPurgeableReposFunc) PushReturn(r0 []api.RepoName, r1 error) { + f.PushHook(func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error) { + return r0, r1 }) } -func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) nextHook() func(context.Context, database.IterateRepoGitserverStatusOptions) ([]types.RepoGitserverStatus, int, error) { +func (f *GitserverRepoStoreListPurgeableReposFunc) nextHook() func(context.Context, database.ListPurgableReposOptions) ([]api.RepoName, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -38256,55 +38507,52 @@ func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) nextHook() func(conte return hook } -func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) appendCall(r0 GitserverRepoStoreIterateRepoGitserverStatusFuncCall) { +func (f *GitserverRepoStoreListPurgeableReposFunc) appendCall(r0 GitserverRepoStoreListPurgeableReposFuncCall) { f.mutex.Lock() f.history = append(f.history, r0) f.mutex.Unlock() } // History returns a sequence of -// GitserverRepoStoreIterateRepoGitserverStatusFuncCall objects describing -// the invocations of this function. -func (f *GitserverRepoStoreIterateRepoGitserverStatusFunc) History() []GitserverRepoStoreIterateRepoGitserverStatusFuncCall { +// GitserverRepoStoreListPurgeableReposFuncCall objects describing the +// invocations of this function. +func (f *GitserverRepoStoreListPurgeableReposFunc) History() []GitserverRepoStoreListPurgeableReposFuncCall { f.mutex.Lock() - history := make([]GitserverRepoStoreIterateRepoGitserverStatusFuncCall, len(f.history)) + history := make([]GitserverRepoStoreListPurgeableReposFuncCall, len(f.history)) copy(history, f.history) f.mutex.Unlock() return history } -// GitserverRepoStoreIterateRepoGitserverStatusFuncCall is an object that -// describes an invocation of method IterateRepoGitserverStatus on an -// instance of MockGitserverRepoStore. -type GitserverRepoStoreIterateRepoGitserverStatusFuncCall struct { +// GitserverRepoStoreListPurgeableReposFuncCall is an object that describes +// an invocation of method ListPurgeableRepos on an instance of +// MockGitserverRepoStore. +type GitserverRepoStoreListPurgeableReposFuncCall struct { // Arg0 is the value of the 1st argument passed to this method // invocation. Arg0 context.Context // Arg1 is the value of the 2nd argument passed to this method // invocation. - Arg1 database.IterateRepoGitserverStatusOptions + Arg1 database.ListPurgableReposOptions // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []types.RepoGitserverStatus + Result0 []api.RepoName // Result1 is the value of the 2nd result returned from this method // invocation. - Result1 int - // Result2 is the value of the 3rd result returned from this method - // invocation. - Result2 error + Result1 error } // Args returns an interface slice containing the arguments of this // invocation. -func (c GitserverRepoStoreIterateRepoGitserverStatusFuncCall) Args() []interface{} { +func (c GitserverRepoStoreListPurgeableReposFuncCall) Args() []interface{} { return []interface{}{c.Arg0, c.Arg1} } // Results returns an interface slice containing the results of this // invocation. -func (c GitserverRepoStoreIterateRepoGitserverStatusFuncCall) Results() []interface{} { - return []interface{}{c.Result0, c.Result1, c.Result2} +func (c GitserverRepoStoreListPurgeableReposFuncCall) Results() []interface{} { + return []interface{}{c.Result0, c.Result1} } // GitserverRepoStoreListReposWithLastErrorFunc describes the behavior when @@ -59402,6 +59650,10 @@ func (c RepoPathStoreUpdateFileCountsFuncCall) Results() []interface{} { // github.com/sourcegraph/sourcegraph/internal/database) used for unit // testing. type MockRepoStatisticsStore struct { + // CompactGitserverReposStatisticsFunc is an instance of a mock function + // object controlling the behavior of the method + // CompactGitserverReposStatistics. + CompactGitserverReposStatisticsFunc *RepoStatisticsStoreCompactGitserverReposStatisticsFunc // CompactRepoStatisticsFunc is an instance of a mock function object // controlling the behavior of the method CompactRepoStatistics. CompactRepoStatisticsFunc *RepoStatisticsStoreCompactRepoStatisticsFunc @@ -59428,6 +59680,11 @@ type MockRepoStatisticsStore struct { // overwritten. func NewMockRepoStatisticsStore() *MockRepoStatisticsStore { return &MockRepoStatisticsStore{ + CompactGitserverReposStatisticsFunc: &RepoStatisticsStoreCompactGitserverReposStatisticsFunc{ + defaultHook: func(context.Context) (r0 error) { + return + }, + }, CompactRepoStatisticsFunc: &RepoStatisticsStoreCompactRepoStatisticsFunc{ defaultHook: func(context.Context) (r0 error) { return @@ -59466,6 +59723,11 @@ func NewMockRepoStatisticsStore() *MockRepoStatisticsStore { // overwritten. func NewStrictMockRepoStatisticsStore() *MockRepoStatisticsStore { return &MockRepoStatisticsStore{ + CompactGitserverReposStatisticsFunc: &RepoStatisticsStoreCompactGitserverReposStatisticsFunc{ + defaultHook: func(context.Context) error { + panic("unexpected invocation of MockRepoStatisticsStore.CompactGitserverReposStatistics") + }, + }, CompactRepoStatisticsFunc: &RepoStatisticsStoreCompactRepoStatisticsFunc{ defaultHook: func(context.Context) error { panic("unexpected invocation of MockRepoStatisticsStore.CompactRepoStatistics") @@ -59504,6 +59766,9 @@ func NewStrictMockRepoStatisticsStore() *MockRepoStatisticsStore { // implementation, unless overwritten. func NewMockRepoStatisticsStoreFrom(i database.RepoStatisticsStore) *MockRepoStatisticsStore { return &MockRepoStatisticsStore{ + CompactGitserverReposStatisticsFunc: &RepoStatisticsStoreCompactGitserverReposStatisticsFunc{ + defaultHook: i.CompactGitserverReposStatistics, + }, CompactRepoStatisticsFunc: &RepoStatisticsStoreCompactRepoStatisticsFunc{ defaultHook: i.CompactRepoStatistics, }, @@ -59525,6 +59790,112 @@ func NewMockRepoStatisticsStoreFrom(i database.RepoStatisticsStore) *MockRepoSta } } +// RepoStatisticsStoreCompactGitserverReposStatisticsFunc describes the +// behavior when the CompactGitserverReposStatistics method of the parent +// MockRepoStatisticsStore instance is invoked. +type RepoStatisticsStoreCompactGitserverReposStatisticsFunc struct { + defaultHook func(context.Context) error + hooks []func(context.Context) error + history []RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall + mutex sync.Mutex +} + +// CompactGitserverReposStatistics delegates to the next hook function in +// the queue and stores the parameter and result values of this invocation. +func (m *MockRepoStatisticsStore) CompactGitserverReposStatistics(v0 context.Context) error { + r0 := m.CompactGitserverReposStatisticsFunc.nextHook()(v0) + m.CompactGitserverReposStatisticsFunc.appendCall(RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall{v0, r0}) + return r0 +} + +// SetDefaultHook sets function that is called when the +// CompactGitserverReposStatistics method of the parent +// MockRepoStatisticsStore instance is invoked and the hook queue is empty. +func (f *RepoStatisticsStoreCompactGitserverReposStatisticsFunc) SetDefaultHook(hook func(context.Context) error) { + f.defaultHook = hook +} + +// PushHook adds a function to the end of hook queue. Each invocation of the +// CompactGitserverReposStatistics method of the parent +// MockRepoStatisticsStore instance invokes the hook at the front of the +// queue and discards it. After the queue is empty, the default hook +// function is invoked for any future action. +func (f *RepoStatisticsStoreCompactGitserverReposStatisticsFunc) PushHook(hook func(context.Context) error) { + f.mutex.Lock() + f.hooks = append(f.hooks, hook) + f.mutex.Unlock() +} + +// SetDefaultReturn calls SetDefaultHook with a function that returns the +// given values. +func (f *RepoStatisticsStoreCompactGitserverReposStatisticsFunc) SetDefaultReturn(r0 error) { + f.SetDefaultHook(func(context.Context) error { + return r0 + }) +} + +// PushReturn calls PushHook with a function that returns the given values. +func (f *RepoStatisticsStoreCompactGitserverReposStatisticsFunc) PushReturn(r0 error) { + f.PushHook(func(context.Context) error { + return r0 + }) +} + +func (f *RepoStatisticsStoreCompactGitserverReposStatisticsFunc) nextHook() func(context.Context) error { + f.mutex.Lock() + defer f.mutex.Unlock() + + if len(f.hooks) == 0 { + return f.defaultHook + } + + hook := f.hooks[0] + f.hooks = f.hooks[1:] + return hook +} + +func (f *RepoStatisticsStoreCompactGitserverReposStatisticsFunc) appendCall(r0 RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall) { + f.mutex.Lock() + f.history = append(f.history, r0) + f.mutex.Unlock() +} + +// History returns a sequence of +// RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall objects +// describing the invocations of this function. +func (f *RepoStatisticsStoreCompactGitserverReposStatisticsFunc) History() []RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall { + f.mutex.Lock() + history := make([]RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall, len(f.history)) + copy(history, f.history) + f.mutex.Unlock() + + return history +} + +// RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall is an object +// that describes an invocation of method CompactGitserverReposStatistics on +// an instance of MockRepoStatisticsStore. +type RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall struct { + // Arg0 is the value of the 1st argument passed to this method + // invocation. + Arg0 context.Context + // Result0 is the value of the 1st result returned from this method + // invocation. + Result0 error +} + +// Args returns an interface slice containing the arguments of this +// invocation. +func (c RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall) Args() []interface{} { + return []interface{}{c.Arg0} +} + +// Results returns an interface slice containing the results of this +// invocation. +func (c RepoStatisticsStoreCompactGitserverReposStatisticsFuncCall) Results() []interface{} { + return []interface{}{c.Result0} +} + // RepoStatisticsStoreCompactRepoStatisticsFunc describes the behavior when // the CompactRepoStatistics method of the parent MockRepoStatisticsStore // instance is invoked. @@ -82843,6 +83214,9 @@ func (c UserRoleStoreWithTransactFuncCall) Results() []interface{} { // the package github.com/sourcegraph/sourcegraph/internal/database) used // for unit testing. type MockUserStore struct { + // ChangeCodyPlanFunc is an instance of a mock function object + // controlling the behavior of the method ChangeCodyPlan. + ChangeCodyPlanFunc *UserStoreChangeCodyPlanFunc // CheckAndDecrementInviteQuotaFunc is an instance of a mock function // object controlling the behavior of the method // CheckAndDecrementInviteQuota. @@ -82966,9 +83340,6 @@ type MockUserStore struct { // UpdatePasswordFunc is an instance of a mock function object // controlling the behavior of the method UpdatePassword. UpdatePasswordFunc *UserStoreUpdatePasswordFunc - // UpgradeToCodyProFunc is an instance of a mock function object - // controlling the behavior of the method UpgradeToCodyPro. - UpgradeToCodyProFunc *UserStoreUpgradeToCodyProFunc // WithFunc is an instance of a mock function object controlling the // behavior of the method With. WithFunc *UserStoreWithFunc @@ -82978,6 +83349,11 @@ type MockUserStore struct { // methods return zero values for all results, unless overwritten. func NewMockUserStore() *MockUserStore { return &MockUserStore{ + ChangeCodyPlanFunc: &UserStoreChangeCodyPlanFunc{ + defaultHook: func(context.Context, int32, bool) (r0 error) { + return + }, + }, CheckAndDecrementInviteQuotaFunc: &UserStoreCheckAndDecrementInviteQuotaFunc{ defaultHook: func(context.Context, int32) (r0 bool, r1 error) { return @@ -83178,11 +83554,6 @@ func NewMockUserStore() *MockUserStore { return }, }, - UpgradeToCodyProFunc: &UserStoreUpgradeToCodyProFunc{ - defaultHook: func(context.Context, int32) (r0 error) { - return - }, - }, WithFunc: &UserStoreWithFunc{ defaultHook: func(basestore.ShareableStore) (r0 database.UserStore) { return @@ -83195,6 +83566,11 @@ func NewMockUserStore() *MockUserStore { // methods panic on invocation, unless overwritten. func NewStrictMockUserStore() *MockUserStore { return &MockUserStore{ + ChangeCodyPlanFunc: &UserStoreChangeCodyPlanFunc{ + defaultHook: func(context.Context, int32, bool) error { + panic("unexpected invocation of MockUserStore.ChangeCodyPlan") + }, + }, CheckAndDecrementInviteQuotaFunc: &UserStoreCheckAndDecrementInviteQuotaFunc{ defaultHook: func(context.Context, int32) (bool, error) { panic("unexpected invocation of MockUserStore.CheckAndDecrementInviteQuota") @@ -83395,11 +83771,6 @@ func NewStrictMockUserStore() *MockUserStore { panic("unexpected invocation of MockUserStore.UpdatePassword") }, }, - UpgradeToCodyProFunc: &UserStoreUpgradeToCodyProFunc{ - defaultHook: func(context.Context, int32) error { - panic("unexpected invocation of MockUserStore.UpgradeToCodyPro") - }, - }, WithFunc: &UserStoreWithFunc{ defaultHook: func(basestore.ShareableStore) database.UserStore { panic("unexpected invocation of MockUserStore.With") @@ -83412,6 +83783,9 @@ func NewStrictMockUserStore() *MockUserStore { // All methods delegate to the given implementation, unless overwritten. func NewMockUserStoreFrom(i database.UserStore) *MockUserStore { return &MockUserStore{ + ChangeCodyPlanFunc: &UserStoreChangeCodyPlanFunc{ + defaultHook: i.ChangeCodyPlan, + }, CheckAndDecrementInviteQuotaFunc: &UserStoreCheckAndDecrementInviteQuotaFunc{ defaultHook: i.CheckAndDecrementInviteQuota, }, @@ -83532,15 +83906,120 @@ func NewMockUserStoreFrom(i database.UserStore) *MockUserStore { UpdatePasswordFunc: &UserStoreUpdatePasswordFunc{ defaultHook: i.UpdatePassword, }, - UpgradeToCodyProFunc: &UserStoreUpgradeToCodyProFunc{ - defaultHook: i.UpgradeToCodyPro, - }, WithFunc: &UserStoreWithFunc{ defaultHook: i.With, }, } } +// UserStoreChangeCodyPlanFunc describes the behavior when the +// ChangeCodyPlan method of the parent MockUserStore instance is invoked. +type UserStoreChangeCodyPlanFunc struct { + defaultHook func(context.Context, int32, bool) error + hooks []func(context.Context, int32, bool) error + history []UserStoreChangeCodyPlanFuncCall + mutex sync.Mutex +} + +// ChangeCodyPlan delegates to the next hook function in the queue and +// stores the parameter and result values of this invocation. +func (m *MockUserStore) ChangeCodyPlan(v0 context.Context, v1 int32, v2 bool) error { + r0 := m.ChangeCodyPlanFunc.nextHook()(v0, v1, v2) + m.ChangeCodyPlanFunc.appendCall(UserStoreChangeCodyPlanFuncCall{v0, v1, v2, r0}) + return r0 +} + +// SetDefaultHook sets function that is called when the ChangeCodyPlan +// method of the parent MockUserStore instance is invoked and the hook queue +// is empty. +func (f *UserStoreChangeCodyPlanFunc) SetDefaultHook(hook func(context.Context, int32, bool) error) { + f.defaultHook = hook +} + +// PushHook adds a function to the end of hook queue. Each invocation of the +// ChangeCodyPlan method of the parent MockUserStore instance invokes the +// hook at the front of the queue and discards it. After the queue is empty, +// the default hook function is invoked for any future action. +func (f *UserStoreChangeCodyPlanFunc) PushHook(hook func(context.Context, int32, bool) error) { + f.mutex.Lock() + f.hooks = append(f.hooks, hook) + f.mutex.Unlock() +} + +// SetDefaultReturn calls SetDefaultHook with a function that returns the +// given values. +func (f *UserStoreChangeCodyPlanFunc) SetDefaultReturn(r0 error) { + f.SetDefaultHook(func(context.Context, int32, bool) error { + return r0 + }) +} + +// PushReturn calls PushHook with a function that returns the given values. +func (f *UserStoreChangeCodyPlanFunc) PushReturn(r0 error) { + f.PushHook(func(context.Context, int32, bool) error { + return r0 + }) +} + +func (f *UserStoreChangeCodyPlanFunc) nextHook() func(context.Context, int32, bool) error { + f.mutex.Lock() + defer f.mutex.Unlock() + + if len(f.hooks) == 0 { + return f.defaultHook + } + + hook := f.hooks[0] + f.hooks = f.hooks[1:] + return hook +} + +func (f *UserStoreChangeCodyPlanFunc) appendCall(r0 UserStoreChangeCodyPlanFuncCall) { + f.mutex.Lock() + f.history = append(f.history, r0) + f.mutex.Unlock() +} + +// History returns a sequence of UserStoreChangeCodyPlanFuncCall objects +// describing the invocations of this function. +func (f *UserStoreChangeCodyPlanFunc) History() []UserStoreChangeCodyPlanFuncCall { + f.mutex.Lock() + history := make([]UserStoreChangeCodyPlanFuncCall, len(f.history)) + copy(history, f.history) + f.mutex.Unlock() + + return history +} + +// UserStoreChangeCodyPlanFuncCall is an object that describes an invocation +// of method ChangeCodyPlan on an instance of MockUserStore. +type UserStoreChangeCodyPlanFuncCall struct { + // Arg0 is the value of the 1st argument passed to this method + // invocation. + Arg0 context.Context + // Arg1 is the value of the 2nd argument passed to this method + // invocation. + Arg1 int32 + // Arg2 is the value of the 3rd argument passed to this method + // invocation. + Arg2 bool + // Result0 is the value of the 1st result returned from this method + // invocation. + Result0 error +} + +// Args returns an interface slice containing the arguments of this +// invocation. +func (c UserStoreChangeCodyPlanFuncCall) Args() []interface{} { + return []interface{}{c.Arg0, c.Arg1, c.Arg2} +} + +// Results returns an interface slice containing the results of this +// invocation. +func (c UserStoreChangeCodyPlanFuncCall) Results() []interface{} { + return []interface{}{c.Result0} +} + // UserStoreCheckAndDecrementInviteQuotaFunc describes the behavior when the // CheckAndDecrementInviteQuota method of the parent MockUserStore instance // is invoked. @@ -87866,111 +88345,6 @@ func (c UserStoreUpdatePasswordFuncCall) Results() []interface{} { return []interface{}{c.Result0} } -// UserStoreUpgradeToCodyProFunc describes the behavior when the -// UpgradeToCodyPro method of the parent MockUserStore instance is invoked. -type UserStoreUpgradeToCodyProFunc struct { - defaultHook func(context.Context, int32) error - hooks []func(context.Context, int32) error - history []UserStoreUpgradeToCodyProFuncCall - mutex sync.Mutex -} - -// UpgradeToCodyPro delegates to the next hook function in the queue and -// stores the parameter and result values of this invocation. -func (m *MockUserStore) UpgradeToCodyPro(v0 context.Context, v1 int32) error { - r0 := m.UpgradeToCodyProFunc.nextHook()(v0, v1) - m.UpgradeToCodyProFunc.appendCall(UserStoreUpgradeToCodyProFuncCall{v0, v1, r0}) - return r0 -} - -// SetDefaultHook sets function that is called when the UpgradeToCodyPro -// method of the parent MockUserStore instance is invoked and the hook queue -// is empty. -func (f *UserStoreUpgradeToCodyProFunc) SetDefaultHook(hook func(context.Context, int32) error) { - f.defaultHook = hook -} - -// PushHook adds a function to the end of hook queue. Each invocation of the -// UpgradeToCodyPro method of the parent MockUserStore instance invokes the -// hook at the front of the queue and discards it. After the queue is empty, -// the default hook function is invoked for any future action. -func (f *UserStoreUpgradeToCodyProFunc) PushHook(hook func(context.Context, int32) error) { - f.mutex.Lock() - f.hooks = append(f.hooks, hook) - f.mutex.Unlock() -} - -// SetDefaultReturn calls SetDefaultHook with a function that returns the -// given values. -func (f *UserStoreUpgradeToCodyProFunc) SetDefaultReturn(r0 error) { - f.SetDefaultHook(func(context.Context, int32) error { - return r0 - }) -} - -// PushReturn calls PushHook with a function that returns the given values. -func (f *UserStoreUpgradeToCodyProFunc) PushReturn(r0 error) { - f.PushHook(func(context.Context, int32) error { - return r0 - }) -} - -func (f *UserStoreUpgradeToCodyProFunc) nextHook() func(context.Context, int32) error { - f.mutex.Lock() - defer f.mutex.Unlock() - - if len(f.hooks) == 0 { - return f.defaultHook - } - - hook := f.hooks[0] - f.hooks = f.hooks[1:] - return hook -} - -func (f *UserStoreUpgradeToCodyProFunc) appendCall(r0 UserStoreUpgradeToCodyProFuncCall) { - f.mutex.Lock() - f.history = append(f.history, r0) - f.mutex.Unlock() -} - -// History returns a sequence of UserStoreUpgradeToCodyProFuncCall objects -// describing the invocations of this function. -func (f *UserStoreUpgradeToCodyProFunc) History() []UserStoreUpgradeToCodyProFuncCall { - f.mutex.Lock() - history := make([]UserStoreUpgradeToCodyProFuncCall, len(f.history)) - copy(history, f.history) - f.mutex.Unlock() - - return history -} - -// UserStoreUpgradeToCodyProFuncCall is an object that describes an -// invocation of method UpgradeToCodyPro on an instance of MockUserStore. -type UserStoreUpgradeToCodyProFuncCall struct { - // Arg0 is the value of the 1st argument passed to this method - // invocation. - Arg0 context.Context - // Arg1 is the value of the 2nd argument passed to this method - // invocation. - Arg1 int32 - // Result0 is the value of the 1st result returned from this method - // invocation. - Result0 error -} - -// Args returns an interface slice containing the arguments of this -// invocation. -func (c UserStoreUpgradeToCodyProFuncCall) Args() []interface{} { - return []interface{}{c.Arg0, c.Arg1} -} - -// Results returns an interface slice containing the results of this -// invocation. -func (c UserStoreUpgradeToCodyProFuncCall) Results() []interface{} { - return []interface{}{c.Result0} -} - // UserStoreWithFunc describes the behavior when the With method of the // parent MockUserStore instance is invoked. type UserStoreWithFunc struct { diff --git a/internal/database/event_logs.go b/internal/database/event_logs.go index 7484ea840cb53..a6cf14f29bab5 100644 --- a/internal/database/event_logs.go +++ b/internal/database/event_logs.go @@ -26,8 +26,8 @@ import ( "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/internal/version" - "github.com/sourcegraph/sourcegraph/internal/xcontext" "github.com/sourcegraph/sourcegraph/lib/errors" + "github.com/sourcegraph/sourcegraph/lib/pointers" ) type EventLogStore interface { @@ -86,6 +86,9 @@ type EventLogStore interface { // CodeIntelligenceWAUs returns the WAU (current week) with any (precise or search-based) code intelligence event. CodeIntelligenceWAUs(ctx context.Context) (int, error) + // CountBySQL gets a count of event logged based on the query. + CountBySQL(ctx context.Context, querySuffix *sqlf.Query) (int, error) + // CountByUserID gets a count of events logged by a given user. CountByUserID(ctx context.Context, userID int32) (int, error) @@ -308,7 +311,7 @@ func (l *eventLogStore) BulkInsert(ctx context.Context, events []*Event) error { // Create a cancel-free context to avoid interrupting the insert when // the parent context is cancelled, and add our own timeout on the insert // to make sure things don't get stuck in an unbounded manner. - insertCtx, cancel := context.WithTimeout(xcontext.Detach(ctx), 5*time.Minute) + insertCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 5*time.Minute) defer cancel() return batch.InsertValues( @@ -414,15 +417,15 @@ func (l *eventLogStore) LatestPing(ctx context.Context) (*Event, error) { } func (l *eventLogStore) CountByUserID(ctx context.Context, userID int32) (int, error) { - return l.countBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d", userID)) + return l.CountBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d", userID)) } func (l *eventLogStore) CountByUserIDAndEventName(ctx context.Context, userID int32, name string) (int, error) { - return l.countBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d AND name = %s", userID, name)) + return l.CountBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d AND name = %s", userID, name)) } func (l *eventLogStore) CountByUserIDAndEventNamePrefix(ctx context.Context, userID int32, namePrefix string) (int, error) { - return l.countBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d AND name LIKE %s", userID, namePrefix+"%")) + return l.CountBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d AND name LIKE %s", userID, namePrefix+"%")) } func (l *eventLogStore) CountByUserIDAndEventNames(ctx context.Context, userID int32, names []string) (int, error) { @@ -430,11 +433,11 @@ func (l *eventLogStore) CountByUserIDAndEventNames(ctx context.Context, userID i for _, v := range names { items = append(items, sqlf.Sprintf("%s", v)) } - return l.countBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d AND name IN (%s)", userID, sqlf.Join(items, ","))) + return l.CountBySQL(ctx, sqlf.Sprintf("WHERE user_id = %d AND name IN (%s)", userID, sqlf.Join(items, ","))) } -// countBySQL gets a count of event logs. -func (l *eventLogStore) countBySQL(ctx context.Context, querySuffix *sqlf.Query) (int, error) { +// CountBySQL gets a count of event logs. +func (l *eventLogStore) CountBySQL(ctx context.Context, querySuffix *sqlf.Query) (int, error) { q := sqlf.Sprintf("SELECT COUNT(*) FROM event_logs %s", querySuffix) r := l.QueryRow(ctx, q) var count int @@ -1191,10 +1194,10 @@ func (l *eventLogStore) CodeIntelligenceRepositoryCountsByLanguage(ctx context.C } byLanguage[language] = CodeIntelligenceRepositoryCountsForLanguage{ - NumRepositoriesWithUploadRecords: safeDerefIntPtr(numRepositoriesWithUploadRecords), - NumRepositoriesWithFreshUploadRecords: safeDerefIntPtr(numRepositoriesWithFreshUploadRecords), - NumRepositoriesWithIndexRecords: safeDerefIntPtr(numRepositoriesWithIndexRecords), - NumRepositoriesWithFreshIndexRecords: safeDerefIntPtr(numRepositoriesWithFreshIndexRecords), + NumRepositoriesWithUploadRecords: pointers.DerefZero(numRepositoriesWithUploadRecords), + NumRepositoriesWithFreshUploadRecords: pointers.DerefZero(numRepositoriesWithFreshUploadRecords), + NumRepositoriesWithIndexRecords: pointers.DerefZero(numRepositoriesWithIndexRecords), + NumRepositoriesWithFreshIndexRecords: pointers.DerefZero(numRepositoriesWithFreshIndexRecords), } } if err := rows.Err(); err != nil { @@ -1204,14 +1207,6 @@ func (l *eventLogStore) CodeIntelligenceRepositoryCountsByLanguage(ctx context.C return byLanguage, nil } -func safeDerefIntPtr(v *int) int { - if v != nil { - return *v - } - - return 0 -} - var codeIntelligenceRepositoryCountsByLanguageQuery = ` SELECT -- Clean up indexer by removing sourcegraph/ docker image prefix for auto-index diff --git a/internal/database/external_services.go b/internal/database/external_services.go index f7779e17ecee5..4021f88dbbd9f 100644 --- a/internal/database/external_services.go +++ b/internal/database/external_services.go @@ -100,6 +100,11 @@ type ExternalServiceStore interface { // found or not in processing or queued state. CancelSyncJob(ctx context.Context, opts ExternalServicesCancelSyncJobOptions) error + // CleanupSyncJobs removes sync jobs that have finished before the given threshold. + // Additionally, only up to LimitPerService records are kept, deleting records + // to only keep the newest N. + CleanupSyncJobs(ctx context.Context, opts ExternalServicesCleanupSyncJobsOptions) error + // UpdateSyncJobCounters persists only the sync job counters for the supplied job. UpdateSyncJobCounters(ctx context.Context, job *types.ExternalServiceSyncJob) error @@ -1381,6 +1386,54 @@ func (e *externalServiceStore) CancelSyncJob(ctx context.Context, opts ExternalS return nil } +type ExternalServicesCleanupSyncJobsOptions struct { + // Remove jobs that are older than the given duration from NOW(). + OlderThan time.Duration + // Removes the oldest jobs until only MaxPerExternalService jobs remain for + // each service. + MaxPerExternalService int +} + +func (e *externalServiceStore) CleanupSyncJobs(ctx context.Context, opts ExternalServicesCleanupSyncJobsOptions) error { + if opts.MaxPerExternalService < 1 { + return errors.New("MaxPerExternalService must be greater than 0") + } + + q := buildCleanupSyncJobsQuery(opts) + return e.Exec(ctx, q) +} + +const cleanupSyncJobsQueryFmtstr = ` +WITH ranked_jobs AS ( + SELECT + id, + external_service_id, + state, + finished_at, + ROW_NUMBER() OVER (PARTITION BY external_service_id ORDER BY finished_at DESC) as rn + FROM + external_service_sync_jobs + WHERE + state IN ('completed', 'failed', 'canceled') + AND + finished_at IS NOT NULL +) +DELETE FROM + external_service_sync_jobs +WHERE + id IN ( + SELECT id FROM ranked_jobs + WHERE + rn > %s + OR + finished_at < %s + ) +` + +func buildCleanupSyncJobsQuery(opts ExternalServicesCleanupSyncJobsOptions) *sqlf.Query { + return sqlf.Sprintf(cleanupSyncJobsQueryFmtstr, opts.MaxPerExternalService, time.Now().Add(-opts.OlderThan)) +} + func (e *externalServiceStore) hasRunningSyncJobs(ctx context.Context, id int64) (bool, error) { q := sqlf.Sprintf(` SELECT 1 diff --git a/internal/database/external_services_test.go b/internal/database/external_services_test.go index 917c72b3f0733..b7aff6158c600 100644 --- a/internal/database/external_services_test.go +++ b/internal/database/external_services_test.go @@ -2578,3 +2578,137 @@ func Test_validateOtherExternalServiceConnection(t *testing.T) { err = validateOtherExternalServiceConnection(conn) require.NoError(t, err) } + +func TestExternalServices_CleanupSyncJobs(t *testing.T) { + if testing.Short() { + t.Skip() + } + t.Parallel() + logger := logtest.Scoped(t) + db := NewDB(logger, dbtest.NewDB(t)) + ctx := context.Background() + + // Create a new external service + confGet := func() *conf.Unified { + return &conf.Unified{} + } + es := &types.ExternalService{ + Kind: extsvc.KindGitHub, + DisplayName: "GITHUB #1", + Config: extsvc.NewUnencryptedConfig(`{"url": "https://github.com", "repositoryQuery": ["none"], "token": "abc"}`), + } + err := db.ExternalServices().Create(ctx, confGet, es) + if err != nil { + t.Fatal(err) + } + + now := timeutil.Now() + q := ` + INSERT INTO external_service_sync_jobs + (external_service_id, state, queued_at, finished_at) + VALUES + ($2, 'completed', $1::timestamp - interval '40 day', $1::timestamp - interval '40 day'), -- completed and older than 30d, delete + ($2, 'failed', $1::timestamp - interval '40 day', $1::timestamp - interval '40 day'), -- failed and older than 30d, delete + ($2, 'processing', $1::timestamp - interval '40 day', $1::timestamp - interval '40 day'), -- processing but older than 30d, still keep + ($2, 'processing', $1::timestamp - interval '20 day', $1::timestamp - interval '20 day'), -- processing and newer than 30d, keep + ($2, 'failed', $1::timestamp - interval '20 day', $1::timestamp - interval '20 day'), -- failed but newer than 30d, keep + ($2, 'canceled', $1::timestamp - interval '10 day', $1::timestamp - interval '10 day'), -- canceled but newer than 30d, keep + ($2, 'completed', $1::timestamp - interval '10 day', $1::timestamp - interval '10 day') -- completed but newer than 30d, keep + ` + _, err = db.ExecContext(ctx, q, now, es.ID) + require.NoError(t, err) + + require.NoError( + t, + db.ExternalServices().CleanupSyncJobs(ctx, ExternalServicesCleanupSyncJobsOptions{ + MaxPerExternalService: 1000, + OlderThan: 30 * 24 * time.Hour, + }), + ) + + // With large MaxPerExternalService, expect that only the jobs that are older than 30d + // are deleted. + syncJobs, err := db.ExternalServices().GetSyncJobs(ctx, ExternalServicesGetSyncJobsOptions{}) + require.NoError(t, err) + require.Equal(t, []*types.ExternalServiceSyncJob{ + { + ID: 3, + ExternalServiceID: es.ID, + State: "processing", + QueuedAt: now.Add(-40 * 24 * time.Hour), + FinishedAt: now.Add(-40 * 24 * time.Hour), + }, + { + ID: 4, + ExternalServiceID: es.ID, + State: "processing", + QueuedAt: now.Add(-20 * 24 * time.Hour), + FinishedAt: now.Add(-20 * 24 * time.Hour), + }, + { + ID: 5, + ExternalServiceID: es.ID, + State: "failed", + QueuedAt: now.Add(-20 * 24 * time.Hour), + FinishedAt: now.Add(-20 * 24 * time.Hour), + }, + { + ID: 6, + ExternalServiceID: es.ID, + State: "canceled", + QueuedAt: now.Add(-10 * 24 * time.Hour), + FinishedAt: now.Add(-10 * 24 * time.Hour), + }, + { + ID: 7, + ExternalServiceID: es.ID, + State: "completed", + QueuedAt: now.Add(-10 * 24 * time.Hour), + FinishedAt: now.Add(-10 * 24 * time.Hour), + }, + }, syncJobs) + + // Now only keep the last 2 records: + require.NoError( + t, + db.ExternalServices().CleanupSyncJobs(ctx, ExternalServicesCleanupSyncJobsOptions{ + MaxPerExternalService: 2, + OlderThan: 30 * 24 * time.Hour, + }), + ) + + syncJobs, err = db.ExternalServices().GetSyncJobs(ctx, ExternalServicesGetSyncJobsOptions{}) + require.NoError(t, err) + require.Equal(t, []*types.ExternalServiceSyncJob{ + // Processing are skipped in deletion. + { + ID: 3, + ExternalServiceID: es.ID, + State: "processing", + QueuedAt: now.Add(-40 * 24 * time.Hour), + FinishedAt: now.Add(-40 * 24 * time.Hour), + }, + // Processing are skipped in deletion. + { + ID: 4, + ExternalServiceID: es.ID, + State: "processing", + QueuedAt: now.Add(-20 * 24 * time.Hour), + FinishedAt: now.Add(-20 * 24 * time.Hour), + }, + { + ID: 6, + ExternalServiceID: es.ID, + State: "canceled", + QueuedAt: now.Add(-10 * 24 * time.Hour), + FinishedAt: now.Add(-10 * 24 * time.Hour), + }, + { + ID: 7, + ExternalServiceID: es.ID, + State: "completed", + QueuedAt: now.Add(-10 * 24 * time.Hour), + FinishedAt: now.Add(-10 * 24 * time.Hour), + }, + }, syncJobs) +} diff --git a/internal/database/gitserver_repos.go b/internal/database/gitserver_repos.go index 2a746c426fa6a..26817caacd9f6 100644 --- a/internal/database/gitserver_repos.go +++ b/internal/database/gitserver_repos.go @@ -58,9 +58,9 @@ type GitserverRepoStore interface { // ListReposWithLastError iterates over repos w/ non-empty last_error field and calls the repoFn for these repos. // note that this currently filters out any repos which do not have an associated external service where cloud_default = true. ListReposWithLastError(ctx context.Context) ([]api.RepoName, error) - // IteratePurgeableRepos iterates over all purgeable repos. These are repos that + // ListPurgeableRepos returns all purgeable repos. These are repos that // are cloned on disk but have been deleted or blocked. - IteratePurgeableRepos(ctx context.Context, options IteratePurgableReposOptions, repoFn func(repo api.RepoName) error) error + ListPurgeableRepos(ctx context.Context, options ListPurgableReposOptions) ([]api.RepoName, error) // TotalErroredCloudDefaultRepos returns the total number of repos which have a non-empty last_error field. Note that this is only // counting repos with an associated cloud_default external service. TotalErroredCloudDefaultRepos(ctx context.Context) (int, error) @@ -122,22 +122,33 @@ func (s *gitserverRepoStore) Update(ctx context.Context, repos ...*types.Gitserv } const updateGitserverReposQueryFmtstr = ` +WITH update_data AS ( + SELECT * FROM ( + VALUES + -- (, , , , , , , ), + %s + ) AS tmp(repo_id, clone_status, shard_id, last_error, last_fetched, last_changed, corrupted_at, repo_size_bytes) +), +locked_data AS ( + SELECT update_data.* + FROM update_data + JOIN gitserver_repos gr ON gr.repo_id = update_data.repo_id + ORDER BY update_data.repo_id ASC + FOR UPDATE OF gr +) UPDATE gitserver_repos AS gr SET - clone_status = tmp.clone_status, - shard_id = tmp.shard_id, - last_error = tmp.last_error, - last_fetched = tmp.last_fetched, - last_changed = tmp.last_changed, - corrupted_at = tmp.corrupted_at, - repo_size_bytes = tmp.repo_size_bytes, + clone_status = locked_data.clone_status, + shard_id = locked_data.shard_id, + last_error = locked_data.last_error, + last_fetched = locked_data.last_fetched, + last_changed = locked_data.last_changed, + corrupted_at = locked_data.corrupted_at, + repo_size_bytes = locked_data.repo_size_bytes, updated_at = NOW() -FROM (VALUES - -- (, , , , , , , ), - %s - ) AS tmp(repo_id, clone_status, shard_id, last_error, last_fetched, last_changed, corrupted_at, repo_size_bytes) - WHERE - tmp.repo_id = gr.repo_id +FROM locked_data +WHERE + locked_data.repo_id = gr.repo_id ` func (s *gitserverRepoStore) TotalErroredCloudDefaultRepos(ctx context.Context) (int, error) { @@ -183,7 +194,7 @@ func scanLastErroredRepoRow(scanner dbutil.Scanner) (name api.RepoName, err erro var scanLastErroredRepos = basestore.NewSliceScanner(scanLastErroredRepoRow) -type IteratePurgableReposOptions struct { +type ListPurgableReposOptions struct { // DeletedBefore will filter the deleted repos to only those that were deleted // before the given time. The zero value will not apply filtering. DeletedBefore time.Time @@ -195,7 +206,9 @@ type IteratePurgableReposOptions struct { Limiter *ratelimit.InstrumentedLimiter } -func (s *gitserverRepoStore) IteratePurgeableRepos(ctx context.Context, options IteratePurgableReposOptions, repoFn func(repo api.RepoName) error) (err error) { +var scanRepoNames = basestore.NewSliceScanner(basestore.ScanAny[api.RepoName]) + +func (s *gitserverRepoStore) ListPurgeableRepos(ctx context.Context, options ListPurgableReposOptions) (repos []api.RepoName, err error) { deletedAtClause := sqlf.Sprintf("deleted_at IS NOT NULL") if !options.DeletedBefore.IsZero() { deletedAtClause = sqlf.Sprintf("(deleted_at IS NOT NULL AND deleted_at < %s)", options.DeletedBefore) @@ -204,27 +217,7 @@ func (s *gitserverRepoStore) IteratePurgeableRepos(ctx context.Context, options if options.Limit > 0 { query = query + fmt.Sprintf(" LIMIT %d", options.Limit) } - rows, err := s.Query(ctx, sqlf.Sprintf(query, deletedAtClause, types.CloneStatusCloned)) - if err != nil { - return errors.Wrap(err, "fetching repos with nonempty last_error") - } - defer func() { - err = basestore.CloseRows(rows, err) - }() - - for rows.Next() { - var name api.RepoName - if err := rows.Scan(&name); err != nil { - return errors.Wrap(err, "scanning row") - } - err := repoFn(name) - if err != nil { - // Abort - return errors.Wrap(err, "calling repoFn") - } - } - - return nil + return scanRepoNames(s.Query(ctx, sqlf.Sprintf(query, deletedAtClause, types.CloneStatusCloned))) } const purgableReposQuery = ` @@ -702,19 +695,29 @@ func (s *gitserverRepoStore) updateRepoSizesWithBatchSize(ctx context.Context, r } const updateRepoSizesQueryFmtstr = ` +WITH update_data AS ( + SELECT * FROM (VALUES + -- (, ), + %s + ) AS tmp(repo_name, repo_size_bytes) +), +locked_data AS ( + SELECT update_data.*, gr.repo_id + FROM update_data + JOIN gitserver_repos gr ON gr.repo_id = (SELECT r.id FROM repo r WHERE r.name = update_data.repo_name) + WHERE + update_data.repo_size_bytes IS DISTINCT FROM gr.repo_size_bytes + ORDER BY gr.repo_id ASC + FOR UPDATE OF gr +) + UPDATE gitserver_repos AS gr SET - repo_size_bytes = tmp.repo_size_bytes, + repo_size_bytes = locked_data.repo_size_bytes, updated_at = NOW() -FROM (VALUES --- (, ), - %s -) AS tmp(repo_name, repo_size_bytes) -JOIN repo ON repo.name = tmp.repo_name +FROM locked_data WHERE - repo.id = gr.repo_id -AND - tmp.repo_size_bytes IS DISTINCT FROM gr.repo_size_bytes + locked_data.repo_id = gr.repo_id ` // sanitizeToUTF8 will remove any null character terminated string. The null character can be diff --git a/internal/database/gitserver_repos_test.go b/internal/database/gitserver_repos_test.go index ffe232219fc25..04fe3d00094c2 100644 --- a/internal/database/gitserver_repos_test.go +++ b/internal/database/gitserver_repos_test.go @@ -108,7 +108,7 @@ func TestIterateRepoGitserverStatus(t *testing.T) { }) } -func TestIteratePurgeableRepos(t *testing.T) { +func TestListPurgeableRepos(t *testing.T) { ctx := context.Background() logger := logtest.Scoped(t) db := NewDB(logger, dbtest.NewDB(t)) @@ -145,12 +145,12 @@ func TestIteratePurgeableRepos(t *testing.T) { for _, tt := range []struct { name string - options IteratePurgableReposOptions + options ListPurgableReposOptions wantRepos []api.RepoName }{ { name: "zero deletedBefore", - options: IteratePurgableReposOptions{ + options: ListPurgableReposOptions{ DeletedBefore: time.Time{}, Limit: 0, }, @@ -158,7 +158,7 @@ func TestIteratePurgeableRepos(t *testing.T) { }, { name: "deletedBefore now", - options: IteratePurgableReposOptions{ + options: ListPurgableReposOptions{ DeletedBefore: time.Now(), Limit: 0, }, @@ -167,7 +167,7 @@ func TestIteratePurgeableRepos(t *testing.T) { }, { name: "deletedBefore 5 minutes ago", - options: IteratePurgableReposOptions{ + options: ListPurgableReposOptions{ DeletedBefore: time.Now().Add(-5 * time.Minute), Limit: 0, }, @@ -175,7 +175,7 @@ func TestIteratePurgeableRepos(t *testing.T) { }, { name: "test limit", - options: IteratePurgableReposOptions{ + options: ListPurgableReposOptions{ DeletedBefore: time.Time{}, Limit: 1, }, @@ -183,13 +183,8 @@ func TestIteratePurgeableRepos(t *testing.T) { }, } { t.Run(tt.name, func(t *testing.T) { - var have []api.RepoName - if err := db.GitserverRepos().IteratePurgeableRepos(ctx, tt.options, func(repo api.RepoName) error { - have = append(have, repo) - return nil - }); err != nil { - t.Fatal(err) - } + have, err := db.GitserverRepos().ListPurgeableRepos(ctx, tt.options) + require.NoError(t, err) sort.Slice(have, func(i, j int) bool { return have[i] < have[j] }) diff --git a/internal/database/repo_statistics.go b/internal/database/repo_statistics.go index 6a76c1e7c1f5b..bb4a0e8e96598 100644 --- a/internal/database/repo_statistics.go +++ b/internal/database/repo_statistics.go @@ -42,6 +42,7 @@ type RepoStatisticsStore interface { GetRepoStatistics(ctx context.Context) (RepoStatistics, error) CompactRepoStatistics(ctx context.Context) error GetGitserverReposStatistics(ctx context.Context) ([]GitserverReposStatistic, error) + CompactGitserverReposStatistics(ctx context.Context) error } // repoStatisticsStore is responsible for data stored in the repo_statistics @@ -116,6 +117,35 @@ SELECT FROM deleted; ` +func (s *repoStatisticsStore) CompactGitserverReposStatistics(ctx context.Context) error { + return s.Exec(ctx, sqlf.Sprintf(compactGitserverReposStatisticsQueryFmtstr)) +} + +const compactGitserverReposStatisticsQueryFmtstr = ` +WITH deleted AS ( + DELETE FROM gitserver_repos_statistics + RETURNING + shard_id, + total, + not_cloned, + cloning, + cloned, + failed_fetch, + corrupted +) +INSERT INTO gitserver_repos_statistics (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) +SELECT + shard_id, + SUM(total), + SUM(not_cloned), + SUM(cloning), + SUM(cloned), + SUM(failed_fetch), + SUM(corrupted) +FROM deleted +GROUP BY shard_id +` + func (s *repoStatisticsStore) GetGitserverReposStatistics(ctx context.Context) ([]GitserverReposStatistic, error) { rows, err := s.Query(ctx, sqlf.Sprintf(getGitserverReposStatisticsQueryFmtStr)) return scanGitserverReposStatistics(rows, err) @@ -124,13 +154,14 @@ func (s *repoStatisticsStore) GetGitserverReposStatistics(ctx context.Context) ( const getGitserverReposStatisticsQueryFmtStr = ` SELECT shard_id, - total, - not_cloned, - cloning, - cloned, - failed_fetch, - corrupted + SUM(total) AS total, + SUM(not_cloned) AS not_cloned, + SUM(cloning) AS cloning, + SUM(cloned) AS cloned, + SUM(failed_fetch) AS failed_fetch, + SUM(corrupted) AS corrupted FROM gitserver_repos_statistics +GROUP BY shard_id ` var scanGitserverReposStatistics = basestore.NewSliceScanner(scanGitserverReposStatistic) diff --git a/internal/database/repo_statistics_test.go b/internal/database/repo_statistics_test.go index 46d4e8ed2ed92..707c5b7e2c95e 100644 --- a/internal/database/repo_statistics_test.go +++ b/internal/database/repo_statistics_test.go @@ -486,6 +486,86 @@ func TestRepoStatistics_Compaction(t *testing.T) { } } +func TestGitserverReposStatistics_Compaction(t *testing.T) { + if testing.Short() { + t.Skip() + } + + logger := logtest.Scoped(t) + db := NewDB(logger, dbtest.NewDB(t)) + ctx := context.Background() + s := &repoStatisticsStore{Store: basestore.NewWithHandle(db.Handle())} + + shards := []string{ + "shard-1", + "shard-2", + "shard-3", + } + repos := types.Repos{ + &types.Repo{Name: "repo1"}, + &types.Repo{Name: "repo2"}, + &types.Repo{Name: "repo3"}, + &types.Repo{Name: "repo4"}, + &types.Repo{Name: "repo5"}, + &types.Repo{Name: "repo6"}, + } + + // Trigger 21 insertions into gitserver_repos_statistics table: + // 6 repos added: 6 rows + createTestRepos(ctx, t, db, repos) + // 6 clone status changes and shard assignments: 12 rows + setCloneStatus(t, db, repos[0].Name, shards[0], types.CloneStatusCloning) + setCloneStatus(t, db, repos[1].Name, shards[0], types.CloneStatusCloning) + setCloneStatus(t, db, repos[2].Name, shards[1], types.CloneStatusCloning) + setCloneStatus(t, db, repos[3].Name, shards[1], types.CloneStatusCloning) + setCloneStatus(t, db, repos[4].Name, shards[2], types.CloneStatusCloning) + setCloneStatus(t, db, repos[5].Name, shards[2], types.CloneStatusCloning) + // 2 errors: 2 rows + setLastError(t, db, repos[0].Name, shards[0], "internet broke repo-1") + setLastError(t, db, repos[4].Name, shards[2], "internet broke repo-5") + // 1 corruption: 1 row + logCorruption(t, db, repos[2].Name, shards[1], "runaway corruption repo-3") + + // Safety check that the counts are right: + wantRepoStatistics := RepoStatistics{Total: 6, Cloning: 6, FailedFetch: 2, Corrupted: 1} + wantGitserverReposStatistics := []GitserverReposStatistic{ + {ShardID: ""}, + {ShardID: shards[0], Total: 2, Cloning: 2, FailedFetch: 1}, + {ShardID: shards[1], Total: 2, Cloning: 2, FailedFetch: 0, Corrupted: 1}, + {ShardID: shards[2], Total: 2, Cloning: 2, FailedFetch: 1}, + } + assertRepoStatistics(t, ctx, s, wantRepoStatistics, wantGitserverReposStatistics) + + wantCount := 21 + count := queryGitserverReposStatisticsCount(t, ctx, s) + if count != wantCount { + t.Fatalf("wrong statistics count. have=%d, want=%d", count, wantCount) + } + + // Now we compact the rows into a single row: + if err := s.CompactGitserverReposStatistics(ctx); err != nil { + t.Fatalf("GetRepoStatistics failed: %s", err) + } + + // We should be left with 4 rows: one for each shard, plus empty shard + wantCount = 4 + count = queryGitserverReposStatisticsCount(t, ctx, s) + if count != wantCount { + t.Fatalf("wrong statistics count. have=%d, want=%d", count, wantCount) + } + + // And counts should still be the same + assertRepoStatistics(t, ctx, s, wantRepoStatistics, wantGitserverReposStatistics) + + // Safety check: add another event and make sure row count goes up again + setCloneStatus(t, db, repos[5].Name, shards[2], types.CloneStatusCloned) + wantCount = 5 + count = queryGitserverReposStatisticsCount(t, ctx, s) + if count != wantCount { + t.Fatalf("wrong statistics count. have=%d, want=%d", count, wantCount) + } +} + func queryRepoName(t *testing.T, ctx context.Context, s *repoStatisticsStore, repoID api.RepoID) api.RepoName { t.Helper() var name api.RepoName @@ -506,6 +586,15 @@ func queryRepoStatisticsCount(t *testing.T, ctx context.Context, s *repoStatisti return count } +func queryGitserverReposStatisticsCount(t *testing.T, ctx context.Context, s *repoStatisticsStore) int { + t.Helper() + count, err := basestore.ScanInt(s.QueryRow(ctx, sqlf.Sprintf("SELECT COUNT(*) FROM gitserver_repos_statistics;"))) + if err != nil { + t.Fatalf("failed to query gitserver_repos_statistics count: %s", err) + } + return count +} + func setCloneStatus(t *testing.T, db DB, repoName api.RepoName, shard string, status types.CloneStatus) { t.Helper() if err := db.GitserverRepos().SetCloneStatus(context.Background(), repoName, status, shard); err != nil { diff --git a/internal/database/schema.json b/internal/database/schema.json index 526b10df9b6ba..d8ea8f8267168 100644 --- a/internal/database/schema.json +++ b/internal/database/schema.json @@ -148,15 +148,15 @@ }, { "Name": "recalc_gitserver_repos_statistics_on_delete", - "Definition": "CREATE OR REPLACE FUNCTION public.recalc_gitserver_repos_statistics_on_delete()\n RETURNS trigger\n LANGUAGE plpgsql\nAS $function$ BEGIN\n UPDATE gitserver_repos_statistics grs\n SET\n total = grs.total - (SELECT COUNT(*) FROM oldtab WHERE oldtab.shard_id = grs.shard_id),\n not_cloned = grs.not_cloned - (SELECT COUNT(*) FILTER(WHERE clone_status = 'not_cloned') FROM oldtab WHERE oldtab.shard_id = grs.shard_id),\n cloning = grs.cloning - (SELECT COUNT(*) FILTER(WHERE clone_status = 'cloning') FROM oldtab WHERE oldtab.shard_id = grs.shard_id),\n cloned = grs.cloned - (SELECT COUNT(*) FILTER(WHERE clone_status = 'cloned') FROM oldtab WHERE oldtab.shard_id = grs.shard_id),\n failed_fetch = grs.cloned - (SELECT COUNT(*) FILTER(WHERE last_error IS NOT NULL) FROM oldtab WHERE oldtab.shard_id = grs.shard_id)\n ;\n\n RETURN NULL;\n END\n$function$\n" + "Definition": "CREATE OR REPLACE FUNCTION public.recalc_gitserver_repos_statistics_on_delete()\n RETURNS trigger\n LANGUAGE plpgsql\nAS $function$ BEGIN\n INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted)\n SELECT\n oldtab.shard_id,\n (-COUNT(*)),\n (-COUNT(*) FILTER(WHERE clone_status = 'not_cloned')),\n (-COUNT(*) FILTER(WHERE clone_status = 'cloning')),\n (-COUNT(*) FILTER(WHERE clone_status = 'cloned')),\n (-COUNT(*) FILTER(WHERE last_error IS NOT NULL)),\n (-COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL))\n FROM oldtab\n GROUP BY oldtab.shard_id;\n\n RETURN NULL;\n END\n$function$\n" }, { "Name": "recalc_gitserver_repos_statistics_on_insert", - "Definition": "CREATE OR REPLACE FUNCTION public.recalc_gitserver_repos_statistics_on_insert()\n RETURNS trigger\n LANGUAGE plpgsql\nAS $function$ BEGIN\n INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch)\n SELECT\n shard_id,\n COUNT(*) AS total,\n COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned,\n COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning,\n COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned,\n COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch\n FROM\n newtab\n GROUP BY shard_id\n ON CONFLICT(shard_id)\n DO UPDATE\n SET\n total = grs.total + excluded.total,\n not_cloned = grs.not_cloned + excluded.not_cloned,\n cloning = grs.cloning + excluded.cloning,\n cloned = grs.cloned + excluded.cloned,\n failed_fetch = grs.failed_fetch + excluded.failed_fetch\n ;\n\n RETURN NULL;\n END\n$function$\n" + "Definition": "CREATE OR REPLACE FUNCTION public.recalc_gitserver_repos_statistics_on_insert()\n RETURNS trigger\n LANGUAGE plpgsql\nAS $function$ BEGIN\n -------------------------------------------------\n -- THIS IS CHANGED TO APPEND\n -------------------------------------------------\n INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted)\n SELECT\n shard_id,\n COUNT(*) AS total,\n COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned,\n COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning,\n COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned,\n COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch,\n COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL) AS corrupted\n FROM\n newtab\n GROUP BY shard_id\n ;\n\n RETURN NULL;\n END\n$function$\n" }, { "Name": "recalc_gitserver_repos_statistics_on_update", - "Definition": "CREATE OR REPLACE FUNCTION public.recalc_gitserver_repos_statistics_on_update()\n RETURNS trigger\n LANGUAGE plpgsql\nAS $function$ BEGIN\n INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted)\n SELECT\n newtab.shard_id AS shard_id,\n COUNT(*) AS total,\n COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned,\n COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning,\n COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned,\n COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch,\n COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL) AS corrupted\n FROM\n newtab\n GROUP BY newtab.shard_id\n ON CONFLICT(shard_id) DO\n UPDATE\n SET\n total = grs.total + (excluded.total - (SELECT COUNT(*) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)),\n not_cloned = grs.not_cloned + (excluded.not_cloned - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'not_cloned') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)),\n cloning = grs.cloning + (excluded.cloning - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'cloning') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)),\n cloned = grs.cloned + (excluded.cloned - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'cloned') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)),\n failed_fetch = grs.failed_fetch + (excluded.failed_fetch - (SELECT COUNT(*) FILTER(WHERE ot.last_error IS NOT NULL) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)),\n corrupted = grs.corrupted + (excluded.corrupted - (SELECT COUNT(*) FILTER(WHERE ot.corrupted_at IS NOT NULL) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id))\n ;\n\n -------------------------------------------------\n -- IMPORTANT: THIS IS CHANGED TO INCLUDE `corrupted`\n -------------------------------------------------\n WITH moved AS (\n SELECT\n oldtab.shard_id AS shard_id,\n COUNT(*) AS total,\n COUNT(*) FILTER(WHERE oldtab.clone_status = 'not_cloned') AS not_cloned,\n COUNT(*) FILTER(WHERE oldtab.clone_status = 'cloning') AS cloning,\n COUNT(*) FILTER(WHERE oldtab.clone_status = 'cloned') AS cloned,\n COUNT(*) FILTER(WHERE oldtab.last_error IS NOT NULL) AS failed_fetch,\n COUNT(*) FILTER(WHERE oldtab.corrupted_at IS NOT NULL) AS corrupted\n FROM\n oldtab\n JOIN newtab ON newtab.repo_id = oldtab.repo_id\n WHERE\n oldtab.shard_id != newtab.shard_id\n GROUP BY oldtab.shard_id\n )\n UPDATE gitserver_repos_statistics grs\n SET\n total = grs.total - moved.total,\n not_cloned = grs.not_cloned - moved.not_cloned,\n cloning = grs.cloning - moved.cloning,\n cloned = grs.cloned - moved.cloned,\n failed_fetch = grs.failed_fetch - moved.failed_fetch,\n corrupted = grs.corrupted - moved.corrupted\n FROM moved\n WHERE moved.shard_id = grs.shard_id;\n\n -------------------------------------------------\n -- IMPORTANT: THIS IS CHANGED TO INCLUDE `corrupted`\n -------------------------------------------------\n WITH diff(not_cloned, cloning, cloned, failed_fetch, corrupted) AS (\n VALUES (\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'not_cloned')\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'not_cloned')\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloning')\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloning')\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloned')\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloned')\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.last_error IS NOT NULL)\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.last_error IS NOT NULL)\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.corrupted_at IS NOT NULL)\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.corrupted_at IS NOT NULL)\n )\n\n )\n )\n INSERT INTO repo_statistics (not_cloned, cloning, cloned, failed_fetch, corrupted)\n SELECT not_cloned, cloning, cloned, failed_fetch, corrupted\n FROM diff\n WHERE\n not_cloned != 0\n OR cloning != 0\n OR cloned != 0\n OR failed_fetch != 0\n OR corrupted != 0\n ;\n\n RETURN NULL;\n END\n$function$\n" + "Definition": "CREATE OR REPLACE FUNCTION public.recalc_gitserver_repos_statistics_on_update()\n RETURNS trigger\n LANGUAGE plpgsql\nAS $function$ BEGIN\n\n -------------------------------------------------\n -- THIS IS CHANGED TO APPEND\n -------------------------------------------------\n WITH diff(shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) AS (\n SELECT\n COALESCE(newtab.shard_id, oldtab.shard_id) AS shard_id,\n COUNT(newtab.repo_id) - COUNT(oldtab.repo_id) AS total,\n COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'not_cloned') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'not_cloned') AS not_cloned,\n COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'cloning') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'cloning') AS cloning,\n COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'cloned') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'cloned') AS cloned,\n COUNT(newtab.repo_id) FILTER (WHERE newtab.last_error IS NOT NULL) - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.last_error IS NOT NULL) AS failed_fetch,\n COUNT(newtab.repo_id) FILTER (WHERE newtab.corrupted_at IS NOT NULL) - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.corrupted_at IS NOT NULL) AS corrupted\n FROM\n newtab\n FULL OUTER JOIN\n oldtab ON newtab.repo_id = oldtab.repo_id AND newtab.shard_id = oldtab.shard_id\n GROUP BY\n COALESCE(newtab.shard_id, oldtab.shard_id)\n )\n INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted)\n SELECT shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted\n FROM diff\n WHERE\n total != 0\n OR not_cloned != 0\n OR cloning != 0\n OR cloned != 0\n OR failed_fetch != 0\n OR corrupted != 0\n ;\n\n -------------------------------------------------\n -- UNCHANGED\n -------------------------------------------------\n WITH diff(not_cloned, cloning, cloned, failed_fetch, corrupted) AS (\n VALUES (\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'not_cloned')\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'not_cloned')\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloning')\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloning')\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloned')\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloned')\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.last_error IS NOT NULL)\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.last_error IS NOT NULL)\n ),\n (\n (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.corrupted_at IS NOT NULL)\n -\n (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.corrupted_at IS NOT NULL)\n )\n\n )\n )\n INSERT INTO repo_statistics (not_cloned, cloning, cloned, failed_fetch, corrupted)\n SELECT not_cloned, cloning, cloned, failed_fetch, corrupted\n FROM diff\n WHERE\n not_cloned != 0\n OR cloning != 0\n OR cloned != 0\n OR failed_fetch != 0\n OR corrupted != 0\n ;\n\n RETURN NULL;\n END\n$function$\n" }, { "Name": "recalc_repo_statistics_on_repo_delete", @@ -14709,7 +14709,7 @@ "Name": "shard_id", "Index": 1, "TypeName": "text", - "IsNullable": false, + "IsNullable": true, "Default": "", "CharacterMaximumLength": 0, "IsIdentity": false, @@ -14734,14 +14734,14 @@ ], "Indexes": [ { - "Name": "gitserver_repos_statistics_pkey", - "IsPrimaryKey": true, - "IsUnique": true, + "Name": "gitserver_repos_statistics_shard_id", + "IsPrimaryKey": false, + "IsUnique": false, "IsExclusion": false, "IsDeferrable": false, - "IndexDefinition": "CREATE UNIQUE INDEX gitserver_repos_statistics_pkey ON gitserver_repos_statistics USING btree (shard_id)", - "ConstraintType": "p", - "ConstraintDefinition": "PRIMARY KEY (shard_id)" + "IndexDefinition": "CREATE INDEX gitserver_repos_statistics_shard_id ON gitserver_repos_statistics USING btree (shard_id)", + "ConstraintType": "", + "ConstraintDefinition": "" } ], "Constraints": null, @@ -16913,6 +16913,16 @@ "ConstraintType": "", "ConstraintDefinition": "" }, + { + "Name": "lsif_indexes_repository_id_indexer", + "IsPrimaryKey": false, + "IsUnique": false, + "IsExclusion": false, + "IsDeferrable": false, + "IndexDefinition": "CREATE INDEX lsif_indexes_repository_id_indexer ON lsif_indexes USING btree (repository_id, indexer)", + "ConstraintType": "", + "ConstraintDefinition": "" + }, { "Name": "lsif_indexes_state", "IsPrimaryKey": false, @@ -18051,6 +18061,16 @@ "ConstraintType": "", "ConstraintDefinition": "" }, + { + "Name": "lsif_uploads_repository_id_indexer", + "IsPrimaryKey": false, + "IsUnique": false, + "IsExclusion": false, + "IsDeferrable": false, + "IndexDefinition": "CREATE INDEX lsif_uploads_repository_id_indexer ON lsif_uploads USING btree (repository_id, indexer)", + "ConstraintType": "", + "ConstraintDefinition": "" + }, { "Name": "lsif_uploads_state", "IsPrimaryKey": false, @@ -24508,6 +24528,16 @@ "IndexDefinition": "CREATE UNIQUE INDEX repo_embedding_jobs_pkey ON repo_embedding_jobs USING btree (id)", "ConstraintType": "p", "ConstraintDefinition": "PRIMARY KEY (id)" + }, + { + "Name": "repo_embedding_jobs_repo", + "IsPrimaryKey": false, + "IsUnique": false, + "IsExclusion": false, + "IsDeferrable": false, + "IndexDefinition": "CREATE INDEX repo_embedding_jobs_repo ON repo_embedding_jobs USING btree (repo_id, revision)", + "ConstraintType": "", + "ConstraintDefinition": "" } ], "Constraints": null, diff --git a/internal/database/schema.md b/internal/database/schema.md index d18b71e918770..32e7e7e5ee984 100644 --- a/internal/database/schema.md +++ b/internal/database/schema.md @@ -1974,7 +1974,7 @@ Triggers: ``` Column | Type | Collation | Nullable | Default --------------+--------+-----------+----------+--------- - shard_id | text | | not null | + shard_id | text | | | total | bigint | | not null | 0 not_cloned | bigint | | not null | 0 cloning | bigint | | not null | 0 @@ -1982,7 +1982,7 @@ Triggers: failed_fetch | bigint | | not null | 0 corrupted | bigint | | not null | 0 Indexes: - "gitserver_repos_statistics_pkey" PRIMARY KEY, btree (shard_id) + "gitserver_repos_statistics_shard_id" btree (shard_id) ``` @@ -2345,6 +2345,7 @@ Indexes: "lsif_indexes_dequeue_order_idx" btree ((enqueuer_user_id > 0) DESC, queued_at DESC, id) WHERE state = 'queued'::text OR state = 'errored'::text "lsif_indexes_queued_at_id" btree (queued_at DESC, id) "lsif_indexes_repository_id_commit" btree (repository_id, commit) + "lsif_indexes_repository_id_indexer" btree (repository_id, indexer) "lsif_indexes_state" btree (state) Check constraints: "lsif_uploads_commit_valid_chars" CHECK (commit ~ '^[a-z0-9]{40}$'::text) @@ -2573,6 +2574,7 @@ Indexes: "lsif_uploads_committed_at" btree (committed_at) WHERE state = 'completed'::text "lsif_uploads_last_reconcile_at" btree (last_reconcile_at, id) WHERE state = 'completed'::text "lsif_uploads_repository_id_commit" btree (repository_id, commit) + "lsif_uploads_repository_id_indexer" btree (repository_id, indexer) "lsif_uploads_state" btree (state) "lsif_uploads_uploaded_at_id" btree (uploaded_at DESC, id) WHERE state <> 'deleted'::text Check constraints: @@ -3662,6 +3664,7 @@ Foreign-key constraints: revision | text | | not null | Indexes: "repo_embedding_jobs_pkey" PRIMARY KEY, btree (id) + "repo_embedding_jobs_repo" btree (repo_id, revision) Referenced by: TABLE "repo_embedding_job_stats" CONSTRAINT "repo_embedding_job_stats_job_id_fkey" FOREIGN KEY (job_id) REFERENCES repo_embedding_jobs(id) ON DELETE CASCADE DEFERRABLE diff --git a/internal/database/sub_repo_perms_store.go b/internal/database/sub_repo_perms_store.go index 1b02aa6834323..b1d2891355513 100644 --- a/internal/database/sub_repo_perms_store.go +++ b/internal/database/sub_repo_perms_store.go @@ -199,7 +199,7 @@ WHERE user_id = %s rows, err := s.Query(ctx, q) if err != nil { - return nil, errors.Wrap(err, "getting sub repo permissions by user") + return nil, errors.Wrap(err, "getting sub repo permissions by user and service") } result := make(map[api.ExternalRepoSpec]authz.SubRepoPermissions) diff --git a/internal/database/telemetry_export_store.go b/internal/database/telemetry_export_store.go index 150545a876ac8..5f7e484652afa 100644 --- a/internal/database/telemetry_export_store.go +++ b/internal/database/telemetry_export_store.go @@ -22,7 +22,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/telemetry/sensitivemetadataallowlist" telemetrygatewayv1 "github.com/sourcegraph/sourcegraph/internal/telemetrygateway/v1" "github.com/sourcegraph/sourcegraph/internal/trace" - "github.com/sourcegraph/sourcegraph/internal/xcontext" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -155,7 +154,7 @@ func (s *telemetryEventsExportQueueStore) QueueForExport(ctx context.Context, ev // Create a cancel-free context to avoid interrupting the insert when // the parent context is cancelled, and add our own timeout on the insert // to make sure things don't get stuck in an unbounded manner. - insertCtx, cancel := context.WithTimeout(xcontext.Detach(ctx), 5*time.Minute) + insertCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 5*time.Minute) defer cancel() err = batch.InsertValues( diff --git a/internal/database/telemetry_export_store_test.go b/internal/database/telemetry_export_store_test.go index 1fd9077c84266..41a8198a8522a 100644 --- a/internal/database/telemetry_export_store_test.go +++ b/internal/database/telemetry_export_store_test.go @@ -102,7 +102,7 @@ func TestTelemetryEventsExportQueueLifecycle(t *testing.T) { Action: "View", Timestamp: timestamppb.New(time.Date(2022, 11, 3, 1, 0, 0, 0, time.UTC)), Parameters: &telemetrygatewayv1.EventParameters{ - Metadata: map[string]int64{"public": 1}, + Metadata: map[string]float64{"public": 1}, }, }, { Id: "2", diff --git a/internal/database/users.go b/internal/database/users.go index 9a4b9b087afcd..b49ecd1ca8847 100644 --- a/internal/database/users.go +++ b/internal/database/users.go @@ -95,7 +95,7 @@ type UserStore interface { Transact(context.Context) (UserStore, error) Update(context.Context, int32, UserUpdate) error UpdatePassword(ctx context.Context, id int32, oldPassword, newPassword string) error - UpgradeToCodyPro(ctx context.Context, id int32) error + ChangeCodyPlan(ctx context.Context, id int32, plan bool) error SetChatCompletionsQuota(ctx context.Context, id int32, quota *int) error GetChatCompletionsQuota(ctx context.Context, id int32) (*int, error) SetCodeCompletionsQuota(ctx context.Context, id int32, quota *int) error @@ -619,9 +619,12 @@ func (u *userStore) Update(ctx context.Context, id int32, update UserUpdate) (er // NOTE(naman): THIS IS TEMPORARY FOR DEC GA // Upgrade user to cody pro plan -func (u *userStore) UpgradeToCodyPro(ctx context.Context, id int32) (err error) { - // TODO: update usage limits as well - query := sqlf.Sprintf("UPDATE users SET cody_pro_enabled_at=NOW() WHERE id=%d AND cody_pro_enabled_at IS NULL AND deleted_at IS NULL", id) +func (u *userStore) ChangeCodyPlan(ctx context.Context, id int32, pro bool) (err error) { + query := sqlf.Sprintf("UPDATE users SET cody_pro_enabled_at=NULL WHERE id=%d AND cody_pro_enabled_at IS NOT NULL AND deleted_at IS NULL", id) + + if pro { + query = sqlf.Sprintf("UPDATE users SET cody_pro_enabled_at=NOW() WHERE id=%d AND cody_pro_enabled_at IS NULL AND deleted_at IS NULL", id) + } res, err := u.ExecResult(ctx, query) if err != nil { @@ -643,7 +646,11 @@ func (u *userStore) UpgradeToCodyPro(ctx context.Context, id int32) (err error) return userNotFoundErr{args: []any{id}} } - return errors.New("user is already on Cody Pro plan") + if pro { + return errors.New("user is already on Cody Pro plan") + } + + return errors.New("user is already on Cody Community plan") } return nil diff --git a/internal/embeddings/embed/client/azureopenai/BUILD.bazel b/internal/embeddings/embed/client/azureopenai/BUILD.bazel index 029530306b216..16dec53555393 100644 --- a/internal/embeddings/embed/client/azureopenai/BUILD.bazel +++ b/internal/embeddings/embed/client/azureopenai/BUILD.bazel @@ -11,6 +11,8 @@ go_library( "//internal/embeddings/embed/client", "//internal/embeddings/embed/client/modeltransformations", "//lib/errors", + "@com_github_azure_azure_sdk_for_go_sdk_ai_azopenai//:azopenai", + "@com_github_azure_azure_sdk_for_go_sdk_azidentity//:azidentity", ], ) @@ -20,6 +22,8 @@ go_test( embed = [":azureopenai"], deps = [ "//internal/conf/conftypes", + "//lib/errors", + "@com_github_azure_azure_sdk_for_go_sdk_ai_azopenai//:azopenai", "@com_github_stretchr_testify//require", ], ) diff --git a/internal/embeddings/embed/client/azureopenai/client.go b/internal/embeddings/embed/client/azureopenai/client.go index 7cd49fa585f8b..b84284390ddd4 100644 --- a/internal/embeddings/embed/client/azureopenai/client.go +++ b/internal/embeddings/embed/client/azureopenai/client.go @@ -1,14 +1,13 @@ package azureopenai import ( - "bytes" "context" - "encoding/json" "fmt" - "io" - "net/http" - "net/url" "strings" + "sync" + + "github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai" + "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client" @@ -16,18 +15,68 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" ) -func NewClient(httpClient *http.Client, config *conftypes.EmbeddingsConfig) *azureOpenaiEmbeddingsClient { +// We want to reuse the client because when using the DefaultAzureCredential +// it will acquire a short lived token and reusing the client +// prevents acquiring a new token on every request. +// The client will refresh the token as needed. +var apiClient embeddingsClient + +type embeddingsClient struct { + mu sync.RWMutex + accessToken string + endpoint string + client *azopenai.Client +} + +type EmbeddingsClient interface { + GetEmbeddings(ctx context.Context, body azopenai.EmbeddingsOptions, options *azopenai.GetEmbeddingsOptions) (azopenai.GetEmbeddingsResponse, error) +} + +type GetEmbeddingsAPIClientFunc func(endpoint, accessToken string) (EmbeddingsClient, error) + +func GetAPIClient(endpoint, accessToken string) (EmbeddingsClient, error) { + apiClient.mu.RLock() + if apiClient.client != nil && apiClient.endpoint == endpoint && apiClient.accessToken == accessToken { + apiClient.mu.RUnlock() + return apiClient.client, nil + } + apiClient.mu.RUnlock() + apiClient.mu.Lock() + defer apiClient.mu.Unlock() + var err error + if accessToken != "" { + credential, credErr := azopenai.NewKeyCredential(accessToken) + if credErr != nil { + return nil, credErr + } + apiClient.client, err = azopenai.NewClientWithKeyCredential(endpoint, credential, nil) + } else { + credential, credErr := azidentity.NewDefaultAzureCredential(nil) + if credErr != nil { + return nil, credErr + } + apiClient.client, err = azopenai.NewClient(endpoint, credential, nil) + } + return apiClient.client, err + +} + +func NewClient(getClient GetEmbeddingsAPIClientFunc, config *conftypes.EmbeddingsConfig) (*azureOpenaiEmbeddingsClient, error) { + client, err := getClient(config.Endpoint, config.AccessToken) + if err != nil { + return nil, err + } return &azureOpenaiEmbeddingsClient{ - httpClient: httpClient, + client: client, dimensions: config.Dimensions, accessToken: config.AccessToken, model: config.Model, endpoint: config.Endpoint, - } + }, nil } type azureOpenaiEmbeddingsClient struct { - httpClient *http.Client + client EmbeddingsClient model string dimensions int endpoint string @@ -90,69 +139,20 @@ func (c *azureOpenaiEmbeddingsClient) getEmbeddings(ctx context.Context, texts [ return &client.EmbeddingsResults{Embeddings: embeddings, Failed: failed, Dimensions: c.dimensions}, nil } -func (c *azureOpenaiEmbeddingsClient) requestSingleEmbeddingWithRetryOnNull(ctx context.Context, input string, retries int) (*openaiEmbeddingAPIResponse, error) { +func (c *azureOpenaiEmbeddingsClient) requestSingleEmbeddingWithRetryOnNull(ctx context.Context, input string, retries int) (*azopenai.GetEmbeddingsResponse, error) { for i := 0; i < retries; i++ { - response, err := c.do(ctx, c.model, openaiEmbeddingAPIRequest{Input: input}) + response, err := c.client.GetEmbeddings(ctx, azopenai.EmbeddingsOptions{ + Input: []string{input}, + Deployment: c.model, + }, nil) + if err != nil { return nil, err } if len(response.Data) != 1 || len(response.Data[0].Embedding) == 0 { continue } - return response, nil + return &response, nil } return nil, errors.Newf("null response for embedding after %d retries", retries) } - -func (c *azureOpenaiEmbeddingsClient) do(ctx context.Context, model string, request openaiEmbeddingAPIRequest) (*openaiEmbeddingAPIResponse, error) { - bodyBytes, err := json.Marshal(request) - if err != nil { - return nil, err - } - - url, err := url.Parse(c.endpoint) - if err != nil { - return nil, errors.Wrap(err, "failed to parse configured endpoint") - } - q := url.Query() - q.Add("api-version", "2023-05-15") - url.RawQuery = q.Encode() - url.Path = fmt.Sprintf("/openai/deployments/%s/embeddings", model) - - req, err := http.NewRequestWithContext(ctx, http.MethodPost, url.String(), bytes.NewReader(bodyBytes)) - if err != nil { - return nil, err - } - req.Header.Set("Content-Type", "application/json") - req.Header.Set("api-key", c.accessToken) - - resp, err := c.httpClient.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - respBody, _ := io.ReadAll(io.LimitReader(resp.Body, 1024)) - return nil, errors.Errorf("embeddings: %s %q: failed with status %d: %s", req.Method, req.URL.String(), resp.StatusCode, string(respBody)) - } - - var response openaiEmbeddingAPIResponse - if err := json.NewDecoder(resp.Body).Decode(&response); err != nil { - return nil, err - } - return &response, nil -} - -type openaiEmbeddingAPIRequest struct { - Input string `json:"input"` -} - -type openaiEmbeddingAPIResponse struct { - Data []openaiEmbeddingAPIResponseData `json:"data"` -} - -type openaiEmbeddingAPIResponseData struct { - Index int `json:"index"` - Embedding []float32 `json:"embedding"` -} diff --git a/internal/embeddings/embed/client/azureopenai/client_test.go b/internal/embeddings/embed/client/azureopenai/client_test.go index 66193cf57980b..de44d32685e6e 100644 --- a/internal/embeddings/embed/client/azureopenai/client_test.go +++ b/internal/embeddings/embed/client/azureopenai/client_test.go @@ -2,120 +2,113 @@ package azureopenai import ( "context" - "encoding/json" - "net/http" - "net/http/httptest" - "net/url" "testing" + "github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai" "github.com/stretchr/testify/require" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/lib/errors" ) +type mockResponse struct { + resp azopenai.GetEmbeddingsResponse + err error +} + +type mockAzureClient struct { + current int + responses []mockResponse +} + +func (c *mockAzureClient) GetEmbeddings(ctx context.Context, body azopenai.EmbeddingsOptions, options *azopenai.GetEmbeddingsOptions) (azopenai.GetEmbeddingsResponse, error) { + if c.current < len(c.responses) { + i := c.current + c.current++ + return c.responses[i].resp, c.responses[i].err + } + + return azopenai.GetEmbeddingsResponse{}, errors.New("no more mock responses") + +} + +func newMockAPIClient(responses []mockResponse) GetEmbeddingsAPIClientFunc { + return func(accessToken, endpoint string) (EmbeddingsClient, error) { + return &mockAzureClient{ + responses: responses, + }, nil + } +} + func TestAzureOpenAI(t *testing.T) { t.Run("errors on empty embedding string", func(t *testing.T) { - client := NewClient(http.DefaultClient, &conftypes.EmbeddingsConfig{}) + client, _ := NewClient( + newMockAPIClient([]mockResponse{{resp: azopenai.GetEmbeddingsResponse{}, err: nil}}), + &conftypes.EmbeddingsConfig{}, + ) invalidTexts := []string{"a", ""} // empty string is invalid _, err := client.GetDocumentEmbeddings(context.Background(), invalidTexts) require.ErrorContains(t, err, "empty string") }) t.Run("retry on empty embedding", func(t *testing.T) { - gotRequest1 := false - gotRequest2 := false - s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { - // On the first request, respond with a null embedding - if !gotRequest1 { - resp := openaiEmbeddingAPIResponse{ - Data: []openaiEmbeddingAPIResponseData{{ - Index: 0, - Embedding: nil, - }}, - } - json.NewEncoder(w).Encode(resp) - gotRequest1 = true - return - } - - // The client should try that embedding once more. This time, actually return a value. - if !gotRequest2 { - resp := openaiEmbeddingAPIResponse{ - Data: []openaiEmbeddingAPIResponseData{{ - Index: 0, - Embedding: append(make([]float32, 1535), 1), - }}, - } - json.NewEncoder(w).Encode(resp) - gotRequest2 = true - return - } - - panic("only expected 2 responses") - })) - defer s.Close() - - httpClient := s.Client() - - // HACK: override the URL to always go to the test server - oldTransport := httpClient.Transport - httpClient.Transport = roundTripFunc(func(r *http.Request) (*http.Response, error) { - r.URL, _ = url.Parse(s.URL) - return oldTransport.RoundTrip(r) - }) - - client := NewClient(s.Client(), &conftypes.EmbeddingsConfig{Dimensions: 1536}) - resp, err := client.GetQueryEmbedding(context.Background(), "a") + client, _ := NewClient( + newMockAPIClient( + []mockResponse{ + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: append(make([]float32, 1535), 1), Index: int32Ptr(0)}, + }}}, err: nil}, + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: nil, Index: int32Ptr(1)}, + }}}, err: nil}, + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: append(make([]float32, 1535), 2), Index: int32Ptr(0)}, + }}}, err: nil}, + }), + &conftypes.EmbeddingsConfig{Dimensions: 1536}, + ) + resp, err := client.GetDocumentEmbeddings(context.Background(), []string{"a", "b"}) require.NoError(t, err) var expected []float32 { expected = append(expected, make([]float32, 1535)...) expected = append(expected, 1) + expected = append(expected, make([]float32, 1535)...) + expected = append(expected, 2) } require.Equal(t, expected, resp.Embeddings) require.Empty(t, resp.Failed) - require.Equal(t, 1536, resp.Dimensions) - require.True(t, gotRequest1) - require.True(t, gotRequest2) }) t.Run("retry on empty embedding fails and returns failed indices no error", func(t *testing.T) { - gotRequest1 := false - s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { - // On the first request, respond with a successful embedding - if !gotRequest1 { - resp := openaiEmbeddingAPIResponse{ - Data: []openaiEmbeddingAPIResponseData{{ - Index: 0, - Embedding: append(make([]float32, 1535), 1), - }}, - } - json.NewEncoder(w).Encode(resp) - gotRequest1 = true - return - } - - // Always return an invalid response to all the requests after the first - resp := openaiEmbeddingAPIResponse{ - Data: []openaiEmbeddingAPIResponseData{{ - Index: 0, - Embedding: nil, - }}, - } - json.NewEncoder(w).Encode(resp) - })) - defer s.Close() - - httpClient := s.Client() - oldTransport := httpClient.Transport - httpClient.Transport = roundTripFunc(func(r *http.Request) (*http.Response, error) { - r.URL, _ = url.Parse(s.URL) - return oldTransport.RoundTrip(r) - }) - - client := NewClient(s.Client(), &conftypes.EmbeddingsConfig{Dimensions: 1536, ExcludeChunkOnError: true}) - resp, err := client.GetDocumentEmbeddings(context.Background(), []string{"a", "b"}) - require.NoError(t, err, "expected request to succeed") + client, _ := NewClient( + newMockAPIClient( + []mockResponse{ + // First success + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: append(make([]float32, 1535), 1), Index: int32Ptr(0)}, + }}}, err: nil}, + // Initial Failure + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: nil, Index: int32Ptr(1)}, + }}}, err: nil}, + // Retry 1 + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: nil, Index: int32Ptr(1)}, + }}}, err: nil}, + // Retry 2 + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: nil, Index: int32Ptr(1)}, + }}}, err: nil}, + // Final success + {resp: azopenai.GetEmbeddingsResponse{Embeddings: azopenai.Embeddings{Data: []azopenai.EmbeddingItem{ + {Embedding: append(make([]float32, 1535), 2), Index: int32Ptr(2)}, + }}}, err: nil}, + }), + &conftypes.EmbeddingsConfig{Dimensions: 1536}, + ) + resp, err := client.GetDocumentEmbeddings(context.Background(), []string{"a", "b", "c"}) + require.NoError(t, err) var expected []float32 { expected = append(expected, make([]float32, 1535)...) @@ -123,52 +116,17 @@ func TestAzureOpenAI(t *testing.T) { // zero value embedding when chunk fails to generate embeddings expected = append(expected, make([]float32, 1536)...) + + expected = append(expected, make([]float32, 1535)...) + expected = append(expected, 2) } failed := []int{1} - require.Equal(t, expected, resp.Embeddings) require.Equal(t, failed, resp.Failed) - require.Equal(t, 1536, resp.Dimensions) - }) - t.Run("success", func(t *testing.T) { - requestCount := 0 - s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { - requestCount++ - resp := openaiEmbeddingAPIResponse{ - Data: []openaiEmbeddingAPIResponseData{{ - Index: 0, - Embedding: append(make([]float32, 1535), float32(requestCount)), - }}, - } - json.NewEncoder(w).Encode(resp) - })) - defer s.Close() - - httpClient := s.Client() - oldTransport := httpClient.Transport - httpClient.Transport = roundTripFunc(func(r *http.Request) (*http.Response, error) { - r.URL, _ = url.Parse(s.URL) - return oldTransport.RoundTrip(r) - }) - - client := NewClient(s.Client(), &conftypes.EmbeddingsConfig{Dimensions: 1536}) - resp, err := client.GetDocumentEmbeddings(context.Background(), []string{"a", "b"}) - require.NoError(t, err, "expected request to succeed") - var expected []float32 - { - expected = append(expected, make([]float32, 1535)...) - expected = append(expected, 1) - expected = append(expected, make([]float32, 1535)...) - expected = append(expected, 2) - } - require.Equal(t, expected, resp.Embeddings) - require.Empty(t, resp.Failed) - require.Equal(t, 1536, resp.Dimensions) }) -} -type roundTripFunc func(r *http.Request) (*http.Response, error) +} -func (f roundTripFunc) RoundTrip(r *http.Request) (*http.Response, error) { return f(r) } +func int32Ptr(i int32) *int32 { return &i } diff --git a/internal/embeddings/embed/embed.go b/internal/embeddings/embed/embed.go index b27b152f66bfe..2d6db057e4e4b 100644 --- a/internal/embeddings/embed/embed.go +++ b/internal/embeddings/embed/embed.go @@ -25,11 +25,11 @@ import ( func NewEmbeddingsClient(config *conftypes.EmbeddingsConfig) (client.EmbeddingsClient, error) { switch config.Provider { case conftypes.EmbeddingsProviderNameSourcegraph: - return sourcegraph.NewClient(httpcli.ExternalClient, config), nil + return sourcegraph.NewClient(httpcli.UncachedExternalClient, config), nil case conftypes.EmbeddingsProviderNameOpenAI: - return openai.NewClient(httpcli.ExternalClient, config), nil + return openai.NewClient(httpcli.UncachedExternalClient, config), nil case conftypes.EmbeddingsProviderNameAzureOpenAI: - return azureopenai.NewClient(httpcli.ExternalClient, config), nil + return azureopenai.NewClient(azureopenai.GetAPIClient, config) default: return nil, errors.Newf("invalid provider %q", config.Provider) } diff --git a/internal/embeddings/embed/files.go b/internal/embeddings/embed/files.go index bf610eb2107ff..e0c691ccfa816 100644 --- a/internal/embeddings/embed/files.go +++ b/internal/embeddings/embed/files.go @@ -147,10 +147,3 @@ func IsValidTextFile(fileName string) bool { basename := strings.ToLower(filepath.Base(fileName)) return strings.HasPrefix(basename, "license") } - -func min(a, b int) int { - if a < b { - return a - } - return b -} diff --git a/internal/embeddings/similarity_search.go b/internal/embeddings/similarity_search.go index b0e9da00b3254..fa1746bfe61ff 100644 --- a/internal/embeddings/similarity_search.go +++ b/internal/embeddings/similarity_search.go @@ -202,20 +202,6 @@ func (index *EmbeddingIndex) score(query []int8, i int, opts SearchOptions) Sear } } -func min(a, b int) int { - if a < b { - return a - } - return b -} - -func max(a, b int) int { - if a > b { - return a - } - return b -} - type SearchOptions struct { UseDocumentRanks bool } diff --git a/internal/extsvc/azuredevops/client.go b/internal/extsvc/azuredevops/client.go index 407f2e05c38db..e7e15398576b4 100644 --- a/internal/extsvc/azuredevops/client.go +++ b/internal/extsvc/azuredevops/client.go @@ -134,9 +134,7 @@ func (c *client) do(ctx context.Context, req *http.Request, urlOverride string, } logger := log.Scoped("azuredevops.Client") - resp, err := oauthutil.DoRequest(ctx, logger, c.httpClient, req, c.auth, func(r *http.Request) (*http.Response, error) { - return c.httpClient.Do(r) - }) + resp, err := oauthutil.DoRequest(ctx, logger, c.httpClient, req, c.auth) if err != nil { return "", err } @@ -151,9 +149,7 @@ func (c *client) do(ctx context.Context, req *http.Request, urlOverride string, _ = c.externalRateLimiter.WaitForRateLimit(ctx, 1) req.Body = io.NopCloser(bytes.NewReader(reqBody)) - resp, err = oauthutil.DoRequest(ctx, logger, c.httpClient, req, c.auth, func(r *http.Request) (*http.Response, error) { - return c.httpClient.Do(r) - }) + resp, err = oauthutil.DoRequest(ctx, logger, c.httpClient, req, c.auth) numRetries++ } diff --git a/internal/extsvc/azuredevops/client_test.go b/internal/extsvc/azuredevops/client_test.go index 814639a442772..05bb5c84c2568 100644 --- a/internal/extsvc/azuredevops/client_test.go +++ b/internal/extsvc/azuredevops/client_test.go @@ -139,7 +139,7 @@ func TestRateLimitRetry(t *testing.T) { MockVisualStudioAppURL = "" }) a := &auth.BasicAuth{Username: "test", Password: "test"} - c, err := NewClient("test", srv.URL, a, nil) + c, err := NewClient("test", srv.URL, a, httpcli.TestExternalDoer) c.(*client).internalRateLimiter = ratelimit.NewInstrumentedLimiter("azuredevops", rate.NewLimiter(100, 10)) require.NoError(t, err) c.SetWaitForRateLimit(tt.waitForRateLimit) diff --git a/internal/extsvc/azuredevops/types.go b/internal/extsvc/azuredevops/types.go index 1cb2a02dc554c..12766a519ff3b 100644 --- a/internal/extsvc/azuredevops/types.go +++ b/internal/extsvc/azuredevops/types.go @@ -226,7 +226,7 @@ type PullRequestStatusState string type Repository struct { ID string `json:"id"` Name string `json:"name"` - CloneURL string `json:"remoteURL"` + RemoteURL string `json:"remoteURL"` APIURL string `json:"url"` SSHURL string `json:"sshUrl"` WebURL string `json:"webUrl"` diff --git a/internal/extsvc/bitbucketcloud/client.go b/internal/extsvc/bitbucketcloud/client.go index ec857fc5b0fc7..1bf013c86dd77 100644 --- a/internal/extsvc/bitbucketcloud/client.go +++ b/internal/extsvc/bitbucketcloud/client.go @@ -103,13 +103,20 @@ func newClient(urn string, config *schema.BitbucketCloudConnection, httpClient h return nil, err } + var auther auth.Authenticator + if config.AccessToken != "" { + auther = &auth.OAuthBearerToken{Token: config.AccessToken} + } else { + auther = &auth.BasicAuth{ + Username: config.Username, + Password: config.AppPassword, + } + } + return &client{ httpClient: httpClient, URL: extsvc.NormalizeBaseURL(apiURL), - Auth: &auth.BasicAuth{ - Username: config.Username, - Password: config.AppPassword, - }, + Auth: auther, // Default limits are defined in extsvc.GetLimitFromConfig rateLimit: ratelimit.NewInstrumentedLimiter(urn, ratelimit.NewGlobalRateLimiter(log.Scoped("BitbucketCloudClient"), urn)), }, nil @@ -241,9 +248,7 @@ func (c *client) do(ctx context.Context, req *http.Request, result any) (code in var resp *http.Response sleepTime := 10 * time.Second for { - resp, err = oauthutil.DoRequest(ctx, nil, c.httpClient, req, c.Auth, func(r *http.Request) (*http.Response, error) { - return c.httpClient.Do(r) - }) + resp, err = oauthutil.DoRequest(ctx, nil, c.httpClient, req, c.Auth) if resp != nil { code = resp.StatusCode } diff --git a/internal/extsvc/bitbucketserver/BUILD.bazel b/internal/extsvc/bitbucketserver/BUILD.bazel index 02f9f62cb3597..7337c424077d9 100644 --- a/internal/extsvc/bitbucketserver/BUILD.bazel +++ b/internal/extsvc/bitbucketserver/BUILD.bazel @@ -43,6 +43,7 @@ go_test( embed = [":bitbucketserver"], deps = [ "//internal/extsvc/auth", + "//internal/httpcli", "//internal/ratelimit", "//schema", "@com_github_gomodule_oauth1//oauth", diff --git a/internal/extsvc/bitbucketserver/client_test.go b/internal/extsvc/bitbucketserver/client_test.go index 416c84dabbce2..639061f7be747 100644 --- a/internal/extsvc/bitbucketserver/client_test.go +++ b/internal/extsvc/bitbucketserver/client_test.go @@ -27,6 +27,7 @@ import ( "golang.org/x/time/rate" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/schema" ) @@ -91,7 +92,7 @@ func TestClientKeepsBaseURLPath(t *testing.T) { srvURL, err := url.JoinPath(srv.URL, "/testpath") require.NoError(t, err) bbConf := &schema.BitbucketServerConnection{Url: srvURL} - client, err := NewClient("test", bbConf, nil) + client, err := NewClient("test", bbConf, httpcli.TestExternalDoer) require.NoError(t, err) client.rateLimit = ratelimit.NewInstrumentedLimiter("bitbucket", rate.NewLimiter(100, 10)) diff --git a/internal/extsvc/gerrit/client_test.go b/internal/extsvc/gerrit/client_test.go index 1312ae3eaeb40..fc62a4169a102 100644 --- a/internal/extsvc/gerrit/client_test.go +++ b/internal/extsvc/gerrit/client_test.go @@ -8,11 +8,12 @@ import ( "net/url" "testing" - "github.com/sourcegraph/sourcegraph/internal/httpcli" - "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/time/rate" + + "github.com/sourcegraph/sourcegraph/internal/httpcli" + "github.com/sourcegraph/sourcegraph/internal/ratelimit" ) func TestClient_do(t *testing.T) { @@ -29,7 +30,7 @@ func TestClient_do(t *testing.T) { require.NoError(t, err) c := &client{ - httpClient: httpcli.ExternalDoer, + httpClient: httpcli.TestExternalDoer, URL: srvURL, rateLimit: &ratelimit.InstrumentedLimiter{Limiter: rate.NewLimiter(10, 10)}, } diff --git a/internal/extsvc/github/BUILD.bazel b/internal/extsvc/github/BUILD.bazel index 18990454c214a..011524aeb6298 100644 --- a/internal/extsvc/github/BUILD.bazel +++ b/internal/extsvc/github/BUILD.bazel @@ -6,7 +6,6 @@ go_library( srcs = [ "common.go", "doc.go", - "globallock.go", "v3.go", "v4.go", ], @@ -14,6 +13,7 @@ go_library( visibility = ["//:__subpackages__"], deps = [ "//internal/api", + "//internal/bytesize", "//internal/conf", "//internal/encryption", "//internal/env", @@ -23,18 +23,13 @@ go_library( "//internal/metrics", "//internal/oauthutil", "//internal/ratelimit", - "//internal/redispool", "//internal/trace", "//lib/errors", - "@com_github_go_redsync_redsync_v4//:redsync", - "@com_github_go_redsync_redsync_v4//redis/redigo", "@com_github_google_go_github_v55//github", "@com_github_graphql_go_graphql//language/ast", "@com_github_graphql_go_graphql//language/parser", "@com_github_graphql_go_graphql//language/visitor", "@com_github_masterminds_semver//:semver", - "@com_github_prometheus_client_golang//prometheus", - "@com_github_prometheus_client_golang//prometheus/promauto", "@com_github_segmentio_fasthash//fnv1", "@com_github_sourcegraph_log//:log", "@io_opentelemetry_go_otel//attribute", diff --git a/internal/extsvc/github/common.go b/internal/extsvc/github/common.go index 06ffcb34455f8..d44202a0a445d 100644 --- a/internal/extsvc/github/common.go +++ b/internal/extsvc/github/common.go @@ -22,6 +22,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/internal/api" + "github.com/sourcegraph/sourcegraph/internal/bytesize" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/encryption" "github.com/sourcegraph/sourcegraph/internal/env" @@ -1582,15 +1583,7 @@ func doRequest(ctx context.Context, logger log.Logger, apiURL *url.URL, auther a }() req = req.WithContext(ctx) - resp, err = oauthutil.DoRequest(ctx, logger, httpClient, req, auther, func(r *http.Request) (*http.Response, error) { - // For GitHub.com, to avoid running into rate limits we're limiting concurrency - // per auth token to 1 globally. - if URLIsGitHubDotCom(r.URL) { - return restrictGitHubDotComConcurrency(logger, httpClient, r) - } - - return httpClient.Do(r) - }) + resp, err = oauthutil.DoRequest(ctx, logger, httpClient, req, auther) if err != nil { return nil, errors.Wrap(err, "request failed") } @@ -1814,6 +1807,15 @@ type Repository struct { // Parent is non-nil for forks and contains details of the parent repository. Parent *ParentRepository `json:",omitempty"` + + // DiskUsageKibibytes is, according to GitHub's docs, in kilobytes, but + // empirically it's in kibibytes (meaning: multiples of 1024 bytes, not + // 1000). + DiskUsageKibibytes int `json:"DiskUsage,omitempty"` +} + +func (r *Repository) SizeBytes() bytesize.Bytes { + return bytesize.Bytes(r.DiskUsageKibibytes) * bytesize.KiB } // ParentRepository is the parent of a GitHub repository. @@ -1862,6 +1864,10 @@ type restRepository struct { Visibility string `json:"visibility"` Topics []string `json:"topics"` Parent *restParentRepository `json:"parent,omitempty"` + // DiskUsageKibibytes uses the "size" field which is, according to GitHub's + // docs, in kilobytes, but empirically it's in kibibytes (meaning: + // multiples of 1024 bytes, not 1000). + DiskUsageKibibytes int `json:"size"` } // getRepositoryFromAPI attempts to fetch a repository from the GitHub API without use of the redis cache. @@ -1889,21 +1895,22 @@ func convertRestRepo(restRepo restRepository) *Repository { } repo := Repository{ - ID: restRepo.ID, - DatabaseID: restRepo.DatabaseID, - NameWithOwner: restRepo.FullName, - Description: restRepo.Description, - URL: restRepo.HTMLURL, - IsPrivate: restRepo.Private, - IsFork: restRepo.Fork, - IsArchived: restRepo.Archived, - IsLocked: restRepo.Locked, - IsDisabled: restRepo.Disabled, - ViewerPermission: convertRestRepoPermissions(restRepo.Permissions), - StargazerCount: restRepo.Stars, - ForkCount: restRepo.Forks, - RepositoryTopics: RepositoryTopics{topics}, - Visibility: Visibility(restRepo.Visibility), + ID: restRepo.ID, + DatabaseID: restRepo.DatabaseID, + NameWithOwner: restRepo.FullName, + Description: restRepo.Description, + URL: restRepo.HTMLURL, + IsPrivate: restRepo.Private, + IsFork: restRepo.Fork, + IsArchived: restRepo.Archived, + IsLocked: restRepo.Locked, + IsDisabled: restRepo.Disabled, + ViewerPermission: convertRestRepoPermissions(restRepo.Permissions), + StargazerCount: restRepo.Stars, + ForkCount: restRepo.Forks, + RepositoryTopics: RepositoryTopics{topics}, + Visibility: Visibility(restRepo.Visibility), + DiskUsageKibibytes: restRepo.DiskUsageKibibytes, } if restRepo.Parent != nil { diff --git a/internal/extsvc/github/globallock.go b/internal/extsvc/github/globallock.go deleted file mode 100644 index 127eb392a19c5..0000000000000 --- a/internal/extsvc/github/globallock.go +++ /dev/null @@ -1,210 +0,0 @@ -package github - -import ( - "context" - "crypto/sha256" - "fmt" - "math/rand" - "net/http" - "strings" - "sync" - "time" - - "github.com/go-redsync/redsync/v4" - "github.com/go-redsync/redsync/v4/redis/redigo" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/sourcegraph/log" - - "github.com/sourcegraph/sourcegraph/internal/httpcli" - "github.com/sourcegraph/sourcegraph/internal/redispool" - "github.com/sourcegraph/sourcegraph/lib/errors" -) - -var metricWaitingRequestsGauge = promauto.NewGauge(prometheus.GaugeOpts{ - Name: "src_githubcom_concurrency_lock_waiting_requests", - Help: "Number of requests to GitHub.com waiting on the mutex", -}) - -var metricLockRequestsGauge = promauto.NewGauge(prometheus.GaugeOpts{ - Name: "src_githubcom_concurrency_lock_requests", - Help: "Number of requests to GitHub.com that require a the mutex", -}) - -var metricFailedLockRequestsGauge = promauto.NewGauge(prometheus.GaugeOpts{ - Name: "src_githubcom_concurrency_lock_failed_lock_requests", - Help: "Number of requests to GitHub.com that failed acquiring a the mutex", -}) - -var metricFailedUnlockRequestsGauge = promauto.NewGauge(prometheus.GaugeOpts{ - Name: "src_githubcom_concurrency_lock_failed_unlock_requests", - Help: "Number of requests to GitHub.com that failed unlocking a the mutex", -}) - -var metricLockRequestDurationGauge = promauto.NewHistogram(prometheus.HistogramOpts{ - Name: "src_githubcom_concurrency_lock_acquire_duration_seconds", - Help: "Current number of requests to GitHub.com running for a method.", - Buckets: prometheus.ExponentialBuckets(1, 2, 10), -}) - -func restrictGitHubDotComConcurrency(logger log.Logger, doer httpcli.Doer, r *http.Request) (*http.Response, error) { - logger = logger.Scoped("githubcom-concurrency-limiter") - var token string - if v := r.Header["Authorization"]; len(v) > 0 { - fields := strings.Fields(v[0]) - token = fields[len(fields)-1] - } - - lock := lockForToken(logger, token) - - metricLockRequestsGauge.Inc() - metricWaitingRequestsGauge.Inc() - start := time.Now() - didGetLock := false - if err := lock.LockContext(r.Context()); err != nil { - metricFailedLockRequestsGauge.Inc() - // Note that we do NOT fail the request here, this lock is considered best - // effort. - // - // We log a warning if the error is ErrTaken, since this can happen from time to time. - // Otherwise we log an error. It means that we didn't get the global lock in the permitted - // number of tries. Instead of blocking indefinitely, we let the request pass. - if errors.HasType(err, &redsync.ErrTaken{}) { - logger.Warn("could not acquire mutex to talk to GitHub.com in time, trying to make request concurrently") - } else { - logger.Error("failed to get mutex for GitHub.com, concurrent requests may occur and rate limits can happen", log.Error(err)) - } - } else { - didGetLock = true - } - metricLockRequestDurationGauge.Observe(float64(time.Since(start) / time.Second)) - metricWaitingRequestsGauge.Dec() - - resp, err := doer.Do(r) - - // We use a background context to still successfully unlock the mutex - // in case the request has been canceled. - if didGetLock { - if _, err := lock.UnlockContext(context.Background()); err != nil { - metricFailedUnlockRequestsGauge.Inc() - if errors.HasType(err, &redsync.ErrTaken{}) { - logger.Warn("failed to unlock mutex, GitHub.com requests may be delayed briefly", log.Error(err)) - } else { - logger.Error("failed to unlock mutex, GitHub.com requests may be delayed briefly", log.Error(err)) - } - } - } - - return resp, err -} - -type lock interface { - LockContext(context.Context) error - UnlockContext(context.Context) (bool, error) -} - -var testLock *mockLock - -// TB is a subset of testing.TB -type TB interface { - Name() string - Skip(args ...any) - Helper() - Fatalf(string, ...any) -} - -func SetupForTest(t TB) { - t.Helper() - - testLock = &mockLock{} -} - -type mockLock struct{} - -func (m *mockLock) LockContext(_ context.Context) error { - return nil -} - -func (m *mockLock) UnlockContext(_ context.Context) (bool, error) { - return false, nil -} - -// With a default number of retries of 32, this will average to 8 seconds. -const ( - minRetryDelayMilliSec = 200 - maxRetryDelayMilliSec = 300 -) - -// From https://github.com/go-redsync/redsync/blob/master/redsync.go -func retryDelay(tries int) time.Duration { - return time.Duration(rand.Intn(maxRetryDelayMilliSec-minRetryDelayMilliSec)+minRetryDelayMilliSec) * time.Millisecond -} - -func lockForToken(logger log.Logger, token string) lock { - if testLock != nil { - return testLock - } - // We hash the token so we don't store it as plain-text in redis. - hash := sha256.New() - hashedToken := "hash-failed" - if _, err := hash.Write([]byte(token)); err != nil { - logger.Error("failed to hash token", log.Error(err)) - } else { - hashedToken = string(hash.Sum(nil)) - } - - pool, ok := redispool.Store.Pool() - if !ok { - return globalLockMap.get(hashedToken) - } - - locker := redsync.New(redigo.NewPool(pool)) - return locker.NewMutex(fmt.Sprintf("github-concurrency:%s", hashedToken), redsync.WithRetryDelayFunc(retryDelay)) -} - -type inMemoryLock struct{ mu *sync.Mutex } - -func (l *inMemoryLock) LockContext(ctx context.Context) error { - l.mu.Lock() - return nil -} - -func (l *inMemoryLock) UnlockContext(ctx context.Context) (bool, error) { - l.mu.Unlock() - return true, nil -} - -var globalLockMap = lockMap{ - locks: make(map[string]*sync.Mutex), -} - -// lockMap is a map of strings to mutexes. It's used to serialize github.com API -// requests of each access token in order to prevent abuse rate limiting due -// to concurrency in App mode, where redis is not available. -type lockMap struct { - init sync.Once - mu sync.RWMutex - locks map[string]*sync.Mutex -} - -func (m *lockMap) get(k string) lock { - m.init.Do(func() { m.locks = make(map[string]*sync.Mutex) }) - - m.mu.RLock() - lock, ok := m.locks[k] - m.mu.RUnlock() - - if ok { - return &inMemoryLock{mu: lock} - } - - m.mu.Lock() - lock, ok = m.locks[k] - if !ok { - lock = &sync.Mutex{} - m.locks[k] = lock - } - m.mu.Unlock() - - return &inMemoryLock{mu: lock} -} diff --git a/internal/extsvc/github/testdata/golden/ListOrgRepositories b/internal/extsvc/github/testdata/golden/ListOrgRepositories index d7d682f8ff29c..37bdf8a72cb6d 100644 --- a/internal/extsvc/github/testdata/golden/ListOrgRepositories +++ b/internal/extsvc/github/testdata/golden/ListOrgRepositories @@ -13,7 +13,8 @@ "ViewerPermission": "ADMIN", "RepositoryTopics": { "Nodes": [] - } + }, + "DiskUsage": 1 }, { "ID": "MDEwOlJlcG9zaXRvcnkyNjMwMzM3NjE=", @@ -29,6 +30,7 @@ "ViewerPermission": "ADMIN", "RepositoryTopics": { "Nodes": [] - } + }, + "DiskUsage": 1 } ] \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/ListRepositoriesForSearch b/internal/extsvc/github/testdata/golden/ListRepositoriesForSearch index 218da09b4c2f7..ff18b62abf91a 100644 --- a/internal/extsvc/github/testdata/golden/ListRepositoriesForSearch +++ b/internal/extsvc/github/testdata/golden/ListRepositoriesForSearch @@ -11,9 +11,10 @@ "IsLocked": false, "IsDisabled": false, "ViewerPermission": "READ", - "visibility": "public", "RepositoryTopics": { "Nodes": [] - } + }, + "visibility": "public", + "DiskUsage": 1 } - ] + ] \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/ListTeamRepositories b/internal/extsvc/github/testdata/golden/ListTeamRepositories index 8f62460f090af..963936f3468eb 100644 --- a/internal/extsvc/github/testdata/golden/ListTeamRepositories +++ b/internal/extsvc/github/testdata/golden/ListTeamRepositories @@ -13,6 +13,7 @@ "ViewerPermission": "READ", "RepositoryTopics": { "Nodes": [] - } + }, + "DiskUsage": 1 } ] \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/SearchRepos-huge-query b/internal/extsvc/github/testdata/golden/SearchRepos-huge-query index cfb8249f5f238..a985ecce91eeb 100644 --- a/internal/extsvc/github/testdata/golden/SearchRepos-huge-query +++ b/internal/extsvc/github/testdata/golden/SearchRepos-huge-query @@ -96,33 +96,16 @@ } ] }, - "StargazerCount": 361294, - "ForkCount": 31019 + "StargazerCount": 378065, + "ForkCount": 34811, + "DiskUsage": 398421 }, { - "ID": "MDEwOlJlcG9zaXRvcnkxNzc3MzY1MzM=", - "DatabaseID": 177736533, - "NameWithOwner": "996icu/996.ICU", - "Description": "Repo for counting stars and contributing. Press F to pay respect to glorious developers.", - "URL": "https://github.com/996icu/996.ICU", - "IsPrivate": false, - "IsFork": false, - "IsArchived": false, - "IsLocked": false, - "IsDisabled": false, - "ViewerPermission": "READ", - "RepositoryTopics": { - "Nodes": [] - }, - "StargazerCount": 265043, - "ForkCount": 21462 - }, - { - "ID": "MDEwOlJlcG9zaXRvcnk2MDQ5MzEwMQ==", - "DatabaseID": 60493101, - "NameWithOwner": "jwasham/coding-interview-university", - "Description": "A complete computer science study plan to become a software engineer.", - "URL": "https://github.com/jwasham/coding-interview-university", + "ID": "MDEwOlJlcG9zaXRvcnkxMzQ5MTg5NQ==", + "DatabaseID": 13491895, + "NameWithOwner": "EbookFoundation/free-programming-books", + "Description": ":books: Freely available programming books", + "URL": "https://github.com/EbookFoundation/free-programming-books", "IsPrivate": false, "IsFork": false, "IsArchived": false, @@ -133,68 +116,34 @@ "Nodes": [ { "Topic": { - "Name": "computer-science" - } - }, - { - "Topic": { - "Name": "interview" - } - }, - { - "Topic": { - "Name": "programming-interviews" - } - }, - { - "Topic": { - "Name": "study-plan" - } - }, - { - "Topic": { - "Name": "data-structures" - } - }, - { - "Topic": { - "Name": "algorithms" - } - }, - { - "Topic": { - "Name": "software-engineering" - } - }, - { - "Topic": { - "Name": "algorithm" + "Name": "education" } }, { "Topic": { - "Name": "coding-interviews" + "Name": "books" } }, { "Topic": { - "Name": "interview-prep" + "Name": "list" } }, { "Topic": { - "Name": "coding-interview" + "Name": "resource" } }, { "Topic": { - "Name": "interview-preparation" + "Name": "hacktoberfest" } } ] }, - "StargazerCount": 246973, - "ForkCount": 65490 + "StargazerCount": 303257, + "ForkCount": 58520, + "DiskUsage": 17796 }, { "ID": "MDEwOlJlcG9zaXRvcnkyMTczNzQ2NQ==", @@ -237,15 +186,16 @@ } ] }, - "StargazerCount": 238837, - "ForkCount": 24935 + "StargazerCount": 277707, + "ForkCount": 26720, + "DiskUsage": 1475 }, { - "ID": "MDEwOlJlcG9zaXRvcnk4NTA3NzU1OA==", - "DatabaseID": 85077558, - "NameWithOwner": "kamranahmedse/developer-roadmap", - "Description": "Interactive roadmaps, guides and other educational content to help developers grow in their careers.", - "URL": "https://github.com/kamranahmedse/developer-roadmap", + "ID": "MDEwOlJlcG9zaXRvcnk1NDM0Njc5OQ==", + "DatabaseID": 54346799, + "NameWithOwner": "public-apis/public-apis", + "Description": "A collective list of free APIs", + "URL": "https://github.com/public-apis/public-apis", "IsPrivate": false, "IsFork": false, "IsArchived": false, @@ -256,100 +206,95 @@ "Nodes": [ { "Topic": { - "Name": "computer-science" - } - }, - { - "Topic": { - "Name": "roadmap" - } - }, - { - "Topic": { - "Name": "developer-roadmap" - } - }, - { - "Topic": { - "Name": "frontend-roadmap" - } - }, - { - "Topic": { - "Name": "devops-roadmap" - } - }, - { - "Topic": { - "Name": "backend-roadmap" + "Name": "api" } }, { "Topic": { - "Name": "react-roadmap" + "Name": "public-apis" } }, { "Topic": { - "Name": "angular-roadmap" + "Name": "free" } }, { "Topic": { - "Name": "python-roadmap" + "Name": "apis" } }, { "Topic": { - "Name": "go-roadmap" + "Name": "list" } }, { "Topic": { - "Name": "java-roadmap" + "Name": "development" } }, { "Topic": { - "Name": "dba-roadmap" + "Name": "software" } }, { "Topic": { - "Name": "vue-roadmap" + "Name": "public" } }, { "Topic": { - "Name": "blockchain-roadmap" + "Name": "resources" } }, { "Topic": { - "Name": "javascript-roadmap" + "Name": "dataset" } }, { "Topic": { - "Name": "nodejs-roadmap" + "Name": "open-source" } }, { "Topic": { - "Name": "qa-roadmap" + "Name": "public-api" } }, { "Topic": { - "Name": "software-architect-roadmap" + "Name": "lists" } } ] }, - "StargazerCount": 229269, - "ForkCount": 32902 + "StargazerCount": 268744, + "ForkCount": 30233, + "DiskUsage": 5088 + }, + { + "ID": "MDEwOlJlcG9zaXRvcnkxNzc3MzY1MzM=", + "DatabaseID": 177736533, + "NameWithOwner": "996icu/996.ICU", + "Description": "Repo for counting stars and contributing. Press F to pay respect to glorious developers.", + "URL": "https://github.com/996icu/996.ICU", + "IsPrivate": false, + "IsFork": false, + "IsArchived": false, + "IsLocked": false, + "IsDisabled": false, + "ViewerPermission": "READ", + "RepositoryTopics": { + "Nodes": [] + }, + "StargazerCount": 268154, + "ForkCount": 21476, + "DiskUsage": 187836 } ], - "TotalCount": 2848396, + "TotalCount": 3396424, "EndCursor": "Y3Vyc29yOjU=" } \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/SearchRepos-narrow-query b/internal/extsvc/github/testdata/golden/SearchRepos-narrow-query index 2f082d18d9097..2ca158b8ada71 100644 --- a/internal/extsvc/github/testdata/golden/SearchRepos-narrow-query +++ b/internal/extsvc/github/testdata/golden/SearchRepos-narrow-query @@ -36,8 +36,9 @@ } ] }, - "StargazerCount": 20789, - "ForkCount": 1280 + "StargazerCount": 22111, + "ForkCount": 1363, + "DiskUsage": 2553 } ], "TotalCount": 1, diff --git a/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/first_run b/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/first_run index b68f66f4a7dfc..990f99507dab4 100644 --- a/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/first_run +++ b/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/first_run @@ -9,8 +9,7 @@ "IsArchived": false, "IsLocked": false, "IsDisabled": false, - "ViewerPermission": "WRITE", - "visibility": "public", + "ViewerPermission": "ADMIN", "RepositoryTopics": { "Nodes": [ { @@ -45,6 +44,8 @@ } ] }, - "StargazerCount": 8662, - "ForkCount": 1116 - } + "StargazerCount": 9145, + "ForkCount": 1191, + "visibility": "public", + "DiskUsage": 1162483 + } \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/second_run b/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/second_run index b68f66f4a7dfc..990f99507dab4 100644 --- a/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/second_run +++ b/internal/extsvc/github/testdata/golden/TestGetRepository/cached-response/second_run @@ -9,8 +9,7 @@ "IsArchived": false, "IsLocked": false, "IsDisabled": false, - "ViewerPermission": "WRITE", - "visibility": "public", + "ViewerPermission": "ADMIN", "RepositoryTopics": { "Nodes": [ { @@ -45,6 +44,8 @@ } ] }, - "StargazerCount": 8662, - "ForkCount": 1116 - } + "StargazerCount": 9145, + "ForkCount": 1191, + "visibility": "public", + "DiskUsage": 1162483 + } \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/TestGetRepository/forked_repo b/internal/extsvc/github/testdata/golden/TestGetRepository/forked_repo index 4f8b0cca5b067..770352164fbc1 100644 --- a/internal/extsvc/github/testdata/golden/TestGetRepository/forked_repo +++ b/internal/extsvc/github/testdata/golden/TestGetRepository/forked_repo @@ -10,12 +10,13 @@ "IsLocked": false, "IsDisabled": false, "ViewerPermission": "READ", - "visibility": "public", "RepositoryTopics": { "Nodes": [] }, + "visibility": "public", "Parent": { "NameWithOwner": "sourcegraph/sourcegraph", "IsFork": false - } - } + }, + "DiskUsage": 1073588 + } \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_sourcegraph-testing b/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_sourcegraph-testing index 78d8d43124d8f..321dacfcc886a 100644 --- a/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_sourcegraph-testing +++ b/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_sourcegraph-testing @@ -10,12 +10,13 @@ "IsLocked": false, "IsDisabled": false, "ViewerPermission": "ADMIN", - "visibility": "public", "RepositoryTopics": { "Nodes": [] }, + "visibility": "public", "Parent": { "NameWithOwner": "sourcegraph/automation-testing", "IsFork": false - } - } + }, + "DiskUsage": 705 + } \ No newline at end of file diff --git a/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_user b/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_user index 5633c9d50e9a0..1adda4e94bb43 100644 --- a/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_user +++ b/internal/extsvc/github/testdata/golden/TestV3Client_Fork_success_user @@ -10,12 +10,13 @@ "IsLocked": false, "IsDisabled": false, "ViewerPermission": "ADMIN", - "visibility": "public", "RepositoryTopics": { "Nodes": [] }, + "visibility": "public", "Parent": { "NameWithOwner": "sourcegraph/automation-testing", "IsFork": false - } - } + }, + "DiskUsage": 703 + } \ No newline at end of file diff --git a/internal/extsvc/github/testdata/vcr/GetRepository.yaml b/internal/extsvc/github/testdata/vcr/GetRepository.yaml index 56177af7567ca..819b93645f9fc 100644 --- a/internal/extsvc/github/testdata/vcr/GetRepository.yaml +++ b/internal/extsvc/github/testdata/vcr/GetRepository.yaml @@ -16,7 +16,7 @@ interactions: method: GET response: body: '{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Code - AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-08-02T17:19:10Z","pushed_at":"2023-08-02T18:25:53Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1127953,"stargazers_count":8662,"watchers_count":8662,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1116,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5529,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1116,"open_issues":5529,"watchers":8662,"default_branch":"main","permissions":{"admin":false,"maintain":false,"push":true,"triage":true,"pull":true},"temp_clone_token":"","allow_squash_merge":true,"allow_merge_commit":false,"allow_rebase_merge":true,"allow_auto_merge":true,"delete_branch_on_merge":true,"allow_update_branch":true,"use_squash_pr_title_as_default":true,"squash_merge_commit_message":"PR_BODY","squash_merge_commit_title":"PR_TITLE","merge_commit_message":"PR_TITLE","merge_commit_title":"MERGE_MESSAGE","organization":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"network_count":1116,"subscribers_count":172}' + AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-11-16T12:36:01Z","pushed_at":"2023-11-16T13:37:24Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1162483,"stargazers_count":9145,"watchers_count":9145,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1191,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5499,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1191,"open_issues":5499,"watchers":9145,"default_branch":"main","permissions":{"admin":true,"maintain":true,"push":true,"triage":true,"pull":true},"organization":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"network_count":1191,"subscribers_count":176}' headers: Access-Control-Allow-Origin: - '*' @@ -32,11 +32,11 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Wed, 02 Aug 2023 18:28:48 GMT + - Thu, 16 Nov 2023 13:37:35 GMT Etag: - - W/"f8d4c2324df1f92fa0fe69ed634c7d85818b515154bbefae1f6aa762f2fd888a" + - W/"95c6c7c936c1bbcf5ab16d2d1ca93741d10bedb2516e5fc4c291342945eedfa0" Last-Modified: - - Wed, 02 Aug 2023 17:19:10 GMT + - Thu, 16 Nov 2023 12:36:01 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -46,6 +46,8 @@ interactions: Vary: - Accept, Authorization, Cookie, X-GitHub-OTP - Accept-Encoding, Accept, X-Requested-With + X-Accepted-Github-Permissions: + - metadata=read X-Content-Type-Options: - nosniff X-Frame-Options: @@ -56,17 +58,17 @@ interactions: - github.v3; param=jean-grey-preview; format=json, github.mercy-preview; param=machine-man-preview; format=json X-Github-Request-Id: - - E550:162A2F:5E9890:64897A:64CAA060 + - FFCC:C230:397CD4E9:3A2C68DA:65561B1F X-Ratelimit-Limit: - "5000" X-Ratelimit-Remaining: - - "4978" + - "4998" X-Ratelimit-Reset: - - "1691002952" + - "1700145293" X-Ratelimit-Resource: - core X-Ratelimit-Used: - - "22" + - "2" X-Varied-Accept: - application/vnd.github.jean-grey-preview+json,application/vnd.github.mercy-preview+json X-Xss-Protection: @@ -89,7 +91,7 @@ interactions: method: GET response: body: '{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Code - AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-08-02T17:19:10Z","pushed_at":"2023-08-02T18:25:53Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1127953,"stargazers_count":8662,"watchers_count":8662,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1116,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5529,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1116,"open_issues":5529,"watchers":8662,"default_branch":"main","permissions":{"admin":false,"maintain":false,"push":true,"triage":true,"pull":true},"temp_clone_token":"","allow_squash_merge":true,"allow_merge_commit":false,"allow_rebase_merge":true,"allow_auto_merge":true,"delete_branch_on_merge":true,"allow_update_branch":true,"use_squash_pr_title_as_default":true,"squash_merge_commit_message":"PR_BODY","squash_merge_commit_title":"PR_TITLE","merge_commit_message":"PR_TITLE","merge_commit_title":"MERGE_MESSAGE","organization":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"network_count":1116,"subscribers_count":172}' + AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-11-16T12:36:01Z","pushed_at":"2023-11-16T13:37:24Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1162483,"stargazers_count":9145,"watchers_count":9145,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1191,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5499,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1191,"open_issues":5499,"watchers":9145,"default_branch":"main","permissions":{"admin":true,"maintain":true,"push":true,"triage":true,"pull":true},"organization":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"network_count":1191,"subscribers_count":176}' headers: Access-Control-Allow-Origin: - '*' @@ -105,11 +107,11 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Wed, 02 Aug 2023 18:28:48 GMT + - Thu, 16 Nov 2023 13:37:36 GMT Etag: - - '"f8d4c2324df1f92fa0fe69ed634c7d85818b515154bbefae1f6aa762f2fd888a"' + - '"95c6c7c936c1bbcf5ab16d2d1ca93741d10bedb2516e5fc4c291342945eedfa0"' Last-Modified: - - Wed, 02 Aug 2023 17:19:10 GMT + - Thu, 16 Nov 2023 12:36:01 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -119,6 +121,8 @@ interactions: Vary: - Accept, Authorization, Cookie, X-GitHub-OTP - Accept-Encoding, Accept, X-Requested-With + X-Accepted-Github-Permissions: + - metadata=read X-Content-Type-Options: - nosniff X-Frame-Options: @@ -131,17 +135,17 @@ interactions: - github.v3; param=jean-grey-preview; format=json, github.mercy-preview; param=machine-man-preview; format=json X-Github-Request-Id: - - E550:162A2F:5E98A0:648993:64CAA060 + - FFCC:C230:397CD626:3A2C69F7:65561B1F X-Ratelimit-Limit: - "5000" X-Ratelimit-Remaining: - - "4978" + - "4998" X-Ratelimit-Reset: - - "1691002952" + - "1700145293" X-Ratelimit-Resource: - core X-Ratelimit-Used: - - "22" + - "2" X-Varied-Accept: - application/vnd.github.jean-grey-preview+json,application/vnd.github.mercy-preview+json X-Xss-Protection: @@ -177,7 +181,7 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Wed, 02 Aug 2023 18:28:49 GMT + - Thu, 16 Nov 2023 13:37:36 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -186,6 +190,8 @@ interactions: - max-age=31536000; includeSubdomains; preload Vary: - Accept-Encoding, Accept, X-Requested-With + X-Accepted-Github-Permissions: + - metadata=read X-Content-Type-Options: - nosniff X-Frame-Options: @@ -196,17 +202,17 @@ interactions: - github.v3; param=jean-grey-preview; format=json, github.mercy-preview; param=machine-man-preview; format=json X-Github-Request-Id: - - E550:162A2F:5E98B9:6489AF:64CAA060 + - FFCC:C230:397CD7D1:3A2C6BAA:65561B20 X-Ratelimit-Limit: - "5000" X-Ratelimit-Remaining: - - "4977" + - "4997" X-Ratelimit-Reset: - - "1691002952" + - "1700145293" X-Ratelimit-Resource: - core X-Ratelimit-Used: - - "23" + - "3" X-Varied-Accept: - application/vnd.github.jean-grey-preview+json,application/vnd.github.mercy-preview+json X-Xss-Protection: @@ -229,9 +235,9 @@ interactions: method: GET response: body: '{"id":662172899,"node_id":"R_kgDOJ3f04w","name":"sourcegraph","full_name":"sgtest/sourcegraph","private":false,"owner":{"login":"sgtest","id":5858054,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU4NTgwNTQ=","avatar_url":"https://avatars.githubusercontent.com/u/5858054?v=4","gravatar_id":"","url":"https://api.github.com/users/sgtest","html_url":"https://github.com/sgtest","followers_url":"https://api.github.com/users/sgtest/followers","following_url":"https://api.github.com/users/sgtest/following{/other_user}","gists_url":"https://api.github.com/users/sgtest/gists{/gist_id}","starred_url":"https://api.github.com/users/sgtest/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sgtest/subscriptions","organizations_url":"https://api.github.com/users/sgtest/orgs","repos_url":"https://api.github.com/users/sgtest/repos","events_url":"https://api.github.com/users/sgtest/events{/privacy}","received_events_url":"https://api.github.com/users/sgtest/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sgtest/sourcegraph","description":"Code - Intelligence Platform","fork":true,"url":"https://api.github.com/repos/sgtest/sourcegraph","forks_url":"https://api.github.com/repos/sgtest/sourcegraph/forks","keys_url":"https://api.github.com/repos/sgtest/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sgtest/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sgtest/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sgtest/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sgtest/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sgtest/sourcegraph/events","assignees_url":"https://api.github.com/repos/sgtest/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sgtest/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sgtest/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sgtest/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sgtest/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sgtest/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sgtest/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sgtest/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sgtest/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sgtest/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sgtest/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sgtest/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sgtest/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sgtest/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sgtest/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sgtest/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sgtest/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sgtest/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sgtest/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sgtest/sourcegraph/merges","archive_url":"https://api.github.com/repos/sgtest/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sgtest/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sgtest/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sgtest/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sgtest/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sgtest/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sgtest/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sgtest/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sgtest/sourcegraph/deployments","created_at":"2023-07-04T14:06:51Z","updated_at":"2023-07-04T14:06:51Z","pushed_at":"2023-07-04T14:04:45Z","git_url":"git://github.com/sgtest/sourcegraph.git","ssh_url":"git@github.com:sgtest/sourcegraph.git","clone_url":"https://github.com/sgtest/sourcegraph.git","svn_url":"https://github.com/sgtest/sourcegraph","homepage":"https://sourcegraph.com","size":1073588,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":[],"visibility":"public","forks":0,"open_issues":0,"watchers":0,"default_branch":"main","permissions":{"admin":false,"maintain":false,"push":false,"triage":false,"pull":true},"temp_clone_token":"","organization":{"login":"sgtest","id":5858054,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU4NTgwNTQ=","avatar_url":"https://avatars.githubusercontent.com/u/5858054?v=4","gravatar_id":"","url":"https://api.github.com/users/sgtest","html_url":"https://github.com/sgtest","followers_url":"https://api.github.com/users/sgtest/followers","following_url":"https://api.github.com/users/sgtest/following{/other_user}","gists_url":"https://api.github.com/users/sgtest/gists{/gist_id}","starred_url":"https://api.github.com/users/sgtest/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sgtest/subscriptions","organizations_url":"https://api.github.com/users/sgtest/orgs","repos_url":"https://api.github.com/users/sgtest/repos","events_url":"https://api.github.com/users/sgtest/events{/privacy}","received_events_url":"https://api.github.com/users/sgtest/received_events","type":"Organization","site_admin":false},"parent":{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Code - AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-08-02T17:19:10Z","pushed_at":"2023-08-02T18:25:53Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1127953,"stargazers_count":8662,"watchers_count":8662,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1116,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5529,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1116,"open_issues":5529,"watchers":8662,"default_branch":"main"},"source":{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Code - AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-08-02T17:19:10Z","pushed_at":"2023-08-02T18:25:53Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1127953,"stargazers_count":8662,"watchers_count":8662,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1116,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5529,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1116,"open_issues":5529,"watchers":8662,"default_branch":"main"},"network_count":1116,"subscribers_count":1}' + Intelligence Platform","fork":true,"url":"https://api.github.com/repos/sgtest/sourcegraph","forks_url":"https://api.github.com/repos/sgtest/sourcegraph/forks","keys_url":"https://api.github.com/repos/sgtest/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sgtest/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sgtest/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sgtest/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sgtest/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sgtest/sourcegraph/events","assignees_url":"https://api.github.com/repos/sgtest/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sgtest/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sgtest/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sgtest/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sgtest/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sgtest/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sgtest/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sgtest/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sgtest/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sgtest/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sgtest/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sgtest/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sgtest/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sgtest/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sgtest/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sgtest/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sgtest/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sgtest/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sgtest/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sgtest/sourcegraph/merges","archive_url":"https://api.github.com/repos/sgtest/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sgtest/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sgtest/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sgtest/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sgtest/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sgtest/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sgtest/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sgtest/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sgtest/sourcegraph/deployments","created_at":"2023-07-04T14:06:51Z","updated_at":"2023-07-04T14:06:51Z","pushed_at":"2023-07-04T14:04:45Z","git_url":"git://github.com/sgtest/sourcegraph.git","ssh_url":"git@github.com:sgtest/sourcegraph.git","clone_url":"https://github.com/sgtest/sourcegraph.git","svn_url":"https://github.com/sgtest/sourcegraph","homepage":"https://sourcegraph.com","size":1073588,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":[],"visibility":"public","forks":0,"open_issues":0,"watchers":0,"default_branch":"main","permissions":{"admin":false,"maintain":false,"push":false,"triage":false,"pull":true},"organization":{"login":"sgtest","id":5858054,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU4NTgwNTQ=","avatar_url":"https://avatars.githubusercontent.com/u/5858054?v=4","gravatar_id":"","url":"https://api.github.com/users/sgtest","html_url":"https://github.com/sgtest","followers_url":"https://api.github.com/users/sgtest/followers","following_url":"https://api.github.com/users/sgtest/following{/other_user}","gists_url":"https://api.github.com/users/sgtest/gists{/gist_id}","starred_url":"https://api.github.com/users/sgtest/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sgtest/subscriptions","organizations_url":"https://api.github.com/users/sgtest/orgs","repos_url":"https://api.github.com/users/sgtest/repos","events_url":"https://api.github.com/users/sgtest/events{/privacy}","received_events_url":"https://api.github.com/users/sgtest/received_events","type":"Organization","site_admin":false},"parent":{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Code + AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-11-16T12:36:01Z","pushed_at":"2023-11-16T13:37:24Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1162483,"stargazers_count":9145,"watchers_count":9145,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1191,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5499,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1191,"open_issues":5499,"watchers":9145,"default_branch":"main"},"source":{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Code + AI platform with Code Search & Cody","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2023-11-16T12:36:01Z","pushed_at":"2023-11-16T13:37:24Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":1162483,"stargazers_count":9145,"watchers_count":9145,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"has_discussions":true,"forks_count":1191,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5499,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["code-intelligence","code-search","lsif-enabled","open-source","repo-type-main","sourcegraph"],"visibility":"public","forks":1191,"open_issues":5499,"watchers":9145,"default_branch":"main"},"network_count":1191,"subscribers_count":1}' headers: Access-Control-Allow-Origin: - '*' @@ -247,9 +253,9 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Wed, 02 Aug 2023 18:28:49 GMT + - Thu, 16 Nov 2023 13:37:36 GMT Etag: - - W/"b3b42308a28ca22d0c19011006b03353bf6076fc59f35033fee00d7886903c43" + - W/"58b6438270350b04db8cdc75927d947098d3464ed413448da73d075c2908925c" Last-Modified: - Tue, 04 Jul 2023 14:06:51 GMT Referrer-Policy: @@ -261,6 +267,8 @@ interactions: Vary: - Accept, Authorization, Cookie, X-GitHub-OTP - Accept-Encoding, Accept, X-Requested-With + X-Accepted-Github-Permissions: + - metadata=read X-Content-Type-Options: - nosniff X-Frame-Options: @@ -271,17 +279,17 @@ interactions: - github.v3; param=jean-grey-preview; format=json, github.mercy-preview; param=machine-man-preview; format=json X-Github-Request-Id: - - E550:162A2F:5E98D6:6489CB:64CAA061 + - FFCC:C230:397CD8A0:3A2C6C81:65561B20 X-Ratelimit-Limit: - "5000" X-Ratelimit-Remaining: - - "4976" + - "4996" X-Ratelimit-Reset: - - "1691002952" + - "1700145293" X-Ratelimit-Resource: - core X-Ratelimit-Used: - - "24" + - "4" X-Varied-Accept: - application/vnd.github.jean-grey-preview+json,application/vnd.github.mercy-preview+json X-Xss-Protection: diff --git a/internal/extsvc/github/testdata/vcr/ListRepositoriesForSearch.yaml b/internal/extsvc/github/testdata/vcr/ListRepositoriesForSearch.yaml index 9549c804c68f5..fb05315afde95 100644 --- a/internal/extsvc/github/testdata/vcr/ListRepositoriesForSearch.yaml +++ b/internal/extsvc/github/testdata/vcr/ListRepositoriesForSearch.yaml @@ -32,7 +32,7 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Wed, 15 Feb 2023 23:40:37 GMT + - Thu, 16 Nov 2023 13:32:58 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -52,13 +52,13 @@ interactions: - github.v3; param=jean-grey-preview; format=json, github.mercy-preview; param=machine-man-preview; format=json X-Github-Request-Id: - - 1A54:2217:246F9F5:4AAA415:63ED6D74 + - FF00:A2C4:37E6EB3D:38977480:65561A0A X-Ratelimit-Limit: - "30" X-Ratelimit-Remaining: - "29" X-Ratelimit-Reset: - - "1676504497" + - "1700141638" X-Ratelimit-Resource: - search X-Ratelimit-Used: diff --git a/internal/extsvc/github/testdata/vcr/SearchRepos.yaml b/internal/extsvc/github/testdata/vcr/SearchRepos.yaml index 0df2995bab132..2ff39b50c6462 100644 --- a/internal/extsvc/github/testdata/vcr/SearchRepos.yaml +++ b/internal/extsvc/github/testdata/vcr/SearchRepos.yaml @@ -2,7 +2,7 @@ version: 1 interactions: - request: - body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n\trepositoryTopics(first:100) + body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n\tdiskUsage\n\trepositoryTopics(first:100) {\n\t\tnodes {\n\t\t\ttopic {\n\t\t\t\tname\n\t\t\t}\n\t\t}\n\t}\n}\n\t\nquery($query: String!, $type: SearchType!, $after: String, $first: Int!) {\n\tsearch(query: $query, type: $type, after: $after, first: $first) {\n\t\trepositoryCount\n\t\tpageInfo @@ -20,7 +20,7 @@ interactions: method: POST response: body: '{"data":{"search":{"repositoryCount":1,"pageInfo":{"hasNextPage":false,"endCursor":"Y3Vyc29yOjE="},"nodes":[{"id":"MDEwOlJlcG9zaXRvcnkxMjA4MDU1MQ==","databaseId":12080551,"nameWithOwner":"tsenart/vegeta","description":"HTTP - load testing tool and library. It''s over 9000!","url":"https://github.com/tsenart/vegeta","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":20789,"forkCount":1280,"repositoryTopics":{"nodes":[{"topic":{"name":"load-testing"}},{"topic":{"name":"go"}},{"topic":{"name":"benchmarking"}},{"topic":{"name":"http"}}]}}]}}}' + load testing tool and library. It''s over 9000!","url":"https://github.com/tsenart/vegeta","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":22111,"forkCount":1363,"diskUsage":2553,"repositoryTopics":{"nodes":[{"topic":{"name":"load-testing"}},{"topic":{"name":"go"}},{"topic":{"name":"benchmarking"}},{"topic":{"name":"http"}}]}}]}}}' headers: Access-Control-Allow-Origin: - '*' @@ -34,7 +34,7 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Wed, 15 Feb 2023 23:39:51 GMT + - Thu, 16 Nov 2023 13:26:42 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -50,24 +50,24 @@ interactions: X-Github-Media-Type: - github.v4; param=antiope-preview; format=json X-Github-Request-Id: - - C349:27E9:245189C:4A653D8:63ED6D47 + - FDFF:C346:388C4DBB:393A9134:65561892 X-Ratelimit-Limit: - "5000" X-Ratelimit-Remaining: - - "4955" + - "4991" X-Ratelimit-Reset: - - "1676505052" + - "1700143529" X-Ratelimit-Resource: - graphql X-Ratelimit-Used: - - "45" + - "9" X-Xss-Protection: - "0" status: 200 OK code: 200 duration: "" - request: - body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n\trepositoryTopics(first:100) + body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n\tdiskUsage\n\trepositoryTopics(first:100) {\n\t\tnodes {\n\t\t\ttopic {\n\t\t\t\tname\n\t\t\t}\n\t\t}\n\t}\n}\n\t\nquery($query: String!, $type: SearchType!, $after: String, $first: Int!) {\n\tsearch(query: $query, type: $type, after: $after, first: $first) {\n\t\trepositoryCount\n\t\tpageInfo @@ -84,13 +84,12 @@ interactions: url: https://api.github.com/graphql method: POST response: - body: "{\"data\":{\"search\":{\"repositoryCount\":2848396,\"pageInfo\":{\"hasNextPage\":true,\"endCursor\":\"Y3Vyc29yOjU=\"},\"nodes\":[{\"id\":\"MDEwOlJlcG9zaXRvcnkyODQ1NzgyMw==\",\"databaseId\":28457823,\"nameWithOwner\":\"freeCodeCamp/freeCodeCamp\",\"description\":\"freeCodeCamp.org's - open-source codebase and curriculum. Learn to code for free.\",\"url\":\"https://github.com/freeCodeCamp/freeCodeCamp\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":361294,\"forkCount\":31019,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"learn-to-code\"}},{\"topic\":{\"name\":\"nonprofits\"}},{\"topic\":{\"name\":\"programming\"}},{\"topic\":{\"name\":\"nodejs\"}},{\"topic\":{\"name\":\"react\"}},{\"topic\":{\"name\":\"d3\"}},{\"topic\":{\"name\":\"careers\"}},{\"topic\":{\"name\":\"education\"}},{\"topic\":{\"name\":\"teachers\"}},{\"topic\":{\"name\":\"javascript\"}},{\"topic\":{\"name\":\"certification\"}},{\"topic\":{\"name\":\"curriculum\"}},{\"topic\":{\"name\":\"math\"}},{\"topic\":{\"name\":\"community\"}},{\"topic\":{\"name\":\"freecodecamp\"}},{\"topic\":{\"name\":\"hacktoberfest\"}}]}},{\"id\":\"MDEwOlJlcG9zaXRvcnkxNzc3MzY1MzM=\",\"databaseId\":177736533,\"nameWithOwner\":\"996icu/996.ICU\",\"description\":\"Repo - for counting stars and contributing. Press F to pay respect to glorious developers.\",\"url\":\"https://github.com/996icu/996.ICU\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":265043,\"forkCount\":21462,\"repositoryTopics\":{\"nodes\":[]}},{\"id\":\"MDEwOlJlcG9zaXRvcnk2MDQ5MzEwMQ==\",\"databaseId\":60493101,\"nameWithOwner\":\"jwasham/coding-interview-university\",\"description\":\"A - complete computer science study plan to become a software engineer.\",\"url\":\"https://github.com/jwasham/coding-interview-university\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":246973,\"forkCount\":65490,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"computer-science\"}},{\"topic\":{\"name\":\"interview\"}},{\"topic\":{\"name\":\"programming-interviews\"}},{\"topic\":{\"name\":\"study-plan\"}},{\"topic\":{\"name\":\"data-structures\"}},{\"topic\":{\"name\":\"algorithms\"}},{\"topic\":{\"name\":\"software-engineering\"}},{\"topic\":{\"name\":\"algorithm\"}},{\"topic\":{\"name\":\"coding-interviews\"}},{\"topic\":{\"name\":\"interview-prep\"}},{\"topic\":{\"name\":\"coding-interview\"}},{\"topic\":{\"name\":\"interview-preparation\"}}]}},{\"id\":\"MDEwOlJlcG9zaXRvcnkyMTczNzQ2NQ==\",\"databaseId\":21737465,\"nameWithOwner\":\"sindresorhus/awesome\",\"description\":\"\U0001F60E - Awesome lists about all kinds of interesting topics\",\"url\":\"https://github.com/sindresorhus/awesome\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":238837,\"forkCount\":24935,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"awesome\"}},{\"topic\":{\"name\":\"awesome-list\"}},{\"topic\":{\"name\":\"unicorns\"}},{\"topic\":{\"name\":\"lists\"}},{\"topic\":{\"name\":\"resources\"}}]}},{\"id\":\"MDEwOlJlcG9zaXRvcnk4NTA3NzU1OA==\",\"databaseId\":85077558,\"nameWithOwner\":\"kamranahmedse/developer-roadmap\",\"description\":\"Interactive - roadmaps, guides and other educational content to help developers grow in their - careers.\",\"url\":\"https://github.com/kamranahmedse/developer-roadmap\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":229269,\"forkCount\":32902,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"computer-science\"}},{\"topic\":{\"name\":\"roadmap\"}},{\"topic\":{\"name\":\"developer-roadmap\"}},{\"topic\":{\"name\":\"frontend-roadmap\"}},{\"topic\":{\"name\":\"devops-roadmap\"}},{\"topic\":{\"name\":\"backend-roadmap\"}},{\"topic\":{\"name\":\"react-roadmap\"}},{\"topic\":{\"name\":\"angular-roadmap\"}},{\"topic\":{\"name\":\"python-roadmap\"}},{\"topic\":{\"name\":\"go-roadmap\"}},{\"topic\":{\"name\":\"java-roadmap\"}},{\"topic\":{\"name\":\"dba-roadmap\"}},{\"topic\":{\"name\":\"vue-roadmap\"}},{\"topic\":{\"name\":\"blockchain-roadmap\"}},{\"topic\":{\"name\":\"javascript-roadmap\"}},{\"topic\":{\"name\":\"nodejs-roadmap\"}},{\"topic\":{\"name\":\"qa-roadmap\"}},{\"topic\":{\"name\":\"software-architect-roadmap\"}}]}}]}}}" + body: "{\"data\":{\"search\":{\"repositoryCount\":3396424,\"pageInfo\":{\"hasNextPage\":true,\"endCursor\":\"Y3Vyc29yOjU=\"},\"nodes\":[{\"id\":\"MDEwOlJlcG9zaXRvcnkyODQ1NzgyMw==\",\"databaseId\":28457823,\"nameWithOwner\":\"freeCodeCamp/freeCodeCamp\",\"description\":\"freeCodeCamp.org's + open-source codebase and curriculum. Learn to code for free.\",\"url\":\"https://github.com/freeCodeCamp/freeCodeCamp\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":378065,\"forkCount\":34811,\"diskUsage\":398421,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"learn-to-code\"}},{\"topic\":{\"name\":\"nonprofits\"}},{\"topic\":{\"name\":\"programming\"}},{\"topic\":{\"name\":\"nodejs\"}},{\"topic\":{\"name\":\"react\"}},{\"topic\":{\"name\":\"d3\"}},{\"topic\":{\"name\":\"careers\"}},{\"topic\":{\"name\":\"education\"}},{\"topic\":{\"name\":\"teachers\"}},{\"topic\":{\"name\":\"javascript\"}},{\"topic\":{\"name\":\"certification\"}},{\"topic\":{\"name\":\"curriculum\"}},{\"topic\":{\"name\":\"math\"}},{\"topic\":{\"name\":\"community\"}},{\"topic\":{\"name\":\"freecodecamp\"}},{\"topic\":{\"name\":\"hacktoberfest\"}}]}},{\"id\":\"MDEwOlJlcG9zaXRvcnkxMzQ5MTg5NQ==\",\"databaseId\":13491895,\"nameWithOwner\":\"EbookFoundation/free-programming-books\",\"description\":\":books: + Freely available programming books\",\"url\":\"https://github.com/EbookFoundation/free-programming-books\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":303257,\"forkCount\":58520,\"diskUsage\":17796,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"education\"}},{\"topic\":{\"name\":\"books\"}},{\"topic\":{\"name\":\"list\"}},{\"topic\":{\"name\":\"resource\"}},{\"topic\":{\"name\":\"hacktoberfest\"}}]}},{\"id\":\"MDEwOlJlcG9zaXRvcnkyMTczNzQ2NQ==\",\"databaseId\":21737465,\"nameWithOwner\":\"sindresorhus/awesome\",\"description\":\"\U0001F60E + Awesome lists about all kinds of interesting topics\",\"url\":\"https://github.com/sindresorhus/awesome\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":277707,\"forkCount\":26720,\"diskUsage\":1475,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"awesome\"}},{\"topic\":{\"name\":\"awesome-list\"}},{\"topic\":{\"name\":\"unicorns\"}},{\"topic\":{\"name\":\"lists\"}},{\"topic\":{\"name\":\"resources\"}}]}},{\"id\":\"MDEwOlJlcG9zaXRvcnk1NDM0Njc5OQ==\",\"databaseId\":54346799,\"nameWithOwner\":\"public-apis/public-apis\",\"description\":\"A + collective list of free APIs\",\"url\":\"https://github.com/public-apis/public-apis\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":268744,\"forkCount\":30233,\"diskUsage\":5088,\"repositoryTopics\":{\"nodes\":[{\"topic\":{\"name\":\"api\"}},{\"topic\":{\"name\":\"public-apis\"}},{\"topic\":{\"name\":\"free\"}},{\"topic\":{\"name\":\"apis\"}},{\"topic\":{\"name\":\"list\"}},{\"topic\":{\"name\":\"development\"}},{\"topic\":{\"name\":\"software\"}},{\"topic\":{\"name\":\"public\"}},{\"topic\":{\"name\":\"resources\"}},{\"topic\":{\"name\":\"dataset\"}},{\"topic\":{\"name\":\"open-source\"}},{\"topic\":{\"name\":\"public-api\"}},{\"topic\":{\"name\":\"lists\"}}]}},{\"id\":\"MDEwOlJlcG9zaXRvcnkxNzc3MzY1MzM=\",\"databaseId\":177736533,\"nameWithOwner\":\"996icu/996.ICU\",\"description\":\"Repo + for counting stars and contributing. Press F to pay respect to glorious developers.\",\"url\":\"https://github.com/996icu/996.ICU\",\"isPrivate\":false,\"isFork\":false,\"isArchived\":false,\"isLocked\":false,\"isDisabled\":false,\"viewerPermission\":\"READ\",\"stargazerCount\":268154,\"forkCount\":21476,\"diskUsage\":187836,\"repositoryTopics\":{\"nodes\":[]}}]}}}" headers: Access-Control-Allow-Origin: - '*' @@ -104,7 +103,7 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Wed, 15 Feb 2023 23:39:52 GMT + - Thu, 16 Nov 2023 13:26:44 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -120,17 +119,17 @@ interactions: X-Github-Media-Type: - github.v4; param=antiope-preview; format=json X-Github-Request-Id: - - C349:27E9:24518E2:4A6546D:63ED6D47 + - FDFF:C346:388C4FD3:393A9340:65561892 X-Ratelimit-Limit: - "5000" X-Ratelimit-Remaining: - - "4954" + - "4990" X-Ratelimit-Reset: - - "1676505052" + - "1700143529" X-Ratelimit-Resource: - graphql X-Ratelimit-Used: - - "46" + - "10" X-Xss-Protection: - "0" status: 200 OK diff --git a/internal/extsvc/github/v3_test.go b/internal/extsvc/github/v3_test.go index 5e75dc481f4c7..fe8a89338c95f 100644 --- a/internal/extsvc/github/v3_test.go +++ b/internal/extsvc/github/v3_test.go @@ -36,7 +36,6 @@ func newTestClient(t *testing.T, cli httpcli.Doer) *V3Client { } func newTestClientWithAuthenticator(t *testing.T, auth auth.Authenticator, cli httpcli.Doer) *V3Client { - SetupForTest(t) rcache.SetupForTest(t) ratelimit.SetupForTest(t) @@ -58,35 +57,39 @@ func TestListAffiliatedRepositories(t *testing.T) { visibility: VisibilityAll, wantRepos: []*Repository{ { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQxNTE=", - DatabaseID: 263034151, - NameWithOwner: "sourcegraph-vcr-repos/private-org-repo-1", - URL: "https://github.com/sourcegraph-vcr-repos/private-org-repo-1", - IsPrivate: true, - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQxNTE=", + DatabaseID: 263034151, + NameWithOwner: "sourcegraph-vcr-repos/private-org-repo-1", + URL: "https://github.com/sourcegraph-vcr-repos/private-org-repo-1", + IsPrivate: true, + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 1, }, { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQwNzM=", - DatabaseID: 263034073, - NameWithOwner: "sourcegraph-vcr/private-user-repo-1", - URL: "https://github.com/sourcegraph-vcr/private-user-repo-1", - IsPrivate: true, - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQwNzM=", + DatabaseID: 263034073, + NameWithOwner: "sourcegraph-vcr/private-user-repo-1", + URL: "https://github.com/sourcegraph-vcr/private-user-repo-1", + IsPrivate: true, + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 14, }, { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM5NDk=", - DatabaseID: 263033949, - NameWithOwner: "sourcegraph-vcr/public-user-repo-1", - URL: "https://github.com/sourcegraph-vcr/public-user-repo-1", - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM5NDk=", + DatabaseID: 263033949, + NameWithOwner: "sourcegraph-vcr/public-user-repo-1", + URL: "https://github.com/sourcegraph-vcr/public-user-repo-1", + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 5, }, { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM3NjE=", - DatabaseID: 263033761, - NameWithOwner: "sourcegraph-vcr-repos/public-org-repo-1", - URL: "https://github.com/sourcegraph-vcr-repos/public-org-repo-1", - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM3NjE=", + DatabaseID: 263033761, + NameWithOwner: "sourcegraph-vcr-repos/public-org-repo-1", + URL: "https://github.com/sourcegraph-vcr-repos/public-org-repo-1", + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 1, }, }, }, @@ -95,19 +98,21 @@ func TestListAffiliatedRepositories(t *testing.T) { visibility: VisibilityPublic, wantRepos: []*Repository{ { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM5NDk=", - DatabaseID: 263033949, - NameWithOwner: "sourcegraph-vcr/public-user-repo-1", - URL: "https://github.com/sourcegraph-vcr/public-user-repo-1", - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM5NDk=", + DatabaseID: 263033949, + NameWithOwner: "sourcegraph-vcr/public-user-repo-1", + URL: "https://github.com/sourcegraph-vcr/public-user-repo-1", + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 5, }, { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM3NjE=", - DatabaseID: 263033761, - NameWithOwner: "sourcegraph-vcr-repos/public-org-repo-1", - URL: "https://github.com/sourcegraph-vcr-repos/public-org-repo-1", - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM3NjE=", + DatabaseID: 263033761, + NameWithOwner: "sourcegraph-vcr-repos/public-org-repo-1", + URL: "https://github.com/sourcegraph-vcr-repos/public-org-repo-1", + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 1, }, }, }, @@ -116,21 +121,23 @@ func TestListAffiliatedRepositories(t *testing.T) { visibility: VisibilityPrivate, wantRepos: []*Repository{ { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQxNTE=", - DatabaseID: 263034151, - NameWithOwner: "sourcegraph-vcr-repos/private-org-repo-1", - URL: "https://github.com/sourcegraph-vcr-repos/private-org-repo-1", - IsPrivate: true, - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQxNTE=", + DatabaseID: 263034151, + NameWithOwner: "sourcegraph-vcr-repos/private-org-repo-1", + URL: "https://github.com/sourcegraph-vcr-repos/private-org-repo-1", + IsPrivate: true, + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 1, }, { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQwNzM=", - DatabaseID: 263034073, - NameWithOwner: "sourcegraph-vcr/private-user-repo-1", - URL: "https://github.com/sourcegraph-vcr/private-user-repo-1", - IsPrivate: true, - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQwNzM=", + DatabaseID: 263034073, + NameWithOwner: "sourcegraph-vcr/private-user-repo-1", + URL: "https://github.com/sourcegraph-vcr/private-user-repo-1", + IsPrivate: true, + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 14, }, }, }, @@ -139,20 +146,22 @@ func TestListAffiliatedRepositories(t *testing.T) { affiliations: []RepositoryAffiliation{AffiliationCollaborator, AffiliationOwner}, wantRepos: []*Repository{ { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQwNzM=", - DatabaseID: 263034073, - NameWithOwner: "sourcegraph-vcr/private-user-repo-1", - URL: "https://github.com/sourcegraph-vcr/private-user-repo-1", - IsPrivate: true, - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzQwNzM=", + DatabaseID: 263034073, + NameWithOwner: "sourcegraph-vcr/private-user-repo-1", + URL: "https://github.com/sourcegraph-vcr/private-user-repo-1", + IsPrivate: true, + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 14, }, { - ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM5NDk=", - DatabaseID: 263033949, - NameWithOwner: "sourcegraph-vcr/public-user-repo-1", - URL: "https://github.com/sourcegraph-vcr/public-user-repo-1", - ViewerPermission: "ADMIN", - RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + ID: "MDEwOlJlcG9zaXRvcnkyNjMwMzM5NDk=", + DatabaseID: 263033949, + NameWithOwner: "sourcegraph-vcr/public-user-repo-1", + URL: "https://github.com/sourcegraph-vcr/public-user-repo-1", + ViewerPermission: "ADMIN", + RepositoryTopics: RepositoryTopics{Nodes: []RepositoryTopic{}}, + DiskUsageKibibytes: 5, }, }, }, @@ -968,7 +977,6 @@ func TestV3Client_UpdateRef(t *testing.T) { func newV3TestClient(t testing.TB, name string) (*V3Client, func()) { t.Helper() - SetupForTest(t) cf, save := httptestutil.NewGitHubRecorderFactory(t, update(name), name) uri, err := url.Parse("https://github.com") @@ -989,7 +997,6 @@ func newV3TestClient(t testing.TB, name string) (*V3Client, func()) { func newV3TestEnterpriseClient(t testing.TB, name string) (*V3Client, func()) { t.Helper() - SetupForTest(t) cf, save := httptestutil.NewGitHubRecorderFactory(t, update(name), name) uri, err := url.Parse("https://ghe.sgdev.org/api/v3") @@ -1251,7 +1258,7 @@ func TestRateLimitRetry(t *testing.T) { srvURL, err := url.Parse(srv.URL) require.NoError(t, err) - testCase.client = newV3Client(logtest.NoOp(t), "test", srvURL, nil, "", nil) + testCase.client = newV3Client(logtest.NoOp(t), "test", srvURL, nil, "", httpcli.TestExternalDoer) testCase.client.internalRateLimiter = ratelimit.NewInstrumentedLimiter("githubv3", rate.NewLimiter(100, 10)) testCase.client.waitForRateLimit = true diff --git a/internal/extsvc/github/v4.go b/internal/extsvc/github/v4.go index 8ab7d092f4321..f545de718d50a 100644 --- a/internal/extsvc/github/v4.go +++ b/internal/extsvc/github/v4.go @@ -599,6 +599,7 @@ fragment RepositoryFields on Repository { viewerPermission stargazerCount forkCount + diskUsage repositoryTopics(first:100) { nodes { topic { @@ -636,6 +637,7 @@ fragment RepositoryFields on Repository { isLocked isDisabled forkCount + diskUsage repositoryTopics(first:100) { nodes { topic { diff --git a/internal/extsvc/gitlab/client.go b/internal/extsvc/gitlab/client.go index bb05d82af97ae..14c5110f1c421 100644 --- a/internal/extsvc/gitlab/client.go +++ b/internal/extsvc/gitlab/client.go @@ -268,9 +268,7 @@ func (c *Client) doWithBaseURL(ctx context.Context, req *http.Request, result an // to cache server-side req.Header.Set("Cache-Control", "max-age=0") - resp, err = oauthutil.DoRequest(ctx, log.Scoped("gitlab client"), c.httpClient, req, c.Auth, func(r *http.Request) (*http.Response, error) { - return c.httpClient.Do(r) - }) + resp, err = oauthutil.DoRequest(ctx, log.Scoped("gitlab client"), c.httpClient, req, c.Auth) if resp != nil { c.externalRateLimiter.Update(resp.Header) } diff --git a/internal/extsvc/gitlab/client_test.go b/internal/extsvc/gitlab/client_test.go index 6f0a26cdb4b17..56055482f60c3 100644 --- a/internal/extsvc/gitlab/client_test.go +++ b/internal/extsvc/gitlab/client_test.go @@ -197,7 +197,7 @@ func TestRateLimitRetry(t *testing.T) { srvURL, err := url.Parse(srv.URL) require.NoError(t, err) - provider := NewClientProvider("Test", srvURL, nil) + provider := NewClientProvider("Test", srvURL, httpcli.TestExternalDoer) client := provider.getClient(nil) client.internalRateLimiter = ratelimit.NewInstrumentedLimiter("gitlab", rate.NewLimiter(100, 10)) client.waitForRateLimit = tt.waitForRateLimit diff --git a/internal/extsvc/npm/npm_test.go b/internal/extsvc/npm/npm_test.go index 74a8c652a2b41..58af52e47fec9 100644 --- a/internal/extsvc/npm/npm_test.go +++ b/internal/extsvc/npm/npm_test.go @@ -76,7 +76,7 @@ func TestCredentials(t *testing.T) { defer server.Close() ctx := context.Background() - client, _ := NewHTTPClient("urn", server.URL, credentials, httpcli.ExternalClientFactory) + client, _ := NewHTTPClient("urn", server.URL, credentials, httpcli.TestExternalClientFactory) client.limiter = ratelimit.NewInstrumentedLimiter("npm", rate.NewLimiter(100, 10)) presentDep, err := reposource.ParseNpmVersionedPackage("left-pad@1.3.0") diff --git a/internal/extsvc/types.go b/internal/extsvc/types.go index 8e84adfeb2b62..982bc3633800f 100644 --- a/internal/extsvc/types.go +++ b/internal/extsvc/types.go @@ -630,12 +630,6 @@ func GetLimitFromConfig(config any, kind string) (limit rate.Limit, isDefault bo isDefault = false limit = limitOrInf(c.RateLimit.Enabled, c.RateLimit.RequestsPerHour) } - case *schema.PerforceConnection: - limit = GetDefaultRateLimit(KindPerforce) - if c != nil && c.RateLimit != nil { - isDefault = false - limit = limitOrInf(c.RateLimit.Enabled, c.RateLimit.RequestsPerHour) - } case *schema.JVMPackagesConnection: limit = GetDefaultRateLimit(KindJVMPackages) if c != nil && c.Maven.RateLimit != nil { diff --git a/internal/featureflag/middleware.go b/internal/featureflag/middleware.go index ddc5eb3c257b6..916208872ad8d 100644 --- a/internal/featureflag/middleware.go +++ b/internal/featureflag/middleware.go @@ -98,13 +98,6 @@ func FromContext(ctx context.Context) *FlagSet { return nil } -func CopyContext(dst, from context.Context) context.Context { - if flags := from.Value(flagContextKey{}); flags != nil { - return context.WithValue(dst, flagContextKey{}, flags) - } - return dst -} - func GetEvaluatedFlagSet(ctx context.Context) EvaluatedFlagSet { if flagSet := FromContext(ctx); flagSet != nil { return getEvaluatedFlagSetFromCache(flagSet) diff --git a/internal/fileutil/BUILD.bazel b/internal/fileutil/BUILD.bazel index f53f83a8e2c84..5c72443a39446 100644 --- a/internal/fileutil/BUILD.bazel +++ b/internal/fileutil/BUILD.bazel @@ -11,6 +11,48 @@ go_library( ], importpath = "github.com/sourcegraph/sourcegraph/internal/fileutil", visibility = ["//:__subpackages__"], + deps = select({ + "@io_bazel_rules_go//go/platform:aix": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:android": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:darwin": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:dragonfly": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:freebsd": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:illumos": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:ios": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:js": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:linux": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:netbsd": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:openbsd": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:plan9": [ + "//lib/errors", + ], + "@io_bazel_rules_go//go/platform:solaris": [ + "//lib/errors", + ], + "//conditions:default": [], + }), ) go_test( diff --git a/internal/fileutil/fileutil_posix.go b/internal/fileutil/fileutil_posix.go index 942446699eb36..1a7756174824b 100644 --- a/internal/fileutil/fileutil_posix.go +++ b/internal/fileutil/fileutil_posix.go @@ -6,6 +6,8 @@ package fileutil import ( "os" "path/filepath" + + "github.com/sourcegraph/sourcegraph/lib/errors" ) // RenameAndSync will do an os.Rename followed by fsync to ensure the rename @@ -13,7 +15,7 @@ import ( func RenameAndSync(oldpath, newpath string) error { err := os.Rename(oldpath, newpath) if err != nil { - return err + return errors.Wrapf(err, "failed to rename %q to %q", errors.Safe(oldpath), errors.Safe(newpath)) } oldparent, newparent := filepath.Dir(oldpath), filepath.Dir(newpath) diff --git a/internal/gitserver/v1/BUILD.bazel b/internal/gitserver/v1/BUILD.bazel index aa4727f7dfea3..20f8c5309b535 100644 --- a/internal/gitserver/v1/BUILD.bazel +++ b/internal/gitserver/v1/BUILD.bazel @@ -1,9 +1,7 @@ -load("//dev:go_defs.bzl", "go_test") load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@rules_buf//buf:defs.bzl", "buf_lint_test") load("@rules_proto//proto:defs.bzl", "proto_library") -load("//dev:proto.bzl", "write_proto_stubs_to_source") proto_library( name = "v1_proto", diff --git a/internal/gosyntect/gosyntect.go b/internal/gosyntect/gosyntect.go index 622cc981920de..66a6396085aa8 100644 --- a/internal/gosyntect/gosyntect.go +++ b/internal/gosyntect/gosyntect.go @@ -84,23 +84,9 @@ type Query struct { // Filetype is the language name. Filetype string `json:"filetype"` - // Theme is the color theme to use for highlighting. - // If CSS is true, theme is ignored. - // - // See https://github.com/sourcegraph/syntect_server#embedded-themes - Theme string `json:"theme"` - // Code is the literal code to highlight. Code string `json:"code"` - // CSS causes results to be returned in HTML table format with CSS class - // names annotating the spans rather than inline styles. - // - // TODO: I think we can just delete this? And theme? We don't use these. - // Then we could remove themes from syntect as well. I don't think we - // have any use case for these anymore (and haven't for awhile). - CSS bool `json:"css"` - // LineLengthLimit is the maximum length of line that will be highlighted if set. // Defaults to no max if zero. // If CSS is false, LineLengthLimit is ignored. @@ -129,9 +115,6 @@ type Response struct { } var ( - // ErrInvalidTheme is returned when the Query.Theme is not a valid theme. - ErrInvalidTheme = errors.New("invalid theme") - // ErrRequestTooLarge is returned when the request is too large for syntect_server to handle (e.g. file is too large to highlight). ErrRequestTooLarge = errors.New("request too large") @@ -177,9 +160,7 @@ func (c *Client) Highlight(ctx context.Context, q *Query, format HighlightRespon q.Filetype = languages.NormalizeLanguage(q.Filetype) tr, ctx := trace.New(ctx, "gosyntect.Highlight", - attribute.String("filepath", q.Filepath), - attribute.String("theme", q.Theme), - attribute.Bool("css", q.CSS)) + attribute.String("filepath", q.Filepath)) defer tr.EndWithErr(&err) if isTreesitterBased(q.Engine) && !IsTreesitterSupported(q.Filetype) { @@ -231,8 +212,6 @@ func (c *Client) Highlight(ctx context.Context, q *Query, format HighlightRespon if r.Error != "" { var err error switch r.Code { - case "invalid_theme": - err = ErrInvalidTheme case "resource_not_found": // resource_not_found is returned in the event of a 404, indicating a bug // in gosyntect. diff --git a/internal/gqltestutil/repository.go b/internal/gqltestutil/repository.go index 4735c77e4cc4a..0e8524ba698f3 100644 --- a/internal/gqltestutil/repository.go +++ b/internal/gqltestutil/repository.go @@ -14,7 +14,7 @@ import ( // // This method requires the authenticated user to be a site admin. func (c *Client) WaitForReposToBeCloned(repos ...string) error { - timeout := 120 * time.Second + timeout := 130 * time.Second return c.WaitForReposToBeClonedWithin(timeout, repos...) } diff --git a/internal/grpc/defaults/BUILD.bazel b/internal/grpc/defaults/BUILD.bazel index 852e0d88dbd54..154e721c4048f 100644 --- a/internal/grpc/defaults/BUILD.bazel +++ b/internal/grpc/defaults/BUILD.bazel @@ -17,6 +17,7 @@ go_library( "//internal/grpc/messagesize", "//internal/grpc/propagator", "//internal/requestclient", + "//internal/requestinteraction", "//internal/trace/policy", "//internal/ttlcache", "//lib/errors", diff --git a/internal/grpc/defaults/defaults.go b/internal/grpc/defaults/defaults.go index c1ee943539cb3..eb9d1a56012f3 100644 --- a/internal/grpc/defaults/defaults.go +++ b/internal/grpc/defaults/defaults.go @@ -20,6 +20,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/grpc/contextconv" "github.com/sourcegraph/sourcegraph/internal/grpc/messagesize" + "github.com/sourcegraph/sourcegraph/internal/requestinteraction" "github.com/sourcegraph/sourcegraph/internal/actor" internalgrpc "github.com/sourcegraph/sourcegraph/internal/grpc" @@ -80,6 +81,7 @@ func defaultDialOptions(logger log.Logger, creds credentials.TransportCredential propagator.StreamClientPropagator(actor.ActorPropagator{}), propagator.StreamClientPropagator(policy.ShouldTracePropagator{}), propagator.StreamClientPropagator(requestclient.Propagator{}), + propagator.StreamClientPropagator(requestinteraction.Propagator{}), otelgrpc.StreamClientInterceptor(), internalerrs.PrometheusStreamClientInterceptor, internalerrs.LoggingStreamClientInterceptor(logger), @@ -91,6 +93,7 @@ func defaultDialOptions(logger log.Logger, creds credentials.TransportCredential propagator.UnaryClientPropagator(actor.ActorPropagator{}), propagator.UnaryClientPropagator(policy.ShouldTracePropagator{}), propagator.UnaryClientPropagator(requestclient.Propagator{}), + propagator.UnaryClientPropagator(requestinteraction.Propagator{}), otelgrpc.UnaryClientInterceptor(), internalerrs.PrometheusUnaryClientInterceptor, internalerrs.LoggingUnaryClientInterceptor(logger), @@ -137,6 +140,7 @@ func ServerOptions(logger log.Logger, additionalOptions ...grpc.ServerOption) [] metrics.StreamServerInterceptor(), messagesize.StreamServerInterceptor, propagator.StreamServerPropagator(requestclient.Propagator{}), + propagator.StreamServerPropagator(requestinteraction.Propagator{}), propagator.StreamServerPropagator(actor.ActorPropagator{}), propagator.StreamServerPropagator(policy.ShouldTracePropagator{}), otelgrpc.StreamServerInterceptor(), @@ -148,6 +152,7 @@ func ServerOptions(logger log.Logger, additionalOptions ...grpc.ServerOption) [] metrics.UnaryServerInterceptor(), messagesize.UnaryServerInterceptor, propagator.UnaryServerPropagator(requestclient.Propagator{}), + propagator.UnaryServerPropagator(requestinteraction.Propagator{}), propagator.UnaryServerPropagator(actor.ActorPropagator{}), propagator.UnaryServerPropagator(policy.ShouldTracePropagator{}), otelgrpc.UnaryServerInterceptor(), diff --git a/internal/highlight/highlight.go b/internal/highlight/highlight.go index adcb8041c7e79..dae54430c3071 100644 --- a/internal/highlight/highlight.go +++ b/internal/highlight/highlight.go @@ -417,7 +417,6 @@ func Code(ctx context.Context, p Params) (response *HighlightedCode, aborted boo Filepath: p.Filepath, StabilizeTimeout: stabilizeTimeout, LineLengthLimit: maxLineLength, - CSS: true, Engine: getEngineParameter(filetypeQuery.Engine), } diff --git a/internal/highlight/language.go b/internal/highlight/language.go index 32d62633eb3e4..d483c6d23b8ac 100644 --- a/internal/highlight/language.go +++ b/internal/highlight/language.go @@ -135,6 +135,7 @@ var baseEngineConfig = syntaxEngineConfig{ // Languages enabled for advanced syntax features "perl": EngineScipSyntax, "matlab": EngineScipSyntax, + "java": EngineScipSyntax, }, } diff --git a/internal/httpcli/BUILD.bazel b/internal/httpcli/BUILD.bazel index a8f9d84c49d87..611fd8ecbc8be 100644 --- a/internal/httpcli/BUILD.bazel +++ b/internal/httpcli/BUILD.bazel @@ -22,6 +22,7 @@ go_library( "//internal/metrics", "//internal/rcache", "//internal/requestclient", + "//internal/requestinteraction", "//internal/trace", "//internal/trace/policy", "//internal/types", @@ -32,6 +33,7 @@ go_library( "@com_github_prometheus_client_golang//prometheus/promauto", "@com_github_puerkitobio_rehttp//:rehttp", "@com_github_sourcegraph_log//:log", + "@io_gitea_code_gitea//modules/hostmatcher", "@io_opentelemetry_go_otel//attribute", ], ) diff --git a/internal/httpcli/client.go b/internal/httpcli/client.go index 5b49d0b684b88..54d612765f324 100644 --- a/internal/httpcli/client.go +++ b/internal/httpcli/client.go @@ -15,6 +15,7 @@ import ( "sync" "time" + "code.gitea.io/gitea/modules/hostmatcher" "github.com/PuerkitoBio/rehttp" "github.com/gregjones/httpcache" "github.com/prometheus/client_golang/prometheus" @@ -29,6 +30,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/metrics" "github.com/sourcegraph/sourcegraph/internal/rcache" "github.com/sourcegraph/sourcegraph/internal/requestclient" + "github.com/sourcegraph/sourcegraph/internal/requestinteraction" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/trace/policy" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -41,12 +43,6 @@ type Doer interface { Do(*http.Request) (*http.Response, error) } -type MockDoer func(*http.Request) (*http.Response, error) - -func (m MockDoer) Do(req *http.Request) (*http.Response, error) { - return m(req) -} - // DoerFunc is function adapter that implements the http.RoundTripper // interface by calling itself. type DoerFunc func(*http.Request) (*http.Response, error) @@ -107,7 +103,7 @@ var ExternalClientFactory = NewExternalClientFactory() // UncachedExternalClientFactory is a httpcli.Factory with common options // and middleware pre-set for communicating with external services, but with caching // responses disabled. -var UncachedExternalClientFactory = newExternalClientFactory(false) +var UncachedExternalClientFactory = newExternalClientFactory(false, false) var ( externalTimeout, _ = time.ParseDuration(env.Get("SRC_HTTP_CLI_EXTERNAL_TIMEOUT", "5m", "Timeout for external HTTP requests")) @@ -124,7 +120,7 @@ var ( // use them for one-off requests if possible, and definitely not for larger payloads, // like downloading arbitrarily sized files! func NewExternalClientFactory(middleware ...Middleware) *Factory { - return newExternalClientFactory(true, middleware...) + return newExternalClientFactory(true, false, middleware...) } // NewExternalClientFactory returns a httpcli.Factory with common options @@ -132,7 +128,9 @@ func NewExternalClientFactory(middleware ...Middleware) *Factory { // middleware can also be provided to e.g. enable logging with NewLoggingMiddleware. // If cache is true, responses will be cached in redis for improved rate limiting // and reduced byte transfer sizes. -func newExternalClientFactory(cache bool, middleware ...Middleware) *Factory { +// If testOpt is true, a test-only transport option will be used that does not have +// any IP restrictions for external requests. +func newExternalClientFactory(cache bool, testOpt bool, middleware ...Middleware) *Factory { mw := []Middleware{ ContextErrorMiddleware, HeadersMiddleware("User-Agent", "Sourcegraph-Bot"), @@ -140,16 +138,22 @@ func newExternalClientFactory(cache bool, middleware ...Middleware) *Factory { } mw = append(mw, middleware...) + externalTransportOpt := ExternalTransportOpt + if testOpt || env.InsecureDev { + externalTransportOpt = TestExternalTransportOpt + } + opts := []Opt{ NewTimeoutOpt(externalTimeout), - // ExternalTransportOpt needs to be before TracedTransportOpt and + // externalTransportOpt needs to be before TracedTransportOpt and // NewCachedTransportOpt since it wants to extract a http.Transport, // not a generic http.RoundTripper. - ExternalTransportOpt, + externalTransportOpt, NewErrorResilientTransportOpt( NewRetryPolicy(MaxRetries(externalRetryMaxAttempts), externalRetryAfterMaxDuration), ExpJitterDelayOrRetryAfterDelay(externalRetryDelayBase, externalRetryDelayMax), ), + RequestInteractionTransportOpt, TracedTransportOpt, } if cache { @@ -166,9 +170,27 @@ func newExternalClientFactory(cache bool, middleware ...Middleware) *Factory { // convenience for existing uses of http.DefaultClient. // WARN: This client caches entire responses for etag matching. Do not use it for // one-off requests if possible, and definitely not for larger payloads, like -// downloading arbitrarily sized files! See UncachedExternalClient instead. +// downloading arbitrarily sized files! See UncachedExternalDoer instead. var ExternalDoer, _ = ExternalClientFactory.Doer() +// UncachedExternalDoer is a shared client for external communication. This is a +// convenience for existing uses of http.DefaultClient. +// This client does not cache responses. To cache responses see ExternalDoer instead. +var UncachedExternalDoer, _ = UncachedExternalClientFactory.Doer() + +// TestExternalClientFactory is a httpcli.Factory with common options +// and is created for tests where you'd normally use an ExternalClientFactory. +// Must be used in tests only as it doesn't apply any IP restrictions. +var TestExternalClientFactory = newExternalClientFactory(false, true) + +// TestExternalClient is a shared client for external communication. +// It does not apply any IP filering and must only be used in tests. +var TestExternalClient, _ = TestExternalClientFactory.Client() + +// TestExternalDoer is a shared client for testing external communications. +// It does not apply any IP filering and must only be used in tests. +var TestExternalDoer, _ = TestExternalClientFactory.Doer() + // ExternalClient returns a shared client for external communication. This is // a convenience for existing uses of http.DefaultClient. // WARN: This client caches entire responses for etag matching. Do not use it for @@ -176,6 +198,11 @@ var ExternalDoer, _ = ExternalClientFactory.Doer() // downloading arbitrarily sized files! See UncachedExternalClient instead. var ExternalClient, _ = ExternalClientFactory.Client() +// UncachedExternalClient returns a shared client for external communication. This is +// a convenience for existing uses of http.DefaultClient. +// WARN: This client does not cache responses. To cache responses see ExternalClient instead. +var UncachedExternalClient, _ = UncachedExternalClientFactory.Client() + // InternalClientFactory is a httpcli.Factory with common options // and middleware pre-set for communicating with internal services. var InternalClientFactory = NewInternalClientFactory("internal") @@ -208,6 +235,7 @@ func NewInternalClientFactory(subsystem string, middleware ...Middleware) *Facto MeteredTransportOpt(subsystem), ActorTransportOpt, RequestClientTransportOpt, + RequestInteractionTransportOpt, TracedTransportOpt, ) } @@ -366,19 +394,52 @@ func NewLoggingMiddleware(logger log.Logger) Middleware { } } -// // Common Opts -// +var externalDenyList = env.Get("EXTERNAL_DENY_LIST", "", "Deny list for outgoing requests") + +type denyRule struct { + pattern string + builtin string +} + +var defaultDenylist = []denyRule{ + {builtin: "loopback"}, + {pattern: "169.254.169.254"}, +} + +// TestTransportOpt creates a transport for tests that does not apply any denylisting +func TestExternalTransportOpt(cli *http.Client) error { + tr, err := getTransportForMutation(cli) + if err != nil { + return errors.Wrap(err, "httpcli.ExternalTransportOpt") + } + + cli.Transport = &externalTransport{base: tr} + return nil +} // ExternalTransportOpt returns an Opt that ensures the http.Client.Transport // can contact non-Sourcegraph services. For example Admins can configure -// TLS/SSL settings. +// TLS/SSL settings. This adds filtering for external requests based on +// predefined deny lists. Can be extended using the EXTERNAL_DENY_LIST +// environment variable. func ExternalTransportOpt(cli *http.Client) error { tr, err := getTransportForMutation(cli) if err != nil { return errors.Wrap(err, "httpcli.ExternalTransportOpt") } + var denyList = hostmatcher.ParseHostMatchList("EXTERNAL_DENY_LIST", externalDenyList) + for _, rule := range defaultDenylist { + if rule.builtin != "" { + denyList.AppendBuiltin(rule.builtin) + } else if rule.pattern != "" { + denyList.AppendPattern(rule.pattern) + } + } + + // this dialer will match resolved domain names against the deny list + tr.DialContext = hostmatcher.NewDialContext("", nil, denyList) cli.Transport = &externalTransport{base: tr} return nil } @@ -836,6 +897,19 @@ func RequestClientTransportOpt(cli *http.Client) error { return nil } +func RequestInteractionTransportOpt(cli *http.Client) error { + if cli.Transport == nil { + cli.Transport = http.DefaultTransport + } + + cli.Transport = &wrappedTransport{ + RoundTripper: &requestinteraction.HTTPTransport{RoundTripper: cli.Transport}, + Wrapped: cli.Transport, + } + + return nil +} + // IsRiskyHeader returns true if the request or response header is likely to contain private data. func IsRiskyHeader(name string, values []string) bool { return isRiskyHeaderName(name) || containsRiskyHeaderValue(values) diff --git a/internal/httpcli/client_test.go b/internal/httpcli/client_test.go index ca1498aedf460..ddaaf888a1ce7 100644 --- a/internal/httpcli/client_test.go +++ b/internal/httpcli/client_test.go @@ -13,7 +13,6 @@ import ( "net" "net/http" "net/http/httptest" - "os" "reflect" "strings" "sync/atomic" @@ -406,9 +405,8 @@ func TestErrorResilience(t *testing.T) { // hardcode what go returns for DNS not found to avoid // flakiness across machines. However, CI correctly respects // this so we continue to run against a real DNS server on CI. - if os.Getenv("CI") == "" { - cli.Transport = notFoundTransport{} - } + // TODO(burmudar): Fix DNS infrastructure in Aspect Workflows Infra + cli.Transport = notFoundTransport{} return nil }, NewErrorResilientTransportOpt( diff --git a/internal/insights/query/compute_executor.go b/internal/insights/query/compute_executor.go index 4f24828d70b6b..8b683f9412607 100644 --- a/internal/insights/query/compute_executor.go +++ b/internal/insights/query/compute_executor.go @@ -114,13 +114,6 @@ func sortAndLimitComputedGroups(timeSeries []GeneratedTimeSeries) []GeneratedTim return timeSeries[i].Points[0].Count > timeSeries[j].Points[0].Count } sort.SliceStable(timeSeries, descValueSort) - limit := minInt(20, len(timeSeries)) + limit := min(20, len(timeSeries)) return timeSeries[:limit] } - -func minInt(a, b int) int { - if a < b { - return a - } - return b -} diff --git a/internal/insights/query/querybuilder/regexp_test.go b/internal/insights/query/querybuilder/regexp_test.go index d782ab9ab6b2c..acea4e43fc610 100644 --- a/internal/insights/query/querybuilder/regexp_test.go +++ b/internal/insights/query/querybuilder/regexp_test.go @@ -167,6 +167,18 @@ func TestReplace_Valid(t *testing.T) { want: autogold.Expect(BasicQuery("/replace(?:you)/")), searchType: query.SearchTypeStandard, }, + { + query: "/replaceme/", + replacement: "replace", + want: autogold.Expect(BasicQuery("/replace/")), + searchType: query.SearchTypeNewStandardRC1, + }, + { + query: "/replace(me)/", + replacement: "you", + want: autogold.Expect(BasicQuery("/replace(?:you)/")), + searchType: query.SearchTypeNewStandardRC1, + }, { query: "/replaceme/", replacement: "replace", @@ -191,6 +203,18 @@ func TestReplace_Valid(t *testing.T) { want: autogold.Expect(BasicQuery("/b(?:u)(?:dd)(er)/")), searchType: query.SearchTypeStandard, }, + { + query: "/b(u)tt(er)/", + replacement: "e", + want: autogold.Expect(BasicQuery("/b(?:e)tt(er)/")), + searchType: query.SearchTypeNewStandardRC1, + }, + { + query: "/b(?:u)(tt)(er)/", + replacement: "dd", + want: autogold.Expect(BasicQuery("/b(?:u)(?:dd)(er)/")), + searchType: query.SearchTypeNewStandardRC1, + }, { query: "replaceme", replacement: "replace", @@ -233,6 +257,12 @@ func TestReplace_Valid(t *testing.T) { want: autogold.Expect(BasicQuery("/(?:findme)<\\/title>/")), searchType: query.SearchTypeStandard, }, + { + query: `/<title>(.*)<\/title>/`, + replacement: "findme", + want: autogold.Expect(BasicQuery("/<title>(?:findme)<\\/title>/")), + searchType: query.SearchTypeNewStandardRC1, + }, } for _, test := range tests { t.Run(test.query, func(t *testing.T) { @@ -263,4 +293,16 @@ func TestReplace_Invalid(t *testing.T) { _, err := NewPatternReplacer("repo:repoA rev:3.40.0", query.SearchTypeStandard) require.ErrorIs(t, err, UnsupportedPatternTypeErr) }) + t.Run("multiple patterns", func(t *testing.T) { + _, err := NewPatternReplacer("/replace(me)/ or asdf", query.SearchTypeNewStandardRC1) + require.ErrorIs(t, err, MultiplePatternErr) + }) + t.Run("literal pattern", func(t *testing.T) { + _, err := NewPatternReplacer("asdf", query.SearchTypeNewStandardRC1) + require.ErrorIs(t, err, UnsupportedPatternTypeErr) + }) + t.Run("filters with no pattern", func(t *testing.T) { + _, err := NewPatternReplacer("repo:repoA rev:3.40.0", query.SearchTypeNewStandardRC1) + require.ErrorIs(t, err, UnsupportedPatternTypeErr) + }) } diff --git a/internal/licensing/codygateway.go b/internal/licensing/codygateway.go index 53016dbcc4951..90aea8448576c 100644 --- a/internal/licensing/codygateway.go +++ b/internal/licensing/codygateway.go @@ -24,7 +24,7 @@ func NewCodyGatewayChatRateLimit(plan Plan, userCount *int, licenseTags []string uc = 1 } // Switch on GPT models by default if the customer license has the GPT tag. - models := []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"} + models := []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-2.0", "anthropic/claude-2.1", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"} if slices.Contains(licenseTags, GPTLLMAccessTag) { models = append(models, "openai/gpt-4", "openai/gpt-3.5-turbo") } diff --git a/internal/licensing/codygateway_test.go b/internal/licensing/codygateway_test.go index 58720105e3b5b..32ec28cd4ab41 100644 --- a/internal/licensing/codygateway_test.go +++ b/internal/licensing/codygateway_test.go @@ -22,7 +22,7 @@ func TestNewCodyGatewayChatRateLimit(t *testing.T) { userCount: pointers.Ptr(50), licenseTags: []string{GPTLLMAccessTag}, want: CodyGatewayRateLimit{ - AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-instant-v1", "anthropic/claude-instant-1", "openai/gpt-4", "openai/gpt-3.5-turbo"}, + AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-2.0", "anthropic/claude-2.1", "anthropic/claude-instant-v1", "anthropic/claude-instant-1", "openai/gpt-4", "openai/gpt-3.5-turbo"}, Limit: 2500, IntervalSeconds: 60 * 60 * 24, }, @@ -32,7 +32,7 @@ func TestNewCodyGatewayChatRateLimit(t *testing.T) { plan: PlanEnterprise1, userCount: pointers.Ptr(50), want: CodyGatewayRateLimit{ - AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"}, + AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-2.0", "anthropic/claude-2.1", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"}, Limit: 2500, IntervalSeconds: 60 * 60 * 24, }, @@ -41,7 +41,7 @@ func TestNewCodyGatewayChatRateLimit(t *testing.T) { name: "Enterprise plan with no user count", plan: PlanEnterprise1, want: CodyGatewayRateLimit{ - AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"}, + AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-2.0", "anthropic/claude-2.1", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"}, Limit: 50, IntervalSeconds: 60 * 60 * 24, }, @@ -50,7 +50,7 @@ func TestNewCodyGatewayChatRateLimit(t *testing.T) { name: "Non-enterprise plan with no GPT tag and no user count", plan: "unknown", want: CodyGatewayRateLimit{ - AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"}, + AllowedModels: []string{"anthropic/claude-v1", "anthropic/claude-2", "anthropic/claude-2.0", "anthropic/claude-2.1", "anthropic/claude-instant-v1", "anthropic/claude-instant-1"}, Limit: 10, IntervalSeconds: 60 * 60 * 24, }, diff --git a/internal/licensing/data.go b/internal/licensing/data.go index 861779b82fab3..a85558bc18f55 100644 --- a/internal/licensing/data.go +++ b/internal/licensing/data.go @@ -95,6 +95,15 @@ const ( // FeatureAllowAirGapped is whether or not air gapped mode is allowed on this instance. FeatureAllowAirGapped BasicFeature = "allow-air-gapped" + + // FeatureCodeMonitors is whether code monitors is allowed on this Sourcegraph instance. + FeatureCodeMonitors BasicFeature = "code-monitors" + + // FeatureNotebooks is whether the notebooks feature is allowed on this Sourcegraph instance. + FeatureNotebooks BasicFeature = "notebooks" + + // FeatureCodeSearch is whether the code search feature suite is allowed on this Sourcegraph instance. + FeatureCodeSearch BasicFeature = "code-search" ) var AllFeatures = []Feature{ @@ -111,12 +120,13 @@ var AllFeatures = []Feature{ &FeatureBatchChanges{}, FeatureSCIM, FeatureAllowAirGapped, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, } type PlanDetails struct { Features []Feature - // ExpiredFeatures are the features that still work after the plan is expired. - ExpiredFeatures []Feature } // planDetails defines the features that are enabled for each plan. @@ -125,10 +135,9 @@ var planDetails = map[Plan]PlanDetails{ Features: []Feature{ &FeatureBatchChanges{MaxNumChangesets: 10}, &FeaturePrivateRepositories{Unrestricted: true}, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanOldEnterprise: { @@ -147,10 +156,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureCodeInsights, FeatureSCIM, FeatureCody, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanTeam0: { @@ -160,10 +168,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureSSO, &FeatureBatchChanges{MaxNumChangesets: 10}, &FeaturePrivateRepositories{Unrestricted: true}, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanEnterprise0: { @@ -175,10 +182,9 @@ var planDetails = map[Plan]PlanDetails{ &FeaturePrivateRepositories{Unrestricted: true}, FeatureSCIM, FeatureCody, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, @@ -192,10 +198,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureSSO, FeatureSCIM, FeatureCody, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanEnterprise1: { @@ -209,10 +214,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureSSO, FeatureSCIM, FeatureCody, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanEnterpriseExtension: { @@ -226,10 +230,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureSSO, FeatureSCIM, FeatureCody, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanFree0: { @@ -238,12 +241,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureMonitoring, &FeatureBatchChanges{MaxNumChangesets: 10}, &FeaturePrivateRepositories{Unrestricted: true}, - }, - ExpiredFeatures: []Feature{ - FeatureSSO, - FeatureMonitoring, - &FeatureBatchChanges{MaxNumChangesets: 10}, - &FeaturePrivateRepositories{Unrestricted: true}, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanFree1: { @@ -251,11 +251,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureMonitoring, &FeatureBatchChanges{MaxNumChangesets: 10}, &FeaturePrivateRepositories{MaxNumPrivateRepos: 1}, - }, - ExpiredFeatures: []Feature{ - FeatureMonitoring, - &FeatureBatchChanges{MaxNumChangesets: 10}, - &FeaturePrivateRepositories{MaxNumPrivateRepos: 1}, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, PlanAirGappedEnterprise: { @@ -270,10 +268,9 @@ var planDetails = map[Plan]PlanDetails{ FeatureSCIM, FeatureCody, FeatureAllowAirGapped, - }, - ExpiredFeatures: []Feature{ - FeatureACLs, - FeatureSSO, + FeatureCodeMonitors, + FeatureNotebooks, + FeatureCodeSearch, }, }, } diff --git a/internal/licensing/features.go b/internal/licensing/features.go index 8162a69f0a12f..99080f08e9ea1 100644 --- a/internal/licensing/features.go +++ b/internal/licensing/features.go @@ -33,10 +33,6 @@ func (f BasicFeature) Check(info *Info) error { // Check if the feature is explicitly allowed via license tag. hasFeature := func(want Feature) bool { - // If license is expired, do not look at tags anymore. - if info.IsExpired() { - return false - } for _, t := range info.Tags { // We have been issuing licenses with trailing spaces in the tags for a while. // Eventually we should be able to remove these `TrimSpace` calls again, @@ -48,7 +44,7 @@ func (f BasicFeature) Check(info *Info) error { } return false } - if !(info.Plan().HasFeature(featureTrimmed, info.IsExpired()) || hasFeature(featureTrimmed)) { + if !(info.Plan().HasFeature(featureTrimmed) || hasFeature(featureTrimmed)) { return newFeatureRequiresUpgradeError(f.FeatureName()) } return nil @@ -86,7 +82,7 @@ func (f *FeatureBatchChanges) Check(info *Info) error { } // Otherwise, check the default batch changes feature. - if info.Plan().HasFeature(f, info.IsExpired()) { + if info.Plan().HasFeature(f) { return nil } @@ -119,7 +115,7 @@ func (f *FeaturePrivateRepositories) Check(info *Info) error { } // Otherwise, check the default private repositories feature. - if info.Plan().HasFeature(f, info.IsExpired()) { + if info.Plan().HasFeature(f) { return nil } diff --git a/internal/licensing/plans.go b/internal/licensing/plans.go index a0c8337fbcd4e..0a80e283c4d38 100644 --- a/internal/licensing/plans.go +++ b/internal/licensing/plans.go @@ -13,7 +13,7 @@ type Plan string // HasFeature returns whether the plan has the given feature. // If the target is a pointer, the plan's feature configuration will be // set to the target. -func (p Plan) HasFeature(target Feature, isExpired bool) bool { +func (p Plan) HasFeature(target Feature) bool { if target == nil { panic("licensing: target cannot be nil") } @@ -23,23 +23,12 @@ func (p Plan) HasFeature(target Feature, isExpired bool) bool { panic("licensing: target cannot be a nil pointer") } - if isExpired { - for _, f := range planDetails[p].ExpiredFeatures { - if target.FeatureName() == f.FeatureName() { - if val.Kind() == reflect.Ptr { - val.Elem().Set(reflect.ValueOf(f).Elem()) - } - return true - } - } - } else { - for _, f := range planDetails[p].Features { - if target.FeatureName() == f.FeatureName() { - if val.Kind() == reflect.Ptr { - val.Elem().Set(reflect.ValueOf(f).Elem()) - } - return true + for _, f := range planDetails[p].Features { + if target.FeatureName() == f.FeatureName() { + if val.Kind() == reflect.Ptr { + val.Elem().Set(reflect.ValueOf(f).Elem()) } + return true } } return false diff --git a/internal/licensing/telemetryexport.go b/internal/licensing/telemetryexport.go index fdc8b3879ce9a..02130b3bf6f6c 100644 --- a/internal/licensing/telemetryexport.go +++ b/internal/licensing/telemetryexport.go @@ -65,12 +65,10 @@ const ( TelemetryEventsExportCodyOnly ) -var ( - // legacyExportUsageDataEnabled is the legacy 'EXPORT_USAGE_DATA_ENABLED' - // env var is set. Typically used in Cloud, if the legacy export is enabled, - // we can assume exports are enabled as well. - legacyExportUsageDataEnabled = os.Getenv("EXPORT_USAGE_DATA_ENABLED") == "true" -) +// legacyExportUsageDataEnabled is the legacy 'EXPORT_USAGE_DATA_ENABLED' +// env var is set. Typically used in Cloud, if the legacy export is enabled, +// we can assume exports are enabled as well. +var legacyExportUsageDataEnabled = os.Getenv("EXPORT_USAGE_DATA_ENABLED") == "true" func newTelemetryEventsExportMode(licenseKey string, pk ssh.PublicKey) TelemetryEventsExportMode { if licenseKey == "" { @@ -87,7 +85,7 @@ func newTelemetryEventsExportMode(licenseKey string, pk ssh.PublicKey) Telemetry return TelemetryEventsExportAll // without a valid license key } - if p := (&Info{Info: *key}).Plan(); p.isKnown() && p.HasFeature(FeatureAllowAirGapped, false) { + if p := (&Info{Info: *key}).Plan(); p.isKnown() && p.HasFeature(FeatureAllowAirGapped) { return TelemetryEventsExportDisabled // this is the only way to disable export entirely } diff --git a/internal/logging/BUILD.bazel b/internal/logging/BUILD.bazel index 9e07fb0d565aa..7dd917cc55ead 100644 --- a/internal/logging/BUILD.bazel +++ b/internal/logging/BUILD.bazel @@ -2,10 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "logging", - srcs = [ - "logging.go", - "main.go", - ], + srcs = ["main.go"], importpath = "github.com/sourcegraph/sourcegraph/internal/logging", visibility = ["//:__subpackages__"], deps = [ diff --git a/internal/logging/logging.go b/internal/logging/logging.go deleted file mode 100644 index 06dbac95f10d5..0000000000000 --- a/internal/logging/logging.go +++ /dev/null @@ -1,22 +0,0 @@ -// Package logging carries logic related Sourcegraph's legacy logger, and is DEPRECATED. -// All new logging should use github.com/sourcegraph/log, and existing logging should be opportunistically -// migrated to the new logger. See https://docs.sourcegraph.com/dev/how-to/add_logging -package logging - -// ErrorLogger captures the method required for logging an error. -// -// Deprecated: All logging should use github.com/sourcegraph/log instead. See https://docs.sourcegraph.com/dev/how-to/add_logging -type ErrorLogger interface { - Error(msg string, ctx ...any) -} - -// Log logs the given message and context when the given error is defined. -// -// Deprecated: All logging should use github.com/sourcegraph/log instead. See https://docs.sourcegraph.com/dev/how-to/add_logging -func Log(lg ErrorLogger, msg string, err *error, ctx ...any) { - if lg == nil || err == nil || *err == nil { - return - } - - lg.Error(msg, append(append(make([]any, 0, 2+len(ctx)), "error", *err), ctx...)...) -} diff --git a/internal/oauthutil/oauth2.go b/internal/oauthutil/oauth2.go index bb4f7a3778ddc..f9dc1d20a709c 100644 --- a/internal/oauthutil/oauth2.go +++ b/internal/oauthutil/oauth2.go @@ -43,9 +43,9 @@ type TokenRefresher func(ctx context.Context, doer httpcli.Doer, oauthCtx OAuthC // If the Authenticator implements the AuthenticatorWithRefresh interface, // it will also attempt to refresh the token in case of a 401 response. // If the token is updated successfully, the same request will be retried exactly once. -func DoRequest(ctx context.Context, logger log.Logger, doer httpcli.Doer, req *http.Request, auther auth.Authenticator, doRequest func(*http.Request) (*http.Response, error)) (*http.Response, error) { +func DoRequest(ctx context.Context, logger log.Logger, doer httpcli.Doer, req *http.Request, auther auth.Authenticator) (*http.Response, error) { if auther == nil { - return doRequest(req.WithContext(ctx)) + return doer.Do(req.WithContext(ctx)) } // Try a pre-emptive token refresh in case we know it is definitely expired @@ -71,7 +71,7 @@ func DoRequest(ctx context.Context, logger log.Logger, doer httpcli.Doer, req *h } req.Body = io.NopCloser(bytes.NewBuffer(reqBody)) // Do first request - resp, err := doRequest(req.WithContext(ctx)) + resp, err := doer.Do(req.WithContext(ctx)) if err != nil { return resp, err } @@ -88,7 +88,7 @@ func DoRequest(ctx context.Context, logger log.Logger, doer httpcli.Doer, req *h } // We need to reset the body before retrying the request req.Body = io.NopCloser(bytes.NewBuffer(reqBody)) - resp, err = doRequest(req.WithContext(ctx)) + resp, err = doer.Do(req.WithContext(ctx)) } return resp, err diff --git a/internal/oauthutil/oauth2_test.go b/internal/oauthutil/oauth2_test.go index 000e900a969f4..0e20fc33baadc 100644 --- a/internal/oauthutil/oauth2_test.go +++ b/internal/oauthutil/oauth2_test.go @@ -95,9 +95,7 @@ func TestDoRequest(t *testing.T) { } } - resp, err := DoRequest(ctx, logger, http.DefaultClient, req, auther, func(r *http.Request) (*http.Response, error) { - return http.DefaultClient.Do(r) - }) + resp, err := DoRequest(ctx, logger, http.DefaultClient, req, auther) if err != nil { t.Fatal(err) } diff --git a/internal/own/background/background.go b/internal/own/background/background.go index 9de02117bf4d4..4c4941e4e46f5 100644 --- a/internal/own/background/background.go +++ b/internal/own/background/background.go @@ -2,7 +2,6 @@ package background import ( "context" - "fmt" "strconv" "time" @@ -31,10 +30,6 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" ) -func featureFlagName(jobType IndexJobType) string { - return fmt.Sprintf("own-background-index-repo-%s", jobType.Name) -} - const ( tableName = "own_background_jobs" viewName = "own_background_jobs_config_aware" diff --git a/internal/own/codeowners/v1/BUILD.bazel b/internal/own/codeowners/v1/BUILD.bazel index 5b3358f5e39ed..35829febce0c2 100644 --- a/internal/own/codeowners/v1/BUILD.bazel +++ b/internal/own/codeowners/v1/BUILD.bazel @@ -2,7 +2,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@rules_buf//buf:defs.bzl", "buf_lint_test") load("@rules_proto//proto:defs.bzl", "proto_library") -load("//dev:proto.bzl", "write_proto_stubs_to_source") exports_files(["buf.gen.yaml"]) diff --git a/internal/repos/BUILD.bazel b/internal/repos/BUILD.bazel index 9484417b7a627..def64c3eb151e 100644 --- a/internal/repos/BUILD.bazel +++ b/internal/repos/BUILD.bazel @@ -47,6 +47,7 @@ go_library( "//cmd/frontend/envvar", "//internal/actor", "//internal/api", + "//internal/bytesize", "//internal/codeintel/dependencies", "//internal/conf", "//internal/conf/conftypes", @@ -128,6 +129,7 @@ go_test( "azuredevops_test.go", "bitbucketcloud_test.go", "bitbucketserver_test.go", + "exclude_test.go", "gerrit_test.go", "github_test.go", "gitlab_test.go", @@ -191,12 +193,9 @@ go_test( "//lib/errors", "//lib/pointers", "//schema", - "@com_github_dnaeon_go_vcr//cassette", - "@com_github_dnaeon_go_vcr//recorder", "@com_github_google_go_cmp//cmp", "@com_github_google_go_cmp//cmp/cmpopts", "@com_github_google_uuid//:uuid", - "@com_github_grafana_regexp//:regexp", "@com_github_hexops_autogold_v2//:autogold", "@com_github_keegancsmith_sqlf//:sqlf", "@com_github_sourcegraph_log//:log", diff --git a/internal/repos/awscodecommit.go b/internal/repos/awscodecommit.go index 135cdff679a9b..477c44a4360d8 100644 --- a/internal/repos/awscodecommit.go +++ b/internal/repos/awscodecommit.go @@ -33,7 +33,7 @@ type AWSCodeCommitSource struct { awsRegion string client *awscodecommit.Client - exclude excludeFunc + excluder repoExcluder } // NewAWSCodeCommitSource returns a new AWSCodeCommitSource from the given external service. @@ -85,21 +85,21 @@ func newAWSCodeCommitSource(svc *types.ExternalService, c *schema.AWSCodeCommitC return nil, err } - var eb excludeBuilder + var ex repoExcluder for _, r := range c.Exclude { - eb.Exact(r.Name) - eb.Exact(r.Id) + ex.AddRule(). + Exact(r.Name). + Exact(r.Id) } - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } s := &AWSCodeCommitSource{ - svc: svc, - config: c, - exclude: exclude, - client: awscodecommit.NewClient(awsConfig), + svc: svc, + config: c, + excluder: ex, + client: awscodecommit.NewClient(awsConfig), } endpoint, err := codecommit.NewDefaultEndpointResolver().ResolveEndpoint(c.Region, codecommit.EndpointResolverOptions{}) @@ -176,7 +176,7 @@ func (s *AWSCodeCommitSource) listAllRepositories(ctx context.Context, results c } func (s *AWSCodeCommitSource) excludes(r *awscodecommit.Repository) bool { - return s.exclude(r.Name) || s.exclude(r.ID) + return s.excluder.ShouldExclude(r.Name) || s.excluder.ShouldExclude(r.ID) } // The code below is copied from diff --git a/internal/repos/azuredevops.go b/internal/repos/azuredevops.go index 1d4974ba0eb70..e13ff86562e82 100644 --- a/internal/repos/azuredevops.go +++ b/internal/repos/azuredevops.go @@ -7,6 +7,7 @@ import ( "github.com/goware/urlx" "github.com/sourcegraph/log" + "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" @@ -26,7 +27,7 @@ type AzureDevOpsSource struct { serviceID string config schema.AzureDevOpsConnection logger log.Logger - exclude excludeFunc + excluder repoExcluder } // NewAzureDevOpsSource returns a new AzureDevOpsSource from the given external service. @@ -54,14 +55,13 @@ func NewAzureDevOpsSource(ctx context.Context, logger log.Logger, svc *types.Ext return nil, err } - var eb excludeBuilder + var ex repoExcluder for _, r := range c.Exclude { - eb.Exact(r.Name) - eb.Pattern(r.Pattern) + ex.AddRule(). + Exact(r.Name). + Pattern(r.Pattern) } - - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } @@ -71,7 +71,7 @@ func NewAzureDevOpsSource(ctx context.Context, logger log.Logger, svc *types.Ext serviceID: extsvc.NormalizeBaseURL(cli.GetURL()).String(), config: c, logger: logger, - exclude: exclude, + excluder: ex, }, nil } @@ -115,7 +115,8 @@ func (s *AzureDevOpsSource) processReposFromProjectOrOrg(ctx context.Context, na results <- SourceResult{Source: s, Err: err} continue } - if s.exclude(fmt.Sprintf("%s/%s/%s", org, repo.Project.Name, repo.Name)) { + fullName := fmt.Sprintf("%s/%s/%s", org, repo.Project.Name, repo.Name) + if s.excluder.ShouldExclude(fullName) { continue } repo, err := s.makeRepo(repo) @@ -157,6 +158,11 @@ func (s *AzureDevOpsSource) makeRepo(p azuredevops.Repository) (*types.Repo, err return nil, err } + cloneURL := p.RemoteURL + if s.config.GitURLType == "ssh" { + cloneURL = p.SSHURL + } + name := path.Join(fullURL.Host, fullURL.Path) return &types.Repo{ Name: api.RepoName(name), @@ -170,7 +176,7 @@ func (s *AzureDevOpsSource) makeRepo(p azuredevops.Repository) (*types.Repo, err Sources: map[string]*types.SourceInfo{ urn: { ID: urn, - CloneURL: p.CloneURL, + CloneURL: cloneURL, }, }, Metadata: p, diff --git a/internal/repos/azuredevops_test.go b/internal/repos/azuredevops_test.go index 5d77360f495c3..06c9bec148462 100644 --- a/internal/repos/azuredevops_test.go +++ b/internal/repos/azuredevops_test.go @@ -8,7 +8,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/internal/testutil" - "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) @@ -19,7 +19,10 @@ import ( func TestAzureDevOpsSource_ListRepos(t *testing.T) { ratelimit.SetupForTest(t) - conf := &schema.AzureDevOpsConnection{ + cf, save := NewClientFactory(t, t.Name()) + defer save(t) + + svc := typestest.MakeExternalService(t, extsvc.VariantAzureDevOps, &schema.AzureDevOpsConnection{ Url: "https://dev.azure.com", Username: os.Getenv("AZURE_DEV_OPS_USERNAME"), Token: os.Getenv("AZURE_DEV_OPS_TOKEN"), @@ -32,14 +35,7 @@ func TestAzureDevOpsSource_ListRepos(t *testing.T) { Pattern: "^sgtestazure/sgtestazure/sgtestazure[3-9]", }, }, - } - cf, save := NewClientFactory(t, t.Name()) - defer save(t) - - svc := &types.ExternalService{ - Kind: extsvc.KindAzureDevOps, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, conf)), - } + }) ctx := context.Background() src, err := NewAzureDevOpsSource(ctx, nil, svc, cf) diff --git a/internal/repos/bitbucketcloud.go b/internal/repos/bitbucketcloud.go index 0360e85a40137..ee85e91293ee4 100644 --- a/internal/repos/bitbucketcloud.go +++ b/internal/repos/bitbucketcloud.go @@ -23,11 +23,11 @@ import ( // A BitbucketCloudSource yields repositories from a single BitbucketCloud connection configured // in Sourcegraph via the external services configuration. type BitbucketCloudSource struct { - svc *types.ExternalService - config *schema.BitbucketCloudConnection - exclude excludeFunc - client bitbucketcloud.Client - logger log.Logger + svc *types.ExternalService + config *schema.BitbucketCloudConnection + excluder repoExcluder + client bitbucketcloud.Client + logger log.Logger } var _ UserSource = &BitbucketCloudSource{} @@ -55,14 +55,14 @@ func newBitbucketCloudSource(logger log.Logger, svc *types.ExternalService, c *s return nil, err } - var eb excludeBuilder + var ex repoExcluder for _, r := range c.Exclude { - eb.Exact(r.Name) - eb.Exact(r.Uuid) - eb.Pattern(r.Pattern) + ex.AddRule(). + Exact(r.Name). + Exact(r.Uuid). + Pattern(r.Pattern) } - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } @@ -72,11 +72,11 @@ func newBitbucketCloudSource(logger log.Logger, svc *types.ExternalService, c *s } return &BitbucketCloudSource{ - svc: svc, - config: c, - exclude: exclude, - client: client, - logger: logger, + svc: svc, + config: c, + excluder: ex, + client: client, + logger: logger, }, nil } @@ -161,7 +161,7 @@ func (s *BitbucketCloudSource) remoteURL(repo *bitbucketcloud.Repo) string { } func (s *BitbucketCloudSource) excludes(r *bitbucketcloud.Repo) bool { - return s.exclude(r.FullName) || s.exclude(r.UUID) + return s.excluder.ShouldExclude(r.FullName) || s.excluder.ShouldExclude(r.UUID) } func (s *BitbucketCloudSource) listAllRepos(ctx context.Context, results chan SourceResult) { @@ -238,7 +238,6 @@ func (s *BitbucketCloudSource) WithAuthenticator(a auth.Authenticator) (Source, sc.client = sc.client.WithAuthenticator(a) return &sc, nil - } // ValidateAuthenticator validates the currently set authenticator is usable. diff --git a/internal/repos/bitbucketcloud_test.go b/internal/repos/bitbucketcloud_test.go index f0630809bdc4b..18aa209c2ecdf 100644 --- a/internal/repos/bitbucketcloud_test.go +++ b/internal/repos/bitbucketcloud_test.go @@ -79,6 +79,20 @@ func TestBitbucketCloudSource_ListRepos(t *testing.T) { }, err: "<nil>", }, + { + name: "with access token", + assert: assertAllReposListed([]string{ + "/sourcegraph-source/src-cli", + "/sourcegraph-source/source-test", + }), + conf: &schema.BitbucketCloudConnection{ + AccessToken: os.Getenv("BITBUCKET_CLOUD_ACCESS_TOKEN"), + Teams: []string{ + "sourcegraph-source", + }, + }, + err: "<nil>", + }, } for _, tc := range testCases { @@ -88,11 +102,7 @@ func TestBitbucketCloudSource_ListRepos(t *testing.T) { cf, save := NewClientFactory(t, tc.name) defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindBitbucketCloud, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, tc.conf)), - } - + svc := typestest.MakeExternalService(t, extsvc.VariantBitbucketCloud, tc.conf) bbcSrc, err := newBitbucketCloudSource(logtest.Scoped(t), svc, tc.conf, cf) if err != nil { t.Fatal(err) diff --git a/internal/repos/bitbucketserver.go b/internal/repos/bitbucketserver.go index 9887b197b0fe5..2876278877986 100644 --- a/internal/repos/bitbucketserver.go +++ b/internal/repos/bitbucketserver.go @@ -24,11 +24,11 @@ import ( // A BitbucketServerSource yields repositories from a single BitbucketServer connection configured // in Sourcegraph via the external services configuration. type BitbucketServerSource struct { - svc *types.ExternalService - config *schema.BitbucketServerConnection - exclude excludeFunc - client *bitbucketserver.Client - logger log.Logger + svc *types.ExternalService + config *schema.BitbucketServerConnection + excluder repoExcluder + client *bitbucketserver.Client + logger log.Logger } var _ Source = &BitbucketServerSource{} @@ -64,14 +64,18 @@ func newBitbucketServerSource(logger log.Logger, svc *types.ExternalService, c * return nil, err } - var eb excludeBuilder + var ex repoExcluder for _, r := range c.Exclude { - eb.Exact(r.Name) - eb.Exact(strconv.Itoa(r.Id)) - eb.Pattern(r.Pattern) + rule := ex.AddRule() + rule. + Exact(r.Name). + Pattern(r.Pattern) + + if r.Id != 0 { + rule.Exact(strconv.Itoa(r.Id)) + } } - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } @@ -81,11 +85,11 @@ func newBitbucketServerSource(logger log.Logger, svc *types.ExternalService, c * } return &BitbucketServerSource{ - svc: svc, - config: c, - exclude: exclude, - client: client, - logger: logger, + svc: svc, + config: c, + excluder: ex, + client: client, + logger: logger, }, nil } @@ -203,8 +207,8 @@ func (s *BitbucketServerSource) excludes(r *bitbucketserver.Repo) bool { name = r.Project.Key + "/" + name } if r.State != "AVAILABLE" || - s.exclude(name) || - s.exclude(strconv.Itoa(r.ID)) || + s.excluder.ShouldExclude(name) || + s.excluder.ShouldExclude(strconv.Itoa(r.ID)) || (s.config.ExcludePersonalRepositories && r.IsPersonalRepository()) { return true } diff --git a/internal/repos/bitbucketserver_test.go b/internal/repos/bitbucketserver_test.go index 05de5676c9997..4df632b22165d 100644 --- a/internal/repos/bitbucketserver_test.go +++ b/internal/repos/bitbucketserver_test.go @@ -17,10 +17,12 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" "github.com/sourcegraph/sourcegraph/internal/extsvc/bitbucketserver" + "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/internal/rcache" "github.com/sourcegraph/sourcegraph/internal/testutil" "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" ) @@ -64,7 +66,7 @@ func TestBitbucketServerSource_MakeRepo(t *testing.T) { // httpcli uses rcache, so we need to prepare the redis connection. rcache.SetupForTest(t) - s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, nil) + s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, httpcli.TestExternalClientFactory) if err != nil { t.Fatal(err) } @@ -145,7 +147,7 @@ func TestBitbucketServerSource_Exclude(t *testing.T) { // httpcli uses rcache, so we need to prepare the redis connection. rcache.SetupForTest(t) - s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, nil) + s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, httpcli.TestExternalClientFactory) if err != nil { t.Fatal(err) } @@ -178,16 +180,15 @@ func TestBitbucketServerSource_WithAuthenticator(t *testing.T) { rcache.SetupForTest(t) ratelimit.SetupForTest(t) - svc := &types.ExternalService{ - Kind: extsvc.KindBitbucketServer, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.BitbucketServerConnection{ + svc := typestest.MakeExternalService(t, + extsvc.VariantBitbucketServer, + &schema.BitbucketServerConnection{ Url: "https://bitbucket.sgdev.org", Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), - })), - } + }) ctx := context.Background() - bbsSrc, err := NewBitbucketServerSource(ctx, logtest.Scoped(t), svc, nil) + bbsSrc, err := NewBitbucketServerSource(ctx, logtest.Scoped(t), svc, httpcli.TestExternalClientFactory) if err != nil { t.Fatal(err) } @@ -261,7 +262,7 @@ func TestBitbucketServerSource_ListByReposOnly(t *testing.T) { // httpcli uses rcache, so we need to prepare the redis connection. rcache.SetupForTest(t) - s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, nil) + s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, httpcli.TestExternalClientFactory) if err != nil { t.Fatal(err) } @@ -368,7 +369,7 @@ func TestBitbucketServerSource_ListByRepositoryQuery(t *testing.T) { // httpcli uses rcache, so we need to prepare the redis connection. rcache.SetupForTest(t) - s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, nil) + s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, httpcli.TestExternalClientFactory) if err != nil { t.Fatal(err) } @@ -434,7 +435,7 @@ func TestBitbucketServerSource_ListByProjectKeyMock(t *testing.T) { // httpcli uses rcache, so we need to prepare the redis connection. rcache.SetupForTest(t) - s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, nil) + s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, httpcli.TestExternalClientFactory) if err != nil { t.Fatal(err) } @@ -468,7 +469,7 @@ func TestBitbucketServerSource_ListByProjectKeyAuthentic(t *testing.T) { // httpcli uses rcache, so we need to prepare the redis connection. rcache.SetupForTest(t) - s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, nil) + s, err := newBitbucketServerSource(logtest.Scoped(t), &svc, config, httpcli.TestExternalClientFactory) if err != nil { t.Fatal(err) } diff --git a/internal/repos/exclude.go b/internal/repos/exclude.go index c22cefe462d34..3cd423d5aeec3 100644 --- a/internal/repos/exclude.go +++ b/internal/repos/exclude.go @@ -1,79 +1,222 @@ package repos import ( + "strconv" "strings" "github.com/grafana/regexp" + + "github.com/sourcegraph/sourcegraph/internal/bytesize" + "github.com/sourcegraph/sourcegraph/internal/extsvc/github" + "github.com/sourcegraph/sourcegraph/lib/errors" ) // excludeFunc takes either a generic object and returns true if the repo should be excluded. In // the case of repo sourcing it will take a repository name, ID, or the repo itself as input. type excludeFunc func(input any) bool -// excludeBuilder builds an excludeFunc. -type excludeBuilder struct { - exact map[string]struct{} +// repoExcluder is made up of several rules that can be chained together to +// exclude a repository. +// +// Rules can be added by calling `repoExcluder.AddRule()`. +// +// After rules have been added, the caller uses `ShouldExclude` to check if a +// repo should be excluded. In that call, all the rules are OR'd together. If +// one rule excludes, the repo is excluded. +type repoExcluder struct { + rules []*rule +} + +func (e *repoExcluder) ShouldExclude(input any) bool { + for _, r := range e.rules { + if r.Excludes(input) { + return true + } + } + + return false +} + +func (e *repoExcluder) AddRule() *rule { + r := &rule{} + e.rules = append(e.rules, r) + return r +} + +func (e *repoExcluder) RuleErrors() error { + var err errors.MultiError + for _, r := range e.rules { + err = errors.Append(err, r.err) + } + return err +} + +// rule represents a single exclusion, whose conditions must all be bet in +// order to exclude a repository. +type rule struct { + exact string patterns []*regexp.Regexp generic []excludeFunc - err error + + // err can be set during construction if any patterns failed to compile. + err error } -// Exact will case-insensitively exclude the string name. -func (e *excludeBuilder) Exact(name string) { - if e.exact == nil { - e.exact = map[string]struct{}{} - } +// Exact will keep track of the exact value passed in and then match it against +// the input of the `Excludes` method. +// +// If the input is an empty string, it will be ignored. +func (r *rule) Exact(name string) *rule { if name == "" { - return + return r } - e.exact[strings.ToLower(name)] = struct{}{} + r.exact = strings.ToLower(name) + return r } // Pattern will exclude strings matching the regex pattern. -func (e *excludeBuilder) Pattern(pattern string) { +func (r *rule) Pattern(pattern string) *rule { if pattern == "" { - return + return r } re, err := regexp.Compile(pattern) if err != nil { - e.err = err - return + r.err = err + return r } - e.patterns = append(e.patterns, re) + r.patterns = append(r.patterns, re) + return r } // Generic registers the passed in exclude function that will be used to determine whether a repo // should be excluded. -func (e *excludeBuilder) Generic(ef excludeFunc) { +func (r *rule) Generic(ef excludeFunc) *rule { if ef == nil { - return + return r } - e.generic = append(e.generic, ef) + r.generic = append(r.generic, ef) + return r } -// Build will return an excludeFunc based on the previous calls to Exact, Pattern, and -// Generic. -func (e *excludeBuilder) Build() (excludeFunc, error) { - return func(input any) bool { - if inputString, ok := input.(string); ok { - if _, ok := e.exact[strings.ToLower(inputString)]; ok { - return true - } +// Excludes returns true if the input matches ALL of the previously set +// attributes of the rule. +func (r *rule) Excludes(input any) bool { + exclude := false - for _, re := range e.patterns { - if re.MatchString(inputString) { - return true - } - } - } else { - for _, ef := range e.generic { - if ef(input) { - return true - } + if inputString, ok := input.(string); ok { + if r.exact == strings.ToLower(inputString) { + exclude = true + } + + for _, re := range r.patterns { + exclude = re.MatchString(inputString) + if !exclude { + return false } } + } + + for _, ef := range r.generic { + exclude = ef(input) + if !exclude { + return false + } + } + + return exclude +} + +var starsConstraintRegex = regexp.MustCompile(`([<>=]{1,2})\s*(\d+)`) + +func buildStarsConstraintsExcludeFn(constraint string) (excludeFunc, error) { + matches := starsConstraintRegex.FindStringSubmatch(constraint) + if matches == nil { + return nil, errors.Newf("invalid stars constraint format: %q", constraint) + } + + operator, err := newOperator(matches[1]) + if err != nil { + return nil, errors.Wrapf(err, "failed to evaluate stars constraint") + } - return false - }, e.err + count, err := strconv.Atoi(matches[2]) + if err != nil { + return nil, err + } + + return func(input any) bool { + r, ok := input.(github.Repository) + if !ok { + return false + } + return operator.Eval(r.StargazerCount, count) + }, nil +} + +var sizeConstraintRegex = regexp.MustCompile(`([<>=]{1,2})\s*(\d+\s*\w+)`) + +func buildSizeConstraintsExcludeFn(constraint string) (excludeFunc, error) { + sizeMatch := sizeConstraintRegex.FindStringSubmatch(constraint) + if sizeMatch == nil { + return nil, errors.Newf("invalid size constraint format: %q", constraint) + } + + operator, err := newOperator(sizeMatch[1]) + if err != nil { + return nil, errors.Wrapf(err, "failed to evaluate size constraint") + } + + size, err := bytesize.Parse(sizeMatch[2]) + if err != nil { + return nil, err + } + + return func(input any) bool { + r, ok := input.(github.Repository) + if !ok { + return false + } + + repoSize := int(r.SizeBytes()) + + // If we don't have a repository size, we don't exclude + if repoSize == 0 { + return false + } + + return operator.Eval(repoSize, int(size)) + }, nil +} + +type operator string + +const ( + opLess operator = "<" + opLessOrEqual operator = "<=" + opGreater operator = ">" + opGreaterOrEqual operator = ">=" +) + +func newOperator(input string) (operator, error) { + if input != "<" && input != "<=" && input != ">" && input != ">=" { + return "", errors.Newf("invalid operator %q", input) + } + return operator(input), nil +} + +func (o operator) Eval(left, right int) bool { + switch o { + case "<": + return left < right + case ">": + return left > right + case "<=": + return left <= right + case ">=": + return left >= right + default: + // I wish Go had enums + panic(errors.Newf("unknown operator: %q", o)) + } } diff --git a/internal/repos/exclude_test.go b/internal/repos/exclude_test.go new file mode 100644 index 0000000000000..9eabd5502df0a --- /dev/null +++ b/internal/repos/exclude_test.go @@ -0,0 +1,210 @@ +package repos + +import ( + "strings" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/sourcegraph/sourcegraph/internal/extsvc/github" + "github.com/sourcegraph/sourcegraph/schema" +) + +func TestRepoExcluderRuleErrors(t *testing.T) { + var ex repoExcluder + + ex.AddRule().Pattern("valid") + require.NoError(t, ex.RuleErrors()) + + ex.AddRule().Pattern("[\\\\") + require.Error(t, ex.RuleErrors()) +} + +func TestRuleExcludes(t *testing.T) { + startsWithFoo := func(input any) bool { + if s, ok := input.(string); ok { + return strings.HasPrefix(s, "foo") + } + return false + } + + t.Run("ExactName", func(t *testing.T) { + r := &rule{} + r.Exact("foobar") + + assert.Equal(t, true, r.Excludes("foobar")) + assert.Equal(t, false, r.Excludes("barfoo")) + + // Only one exact value can exist + r.Exact("barfoo") + assert.Equal(t, false, r.Excludes("foobar")) + assert.Equal(t, true, r.Excludes("barfoo")) + }) + + t.Run("Pattern", func(t *testing.T) { + r := &rule{} + r.Pattern("^foo.*") + + assert.Equal(t, true, r.Excludes("foobar")) + assert.Equal(t, false, r.Excludes("barfoo")) + }) + + t.Run("Generic", func(t *testing.T) { + r := &rule{} + r.Generic(startsWithFoo) + + assert.Equal(t, true, r.Excludes("foobar")) + assert.Equal(t, false, r.Excludes("barfoo")) + }) + + t.Run("multiple conditions", func(t *testing.T) { + r := &rule{} + r.Exact("foobar") + r.Pattern("^foo.*") + + assert.Equal(t, true, r.Excludes("foobar")) + assert.Equal(t, false, r.Excludes("barfoo")) + + r.Generic(startsWithFoo) + + assert.Equal(t, true, r.Excludes("foobar")) + assert.Equal(t, false, r.Excludes("barfoo")) + + endsWithFoo := func(input any) bool { + if s, ok := input.(string); ok { + return strings.HasSuffix(s, "foo") + } + return false + } + + r.Generic(endsWithFoo) + // All conditions have to be true and no argument here fulfills all of them + assert.Equal(t, false, r.Excludes("foobar")) + assert.Equal(t, false, r.Excludes("barfoo")) + }) +} + +func TestGitHubStarsAndSize(t *testing.T) { + assertExcluded := func(t *testing.T, githubRule *schema.ExcludedGitHubRepo, repo github.Repository, wantExcluded bool) { + t.Helper() + rule := &rule{} + + if githubRule.Stars != "" { + fn, err := buildStarsConstraintsExcludeFn(githubRule.Stars) + require.NoError(t, err) + rule.Generic(fn) + } + + if githubRule.Size != "" { + fn, err := buildSizeConstraintsExcludeFn(githubRule.Size) + require.NoError(t, err) + rule.Generic(fn) + } + + assert.Equal( + t, + wantExcluded, + rule.Excludes(repo), + "rule.Stars=%q, rule.Size=%q, repo.StarGazerCount=%d, repo.DiskUsageKibibytes=%d", + githubRule.Stars, + githubRule.Size, + repo.StargazerCount, + repo.DiskUsageKibibytes, + ) + } + + t.Run("stars", func(t *testing.T) { + tests := []struct { + rule string + stars int + wantExcluded bool + }{ + {"< 100", 99, true}, + {"< 100", 100, false}, + + {"<= 100", 100, true}, + {"<= 100", 99, true}, + {"<= 100", 101, false}, + + {"> 100", 101, true}, + {"> 100", 100, false}, + + {">= 100", 100, true}, + {">= 100", 101, true}, + {">= 100", 99, false}, + } + for _, tt := range tests { + excludeRule := &schema.ExcludedGitHubRepo{Stars: tt.rule} + repo := github.Repository{StargazerCount: tt.stars} + assertExcluded(t, excludeRule, repo, tt.wantExcluded) + } + }) + + t.Run("size", func(t *testing.T) { + tests := []struct { + rule string + sizeKibibytes int + wantExcluded bool + }{ + {"< 100 KiB", 99, true}, + {"< 100 KiB", 100, false}, + + {"<= 100 KiB", 100, true}, + {"<= 100 KiB", 99, true}, + {"<= 100 KiB", 101, false}, + + {"> 100 KiB", 101, true}, + {"> 100 KiB", 100, false}, + + {">= 100 KiB", 100, true}, + {">= 100 KiB", 101, true}, + {">= 100 KiB", 99, false}, + + {"< 1025 B", 1, true}, + {"< 1024 B", 1, false}, + {"< 1025 B", 2, false}, + + {"< 100 KiB", 99, true}, + {"< 100 KiB", 100, false}, + {"< 100 KB", 99, false}, + {"< 102 KB", 99, true}, + + {"< 100 MiB", 99, true}, + {"< 100 MiB", 102400, false}, + {"< 101 MiB", 102400, true}, + {"< 100 MB", 102400, false}, + {"< 105 MB", 102400, true}, + + {"< 1 GiB", 1024*1024 - 1, true}, + {"< 1 GiB", 1024 * 1024, false}, + + {"< 1 GB", 1024*1024 - 1, false}, + {"< 2 GB", 1024 * 1024, true}, + + // Ignore repositories with 0 size + {"< 1 MB", 0, false}, + } + + for _, tt := range tests { + excludeRule := &schema.ExcludedGitHubRepo{Size: tt.rule} + repo := github.Repository{DiskUsageKibibytes: tt.sizeKibibytes} + assertExcluded(t, excludeRule, repo, tt.wantExcluded) + } + }) + + t.Run("stars and size", func(t *testing.T) { + rule := &schema.ExcludedGitHubRepo{Stars: "< 100", Size: ">= 1GB"} + + // Less than 100 stars, equal or greater than 1GB in size + assertExcluded(t, rule, github.Repository{StargazerCount: 99, DiskUsageKibibytes: 976563}, true) + assertExcluded(t, rule, github.Repository{StargazerCount: 99, DiskUsageKibibytes: 976563 + 1}, true) + + // Equal or greater than 100 stars, greater than 1GB in size + assertExcluded(t, rule, github.Repository{StargazerCount: 100, DiskUsageKibibytes: 976563 + 1}, false) + assertExcluded(t, rule, github.Repository{StargazerCount: 101, DiskUsageKibibytes: 976563 + 1}, false) + + // Greater than 100 stars, less than 1 GB + assertExcluded(t, rule, github.Repository{StargazerCount: 101, DiskUsageKibibytes: 500}, false) + }) +} diff --git a/internal/repos/gerrit_test.go b/internal/repos/gerrit_test.go index 6763ff975e7e1..908aedbe1386f 100644 --- a/internal/repos/gerrit_test.go +++ b/internal/repos/gerrit_test.go @@ -11,27 +11,22 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/ratelimit" "github.com/sourcegraph/sourcegraph/internal/testutil" - "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) func TestGerritSource_ListRepos(t *testing.T) { ratelimit.SetupForTest(t) - cfName := t.Name() t.Run("no filtering", func(t *testing.T) { - conf := &schema.GerritConnection{ + cf, save := NewClientFactory(t, t.Name()) + defer save(t) + + svc := typestest.MakeExternalService(t, extsvc.VariantGerrit, &schema.GerritConnection{ Url: "https://gerrit.sgdev.org", Username: os.Getenv("GERRIT_USERNAME"), Password: os.Getenv("GERRIT_PASSWORD"), - } - cf, save := NewClientFactory(t, cfName) - defer save(t) - - svc := &types.ExternalService{ - Kind: extsvc.KindGerrit, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, conf)), - } + }) ctx := context.Background() src, err := NewGerritSource(ctx, svc, cf) @@ -46,21 +41,17 @@ func TestGerritSource_ListRepos(t *testing.T) { }) t.Run("with filtering", func(t *testing.T) { - conf := &schema.GerritConnection{ + cf, save := NewClientFactory(t, t.Name()) + defer save(t) + + svc := typestest.MakeExternalService(t, extsvc.VariantGerrit, &schema.GerritConnection{ Projects: []string{ "src-cli", }, Url: "https://gerrit.sgdev.org", Username: os.Getenv("GERRIT_USERNAME"), Password: os.Getenv("GERRIT_PASSWORD"), - } - cf, save := NewClientFactory(t, cfName) - defer save(t) - - svc := &types.ExternalService{ - Kind: extsvc.KindGerrit, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, conf)), - } + }) ctx := context.Background() src, err := NewGerritSource(ctx, svc, cf) diff --git a/internal/repos/github.go b/internal/repos/github.go index 13c98f3fd4372..c119be8331c7e 100644 --- a/internal/repos/github.go +++ b/internal/repos/github.go @@ -36,7 +36,7 @@ import ( type GitHubSource struct { svc *types.ExternalService config *schema.GitHubConnection - exclude excludeFunc + excluder repoExcluder githubDotCom bool baseURL *url.URL v3Client *github.V3Client @@ -121,10 +121,7 @@ func newGitHubSource( return nil, err } - var ( - eb excludeBuilder - excludeForks bool - ) + var ex repoExcluder excludeArchived := func(repo any) bool { if githubRepo, ok := repo.(github.Repository); ok { return githubRepo.IsArchived @@ -137,23 +134,39 @@ func newGitHubSource( } return false } + for _, r := range c.Exclude { + rule := ex.AddRule(). + Exact(r.Name). + Exact(r.Id). + Pattern(r.Pattern) + + if r.Size != "" { + fn, err := buildSizeConstraintsExcludeFn(r.Size) + if err != nil { + return nil, err + } + rule.Generic(fn) + } + if r.Stars != "" { + fn, err := buildStarsConstraintsExcludeFn(r.Stars) + if err != nil { + return nil, err + } + rule.Generic(fn) + } + if r.Archived { - eb.Generic(excludeArchived) + rule.Generic(excludeArchived) } if r.Forks { - excludeForks = true - eb.Generic(excludeFork) + rule.Generic(excludeFork) } - eb.Exact(r.Name) - eb.Exact(r.Id) - eb.Pattern(r.Pattern) } - - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } + auther, err := ghauth.FromConnection(ctx, c, db.GitHubApps(), keyring.Default().GitHubAppKey) if err != nil { return nil, err @@ -192,7 +205,7 @@ func newGitHubSource( return &GitHubSource{ svc: svc, config: c, - exclude: exclude, + excluder: ex, baseURL: baseURL, githubDotCom: githubDotCom, v3Client: v3Client, @@ -202,7 +215,6 @@ func newGitHubSource( markInternalReposAsPublic: (c.Authorization != nil) && c.Authorization.MarkInternalReposAsPublic, logger: logger.With( log.Object("GitHubSource", - log.Bool("excludeForks", excludeForks), log.Bool("githubDotCom", githubDotCom), log.String("originalHostname", originalHostname), ), @@ -319,16 +331,11 @@ func (s *GitHubSource) fetchReposAffiliated(ctx context.Context, first int, excl close(unfiltered) }() - var eb excludeBuilder - // Only exclude on exact nameWithOwner match + set := make(map[string]struct{}) for _, r := range excludedRepos { - eb.Exact(r) - } - exclude, err := eb.Build() - if err != nil { - results <- SourceResult{Source: s, Err: err} - return + set[r] = struct{}{} } + excluded := func(name string) bool { _, ok := set[name]; return ok } s.logger.Debug("fetch github repos by affiliation", log.Int("excluded repos count", len(excludedRepos))) for res := range unfiltered { @@ -340,7 +347,7 @@ func (s *GitHubSource) fetchReposAffiliated(ctx context.Context, first int, excl continue } s.logger.Debug("unfiltered", log.String("repo", res.repo.NameWithOwner)) - if !exclude(res.repo.NameWithOwner) { + if !excluded(res.repo.NameWithOwner) { results <- SourceResult{Source: s, Repo: s.makeRepo(res.repo)} s.logger.Debug("sent to result", log.String("repo", res.repo.NameWithOwner)) first-- @@ -449,7 +456,9 @@ func (s *GitHubSource) excludes(r *github.Repository) bool { return true } - if s.exclude(r.NameWithOwner) || s.exclude(r.ID) || s.exclude(*r) { + if s.excluder.ShouldExclude(r.NameWithOwner) || + s.excluder.ShouldExclude(r.ID) || + s.excluder.ShouldExclude(*r) { return true } diff --git a/internal/repos/github_test.go b/internal/repos/github_test.go index 78d38bf95b1ac..cca2679d5846b 100644 --- a/internal/repos/github_test.go +++ b/internal/repos/github_test.go @@ -136,18 +136,14 @@ func TestPublicRepos_PaginationTerminatesGracefully(t *testing.T) { // We need to clear the cache before we run the tests rcache.SetupForTest(t) ratelimit.SetupForTest(t) - github.SetupForTest(t) fixtureName := "GITHUB-ENTERPRISE/list-public-repos" gheToken := prepareGheToken(t, fixtureName) - service := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://ghe.sgdev.org", - Token: gheToken, - })), - } + service := typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://ghe.sgdev.org", + Token: gheToken, + }) factory, save := NewClientFactory(t, fixtureName) defer save(t) @@ -194,7 +190,6 @@ func prepareGheToken(t *testing.T, fixtureName string) string { } func TestGithubSource_GetRepo(t *testing.T) { - github.SetupForTest(t) testCases := []struct { name string nameWithOwner string @@ -234,13 +229,14 @@ func TestGithubSource_GetRepo(t *testing.T) { }, }, Metadata: &github.Repository{ - ID: "MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==", - DatabaseID: 41288708, - NameWithOwner: "sourcegraph/sourcegraph", - Description: "Code search and navigation tool (self-hosted)", - URL: "https://github.com/sourcegraph/sourcegraph", - StargazerCount: 2220, - ForkCount: 164, + ID: "MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==", + DatabaseID: 41288708, + NameWithOwner: "sourcegraph/sourcegraph", + Description: "Code search and navigation tool (self-hosted)", + URL: "https://github.com/sourcegraph/sourcegraph", + StargazerCount: 2220, + ForkCount: 164, + DiskUsageKibibytes: 302301, // We're hitting github.com here, so visibility will be empty irrespective // of repository type. This is a GitHub enterprise only feature. Visibility: "", @@ -269,12 +265,9 @@ func TestGithubSource_GetRepo(t *testing.T) { cf, save := NewClientFactory(t, tc.name) defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://github.com", - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://github.com", + }) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logtest.Scoped(t), dbmocks.NewMockDB(), svc, cf) @@ -295,7 +288,6 @@ func TestGithubSource_GetRepo(t *testing.T) { } func TestGithubSource_GetRepo_Enterprise(t *testing.T) { - github.SetupForTest(t) testCases := []struct { name string nameWithOwner string @@ -373,13 +365,10 @@ func TestGithubSource_GetRepo_Enterprise(t *testing.T) { t.Fatalf("GHE_TOKEN needs to be set to a token that can access ghe.sgdev.org to update this test fixture") } - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://ghe.sgdev.org", - Token: gheToken, - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://ghe.sgdev.org", + Token: gheToken, + }) cf, save := NewClientFactory(t, tc.name) defer save(t) @@ -405,16 +394,13 @@ func TestGithubSource_GetRepo_Enterprise(t *testing.T) { // Configure external service to mark internal repositories as public // and sync again - svc = &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://ghe.sgdev.org", - Token: gheToken, - Authorization: &schema.GitHubAuthorization{ - MarkInternalReposAsPublic: true, - }, - })), - } + svc = typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://ghe.sgdev.org", + Token: gheToken, + Authorization: &schema.GitHubAuthorization{ + MarkInternalReposAsPublic: true, + }, + }) githubSrc, err = NewGitHubSource(ctx, logtest.Scoped(t), dbmocks.NewMockDB(), svc, cf) if err != nil { @@ -442,7 +428,6 @@ func TestMakeRepo_NullCharacter(t *testing.T) { // uses rcache, a caching layer that uses Redis. // We need to clear the cache before we run the tests rcache.SetupForTest(t) - github.SetupForTest(t) r := &github.Repository{ Description: "Fun nulls \x00\x00\x00", @@ -464,7 +449,6 @@ func TestMakeRepo_NullCharacter(t *testing.T) { } func TestGithubSource_makeRepo(t *testing.T) { - github.SetupForTest(t) b, err := os.ReadFile(filepath.Join("testdata", "github-repos.json")) if err != nil { t.Fatal(err) @@ -559,7 +543,6 @@ func TestMatchOrg(t *testing.T) { } func TestGitHubSource_doRecursively(t *testing.T) { - github.SetupForTest(t) ctx := context.Background() testCases := map[string]struct { @@ -620,7 +603,7 @@ func TestGitHubSource_doRecursively(t *testing.T) { apiURL, err := url.Parse(srv.URL) require.NoError(t, err) - ghCli := github.NewV4Client("", apiURL, nil, nil) + ghCli := github.NewV4Client("", apiURL, nil, httpcli.TestExternalDoer) q := newRepositoryQuery("stars:>=5", ghCli, logtest.NoOp(t)) q.Limit = 5 @@ -643,7 +626,6 @@ func TestGitHubSource_doRecursively(t *testing.T) { } func TestGithubSource_ListRepos(t *testing.T) { - github.SetupForTest(t) assertAllReposListed := func(want []string) typestest.ReposAssertion { return func(t testing.TB, rs types.Repos) { t.Helper() @@ -781,6 +763,7 @@ func TestGithubSource_ListRepos(t *testing.T) { // uses rcache, a caching layer that uses Redis. // We need to clear the cache before we run the tests rcache.SetupForTest(t) + ratelimit.SetupForTest(t) var ( cf *httpcli.Factory @@ -794,10 +777,7 @@ func TestGithubSource_ListRepos(t *testing.T) { defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, tc.conf)), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, tc.conf) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logtest.Scoped(t), dbmocks.NewMockDB(), svc, cf) @@ -831,15 +811,11 @@ func TestGithubSource_WithAuthenticator(t *testing.T) { // uses rcache, a caching layer that uses Redis. // We need to clear the cache before we run the tests rcache.SetupForTest(t) - github.SetupForTest(t) - - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://github.com", - Token: os.Getenv("GITHUB_TOKEN"), - })), - } + + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://github.com", + Token: os.Getenv("GITHUB_TOKEN"), + }) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logtest.Scoped(t), dbmocks.NewMockDB(), svc, nil) @@ -866,15 +842,11 @@ func TestGithubSource_excludes_disabledAndLocked(t *testing.T) { // uses rcache, a caching layer that uses Redis. // We need to clear the cache before we run the tests rcache.SetupForTest(t) - github.SetupForTest(t) - - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://github.com", - Token: os.Getenv("GITHUB_TOKEN"), - })), - } + + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://github.com", + Token: os.Getenv("GITHUB_TOKEN"), + }) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logtest.Scoped(t), dbmocks.NewMockDB(), svc, nil) @@ -894,7 +866,6 @@ func TestGithubSource_excludes_disabledAndLocked(t *testing.T) { } func TestGithubSource_GetVersion(t *testing.T) { - github.SetupForTest(t) logger := logtest.Scoped(t) t.Run("github.com", func(t *testing.T) { // The GitHubSource uses the github.Client under the hood, which @@ -902,12 +873,9 @@ func TestGithubSource_GetVersion(t *testing.T) { // We need to clear the cache before we run the tests rcache.SetupForTest(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://github.com", - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://github.com", + }) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logger, dbmocks.NewMockDB(), svc, nil) @@ -940,13 +908,10 @@ func TestGithubSource_GetVersion(t *testing.T) { cf, save := NewClientFactory(t, fixtureName) defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://ghe.sgdev.org", - Token: gheToken, - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://ghe.sgdev.org", + Token: gheToken, + }) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logger, dbmocks.NewMockDB(), svc, cf) @@ -966,7 +931,6 @@ func TestGithubSource_GetVersion(t *testing.T) { } func TestRepositoryQuery_DoWithRefinedWindow(t *testing.T) { - github.SetupForTest(t) for _, tc := range []struct { name string query string @@ -1034,7 +998,6 @@ func TestRepositoryQuery_DoWithRefinedWindow(t *testing.T) { } func TestRepositoryQuery_DoSingleRequest(t *testing.T) { - github.SetupForTest(t) for _, tc := range []struct { name string query string @@ -1107,7 +1070,6 @@ func TestRepositoryQuery_DoSingleRequest(t *testing.T) { } func TestGithubSource_SearchRepositories(t *testing.T) { - github.SetupForTest(t) assertReposSearched := func(want []string) typestest.ReposAssertion { return func(t testing.TB, rs types.Repos) { t.Helper() @@ -1277,10 +1239,7 @@ func TestGithubSource_SearchRepositories(t *testing.T) { defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, tc.conf)), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, tc.conf) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logtest.Scoped(t), dbmocks.NewMockDB(), svc, cf) @@ -1300,20 +1259,11 @@ func TestGithubSource_SearchRepositories(t *testing.T) { } } -type mockDoer struct { - do func(*http.Request) (*http.Response, error) -} - -func (c *mockDoer) Do(r *http.Request) (*http.Response, error) { - return c.do(r) -} - // TestGithubSource_ListRepos_GitHubApp tests the ListRepos function for GitHub // Apps specifically. We have a separate test case for this so that the VCR // tests for GitHub App and non-GitHub App connections can be updated separately, // as setting up credentials for a GitHub App VCR test is significantly more effort. func TestGithubSource_ListRepos_GitHubApp(t *testing.T) { - github.SetupForTest(t) // This private key is no longer valid. If this VCR test needs to be updated, // a new GitHub App with new keys and secrets will have to be created // and deleted afterwards. @@ -1422,10 +1372,7 @@ EyAO2RYQG7mSE6w6CtTFiCjjmELpvdD2s1ygvPdCO1MJlCX264E3og== defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, tc.conf)), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitHub, tc.conf) ctx := context.Background() githubSrc, err := NewGitHubSource(ctx, logtest.Scoped(t), db, svc, cf) diff --git a/internal/repos/gitlab.go b/internal/repos/gitlab.go index fc6c1b5243f0e..9b78bbddbb49c 100644 --- a/internal/repos/gitlab.go +++ b/internal/repos/gitlab.go @@ -30,7 +30,7 @@ import ( type GitLabSource struct { svc *types.ExternalService config *schema.GitLabConnection - exclude excludeFunc + excluder repoExcluder baseURL *url.URL // URL with path /api/v4 (no trailing slash) nameTransformations reposource.NameTransformations provider *gitlab.ClientProvider @@ -90,23 +90,26 @@ func newGitLabSource(logger log.Logger, svc *types.ExternalService, c *schema.Gi return nil, err } - var eb excludeBuilder + var ex repoExcluder for _, r := range c.Exclude { - eb.Exact(r.Name) - eb.Exact(strconv.Itoa(r.Id)) - eb.Pattern(r.Pattern) - excludeFunc := func(repo any) bool { - if project, ok := repo.(gitlab.Project); ok { - return project.EmptyRepo - } - return false + rule := ex.AddRule(). + Exact(r.Name). + Pattern(r.Pattern) + + if r.Id != 0 { + rule.Exact(strconv.Itoa(r.Id)) } + if r.EmptyRepos { - eb.Generic(excludeFunc) + rule.Generic(func(repo any) bool { + if project, ok := repo.(gitlab.Project); ok { + return project.EmptyRepo + } + return false + }) } } - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } @@ -140,7 +143,7 @@ func newGitLabSource(logger log.Logger, svc *types.ExternalService, c *schema.Gi return &GitLabSource{ svc: svc, config: c, - exclude: exclude, + excluder: ex, baseURL: baseURL, nameTransformations: nts, provider: provider, @@ -255,7 +258,9 @@ func (s *GitLabSource) remoteURL(proj *gitlab.Project) string { } func (s *GitLabSource) excludes(p *gitlab.Project) bool { - return s.exclude(p.PathWithNamespace) || s.exclude(strconv.Itoa(p.ID)) || s.exclude(*p) + return s.excluder.ShouldExclude(p.PathWithNamespace) || + s.excluder.ShouldExclude(strconv.Itoa(p.ID)) || + s.excluder.ShouldExclude(*p) } func (s *GitLabSource) listAllProjects(ctx context.Context, results chan SourceResult) { diff --git a/internal/repos/gitlab_test.go b/internal/repos/gitlab_test.go index edf9308de29ac..b5c64c1fd7781 100644 --- a/internal/repos/gitlab_test.go +++ b/internal/repos/gitlab_test.go @@ -20,6 +20,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/rcache" "github.com/sourcegraph/sourcegraph/internal/testutil" "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" ) @@ -141,12 +142,9 @@ func TestGitLabSource_GetRepo(t *testing.T) { cf, save := NewClientFactory(t, tc.name) defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitLab, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitLabConnection{ - Url: "https://gitlab.com", - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitLab, &schema.GitLabConnection{ + Url: "https://gitlab.com", + }) ctx := context.Background() gitlabSrc, err := NewGitLabSource(ctx, logtest.Scoped(t), svc, cf) @@ -311,10 +309,7 @@ func TestGitlabSource_ListRepos(t *testing.T) { cf, save := NewClientFactory(t, t.Name()) defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitLab, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, conf)), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitLab, conf) ctx := context.Background() src, err := NewGitLabSource(ctx, nil, svc, cf) diff --git a/internal/repos/gitolite.go b/internal/repos/gitolite.go index b195221d32e28..2e0693ffbe81f 100644 --- a/internal/repos/gitolite.go +++ b/internal/repos/gitolite.go @@ -18,9 +18,9 @@ import ( // A GitoliteSource yields repositories from a single Gitolite connection configured // in Sourcegraph via the external services configuration. type GitoliteSource struct { - svc *types.ExternalService - conn *schema.GitoliteConnection - exclude excludeFunc + svc *types.ExternalService + conn *schema.GitoliteConnection + excluder repoExcluder // gitoliteLister allows us to list Gitlolite repos. In practice, we ask // gitserver to talk to gitolite because it holds the ssh keys required for @@ -50,23 +50,23 @@ func NewGitoliteSource(ctx context.Context, svc *types.ExternalService, cf *http return nil, err } - var eb excludeBuilder + var ex repoExcluder for _, r := range c.Exclude { - eb.Exact(r.Name) - eb.Pattern(r.Pattern) + ex.AddRule(). + Exact(r.Name). + Pattern(r.Pattern) } - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } lister := gitserver.NewGitoliteLister(gitoliteDoer) return &GitoliteSource{ - svc: svc, - conn: &c, - lister: lister, - exclude: exclude, + svc: svc, + conn: &c, + lister: lister, + excluder: ex, }, nil } @@ -105,7 +105,7 @@ func (s GitoliteSource) ExternalServices() types.ExternalServices { } func (s GitoliteSource) excludes(gr *gitolite.Repo, r *types.Repo) bool { - return s.exclude(gr.Name) || + return s.excluder.ShouldExclude(gr.Name) || strings.ContainsAny(string(r.Name), "\\^$|()[]*?{},") } diff --git a/internal/repos/gitolite_test.go b/internal/repos/gitolite_test.go index d8ab33b6b4fda..c2d1fd5c2ecc7 100644 --- a/internal/repos/gitolite_test.go +++ b/internal/repos/gitolite_test.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/httpcli" - "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) @@ -14,10 +14,7 @@ func TestGitoliteSource(t *testing.T) { cf, save := newClientFactoryWithOpt(t, "basic", httpcli.ExternalTransportOpt) defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindGitolite, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitoliteConnection{})), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGitolite, &schema.GitoliteConnection{}) ctx := context.Background() _, err := NewGitoliteSource(ctx, svc, cf) diff --git a/internal/repos/go_packages_test.go b/internal/repos/go_packages_test.go index 143f07a3c4bbe..99540c0ccfbe2 100644 --- a/internal/repos/go_packages_test.go +++ b/internal/repos/go_packages_test.go @@ -8,7 +8,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/codeintel/dependencies" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/testutil" - "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) @@ -37,25 +37,22 @@ func TestGoPackagesSource_ListRepos(t *testing.T) { }, }) - svc := types.ExternalService{ - Kind: extsvc.KindGoPackages, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GoModulesConnection{ - Urls: []string{ - "https://proxy.golang.org", - }, - Dependencies: []string{ - "github.com/tsenart/vegeta/v12@v12.8.4", - "github.com/coreos/go-oidc@v2.2.1+incompatible", - "github.com/google/zoekt@v0.0.0-20211108135652-f8e8ada171c7", - "github.com/gorilla/mux@v1.8.0", - }, - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantGoPackages, &schema.GoModulesConnection{ + Urls: []string{ + "https://proxy.golang.org", + }, + Dependencies: []string{ + "github.com/tsenart/vegeta/v12@v12.8.4", + "github.com/coreos/go-oidc@v2.2.1+incompatible", + "github.com/google/zoekt@v0.0.0-20211108135652-f8e8ada171c7", + "github.com/gorilla/mux@v1.8.0", + }, + }) cf, save := NewClientFactory(t, t.Name()) t.Cleanup(func() { save(t) }) - src, err := NewGoPackagesSource(ctx, &svc, cf) + src, err := NewGoPackagesSource(ctx, svc, cf) if err != nil { t.Fatal(err) } diff --git a/internal/repos/localgit_test.go b/internal/repos/localgit_test.go index 1da6a1cba3d1b..930e5fe9b60ba 100644 --- a/internal/repos/localgit_test.go +++ b/internal/repos/localgit_test.go @@ -14,7 +14,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/testutil" - "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) @@ -74,14 +74,11 @@ func TestLocalGitSource_ListRepos(t *testing.T) { ctx := context.Background() - svc := types.ExternalService{ - Kind: extsvc.VariantLocalGit.AsKind(), - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.LocalGitExternalService{ - Repos: repoPatterns, - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantLocalGit, &schema.LocalGitExternalService{ + Repos: repoPatterns, + }) - src, err := NewLocalGitSource(ctx, logtest.Scoped(t), &svc) + src, err := NewLocalGitSource(ctx, logtest.Scoped(t), svc) if err != nil { t.Fatal(err) } diff --git a/internal/repos/npm_packages_test.go b/internal/repos/npm_packages_test.go index 7edf42650e12e..9b07bb44da775 100644 --- a/internal/repos/npm_packages_test.go +++ b/internal/repos/npm_packages_test.go @@ -14,7 +14,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database/dbtest" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/testutil" - "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) @@ -162,18 +162,15 @@ func TestNPMPackagesSource_ListRepos(t *testing.T) { }, }) - svc := types.ExternalService{ - Kind: extsvc.KindNpmPackages, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.NpmPackagesConnection{ - Registry: "https://registry.npmjs.org", - Dependencies: []string{"@sourcegraph/prettierrc@2.2.0"}, - })), - } + svc := typestest.MakeExternalService(t, extsvc.VariantNpmPackages, &schema.NpmPackagesConnection{ + Registry: "https://registry.npmjs.org", + Dependencies: []string{"@sourcegraph/prettierrc@2.2.0"}, + }) cf, save := NewClientFactory(t, t.Name()) t.Cleanup(func() { save(t) }) - src, err := NewNpmPackagesSource(ctx, &svc, cf) + src, err := NewNpmPackagesSource(ctx, svc, cf) if err != nil { t.Fatal(err) } diff --git a/internal/repos/other.go b/internal/repos/other.go index 9f7da6332f585..ed18f791b58df 100644 --- a/internal/repos/other.go +++ b/internal/repos/other.go @@ -26,11 +26,11 @@ type ( // A OtherSource yields repositories from a single Other connection configured // in Sourcegraph via the external services configuration. OtherSource struct { - svc *types.ExternalService - conn *schema.OtherExternalServiceConnection - exclude excludeFunc - client httpcli.Doer - logger log.Logger + svc *types.ExternalService + conn *schema.OtherExternalServiceConnection + excluder repoExcluder + client httpcli.Doer + logger log.Logger } // A srcExposeItem is the object model returned by src-cli when serving git repos @@ -62,13 +62,13 @@ func NewOtherSource(ctx context.Context, svc *types.ExternalService, cf *httpcli return nil, err } - var eb excludeBuilder + var ex repoExcluder for _, r := range c.Exclude { - eb.Exact(r.Name) - eb.Pattern(r.Pattern) + ex.AddRule(). + Exact(r.Name). + Pattern(r.Pattern) } - exclude, err := eb.Build() - if err != nil { + if err := ex.RuleErrors(); err != nil { return nil, err } @@ -77,11 +77,11 @@ func NewOtherSource(ctx context.Context, svc *types.ExternalService, cf *httpcli } return &OtherSource{ - svc: svc, - conn: &c, - exclude: exclude, - client: cli, - logger: logger, + svc: svc, + conn: &c, + excluder: ex, + client: cli, + logger: logger, }, nil } @@ -137,7 +137,7 @@ func (s OtherSource) ExternalServices() types.ExternalServices { } func (s OtherSource) excludes(r *types.Repo) bool { - return s.exclude(string(r.Name)) + return s.excluder.ShouldExclude(string(r.Name)) } func (s OtherSource) cloneURLs() ([]*url.URL, error) { diff --git a/internal/repos/other_test.go b/internal/repos/other_test.go index 50d25828473b2..5df838ad69030 100644 --- a/internal/repos/other_test.go +++ b/internal/repos/other_test.go @@ -15,6 +15,7 @@ import ( "github.com/stretchr/testify/require" "github.com/sourcegraph/log/logtest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/extsvc" @@ -158,7 +159,7 @@ func TestSrcExpose_SrcExposeServer(t *testing.T) { ID: 1, Kind: extsvc.KindOther, Config: extsvc.NewUnencryptedConfig(fmt.Sprintf(`{"url": %q, "repos": ["%s"]}`, s.URL, "src-expose")), - }, nil, nil) + }, httpcli.TestExternalClientFactory, nil) if err != nil { t.Fatal(err) } @@ -333,7 +334,7 @@ func TestSrcExpose_SrcServeLocalServer(t *testing.T) { ID: 1, Kind: extsvc.KindOther, Config: extsvc.NewUnencryptedConfig(string(config)), - }, nil, nil) + }, httpcli.TestExternalClientFactory, nil) if err != nil { t.Fatal(err) } diff --git a/internal/repos/pagure_test.go b/internal/repos/pagure_test.go index 3c05955bdfc26..fed663aa41907 100644 --- a/internal/repos/pagure_test.go +++ b/internal/repos/pagure_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/sourcegraph/sourcegraph/internal/testutil" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/internal/extsvc" - "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/schema" ) @@ -19,10 +19,7 @@ func TestPagureSource_ListRepos(t *testing.T) { cf, save := NewClientFactory(t, t.Name()) defer save(t) - svc := &types.ExternalService{ - Kind: extsvc.KindPagure, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, conf)), - } + svc := typestest.MakeExternalService(t, extsvc.VariantPagure, conf) ctx := context.Background() src, err := NewPagureSource(ctx, svc, cf) diff --git a/internal/repos/perforce_test.go b/internal/repos/perforce_test.go index 6d6e86b254f9e..6982794c57da0 100644 --- a/internal/repos/perforce_test.go +++ b/internal/repos/perforce_test.go @@ -78,10 +78,7 @@ func TestPerforceSource_ListRepos(t *testing.T) { tc := tc tc.name = "PERFORCE-LIST-REPOS/" + tc.name t.Run(tc.name, func(t *testing.T) { - svc := &types.ExternalService{ - Kind: extsvc.KindPerforce, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, tc.conf)), - } + svc := typestest.MakeExternalService(t, extsvc.VariantPerforce, tc.conf) gc := gitserver.NewMockClient() gc.IsPerforcePathCloneableFunc.SetDefaultHook(func(ctx context.Context, _ protocol.PerforceConnectionDetails, depotPath string) error { diff --git a/internal/repos/purge.go b/internal/repos/purge.go index 723aa55d6b51d..4c232a619c11c 100644 --- a/internal/repos/purge.go +++ b/internal/repos/purge.go @@ -10,7 +10,6 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/internal/actor" - "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/gitserver" @@ -49,7 +48,7 @@ func NewRepositoryPurgeWorker(ctx context.Context, logger log.Logger, db databas timeToNextPurge = time.Duration(purgeConfig.IntervalMinutes) * time.Minute purgeLogger.Debug("running repository purge", log.Duration("timeToNextPurge", timeToNextPurge)) - if err := purge(ctx, purgeLogger, db, database.IteratePurgableReposOptions{ + if err := purge(ctx, purgeLogger, db, database.ListPurgableReposOptions{ Limit: 5000, Limiter: limiter, DeletedBefore: deletedBefore, @@ -79,7 +78,7 @@ func PurgeOldestRepos(logger log.Logger, db database.DB, limit int, perSecond fl go func() { limiter := ratelimit.NewInstrumentedLimiter("PurgeOldestRepos", rate.NewLimiter(rate.Limit(perSecond), 1)) // Use a background routine so that we don't time out based on the http context. - if err := purge(context.Background(), logger, db, database.IteratePurgableReposOptions{ + if err := purge(context.Background(), logger, db, database.ListPurgableReposOptions{ Limit: limit, Limiter: limiter, }); err != nil { @@ -90,7 +89,7 @@ func PurgeOldestRepos(logger log.Logger, db database.DB, limit int, perSecond fl } // purge purges repos, returning the number of repos that were successfully purged -func purge(ctx context.Context, logger log.Logger, db database.DB, options database.IteratePurgableReposOptions) error { +func purge(ctx context.Context, logger log.Logger, db database.DB, options database.ListPurgableReposOptions) error { start := time.Now() gitserverClient := gitserver.NewClient("repos.purgeworker") var ( @@ -99,7 +98,12 @@ func purge(ctx context.Context, logger log.Logger, db database.DB, options datab failed int ) - err := db.GitserverRepos().IteratePurgeableRepos(ctx, options, func(repo api.RepoName) error { + repos, err := db.GitserverRepos().ListPurgeableRepos(ctx, options) + if err != nil { + return errors.Wrap(err, "listing purgeable repos") + } + + for _, repo := range repos { if options.Limiter != nil { if err := options.Limiter.Wait(ctx); err != nil { // A rate limit failure is fatal @@ -112,19 +116,19 @@ func purge(ctx context.Context, logger log.Logger, db database.DB, options datab logger.Warn("failed to remove repository", log.String("repo", string(repo)), log.Error(err)) purgeFailed.Inc() failed++ - return nil + continue } success++ purgeSuccess.Inc() - return nil - }) + } + // If we did something we log with a higher level. statusLogger := logger.Debug if failed > 0 { statusLogger = logger.Warn } statusLogger("repository purge finished", log.Int("total", total), log.Int("removed", success), log.Int("failed", failed), log.Duration("duration", time.Since(start))) - return errors.Wrap(err, "iterating purgeable repos") + return nil } // randSleepDuration will sleep for an expected d duration with a jitter in [-jitter / diff --git a/internal/repos/python_packages_test.go b/internal/repos/python_packages_test.go index 1e497d601a3e5..beb8088054d48 100644 --- a/internal/repos/python_packages_test.go +++ b/internal/repos/python_packages_test.go @@ -8,7 +8,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/codeintel/dependencies" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/testutil" - "github.com/sourcegraph/sourcegraph/internal/types" + "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) @@ -35,9 +35,9 @@ func TestPythonPackagesSource_ListRepos(t *testing.T) { }, }) - svc := types.ExternalService{ - Kind: extsvc.KindPythonPackages, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.PythonPackagesConnection{ + svc := typestest.MakeExternalService(t, + extsvc.VariantPythonPackages, + &schema.PythonPackagesConnection{ Urls: []string{ "https://pypi.org/simple", }, @@ -47,13 +47,12 @@ func TestPythonPackagesSource_ListRepos(t *testing.T) { "randio==0.1.1", "pytimeparse==1.1.8", }, - })), - } + }) cf, save := NewClientFactory(t, t.Name()) t.Cleanup(func() { save(t) }) - src, err := NewPythonPackagesSource(ctx, &svc, cf) + src, err := NewPythonPackagesSource(ctx, svc, cf) if err != nil { t.Fatal(err) } diff --git a/internal/repos/sources_test.go b/internal/repos/sources_test.go index db3df6d98b34d..3aff794dda26c 100644 --- a/internal/repos/sources_test.go +++ b/internal/repos/sources_test.go @@ -6,14 +6,9 @@ import ( "os" "reflect" "sort" - "strconv" - "strings" "testing" - "github.com/dnaeon/go-vcr/cassette" - "github.com/dnaeon/go-vcr/recorder" "github.com/google/go-cmp/cmp" - "github.com/grafana/regexp" "github.com/sourcegraph/log/logtest" @@ -25,12 +20,123 @@ import ( "github.com/sourcegraph/sourcegraph/internal/extsvc/phabricator" "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/httptestutil" + "github.com/sourcegraph/sourcegraph/internal/ratelimit" + "github.com/sourcegraph/sourcegraph/internal/rcache" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/internal/types/typestest" "github.com/sourcegraph/sourcegraph/schema" ) -func TestSources_ListRepos(t *testing.T) { +// TestSources_ListRepos_YieldExistingRepos is the main, happy-path test for +// listing repositories. +func TestSources_ListRepos_YieldExistingRepos(t *testing.T) { + ratelimit.SetupForTest(t) + rcache.SetupForTest(t) + + tests := []struct { + svc *types.ExternalService + wantNames []string + }{ + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://github.com", + Token: os.Getenv("GITHUB_ACCESS_TOKEN"), + Repos: []string{ + "sourcegraph/Sourcegraph", + "tsenart/Vegeta", + "tsenart/vegeta-missing", + }, + }), + wantNames: []string{ + "github.com/sourcegraph/sourcegraph", + "github.com/tsenart/vegeta", + }, + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitLab, &schema.GitLabConnection{ + Url: "https://gitlab.com", + Token: os.Getenv("GITLAB_ACCESS_TOKEN"), + ProjectQuery: []string{"none"}, + Projects: []*schema.GitLabProject{ + {Name: "gnachman/iterm2"}, + {Name: "gnachman/iterm2-missing"}, + {Id: 13083}, // https://gitlab.com/gitlab-org/gitlab-ce + }, + }), + wantNames: []string{ + "gitlab.com/gitlab-org/gitlab-ce", + "gitlab.com/gnachman/iterm2", + }, + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantBitbucketServer, &schema.BitbucketServerConnection{ + Url: "https://bitbucket.sgdev.org", + Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), + RepositoryQuery: []string{"none"}, + Repos: []string{ + "Sour/vegetA", + "sour/sourcegraph", + }, + }), + wantNames: []string{ + "bitbucket.sgdev.org/SOUR/sourcegraph", + "bitbucket.sgdev.org/SOUR/vegeta", + }, + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantAWSCodeCommit, &schema.AWSCodeCommitConnection{ + AccessKeyID: getAWSEnv("AWS_ACCESS_KEY_ID"), + SecretAccessKey: getAWSEnv("AWS_SECRET_ACCESS_KEY"), + Region: "us-west-1", + GitCredentials: schema.AWSCodeCommitGitCredentials{ + Username: "git-username", + Password: "git-password", + }, + }), + wantNames: []string{ + "__WARNING_DO_NOT_PUT_ANY_PRIVATE_CODE_IN_HERE", + "empty-repo", + "stripe-go", + "test", + "test2", + }, + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantOther, &schema.OtherExternalServiceConnection{ + Url: "https://github.com", + Repos: []string{ + "google/go-cmp", + }, + }), + wantNames: []string{ + "github.com/google/go-cmp", + }, + }, + } + + for _, tc := range tests { + t.Run(tc.svc.Kind, func(t *testing.T) { + name := tc.svc.Kind + "/included-repos-that-exist-are-yielded" + + cf, save := NewClientFactory(t, name) + defer save(t) + + repos := listRepos(t, cf, tc.svc) + + var haveNames []string + for _, r := range repos { + haveNames = append(haveNames, string(r.Name)) + } + sort.Strings(haveNames) + + if !reflect.DeepEqual(haveNames, tc.wantNames) { + t.Error(cmp.Diff(haveNames, tc.wantNames)) + } + }) + } +} + +func TestSources_ListRepos_Excluded(t *testing.T) { conf.Mock(&conf.Unified{ ServiceConnectionConfig: conftypes.ServiceConnections{ GitServers: []string{"127.0.0.1:3178"}, @@ -42,650 +148,420 @@ func TestSources_ListRepos(t *testing.T) { }) defer conf.Mock(nil) - type testCase struct { - name string - ctx context.Context - svcs types.ExternalServices - assert func(*types.ExternalService) typestest.ReposAssertion - err string - } - - var testCases []testCase - - { - svcs := types.ExternalServices{ - { - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://github.com", - Token: os.Getenv("GITHUB_ACCESS_TOKEN"), - RepositoryQuery: []string{ - "user:tsenart in:name patrol", - }, - Repos: []string{ - "sourcegraph/Sourcegraph", - "keegancsmith/sqlf", - "tsenart/VEGETA", - "tsenart/go-tsz", // fork - }, - Exclude: []*schema.ExcludedGitHubRepo{ - {Name: "tsenart/Vegeta"}, - {Id: "MDEwOlJlcG9zaXRvcnkxNTM2NTcyNDU="}, // tsenart/patrol ID - {Pattern: "^keegancsmith/.*"}, - {Forks: true}, - }, - })), + rcache.SetupForTest(t) + ratelimit.SetupForTest(t) + + tests := []struct { + svc *types.ExternalService + wantNames []string + }{ + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://github.com", + Token: os.Getenv("GITHUB_ACCESS_TOKEN"), + RepositoryQuery: []string{ + "user:tsenart in:name patrol", // yields only the tsenart/patrol repo + }, + Repos: []string{ + "sourcegraph/sourcegraph", + "keegancsmith/sqlf", + "tsenart/VEGETA", + "tsenart/go-tsz", // fork + "sourcegraph/about", // has >500MB and < 200 stars + "facebook/react", // has 215k stars as of now + "torvalds/linux", // has ~4GB + "avelino/awesome-go", // has < 20 MB and > 100k stars + }, + Exclude: []*schema.ExcludedGitHubRepo{ + {Name: "tsenart/Vegeta"}, + {Id: "MDEwOlJlcG9zaXRvcnkxNTM2NTcyNDU="}, // tsenart/patrol ID + {Pattern: "^keegancsmith/.*"}, + {Forks: true}, + {Stars: "> 215000"}, // exclude facebook/react + {Size: "> 3GB"}, // exclude torvalds/linux + {Size: ">= 500MB", Stars: "< 200"}, // exclude about repo + {Size: "<= 20MB", Stars: "> 100000"}, // exclude awesome-go + }, + }), + wantNames: []string{ + "github.com/sourcegraph/sourcegraph", }, - { - Kind: extsvc.KindGitLab, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitLabConnection{ - Url: "https://gitlab.com", - Token: os.Getenv("GITLAB_ACCESS_TOKEN"), - ProjectQuery: []string{ - "?search=gokulkarthick", - "?search=dotfiles-vegetableman", - }, - Exclude: []*schema.ExcludedGitLabProject{ - {Name: "gokulkarthick/gokulkarthick"}, - {Id: 7789240}, - }, - })), + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitLab, &schema.GitLabConnection{ + Url: "https://gitlab.com", + Token: os.Getenv("GITLAB_ACCESS_TOKEN"), + ProjectQuery: []string{ + "?search=gokulkarthick", + "?search=dotfiles-vegetableman", + }, + Exclude: []*schema.ExcludedGitLabProject{ + {Name: "gokulkarthick/gokulkarthick"}, + {Id: 7789240}, + }, + }), + wantNames: []string{ + "gitlab.com/guld/dotfiles-vegetableman", }, - { - Kind: extsvc.KindBitbucketServer, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.BitbucketServerConnection{ - Url: "https://bitbucket.sgdev.org", - Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), - Repos: []string{ - "SOUR/vegeta", - "sour/sourcegraph", - }, - RepositoryQuery: []string{ - "?visibility=private", - }, - Exclude: []*schema.ExcludedBitbucketServerRepo{ - {Name: "SOUR/Vegeta"}, // test case insensitivity - {Id: 10067}, // sourcegraph repo id - {Pattern: ".*/automation"}, // only matches automation-testing repo - }, - })), + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantBitbucketServer, &schema.BitbucketServerConnection{ + Url: "https://bitbucket.sgdev.org", + Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), + Repos: []string{ + "SOUR/vegeta", + "sour/sourcegraph", + }, + RepositoryQuery: []string{ + "?visibility=private", + }, + Exclude: []*schema.ExcludedBitbucketServerRepo{ + {Name: "SOUR/Vegeta"}, // test case insensitivity + {Id: 10067}, // sourcegraph repo id + {Pattern: ".*/automation"}, // only matches automation-testing repo + {Pattern: ".*public-repo.*"}, + {Pattern: ".*secret-repo.*"}, + {Pattern: ".*private-repo.*"}, + {Pattern: ".*SGDEMO.*"}, + }, + }), + wantNames: []string{ + "bitbucket.sgdev.org/IJ/ijt-repo-testing-sg-3.6", + "bitbucket.sgdev.org/K8S/zoekt", + "bitbucket.sgdev.org/PUBLIC/archived-repo", + "bitbucket.sgdev.org/SOUR/sd", + "bitbucket.sgdev.org/SOURCEGRAPH/jsonrpc2", }, - { - Kind: extsvc.KindAWSCodeCommit, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.AWSCodeCommitConnection{ - AccessKeyID: getAWSEnv("AWS_ACCESS_KEY_ID"), - SecretAccessKey: getAWSEnv("AWS_SECRET_ACCESS_KEY"), - Region: "us-west-1", - GitCredentials: schema.AWSCodeCommitGitCredentials{ - Username: "git-username", - Password: "git-password", - }, - Exclude: []*schema.ExcludedAWSCodeCommitRepo{ - {Name: "stRIPE-gO"}, - {Id: "020a4751-0f46-4e19-82bf-07d0989b67dd"}, // ID of `test` - {Name: "test2", Id: "2686d63d-bff4-4a3e-a94f-3e6df904238d"}, // ID of `test2` - }, - })), + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantAWSCodeCommit, &schema.AWSCodeCommitConnection{ + AccessKeyID: getAWSEnv("AWS_ACCESS_KEY_ID"), + SecretAccessKey: getAWSEnv("AWS_SECRET_ACCESS_KEY"), + Region: "us-west-1", + GitCredentials: schema.AWSCodeCommitGitCredentials{ + Username: "git-username", + Password: "git-password", + }, + Exclude: []*schema.ExcludedAWSCodeCommitRepo{ + {Name: "stRIPE-gO"}, + {Id: "020a4751-0f46-4e19-82bf-07d0989b67dd"}, // ID of `test` + {Name: "test2", Id: "2686d63d-bff4-4a3e-a94f-3e6df904238d"}, // ID of `test2` + }, + }), + wantNames: []string{ + "__WARNING_DO_NOT_PUT_ANY_PRIVATE_CODE_IN_HERE", + "empty-repo", }, - { - Kind: extsvc.KindGitolite, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitoliteConnection{ - Prefix: "gitolite.mycorp.com/", - Host: "ssh://git@127.0.0.1:2222", - Exclude: []*schema.ExcludedGitoliteRepo{ - {Name: "bar"}, - }, - })), + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitolite, &schema.GitoliteConnection{ + Prefix: "gitolite.mycorp.com/", + Host: "ssh://git@127.0.0.1:2222", + Exclude: []*schema.ExcludedGitoliteRepo{ + {Name: "bar"}, + {Pattern: "gitolite-ad.*"}, + }, + }), + wantNames: []string{ + "gitolite.mycorp.com/baz", + "gitolite.mycorp.com/foo", + "gitolite.mycorp.com/testing", }, - } + }, + } - testCases = append(testCases, testCase{ - name: "excluded repos are never yielded", - svcs: svcs, - assert: func(s *types.ExternalService) typestest.ReposAssertion { - return func(t testing.TB, rs types.Repos) { - t.Helper() - - set := make(map[string]bool) - var patterns []*regexp.Regexp - - ctx := context.Background() - c, err := s.Configuration(ctx) - if err != nil { - t.Fatal(err) - } - - type excluded struct { - name, id, pattern string - } - - var ex []excluded - switch cfg := c.(type) { - case *schema.GitHubConnection: - for _, e := range cfg.Exclude { - ex = append(ex, excluded{name: e.Name, id: e.Id, pattern: e.Pattern}) - } - case *schema.GitLabConnection: - for _, e := range cfg.Exclude { - ex = append(ex, excluded{name: e.Name, id: strconv.Itoa(e.Id)}) - } - case *schema.BitbucketServerConnection: - for _, e := range cfg.Exclude { - ex = append(ex, excluded{name: e.Name, id: strconv.Itoa(e.Id), pattern: e.Pattern}) - } - case *schema.AWSCodeCommitConnection: - for _, e := range cfg.Exclude { - ex = append(ex, excluded{name: e.Name, id: e.Id}) - } - case *schema.GitoliteConnection: - for _, e := range cfg.Exclude { - ex = append(ex, excluded{name: e.Name, pattern: e.Pattern}) - } - } - - if len(ex) == 0 { - t.Fatal("exclude list must not be empty") - } - - for _, e := range ex { - name := e.name - switch s.Kind { - case extsvc.KindGitHub, extsvc.KindBitbucketServer: - name = strings.ToLower(name) - } - set[name], set[e.id] = true, true - if e.pattern != "" { - re, err := regexp.Compile(e.pattern) - if err != nil { - t.Fatal(err) - } - patterns = append(patterns, re) - } - } - - for _, r := range rs { - if r.Fork { - t.Errorf("excluded fork was yielded: %s", r.Name) - } - - if set[string(r.Name)] || set[r.ExternalRepo.ID] { - t.Errorf("excluded repo{name=%s, id=%s} was yielded", r.Name, r.ExternalRepo.ID) - } - - for _, re := range patterns { - if re.MatchString(string(r.Name)) { - t.Errorf("excluded repo{name=%s} matching %q was yielded", r.Name, re.String()) - } - } - } - } - }, - err: "<nil>", + for _, tc := range tests { + t.Run(tc.svc.Kind, func(t *testing.T) { + name := tc.svc.Kind + "/excluded-repos-are-never-yielded" + + cf, save := NewClientFactory(t, name) + defer save(t) + + repos := listRepos(t, cf, tc.svc) + + var haveNames []string + for _, r := range repos { + haveNames = append(haveNames, string(r.Name)) + } + sort.Strings(haveNames) + + if !reflect.DeepEqual(haveNames, tc.wantNames) { + t.Error(cmp.Diff(haveNames, tc.wantNames)) + } }) } +} - { - svcs := types.ExternalServices{ - { - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://github.com", - Token: os.Getenv("GITHUB_ACCESS_TOKEN"), - Repos: []string{ - "sourcegraph/Sourcegraph", - "tsenart/Vegeta", - "tsenart/vegeta-missing", - }, - })), +func TestSources_ListRepos_RepositoryPathPattern(t *testing.T) { + // conf mock is required for gitolite + conf.Mock(&conf.Unified{ + ServiceConnectionConfig: conftypes.ServiceConnections{ + GitServers: []string{"127.0.0.1:3178"}, + }, SiteConfiguration: schema.SiteConfiguration{ + ExperimentalFeatures: &schema.ExperimentalFeatures{ + EnableGRPC: boolPointer(false), }, - { - Kind: extsvc.KindGitLab, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitLabConnection{ - Url: "https://gitlab.com", - Token: os.Getenv("GITLAB_ACCESS_TOKEN"), - ProjectQuery: []string{"none"}, - Projects: []*schema.GitLabProject{ - {Name: "gnachman/iterm2"}, - {Name: "gnachman/iterm2-missing"}, - {Id: 13083}, // https://gitlab.com/gitlab-org/gitlab-ce - }, - })), + }, + }) + defer conf.Mock(nil) + + ratelimit.SetupForTest(t) + rcache.SetupForTest(t) + + tests := []struct { + svc *types.ExternalService + wantNames []string + wantURIs []string + }{ + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitHub, &schema.GitHubConnection{ + Url: "https://github.com", + Token: os.Getenv("GITHUB_ACCESS_TOKEN"), + RepositoryPathPattern: "{host}/a/b/c/{nameWithOwner}", + RepositoryQuery: []string{"none"}, + Repos: []string{"tsenart/vegeta"}, + }), + wantNames: []string{"github.com/a/b/c/tsenart/vegeta"}, + wantURIs: []string{"github.com/tsenart/vegeta"}, + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitLab, &schema.GitLabConnection{ + Url: "https://gitlab.com", + Token: os.Getenv("GITLAB_ACCESS_TOKEN"), + RepositoryPathPattern: "{host}/a/b/c/{pathWithNamespace}", + ProjectQuery: []string{"none"}, + Projects: []*schema.GitLabProject{ + {Name: "gnachman/iterm2"}, + }, + }), + wantNames: []string{"gitlab.com/a/b/c/gnachman/iterm2"}, + wantURIs: []string{"gitlab.com/gnachman/iterm2"}, + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantBitbucketServer, &schema.BitbucketServerConnection{ + Url: "https://bitbucket.sgdev.org", + Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), + RepositoryPathPattern: "{host}/a/b/c/{projectKey}/{repositorySlug}", + RepositoryQuery: []string{"none"}, + Repos: []string{"sour/vegeta"}, + }), + wantNames: []string{"bitbucket.sgdev.org/a/b/c/SOUR/vegeta"}, + wantURIs: []string{"bitbucket.sgdev.org/SOUR/vegeta"}, + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantAWSCodeCommit, &schema.AWSCodeCommitConnection{ + AccessKeyID: getAWSEnv("AWS_ACCESS_KEY_ID"), + SecretAccessKey: getAWSEnv("AWS_SECRET_ACCESS_KEY"), + Region: "us-west-1", + GitCredentials: schema.AWSCodeCommitGitCredentials{ + Username: "git-username", + Password: "git-password", + }, + RepositoryPathPattern: "a/b/c/{name}", + }), + wantNames: []string{ + "a/b/c/empty-repo", + "a/b/c/stripe-go", + "a/b/c/test2", + "a/b/c/__WARNING_DO_NOT_PUT_ANY_PRIVATE_CODE_IN_HERE", + "a/b/c/test", }, - { - Kind: extsvc.KindBitbucketServer, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.BitbucketServerConnection{ - Url: "https://bitbucket.sgdev.org", - Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), - RepositoryQuery: []string{"none"}, - Repos: []string{ - "Sour/vegetA", - "sour/sourcegraph", - }, - })), + wantURIs: []string{ + "empty-repo", + "stripe-go", + "test2", + "__WARNING_DO_NOT_PUT_ANY_PRIVATE_CODE_IN_HERE", + "test", }, - { - Kind: extsvc.KindOther, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.OtherExternalServiceConnection{ - Url: "https://github.com", - Repos: []string{ - "google/go-cmp", - }, - })), + }, + { + svc: typestest.MakeExternalService(t, extsvc.VariantGitolite, &schema.GitoliteConnection{ + // Prefix serves as a sort of repositoryPathPattern for Gitolite + Prefix: "gitolite.mycorp.com/", + Host: "ssh://git@127.0.0.1:2222", + }), + wantNames: []string{ + "gitolite.mycorp.com/bar", + "gitolite.mycorp.com/baz", + "gitolite.mycorp.com/foo", + "gitolite.mycorp.com/gitolite-admin", + "gitolite.mycorp.com/testing", }, - { - Kind: extsvc.KindAWSCodeCommit, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.AWSCodeCommitConnection{ - AccessKeyID: getAWSEnv("AWS_ACCESS_KEY_ID"), - SecretAccessKey: getAWSEnv("AWS_SECRET_ACCESS_KEY"), - Region: "us-west-1", - GitCredentials: schema.AWSCodeCommitGitCredentials{ - Username: "git-username", - Password: "git-password", - }, - })), + wantURIs: []string{ + "gitolite.mycorp.com/bar", + "gitolite.mycorp.com/baz", + "gitolite.mycorp.com/foo", + "gitolite.mycorp.com/gitolite-admin", + "gitolite.mycorp.com/testing", }, - } + }, + } - testCases = append(testCases, testCase{ - name: "included repos that exist are yielded", - svcs: svcs, - assert: func(s *types.ExternalService) typestest.ReposAssertion { - return func(t testing.TB, rs types.Repos) { - t.Helper() - - have := rs.Names() - sort.Strings(have) - - var want []string - switch s.Kind { - case extsvc.KindGitHub: - want = []string{ - "github.com/sourcegraph/sourcegraph", - "github.com/tsenart/vegeta", - } - case extsvc.KindBitbucketServer: - want = []string{ - "bitbucket.sgdev.org/SOUR/sourcegraph", - "bitbucket.sgdev.org/SOUR/vegeta", - } - case extsvc.KindGitLab: - want = []string{ - "gitlab.com/gitlab-org/gitlab-ce", - "gitlab.com/gnachman/iterm2", - } - case extsvc.KindAWSCodeCommit: - want = []string{ - "__WARNING_DO_NOT_PUT_ANY_PRIVATE_CODE_IN_HERE", - "empty-repo", - "stripe-go", - "test", - "test2", - } - case extsvc.KindOther: - want = []string{ - "github.com/google/go-cmp", - } - } - - if !reflect.DeepEqual(have, want) { - t.Error(cmp.Diff(have, want)) - } - } - }, - err: "<nil>", + for _, tc := range tests { + t.Run(tc.svc.Kind, func(t *testing.T) { + name := tc.svc.Kind + "/repositoryPathPattern-determines-the-repo-name" + + cf, save := NewClientFactory(t, name) + defer save(t) + + repos := listRepos(t, cf, tc.svc) + + var haveURIs, haveNames []string + for _, r := range repos { + haveURIs = append(haveURIs, r.URI) + haveNames = append(haveNames, string(r.Name)) + } + + if !reflect.DeepEqual(haveNames, tc.wantNames) { + t.Error(cmp.Diff(haveNames, tc.wantNames)) + } + if !reflect.DeepEqual(haveURIs, tc.wantURIs) { + t.Error(cmp.Diff(haveURIs, tc.wantURIs)) + } }) } +} - { - svcs := types.ExternalServices{ - { - Kind: extsvc.KindGitHub, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitHubConnection{ - Url: "https://github.com", - Token: os.Getenv("GITHUB_ACCESS_TOKEN"), - RepositoryPathPattern: "{host}/a/b/c/{nameWithOwner}", - RepositoryQuery: []string{"none"}, - Repos: []string{"tsenart/vegeta"}, - })), - }, - { - Kind: extsvc.KindGitLab, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitLabConnection{ - Url: "https://gitlab.com", - Token: os.Getenv("GITLAB_ACCESS_TOKEN"), - RepositoryPathPattern: "{host}/a/b/c/{pathWithNamespace}", - ProjectQuery: []string{"none"}, - Projects: []*schema.GitLabProject{ - {Name: "gnachman/iterm2"}, - }, - })), - }, - { - Kind: extsvc.KindBitbucketServer, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.BitbucketServerConnection{ - Url: "https://bitbucket.sgdev.org", - Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), - RepositoryPathPattern: "{host}/a/b/c/{projectKey}/{repositorySlug}", - RepositoryQuery: []string{"none"}, - Repos: []string{"sour/vegeta"}, - })), - }, - { - Kind: extsvc.KindAWSCodeCommit, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.AWSCodeCommitConnection{ - AccessKeyID: getAWSEnv("AWS_ACCESS_KEY_ID"), - SecretAccessKey: getAWSEnv("AWS_SECRET_ACCESS_KEY"), - Region: "us-west-1", - GitCredentials: schema.AWSCodeCommitGitCredentials{ - Username: "git-username", - Password: "git-password", - }, - RepositoryPathPattern: "a/b/c/{name}", - })), - }, - { - Kind: extsvc.KindGitolite, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitoliteConnection{ - // Prefix serves as a sort of repositoryPathPattern for Gitolite - Prefix: "gitolite.mycorp.com/", - Host: "ssh://git@127.0.0.1:2222", - })), - }, - } +func TestSources_Phabricator(t *testing.T) { + cf, save := NewClientFactory(t, "PHABRICATOR/phabricator") + defer save(t) - testCases = append(testCases, testCase{ - name: "repositoryPathPattern determines the repo name", - svcs: svcs, - assert: func(s *types.ExternalService) typestest.ReposAssertion { - return func(t testing.TB, rs types.Repos) { - t.Helper() - - haveNames := rs.Names() - var haveURIs []string - for _, r := range rs { - haveURIs = append(haveURIs, r.URI) - } - - var wantNames, wantURIs []string - switch s.Kind { - case extsvc.KindGitHub: - wantNames = []string{ - "github.com/a/b/c/tsenart/vegeta", - } - wantURIs = []string{ - "github.com/tsenart/vegeta", - } - case extsvc.KindGitLab: - wantNames = []string{ - "gitlab.com/a/b/c/gnachman/iterm2", - } - wantURIs = []string{ - "gitlab.com/gnachman/iterm2", - } - case extsvc.KindBitbucketServer: - wantNames = []string{ - "bitbucket.sgdev.org/a/b/c/SOUR/vegeta", - } - wantURIs = []string{ - "bitbucket.sgdev.org/SOUR/vegeta", - } - case extsvc.KindAWSCodeCommit: - wantNames = []string{ - "a/b/c/empty-repo", - "a/b/c/stripe-go", - "a/b/c/test2", - "a/b/c/__WARNING_DO_NOT_PUT_ANY_PRIVATE_CODE_IN_HERE", - "a/b/c/test", - } - wantURIs = []string{ - "empty-repo", - "stripe-go", - "test2", - "__WARNING_DO_NOT_PUT_ANY_PRIVATE_CODE_IN_HERE", - "test", - } - case extsvc.KindGitolite: - wantNames = []string{ - "gitolite.mycorp.com/bar", - "gitolite.mycorp.com/baz", - "gitolite.mycorp.com/foo", - "gitolite.mycorp.com/gitolite-admin", - "gitolite.mycorp.com/testing", - } - wantURIs = wantNames - } - - if !reflect.DeepEqual(haveNames, wantNames) { - t.Error(cmp.Diff(haveNames, wantNames)) - } - if !reflect.DeepEqual(haveURIs, wantURIs) { - t.Error(cmp.Diff(haveURIs, wantURIs)) - } - } - }, - err: "<nil>", - }) + svc := typestest.MakeExternalService(t, extsvc.VariantPhabricator, &schema.PhabricatorConnection{ + Url: "https://secure.phabricator.com", + Token: os.Getenv("PHABRICATOR_TOKEN"), + }) + + repos := listRepos(t, cf, svc) + + if len(repos) == 0 { + t.Fatalf("no repos yielded") } - { - svcs := types.ExternalServices{ - { - Kind: extsvc.KindGitLab, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.GitLabConnection{ - Url: "https://gitlab.com", - Token: os.Getenv("GITLAB_ACCESS_TOKEN"), - RepositoryPathPattern: "{host}/{pathWithNamespace}", - ProjectQuery: []string{"none"}, - Projects: []*schema.GitLabProject{ - {Name: "sg-test.d/repo-git"}, - {Name: "sg-test.d/repo-gitrepo"}, - }, - NameTransformations: []*schema.GitLabNameTransformation{ - { - Regex: "\\.d/", - Replacement: "/", - }, - { - Regex: "-git$", - Replacement: "", - }, - }, - })), - }, + for _, r := range repos { + repo := r.Metadata.(*phabricator.Repo) + if repo.VCS != "git" { + t.Fatalf("non git repo yielded: %+v", repo) } - testCases = append(testCases, testCase{ - name: "nameTransformations updates the repo name", - svcs: svcs, - assert: func(s *types.ExternalService) typestest.ReposAssertion { - return func(t testing.TB, rs types.Repos) { - t.Helper() - - have := rs.Names() - sort.Strings(have) - - var want []string - switch s.Kind { - case extsvc.KindGitLab: - want = []string{ - "gitlab.com/sg-test/repo", - "gitlab.com/sg-test/repo-gitrepo", - } - } - - if !reflect.DeepEqual(have, want) { - t.Error(cmp.Diff(have, want)) - } - } - }, - err: "<nil>", - }) - } + if repo.Status == "inactive" { + t.Fatalf("inactive repo yielded: %+v", repo) + } - { - svcs := types.ExternalServices{ - { - Kind: extsvc.KindPhabricator, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.PhabricatorConnection{ - Url: "https://secure.phabricator.com", - Token: os.Getenv("PHABRICATOR_TOKEN"), - })), - }, + if repo.Name == "" { + t.Fatalf("empty repo name: %+v", repo) } - testCases = append(testCases, testCase{ - name: "phabricator", - svcs: svcs, - assert: func(*types.ExternalService) typestest.ReposAssertion { - return func(t testing.TB, rs types.Repos) { - t.Helper() - - if len(rs) == 0 { - t.Fatalf("no repos yielded") - } - - for _, r := range rs { - repo := r.Metadata.(*phabricator.Repo) - if repo.VCS != "git" { - t.Fatalf("non git repo yielded: %+v", repo) - } - - if repo.Status == "inactive" { - t.Fatalf("inactive repo yielded: %+v", repo) - } - - if repo.Name == "" { - t.Fatalf("empty repo name: %+v", repo) - } - - ext := api.ExternalRepoSpec{ - ID: repo.PHID, - ServiceType: extsvc.TypePhabricator, - ServiceID: "https://secure.phabricator.com", - } - - if have, want := r.ExternalRepo, ext; have != want { - t.Fatal(cmp.Diff(have, want)) - } - } - } - }, - err: "<nil>", - }) + ext := api.ExternalRepoSpec{ + ID: repo.PHID, + ServiceType: extsvc.TypePhabricator, + ServiceID: "https://secure.phabricator.com", + } + + if have, want := r.ExternalRepo, ext; have != want { + t.Fatal(cmp.Diff(have, want)) + } } +} - { - svcs := types.ExternalServices{ +func TestSources_ListRepos_GitLab_NameTransformations(t *testing.T) { + ratelimit.SetupForTest(t) + rcache.SetupForTest(t) + + cf, save := NewClientFactory(t, "GITLAB/nameTransformations-updates-the-repo-name") + defer save(t) + + svc := typestest.MakeExternalService(t, extsvc.VariantGitLab, &schema.GitLabConnection{ + Url: "https://gitlab.com", + Token: os.Getenv("GITLAB_ACCESS_TOKEN"), + RepositoryPathPattern: "{host}/{pathWithNamespace}", + ProjectQuery: []string{"none"}, + Projects: []*schema.GitLabProject{ + {Name: "sg-test.d/repo-git"}, + {Name: "sg-test.d/repo-gitrepo"}, + }, + NameTransformations: []*schema.GitLabNameTransformation{ { - Kind: extsvc.KindBitbucketServer, - Config: extsvc.NewUnencryptedConfig(MarshalJSON(t, &schema.BitbucketServerConnection{ - Url: "https://bitbucket.sgdev.org", - Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), - RepositoryPathPattern: "{repositorySlug}", - RepositoryQuery: []string{"none"}, - Repos: []string{"sour/vegeta", "PUBLIC/archived-repo"}, - })), + Regex: "\\.d/", + Replacement: "/", }, - } - - testCases = append(testCases, testCase{ - name: "bitbucketserver archived", - svcs: svcs, - assert: func(s *types.ExternalService) typestest.ReposAssertion { - return func(t testing.TB, rs types.Repos) { - t.Helper() - - want := map[string]bool{ - "vegeta": false, - "archived-repo": true, - } - got := map[string]bool{} - for _, r := range rs { - got[string(r.Name)] = r.Archived - } - - if !reflect.DeepEqual(got, want) { - t.Error("mismatch archived state (-want +got):\n", cmp.Diff(want, got)) - } - } + { + Regex: "-git$", + Replacement: "", }, - err: "<nil>", - }) + }, + }) + + repos := listRepos(t, cf, svc) + haveNames := types.Repos(repos).Names() + sort.Strings(haveNames) + + wantNames := []string{ + "gitlab.com/sg-test/repo", + "gitlab.com/sg-test/repo-gitrepo", } - for _, tc := range testCases { - tc := tc - for _, svc := range tc.svcs { - name := svc.Kind + "/" + tc.name - t.Run(name, func(t *testing.T) { - cf, save := NewClientFactory(t, name) - defer save(t) - - logger := logtest.Scoped(t) - obs := ObservedSource(logger, NewSourceMetrics()) - src, err := NewSourcer(logtest.Scoped(t), dbmocks.NewMockDB(), cf, obs)(tc.ctx, svc) - if err != nil { - t.Fatal(err) - } - - ctx := tc.ctx - if ctx == nil { - ctx = context.Background() - } - - repos, err := ListAll(ctx, src) - if have, want := fmt.Sprint(err), tc.err; have != want { - t.Errorf("error:\nhave: %q\nwant: %q", have, want) - } - - if tc.assert != nil { - tc.assert(svc)(t, repos) - } - }) - } + if !reflect.DeepEqual(haveNames, wantNames) { + t.Error(cmp.Diff(haveNames, wantNames)) } } -func newClientFactoryWithOpt(t testing.TB, name string, opt httpcli.Opt) (*httpcli.Factory, func(testing.TB)) { - mw, rec := TestClientFactorySetup(t, name) - return httpcli.NewFactory(mw, opt, httptestutil.NewRecorderOpt(rec)), - func(t testing.TB) { Save(t, rec) } +func TestSources_ListRepos_BitbucketServer_Archived(t *testing.T) { + ratelimit.SetupForTest(t) + rcache.SetupForTest(t) + + cf, save := NewClientFactory(t, "BITBUCKETSERVER/bitbucketserver-archived") + defer save(t) + + svc := typestest.MakeExternalService(t, extsvc.VariantBitbucketServer, &schema.BitbucketServerConnection{ + Url: "https://bitbucket.sgdev.org", + Token: os.Getenv("BITBUCKET_SERVER_TOKEN"), + RepositoryPathPattern: "{repositorySlug}", + RepositoryQuery: []string{"none"}, + Repos: []string{"sour/vegeta", "PUBLIC/archived-repo"}, + }) + + repos := listRepos(t, cf, svc) + + wantArchived := map[string]bool{ + "vegeta": false, + "archived-repo": true, + } + + got := map[string]bool{} + for _, r := range repos { + got[string(r.Name)] = r.Archived + } + + if !reflect.DeepEqual(got, wantArchived) { + t.Error("mismatch archived state (-want +got):\n", cmp.Diff(wantArchived, got)) + } } -func newRecorder(t testing.TB, file string, record bool) *recorder.Recorder { - rec, err := httptestutil.NewRecorder(file, record, func(i *cassette.Interaction) error { - // The ratelimit.Monitor type resets its internal timestamp if it's - // updated with a timestamp in the past. This makes tests ran with - // recorded interations just wait for a very long time. Removing - // these headers from the casseste effectively disables rate-limiting - // in tests which replay HTTP interactions, which is desired behaviour. - for _, name := range [...]string{ - "RateLimit-Limit", - "RateLimit-Observed", - "RateLimit-Remaining", - "RateLimit-Reset", - "RateLimit-Resettime", - "X-RateLimit-Limit", - "X-RateLimit-Remaining", - "X-RateLimit-Reset", - } { - i.Response.Headers.Del(name) - } +func listRepos(t *testing.T, cf *httpcli.Factory, svc *types.ExternalService) []*types.Repo { + t.Helper() - // Phabricator requests include a token in the form and body. - ua := i.Request.Headers.Get("User-Agent") - if strings.Contains(strings.ToLower(ua), extsvc.TypePhabricator) { - i.Request.Body = "" - i.Request.Form = nil - } + ctx := context.Background() - return nil - }) + logger := logtest.NoOp(t) + sourcer := NewSourcer(logger, dbmocks.NewMockDB(), cf) + + src, err := sourcer(ctx, svc) if err != nil { t.Fatal(err) } - return rec + repos, err := ListAll(ctx, src) + if err != nil { + t.Errorf("error listing repos: %s", err) + } + + return repos +} + +func newClientFactoryWithOpt(t testing.TB, name string, opt httpcli.Opt) (*httpcli.Factory, func(testing.TB)) { + mw, rec := TestClientFactorySetup(t, name) + return httpcli.NewFactory(mw, opt, httptestutil.NewRecorderOpt(rec)), + func(t testing.TB) { Save(t, rec) } } func getAWSEnv(envVar string) string { diff --git a/internal/repos/sources_test_utils.go b/internal/repos/sources_test_utils.go index 9ff0013607735..f5257de2f282e 100644 --- a/internal/repos/sources_test_utils.go +++ b/internal/repos/sources_test_utils.go @@ -1,7 +1,6 @@ package repos import ( - "encoding/json" "net/http" "path/filepath" "strings" @@ -92,14 +91,3 @@ func NewRecorder(t testing.TB, file string, record bool) *recorder.Recorder { return rec } - -func MarshalJSON(t testing.TB, v any) string { - t.Helper() - - bs, err := json.Marshal(v) - if err != nil { - t.Fatal(err) - } - - return string(bs) -} diff --git a/internal/repos/sync_worker.go b/internal/repos/sync_worker.go index b7fff029cd876..5f62d083eaafa 100644 --- a/internal/repos/sync_worker.go +++ b/internal/repos/sync_worker.go @@ -13,6 +13,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/internal/actor" + "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/goroutine" "github.com/sourcegraph/sourcegraph/internal/observation" @@ -87,7 +88,7 @@ func NewSyncWorker(ctx context.Context, observationCtx *observation.Context, dbH var janitor goroutine.BackgroundRoutine if opts.CleanupOldJobs { - janitor = newJobCleanerRoutine(ctx, dbHandle, opts.CleanupOldJobsInterval) + janitor = newJobCleanerRoutine(ctx, database.NewDBWith(observationCtx.Logger, basestore.NewWithHandle(dbHandle)), opts.CleanupOldJobsInterval) } else { janitor = goroutine.NoopRoutine() } @@ -118,19 +119,14 @@ func newResetterMetrics(observationCtx *observation.Context) dbworker.ResetterMe } } -const cleanSyncJobsQueryFmtstr = ` -DELETE FROM external_service_sync_jobs -WHERE - finished_at < NOW() - INTERVAL '1 day' - AND - state IN ('completed', 'failed', 'canceled') -` - -func newJobCleanerRoutine(ctx context.Context, handle basestore.TransactableHandle, interval time.Duration) goroutine.BackgroundRoutine { +func newJobCleanerRoutine(ctx context.Context, db database.DB, interval time.Duration) goroutine.BackgroundRoutine { return goroutine.NewPeriodicGoroutine( actor.WithInternalActor(ctx), goroutine.HandlerFunc(func(ctx context.Context) error { - _, err := handle.ExecContext(ctx, cleanSyncJobsQueryFmtstr) + err := db.ExternalServices().CleanupSyncJobs(ctx, database.ExternalServicesCleanupSyncJobsOptions{ + OlderThan: 30 * 24 * time.Hour, // 30 days + MaxPerExternalService: 100, + }) return errors.Wrap(err, "error while running job cleaner") }), goroutine.WithName("repo-updater.sync-job-cleaner"), diff --git a/internal/repos/syncer.go b/internal/repos/syncer.go index c7584bc42a6ba..fd0260419f9bd 100644 --- a/internal/repos/syncer.go +++ b/internal/repos/syncer.go @@ -724,6 +724,7 @@ func (s *Syncer) sync(ctx context.Context, svc *types.ExternalService, sourced * s.ObsvCtx.Logger.Debug("retrieved stored repo, falling through", log.String("stored", fmt.Sprintf("%v", stored))) fallthrough case 1: // Existing repo, update. + wasDeleted := !stored[0].DeletedAt.IsZero() s.ObsvCtx.Logger.Debug("existing repo") if err := UpdateRepoLicenseHook(ctx, tx, stored[0], sourced); err != nil { return types.RepoSyncDiff{}, LicenseError{errors.Wrapf(err, "syncer: failed to update repo %s", sourced.Name)} @@ -739,8 +740,13 @@ func (s *Syncer) sync(ctx context.Context, svc *types.ExternalService, sourced * } *sourced = *stored[0] - d.Modified = append(d.Modified, types.RepoModified{Repo: stored[0], Modified: modified}) - s.ObsvCtx.Logger.Debug("appended to modified repos") + if wasDeleted { + d.Added = append(d.Added, stored[0]) + s.ObsvCtx.Logger.Debug("revived soft-deleted repo") + } else { + d.Modified = append(d.Modified, types.RepoModified{Repo: stored[0], Modified: modified}) + s.ObsvCtx.Logger.Debug("appended to modified repos") + } case 0: // New repo, create. s.ObsvCtx.Logger.Debug("new repo") diff --git a/internal/repos/syncer_test.go b/internal/repos/syncer_test.go index 3b0b43aa7b74e..3d2ad8a68e9dc 100644 --- a/internal/repos/syncer_test.go +++ b/internal/repos/syncer_test.go @@ -677,7 +677,7 @@ func TestSyncerSync(t *testing.T) { sort.Sort(want) sort.Sort(have) - typestest.Assert.ReposEqual(want...)(t, have) + typestest.AssertReposEqual(want...)(t, have) })) } } diff --git a/internal/repos/testdata/sources/BITBUCKETCLOUD-LIST-REPOS/with-access-token.yaml b/internal/repos/testdata/sources/BITBUCKETCLOUD-LIST-REPOS/with-access-token.yaml new file mode 100644 index 0000000000000..d3a4a0a275bc1 --- /dev/null +++ b/internal/repos/testdata/sources/BITBUCKETCLOUD-LIST-REPOS/with-access-token.yaml @@ -0,0 +1,143 @@ +--- +version: 1 +interactions: +- request: + body: "" + form: {} + headers: {} + url: https://api.bitbucket.org/2.0/repositories/sourcegraph-source?pagelen=100 + method: GET + response: + body: '{"values": [{"type": "repository", "full_name": "sourcegraph-source/src-cli", + "links": {"self": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli"}, + "html": {"href": "https://bitbucket.org/sourcegraph-source/src-cli"}, "avatar": + {"href": "https://bytebucket.org/ravatar/%7B22bdacfc-eae7-4dcb-81c5-af096a93bd9b%7D?ts=default"}, + "pullrequests": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/pullrequests"}, + "commits": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/commits"}, + "forks": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/forks"}, + "watchers": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/watchers"}, + "branches": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/refs/branches"}, + "tags": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/refs/tags"}, + "downloads": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/downloads"}, + "source": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/src"}, + "clone": [{"name": "https", "href": "https://2h1ehnddx9o2mwnng8plaqp56mb7aq@bitbucket.org/sourcegraph-source/src-cli.git"}, + {"name": "ssh", "href": "git@bitbucket.org:sourcegraph-source/src-cli.git"}], + "hooks": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/src-cli/hooks"}}, + "name": "src-cli", "slug": "src-cli", "description": "", "scm": "git", "website": + null, "owner": {"display_name": "sourcegraph-source", "links": {"self": {"href": + "https://api.bitbucket.org/2.0/workspaces/%7B790592f7-4e5e-44a8-9ec6-8745876fe1c3%7D"}, + "avatar": {"href": "https://bitbucket.org/account/sourcegraph-source/avatar/"}, + "html": {"href": "https://bitbucket.org/%7B790592f7-4e5e-44a8-9ec6-8745876fe1c3%7D/"}}, + "type": "team", "uuid": "{790592f7-4e5e-44a8-9ec6-8745876fe1c3}", "username": + "sourcegraph-source"}, "workspace": {"type": "workspace", "uuid": "{790592f7-4e5e-44a8-9ec6-8745876fe1c3}", + "name": "sourcegraph-source", "slug": "sourcegraph-source", "links": {"avatar": + {"href": "https://bitbucket.org/workspaces/sourcegraph-source/avatar/?ts=1700076275"}, + "html": {"href": "https://bitbucket.org/sourcegraph-source/"}, "self": {"href": + "https://api.bitbucket.org/2.0/workspaces/sourcegraph-source"}}}, "is_private": + true, "project": {"type": "project", "key": "SOUR", "uuid": "{d4cb2804-9d30-4b8d-b880-8097b111375a}", + "name": "source", "links": {"self": {"href": "https://api.bitbucket.org/2.0/workspaces/sourcegraph-source/projects/SOUR"}, + "html": {"href": "https://bitbucket.org/sourcegraph-source/workspace/projects/SOUR"}, + "avatar": {"href": "https://bitbucket.org/account/user/sourcegraph-source/projects/SOUR/avatar/32?ts=1700076320"}}}, + "fork_policy": "no_public_forks", "created_on": "2023-11-15T19:25:20.076854+00:00", + "updated_on": "2023-11-15T19:25:20.911042+00:00", "size": 22185443, "language": + "", "uuid": "{22bdacfc-eae7-4dcb-81c5-af096a93bd9b}", "mainbranch": {"name": + "master", "type": "branch"}, "override_settings": {"default_merge_strategy": + true, "branching_model": true}, "parent": null, "has_issues": false, "has_wiki": + false}, {"type": "repository", "full_name": "sourcegraph-source/source-test", + "links": {"self": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test"}, + "html": {"href": "https://bitbucket.org/sourcegraph-source/source-test"}, "avatar": + {"href": "https://bytebucket.org/ravatar/%7Bdfeaae25-8168-466f-ade4-d07e6837dedf%7D?ts=default"}, + "pullrequests": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/pullrequests"}, + "commits": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/commits"}, + "forks": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/forks"}, + "watchers": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/watchers"}, + "branches": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/refs/branches"}, + "tags": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/refs/tags"}, + "downloads": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/downloads"}, + "source": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/src"}, + "clone": [{"name": "https", "href": "https://2h1ehnddx9o2mwnng8plaqp56mb7aq@bitbucket.org/sourcegraph-source/source-test.git"}, + {"name": "ssh", "href": "git@bitbucket.org:sourcegraph-source/source-test.git"}], + "hooks": {"href": "https://api.bitbucket.org/2.0/repositories/sourcegraph-source/source-test/hooks"}}, + "name": "source-test", "slug": "source-test", "description": "", "scm": "git", + "website": null, "owner": {"display_name": "sourcegraph-source", "links": {"self": + {"href": "https://api.bitbucket.org/2.0/workspaces/%7B790592f7-4e5e-44a8-9ec6-8745876fe1c3%7D"}, + "avatar": {"href": "https://bitbucket.org/account/sourcegraph-source/avatar/"}, + "html": {"href": "https://bitbucket.org/%7B790592f7-4e5e-44a8-9ec6-8745876fe1c3%7D/"}}, + "type": "team", "uuid": "{790592f7-4e5e-44a8-9ec6-8745876fe1c3}", "username": + "sourcegraph-source"}, "workspace": {"type": "workspace", "uuid": "{790592f7-4e5e-44a8-9ec6-8745876fe1c3}", + "name": "sourcegraph-source", "slug": "sourcegraph-source", "links": {"avatar": + {"href": "https://bitbucket.org/workspaces/sourcegraph-source/avatar/?ts=1700076275"}, + "html": {"href": "https://bitbucket.org/sourcegraph-source/"}, "self": {"href": + "https://api.bitbucket.org/2.0/workspaces/sourcegraph-source"}}}, "is_private": + true, "project": {"type": "project", "key": "SOUR", "uuid": "{d4cb2804-9d30-4b8d-b880-8097b111375a}", + "name": "source", "links": {"self": {"href": "https://api.bitbucket.org/2.0/workspaces/sourcegraph-source/projects/SOUR"}, + "html": {"href": "https://bitbucket.org/sourcegraph-source/workspace/projects/SOUR"}, + "avatar": {"href": "https://bitbucket.org/account/user/sourcegraph-source/projects/SOUR/avatar/32?ts=1700076320"}}}, + "fork_policy": "no_public_forks", "created_on": "2023-11-21T13:39:54.600952+00:00", + "updated_on": "2023-11-21T13:39:57.299319+00:00", "size": 54954, "language": + "", "uuid": "{dfeaae25-8168-466f-ade4-d07e6837dedf}", "mainbranch": {"name": + "master", "type": "branch"}, "override_settings": {"default_merge_strategy": + true, "branching_model": true}, "parent": null, "has_issues": false, "has_wiki": + false}], "pagelen": 100, "size": 2, "page": 1}' + headers: + Cache-Control: + - private + Content-Type: + - application/json; charset=utf-8 + Date: + - Tue, 21 Nov 2023 14:28:09 GMT + Etag: + - '"81bd5365c10a63e8359344c6deaad885"' + Server: + - envoy + Strict-Transport-Security: + - max-age=31536000; includeSubDomains; preload + Vary: + - Authorization, Origin, cookie, user-context + X-Asap-Succeeded: + - "True" + X-B3-Spanid: + - 57e688568582f1b8 + X-B3-Traceid: + - 1d016bef27946a4e + X-Content-Type-Options: + - nosniff + X-Credential-Type: + - workspace_access_token + X-Dc-Location: + - Micros-3 + X-Envoy-Upstream-Service-Time: + - "250" + X-Frame-Options: + - SAMEORIGIN + X-Render-Time: + - "0.23119592666625977" + X-Request-Count: + - "1601" + X-Request-Id: + - 1d016bef27946a4e + X-Served-By: + - 3ce7dc13e690 + X-Static-Version: + - ba8afb91e693 + X-Trace-Id: + - 1d016bef27946a4e + X-Usage-Input-Ops: + - "0" + X-Usage-Output-Ops: + - "0" + X-Usage-System-Time: + - "0.004212" + X-Usage-User-Time: + - "0.125926" + X-Used-Mesh: + - "False" + X-Version: + - ba8afb91e693 + X-View-Name: + - bitbucket.apps.repo2.api.v20.repo.RepositoriesHandler + X-Xss-Protection: + - 1; mode=block + status: 200 OK + code: 200 + duration: "" diff --git a/internal/repos/testdata/sources/GITHUB/excluded-repos-are-never-yielded.yaml b/internal/repos/testdata/sources/GITHUB/excluded-repos-are-never-yielded.yaml index 1dba6e2b67f53..e5752c27a795f 100644 --- a/internal/repos/testdata/sources/GITHUB/excluded-repos-are-never-yielded.yaml +++ b/internal/repos/testdata/sources/GITHUB/excluded-repos-are-never-yielded.yaml @@ -2,43 +2,56 @@ version: 1 interactions: - request: - body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n}\n\tquery - {\nrepo0: repository(owner: \"sourcegraph\", name: \"Sourcegraph\") { ... on - Repository { ...RepositoryFields } }\nrepo1: repository(owner: \"keegancsmith\", - name: \"sqlf\") { ... on Repository { ...RepositoryFields } }\nrepo2: repository(owner: - \"tsenart\", name: \"VEGETA\") { ... on Repository { ...RepositoryFields } }\nrepo3: - repository(owner: \"tsenart\", name: \"go-tsz\") { ... on Repository { ...RepositoryFields - } }\n}","variables":{}}' + body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n\tdiskUsage\n\trepositoryTopics(first:100) + {\n\t\tnodes {\n\t\t\ttopic {\n\t\t\t\tname\n\t\t\t}\n\t\t}\n\t}\n}\n\tquery + {\nrepo0: repository(owner: \"sourcegraph\", name: \"sourcegraph\") { ... on + Repository { ...RepositoryFields parent { nameWithOwner, isFork } } }\nrepo1: + repository(owner: \"keegancsmith\", name: \"sqlf\") { ... on Repository { ...RepositoryFields + parent { nameWithOwner, isFork } } }\nrepo2: repository(owner: \"tsenart\", + name: \"VEGETA\") { ... on Repository { ...RepositoryFields parent { nameWithOwner, + isFork } } }\nrepo3: repository(owner: \"tsenart\", name: \"go-tsz\") { ... + on Repository { ...RepositoryFields parent { nameWithOwner, isFork } } }\nrepo4: + repository(owner: \"sourcegraph\", name: \"about\") { ... on Repository { ...RepositoryFields + parent { nameWithOwner, isFork } } }\nrepo5: repository(owner: \"facebook\", + name: \"react\") { ... on Repository { ...RepositoryFields parent { nameWithOwner, + isFork } } }\nrepo6: repository(owner: \"torvalds\", name: \"linux\") { ... + on Repository { ...RepositoryFields parent { nameWithOwner, isFork } } }\nrepo7: + repository(owner: \"avelino\", name: \"awesome-go\") { ... on Repository { ...RepositoryFields + parent { nameWithOwner, isFork } } }\n}","variables":{}}' form: {} headers: Accept: - application/vnd.github.antiope-preview+json + Cache-Control: + - max-age=0 Content-Type: - application/json; charset=utf-8 url: https://api.github.com/graphql method: POST response: - body: '{"data":{"repo0":{"id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","databaseId":41288708,"nameWithOwner":"sourcegraph/sourcegraph","description":"Universal - code search (self-hosted)","url":"https://github.com/sourcegraph/sourcegraph","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"ADMIN","stargazerCount":4888,"forkCount":579},"repo1":{"id":"MDEwOlJlcG9zaXRvcnk1ODk1ODk0Mg==","databaseId":58958942,"nameWithOwner":"keegancsmith/sqlf","description":"sqlf - generates parameterized SQL statements in Go, sprintf style","url":"https://github.com/keegancsmith/sqlf","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":54,"forkCount":3},"repo2":{"id":"MDEwOlJlcG9zaXRvcnkxMjA4MDU1MQ==","databaseId":12080551,"nameWithOwner":"tsenart/vegeta","description":"HTTP - load testing tool and library. It''s over 9000!","url":"https://github.com/tsenart/vegeta","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"ADMIN","stargazerCount":17729,"forkCount":1101},"repo3":{"id":"MDEwOlJlcG9zaXRvcnkxNDE3OTgwNzU=","databaseId":141798075,"nameWithOwner":"tsenart/go-tsz","description":"Time - series compression algorithm from Facebook''s Gorilla paper","url":"https://github.com/tsenart/go-tsz","isPrivate":false,"isFork":true,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"ADMIN","stargazerCount":4,"forkCount":5}}}' + body: '{"data":{"repo0":{"id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","databaseId":41288708,"nameWithOwner":"sourcegraph/sourcegraph","description":"Code + AI platform with Code Search & Cody","url":"https://github.com/sourcegraph/sourcegraph","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"ADMIN","stargazerCount":9145,"forkCount":1192,"diskUsage":1162487,"repositoryTopics":{"nodes":[{"topic":{"name":"sourcegraph"}},{"topic":{"name":"open-source"}},{"topic":{"name":"code-search"}},{"topic":{"name":"code-intelligence"}},{"topic":{"name":"repo-type-main"}},{"topic":{"name":"lsif-enabled"}}]},"parent":null},"repo1":{"id":"MDEwOlJlcG9zaXRvcnk1ODk1ODk0Mg==","databaseId":58958942,"nameWithOwner":"keegancsmith/sqlf","description":"sqlf + generates parameterized SQL statements in Go, sprintf style","url":"https://github.com/keegancsmith/sqlf","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":123,"forkCount":8,"diskUsage":17,"repositoryTopics":{"nodes":[{"topic":{"name":"golang"}},{"topic":{"name":"go"}},{"topic":{"name":"sql"}},{"topic":{"name":"sprintf-style"}}]},"parent":null},"repo2":{"id":"MDEwOlJlcG9zaXRvcnkxMjA4MDU1MQ==","databaseId":12080551,"nameWithOwner":"tsenart/vegeta","description":"HTTP + load testing tool and library. It''s over 9000!","url":"https://github.com/tsenart/vegeta","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":22112,"forkCount":1364,"diskUsage":2553,"repositoryTopics":{"nodes":[{"topic":{"name":"load-testing"}},{"topic":{"name":"go"}},{"topic":{"name":"benchmarking"}},{"topic":{"name":"http"}}]},"parent":null},"repo3":{"id":"MDEwOlJlcG9zaXRvcnkxNDE3OTgwNzU=","databaseId":141798075,"nameWithOwner":"tsenart/go-tsz","description":"Time + series compression algorithm from Facebook''s Gorilla paper","url":"https://github.com/tsenart/go-tsz","isPrivate":false,"isFork":true,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":5,"forkCount":4,"diskUsage":326,"repositoryTopics":{"nodes":[]},"parent":{"nameWithOwner":"dgryski/go-tsz","isFork":false}},"repo4":{"id":"MDEwOlJlcG9zaXRvcnkxNDk1MTg3ODM=","databaseId":149518783,"nameWithOwner":"sourcegraph/about","description":"Sourcegraph + blog, feature announcements, and website (about.sourcegraph.com)","url":"https://github.com/sourcegraph/about","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"ADMIN","stargazerCount":89,"forkCount":168,"diskUsage":524322,"repositoryTopics":{"nodes":[{"topic":{"name":"team"}}]},"parent":null},"repo5":{"id":"MDEwOlJlcG9zaXRvcnkxMDI3MDI1MA==","databaseId":10270250,"nameWithOwner":"facebook/react","description":"The + library for web and native user interfaces.","url":"https://github.com/facebook/react","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":215295,"forkCount":45372,"diskUsage":364386,"repositoryTopics":{"nodes":[{"topic":{"name":"javascript"}},{"topic":{"name":"react"}},{"topic":{"name":"frontend"}},{"topic":{"name":"declarative"}},{"topic":{"name":"ui"}},{"topic":{"name":"library"}}]},"parent":null},"repo6":{"id":"MDEwOlJlcG9zaXRvcnkyMzI1Mjk4","databaseId":2325298,"nameWithOwner":"torvalds/linux","description":"Linux + kernel source tree","url":"https://github.com/torvalds/linux","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":161083,"forkCount":51069,"diskUsage":4786194,"repositoryTopics":{"nodes":[]},"parent":null},"repo7":{"id":"MDEwOlJlcG9zaXRvcnkyMTU0MDc1OQ==","databaseId":21540759,"nameWithOwner":"avelino/awesome-go","description":"A + curated list of awesome Go frameworks, libraries and software","url":"https://github.com/avelino/awesome-go","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":111633,"forkCount":11434,"diskUsage":10576,"repositoryTopics":{"nodes":[{"topic":{"name":"golang"}},{"topic":{"name":"golang-library"}},{"topic":{"name":"go"}},{"topic":{"name":"awesome"}},{"topic":{"name":"awesome-list"}},{"topic":{"name":"hacktoberfest"}}]},"parent":null}}}' headers: Access-Control-Allow-Origin: - '*' Access-Control-Expose-Headers: - ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, - X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, - Sunset - Cache-Control: - - no-cache + X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, + X-GitHub-Request-Id, Deprecation, Sunset Content-Security-Policy: - default-src 'none' Content-Type: - application/json; charset=utf-8 Date: - - Tue, 20 Jul 2021 18:51:56 GMT + - Thu, 16 Nov 2023 14:56:51 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -47,8 +60,6 @@ interactions: - max-age=31536000; includeSubdomains; preload Vary: - Accept-Encoding, Accept, X-Requested-With - X-Accepted-Oauth-Scopes: - - repo X-Content-Type-Options: - nosniff X-Frame-Options: @@ -56,28 +67,29 @@ interactions: X-Github-Media-Type: - github.v4; param=antiope-preview; format=json X-Github-Request-Id: - - B8E2:9885:4A73C8:4C0935:60F71B4C - X-Oauth-Scopes: - - "" + - F7AF:56FE:3B280F2C:3BD93ED2:65562DB3 X-Ratelimit-Resource: - graphql X-Ratelimit-Used: - - "1" + - "13" X-Xss-Protection: - "0" status: 200 OK code: 200 duration: "" - request: - body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n}\n\t\nquery($query: + body: '{"query":"\nfragment RepositoryFields on Repository {\n\tid\n\tdatabaseId\n\tnameWithOwner\n\tdescription\n\turl\n\tisPrivate\n\tisFork\n\tisArchived\n\tisLocked\n\tisDisabled\n\tviewerPermission\n\tstargazerCount\n\tforkCount\n\tdiskUsage\n\trepositoryTopics(first:100) + {\n\t\tnodes {\n\t\t\ttopic {\n\t\t\t\tname\n\t\t\t}\n\t\t}\n\t}\n}\n\t\nquery($query: String!, $type: SearchType!, $after: String, $first: Int!) {\n\tsearch(query: $query, type: $type, after: $after, first: $first) {\n\t\trepositoryCount\n\t\tpageInfo { hasNextPage, endCursor }\n\t\tnodes { ... on Repository { ...RepositoryFields - } }\n\t}\n}","variables":{"first":100,"query":"user:tsenart in:name patrol","type":"REPOSITORY"}}' + } }\n\t}\n}","variables":{"first":100,"query":"user:tsenart in:name patrol created:2007-06-01T00:00:00+00:00..2023-11-16T14:56:51+00:00","type":"REPOSITORY"}}' form: {} headers: Accept: - application/vnd.github.antiope-preview+json + Cache-Control: + - max-age=0 Content-Type: - application/json; charset=utf-8 url: https://api.github.com/graphql @@ -85,23 +97,21 @@ interactions: response: body: '{"data":{"search":{"repositoryCount":1,"pageInfo":{"hasNextPage":false,"endCursor":"Y3Vyc29yOjE="},"nodes":[{"id":"MDEwOlJlcG9zaXRvcnkxNTM2NTcyNDU=","databaseId":153657245,"nameWithOwner":"tsenart/patrol","description":"Patrol is an operator friendly distributed rate limiting HTTP API with strong eventually - consistent CvRDT based replication.","url":"https://github.com/tsenart/patrol","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"ADMIN","stargazerCount":33,"forkCount":3}]}}}' + consistent CvRDT based replication.","url":"https://github.com/tsenart/patrol","isPrivate":false,"isFork":false,"isArchived":false,"isLocked":false,"isDisabled":false,"viewerPermission":"READ","stargazerCount":35,"forkCount":3,"diskUsage":95,"repositoryTopics":{"nodes":[]}}]}}}' headers: Access-Control-Allow-Origin: - '*' Access-Control-Expose-Headers: - ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, - X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, - Sunset - Cache-Control: - - no-cache + X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, + X-GitHub-Request-Id, Deprecation, Sunset Content-Security-Policy: - default-src 'none' Content-Type: - application/json; charset=utf-8 Date: - - Tue, 20 Jul 2021 18:51:56 GMT + - Thu, 16 Nov 2023 14:56:52 GMT Referrer-Policy: - origin-when-cross-origin, strict-origin-when-cross-origin Server: @@ -110,8 +120,6 @@ interactions: - max-age=31536000; includeSubdomains; preload Vary: - Accept-Encoding, Accept, X-Requested-With - X-Accepted-Oauth-Scopes: - - repo X-Content-Type-Options: - nosniff X-Frame-Options: @@ -119,13 +127,11 @@ interactions: X-Github-Media-Type: - github.v4; param=antiope-preview; format=json X-Github-Request-Id: - - B8E2:9885:4A740B:4C0981:60F71B4C - X-Oauth-Scopes: - - "" + - F7AF:56FE:3B2812A4:3BD94230:65562DB3 X-Ratelimit-Resource: - graphql X-Ratelimit-Used: - - "2" + - "14" X-Xss-Protection: - "0" status: 200 OK diff --git a/internal/repos/testdata/sources/TestGerritSource_ListRepos.yaml b/internal/repos/testdata/sources/TestGerritSource_ListRepos/no_filtering.yaml similarity index 100% rename from internal/repos/testdata/sources/TestGerritSource_ListRepos.yaml rename to internal/repos/testdata/sources/TestGerritSource_ListRepos/no_filtering.yaml diff --git a/internal/repos/testdata/sources/TestGerritSource_ListRepos/with_filtering.yaml b/internal/repos/testdata/sources/TestGerritSource_ListRepos/with_filtering.yaml new file mode 100644 index 0000000000000..627a76c950c43 --- /dev/null +++ b/internal/repos/testdata/sources/TestGerritSource_ListRepos/with_filtering.yaml @@ -0,0 +1,146 @@ +--- +version: 1 +interactions: +- request: + body: "" + form: {} + headers: {} + url: https://gerrit.sgdev.org/a/projects/?S=0&n=25&type=CODE + method: GET + response: + body: | + )]}' + { + "beatrix": { + "id": "beatrix", + "state": "ACTIVE" + }, + "idan-temp": { + "id": "idan-temp", + "state": "ACTIVE" + }, + "k8s-gerrit": { + "id": "k8s-gerrit", + "state": "ACTIVE" + }, + "sourcegraph": { + "id": "sourcegraph", + "state": "ACTIVE" + }, + "sourcegraph/create": { + "id": "sourcegraph%2Fcreate", + "state": "ACTIVE" + }, + "src-cli": { + "id": "src-cli", + "state": "ACTIVE" + } + } + headers: + Cache-Control: + - no-cache, no-store, max-age=0, must-revalidate + Cf-Cache-Status: + - DYNAMIC + Cf-Ray: + - 7c872c876c9ca214-YYZ + Content-Disposition: + - attachment + Content-Type: + - application/json;charset=utf-8 + Date: + - Tue, 16 May 2023 22:49:27 GMT + Expires: + - Mon, 01 Jan 1990 00:00:00 GMT + Pragma: + - no-cache + Server: + - cloudflare + Strict-Transport-Security: + - max-age=15724800; includeSubDomains + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - DENY + status: 200 OK + code: 200 + duration: "" +- request: + body: "" + form: {} + headers: {} + url: https://gerrit.sgdev.org/a/projects/?S=25&n=25&type=CODE + method: GET + response: + body: | + )]}' + {} + headers: + Cache-Control: + - no-cache, no-store, max-age=0, must-revalidate + Cf-Cache-Status: + - DYNAMIC + Cf-Ray: + - 7c872c88aedba214-YYZ + Content-Disposition: + - attachment + Content-Length: + - "8" + Content-Type: + - application/json;charset=utf-8 + Date: + - Tue, 16 May 2023 22:49:27 GMT + Expires: + - Mon, 01 Jan 1990 00:00:00 GMT + Pragma: + - no-cache + Server: + - cloudflare + Strict-Transport-Security: + - max-age=15724800; includeSubDomains + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - DENY + status: 200 OK + code: 200 + duration: "" +- request: + body: "" + form: {} + headers: {} + url: https://gerrit.sgdev.org/a/projects/?S=50&n=1 + method: GET + response: + body: | + )]}' + {} + headers: + Cache-Control: + - no-cache, no-store, max-age=0, must-revalidate + Cf-Cache-Status: + - DYNAMIC + Cf-Ray: + - 7c872c891ff8a214-YYZ + Content-Disposition: + - attachment + Content-Length: + - "8" + Content-Type: + - application/json;charset=utf-8 + Date: + - Tue, 16 May 2023 22:49:27 GMT + Expires: + - Mon, 01 Jan 1990 00:00:00 GMT + Pragma: + - no-cache + Server: + - cloudflare + Strict-Transport-Security: + - max-age=15724800; includeSubDomains + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - DENY + status: 200 OK + code: 200 + duration: "" diff --git a/internal/repoupdater/BUILD.bazel b/internal/repoupdater/BUILD.bazel index 151deb5db00be..e096ff7945acf 100644 --- a/internal/repoupdater/BUILD.bazel +++ b/internal/repoupdater/BUILD.bazel @@ -17,7 +17,6 @@ go_library( "//internal/httpcli", "//internal/repoupdater/protocol", "//internal/repoupdater/v1:repoupdater", - "//internal/syncx", "//internal/trace", "//lib/errors", "@com_github_sourcegraph_log//:log", diff --git a/internal/repoupdater/client.go b/internal/repoupdater/client.go index a0af422cc754b..c2ce1ab8bdb6c 100644 --- a/internal/repoupdater/client.go +++ b/internal/repoupdater/client.go @@ -9,6 +9,7 @@ import ( "net/http" "net/url" "os" + "sync" "github.com/sourcegraph/log" "go.opentelemetry.io/otel/attribute" @@ -22,7 +23,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/repoupdater/protocol" proto "github.com/sourcegraph/sourcegraph/internal/repoupdater/v1" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -66,7 +66,7 @@ func NewClient(serverURL string) *Client { return &Client{ URL: serverURL, HTTPClient: defaultDoer, - grpcClient: syncx.OnceValues(func() (proto.RepoUpdaterServiceClient, error) { + grpcClient: sync.OnceValues(func() (proto.RepoUpdaterServiceClient, error) { u, err := url.Parse(serverURL) if err != nil { return nil, err diff --git a/internal/repoupdater/v1/BUILD.bazel b/internal/repoupdater/v1/BUILD.bazel index 446adde8a3633..94fa9ad5abeb7 100644 --- a/internal/repoupdater/v1/BUILD.bazel +++ b/internal/repoupdater/v1/BUILD.bazel @@ -2,7 +2,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@rules_buf//buf:defs.bzl", "buf_lint_test") load("@rules_proto//proto:defs.bzl", "proto_library") -load("//dev:proto.bzl", "write_proto_stubs_to_source") proto_library( name = "v1_proto", diff --git a/internal/requestclient/BUILD.bazel b/internal/requestclient/BUILD.bazel index 6958038c545f7..45ca8c959b2ec 100644 --- a/internal/requestclient/BUILD.bazel +++ b/internal/requestclient/BUILD.bazel @@ -12,6 +12,8 @@ go_library( visibility = ["//:__subpackages__"], deps = [ "//internal/grpc/propagator", + "//internal/requestclient/geolocation", + "//lib/errors", "@com_github_sourcegraph_log//:log", "@org_golang_google_grpc//metadata", "@org_golang_google_grpc//peer", @@ -20,10 +22,15 @@ go_library( go_test( name = "requestclient_test", - srcs = ["grpc_test.go"], + srcs = [ + "client_test.go", + "grpc_test.go", + ], embed = [":requestclient"], deps = [ - "@com_github_google_go_cmp//cmp", + "@com_github_hexops_autogold_v2//:autogold", + "@com_github_stretchr_testify//assert", + "@com_github_stretchr_testify//require", "@org_golang_google_grpc//peer", ], ) diff --git a/internal/requestclient/client.go b/internal/requestclient/client.go index 76711d9db3cf5..60bce37230ce6 100644 --- a/internal/requestclient/client.go +++ b/internal/requestclient/client.go @@ -2,8 +2,13 @@ package requestclient import ( "context" + "strings" + "sync" "github.com/sourcegraph/log" + + "github.com/sourcegraph/sourcegraph/internal/requestclient/geolocation" + "github.com/sourcegraph/sourcegraph/lib/errors" ) type clientKey struct{} @@ -12,7 +17,8 @@ type clientKey struct{} type Client struct { // IP identifies the IP of the client. IP string - // ForwardedFor identifies the originating IP address of a client. + // ForwardedFor identifies the originating IP address of a client. It can + // be a comma-separated list of IP addresses. // // Note: This header can be spoofed and relies on trusted clients/proxies. // For sourcegraph.com we use cloudflare headers to avoid spoofing. @@ -20,6 +26,17 @@ type Client struct { // UserAgent is value of the User-Agent header: // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent UserAgent string + + // wafIPCountryCode is a ISO 3166-1 alpha-2 country code for the + // request client as provided by a WAF (typically Cloudlfare) behind which + // Sourcegraph is hosted. + wafIPCountryCode string + + // countryCode and friends are lazily hydrated once by + // (*Client).OriginCountryCode(). + countryCode string + countryCodeError error + countryCodeOnce sync.Once } // FromContext retrieves the client IP, if available, from context. @@ -40,9 +57,53 @@ func (c *Client) LogFields() []log.Field { if c == nil { return []log.Field{log.String("requestClient", "<nil>")} } + + var ccField log.Field + if cc, err := c.OriginCountryCode(); err != nil { + ccField = log.NamedError("requestClient.countryCode.error", err) + } else { + ccField = log.String("requestClient.countryCode", cc) + } + return []log.Field{ log.String("requestClient.ip", c.IP), log.String("requestClient.forwardedFor", c.ForwardedFor), log.String("requestClient.userAgent", c.UserAgent), + ccField, + } +} + +// OriginCountryCode returns a best-effort inference of the ISO 3166-1 alpha-2 +// country code indicating the geolocation of the request client. +func (c *Client) OriginCountryCode() (string, error) { + c.countryCodeOnce.Do(func() { + c.countryCode, c.countryCodeError = inferOriginCountryCode(c) + }) + return c.countryCode, c.countryCodeError +} + +func inferOriginCountryCode(c *Client) (string, error) { + // If we have a trusted value already, use that directly. + if c.wafIPCountryCode != "" { + return c.wafIPCountryCode, nil + } + + // If we're able to infer a country code from the forwarded-for header, + // use that. We're not too worried about spoofing here because country codes + // are purely for reference and analytics. + if c.ForwardedFor != "" { + // Forwarded-for is a comma-separated list of IP addresses, we only + // want the first one. + ips := strings.Split(c.ForwardedFor, ",") + if cc, err := geolocation.InferCountryCode(ips[0]); err == nil { + return cc, nil + } + } + + // Otherwise, we must infer a country code from the IP address. + cc, err := geolocation.InferCountryCode(c.IP) + if err != nil { + return "", errors.Wrap(err, "geolocation.InferCountryCode") } + return cc, nil } diff --git a/internal/requestclient/client_test.go b/internal/requestclient/client_test.go new file mode 100644 index 0000000000000..e62e505dd9138 --- /dev/null +++ b/internal/requestclient/client_test.go @@ -0,0 +1,62 @@ +package requestclient + +import ( + "strings" + "testing" + + "github.com/hexops/autogold/v2" + "github.com/stretchr/testify/assert" +) + +func TestClientOriginCountryCode(t *testing.T) { + for _, tc := range []struct { + name string + client *Client + wantCode autogold.Value + }{ + { + name: "have trusted geolocation", + client: &Client{ + wafIPCountryCode: "CA", + }, + wantCode: autogold.Expect("CA"), + }, + { + name: "infer from single ForwardedFor", + client: &Client{ + ForwardedFor: "93.184.216.34", // ping -c1 example.net + }, + wantCode: autogold.Expect("GB"), + }, + { + name: "infer from multiple ForwardedFor", + client: &Client{ + ForwardedFor: strings.Join([]string{ + "61.144.235.160", // example from OSS datasets with country code 'CN' + "93.184.216.34", // ping -c1 example.net + }, ","), + }, + wantCode: autogold.Expect("CN"), + }, + { + name: "infer from IP address", + client: &Client{ + IP: "93.184.216.34", // ping -c1 example.net + }, + wantCode: autogold.Expect("GB"), + }, + } { + t.Run(tc.name, func(t *testing.T) { + code, err := tc.client.OriginCountryCode() + assert.NoError(t, err) + tc.wantCode.Equal(t, code) + + // Check cached state + tc.client.countryCodeOnce.Do(func() { + t.Error("countryCodeOnce should have been called already") + }) + assert.Equal(t, code, tc.client.countryCode) + assert.NoError(t, tc.client.countryCodeError) + }) + } +} diff --git a/internal/requestclient/geolocation/BUILD.bazel b/internal/requestclient/geolocation/BUILD.bazel new file mode 100644 index 0000000000000..285018ac227fb --- /dev/null +++ b/internal/requestclient/geolocation/BUILD.bazel @@ -0,0 +1,25 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") +load("//dev:go_defs.bzl", "go_test") + +go_library( + name = "geolocation", + srcs = ["geolocation.go"], + embedsrcs = ["data/dbip-country-lite-2023-11.mmdb"], + importpath = "github.com/sourcegraph/sourcegraph/internal/requestclient/geolocation", + visibility = ["//:__subpackages__"], + deps = [ + "//lib/errors", + "@com_github_oschwald_maxminddb_golang//:maxminddb-golang", + ], +) + +go_test( + name = "geolocation_test", + srcs = ["geolocation_test.go"], + embed = [":geolocation"], + deps = [ + "@com_github_hexops_autogold_v2//:autogold", + "@com_github_stretchr_testify//assert", + "@com_github_stretchr_testify//require", + ], +) diff --git a/internal/requestclient/geolocation/data/README.md b/internal/requestclient/geolocation/data/README.md new file mode 100644 index 0000000000000..e887977bad4be --- /dev/null +++ b/internal/requestclient/geolocation/data/README.md @@ -0,0 +1,14 @@ +# Geolocation data + +This package contains a small geolocation database that gets embedded in the `internal/requestclient/geolocation` package. +We currently use the [DB-IP.com](https://db-ip.com/)'s ["IP to Country Lite" database](https://db-ip.com/db/download/ip-to-country-lite) in MMDB format, which only includes country-level data. + +The free DB-IP Lite database by DB-IP is licensed under a Creative Commons Attribution 4.0 International License. + +The full licensing terms are available [here](https://db-ip.com/db/lite.php). + +## Updating the database + +This database was last updated 11/16/2023. We should aim to update this yearly to stay in sync with any changes. + +The database should be downloaded in MMDB format the ["IP to Country Lite" database page](https://db-ip.com/db/download/ip-to-country-lite). diff --git a/internal/requestclient/geolocation/data/dbip-country-lite-2023-11.mmdb b/internal/requestclient/geolocation/data/dbip-country-lite-2023-11.mmdb new file mode 100644 index 0000000000000..ffe510e12ebca Binary files /dev/null and b/internal/requestclient/geolocation/data/dbip-country-lite-2023-11.mmdb differ diff --git a/internal/requestclient/geolocation/geolocation.go b/internal/requestclient/geolocation/geolocation.go new file mode 100644 index 0000000000000..0c216fdddf4b9 --- /dev/null +++ b/internal/requestclient/geolocation/geolocation.go @@ -0,0 +1,54 @@ +// Package geolocation provides a geolocation database for IP addresses. +// It currently uses https://db-ip.com/db/download/ip-to-country-lite +// +// More details are available in internal/requestclient/geolocation/data/README.md +package geolocation + +import ( + _ "embed" + "net" + "sync" + + "github.com/oschwald/maxminddb-golang" + + "github.com/sourcegraph/sourcegraph/lib/errors" +) + +//go:embed data/dbip-country-lite-2023-11.mmdb +var mmdbData []byte + +// getLocationsDB holds the MMDB-format database embedded at mmdbData. +// It is only evaluated once - subsequent calls will return the first initialized +// *maxminddb.Reader instance. +var getLocationsDB = sync.OnceValue(func() *maxminddb.Reader { + db, err := maxminddb.FromBytes(mmdbData) + if err != nil { + panic(errors.Wrap(err, "initialize IP database")) + } + return db +}) + +// InferCountryCode returns an ISO 3166-1 alpha-2 country code for the given IP +// address: https://en.wikipedia.org/wiki/ISO_3166-1#Codes +func InferCountryCode(ipAddress string) (string, error) { + if ipAddress == "" { + return "", errors.New("no IP address provided") + } + ip := net.ParseIP(ipAddress) + if ip == nil { + return "", errors.Newf("invalid IP address %q provided", ipAddress) + } + + var query struct { + Country struct { + ISOCode string `maxminddb:"iso_code"` + } `maxminddb:"country"` + } + if err := getLocationsDB().Lookup(ip, &query); err != nil { + return "", errors.Wrap(err, "lookup failed") + } + if query.Country.ISOCode == "" { + return "", errors.New("no country code found") + } + return query.Country.ISOCode, nil +} diff --git a/internal/requestclient/geolocation/geolocation_test.go b/internal/requestclient/geolocation/geolocation_test.go new file mode 100644 index 0000000000000..01b513905f17c --- /dev/null +++ b/internal/requestclient/geolocation/geolocation_test.go @@ -0,0 +1,72 @@ +package geolocation + +import ( + "testing" + + "github.com/hexops/autogold/v2" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func BenchmarkInferCountryCode(b *testing.B) { + exampleIPs := []string{ + "61.144.235.160", + "93.184.216.34", + "2606:2800:220:1:248:1893:25c8:1946", + } + for n := 0; n < b.N; n++ { + _, err := InferCountryCode(exampleIPs[b.N%len(exampleIPs)]) + if err != nil { + b.Log(err.Error()) + b.FailNow() + } + } +} + +func TestInferCountryCode(t *testing.T) { + for _, tc := range []struct { + name string + ipAddress string + + wantError autogold.Value + wantCountryCode autogold.Value + }{ + { + name: "empty input", + ipAddress: "", + wantError: autogold.Expect("no IP address provided"), + }, + { + name: "not an IP address", + ipAddress: "sourcegraph.com", + wantError: autogold.Expect(`invalid IP address "sourcegraph.com" provided`), + }, + { + name: "example 1 valid IPv4", + ipAddress: "61.144.235.160", // example from OSS datasets + wantCountryCode: autogold.Expect("CN"), + }, + { + name: "example 2 valid IPv4", + ipAddress: "93.184.216.34", // ping -c1 example.net + wantCountryCode: autogold.Expect("GB"), + }, + { + name: "example valid IPv6", + ipAddress: "2606:2800:220:1:248:1893:25c8:1946", // ping6 -c1 example.net + wantCountryCode: autogold.Expect("US"), + }, + } { + t.Run(tc.name, func(t *testing.T) { + code, err := InferCountryCode(tc.ipAddress) + if tc.wantError != nil { + require.Error(t, err) + tc.wantError.Equal(t, err.Error()) + } else { + assert.NoError(t, err) + tc.wantCountryCode.Equal(t, code) + } + }) + } + +} diff --git a/internal/requestclient/grpc_test.go b/internal/requestclient/grpc_test.go index 908ff4c3942c6..8b93bb1367bb6 100644 --- a/internal/requestclient/grpc_test.go +++ b/internal/requestclient/grpc_test.go @@ -5,7 +5,8 @@ import ( "net" "testing" - "github.com/google/go-cmp/cmp" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "google.golang.org/grpc/peer" ) @@ -109,9 +110,14 @@ func TestPropagator(t *testing.T) { md := propagator.FromContext(requestCtx) resultCtx := propagator.InjectContext(requestCtx, md) - if diff := cmp.Diff(test.wantClient, FromContext(resultCtx)); diff != "" { - t.Errorf("Client mismatch (-want +got):\n%s", diff) - } + + // Explicitly compare exported fields because cmp.Diff doesn't work + // when there are unexported fields + rc := FromContext(resultCtx) + require.NotNil(t, rc) + assert.Equal(t, test.wantClient.IP, rc.IP) + assert.Equal(t, test.wantClient.ForwardedFor, rc.ForwardedFor) + assert.Equal(t, test.wantClient.UserAgent, rc.UserAgent) }) } } diff --git a/internal/requestclient/http.go b/internal/requestclient/http.go index d8a1123d00053..78b1bef5ec03f 100644 --- a/internal/requestclient/http.go +++ b/internal/requestclient/http.go @@ -20,6 +20,8 @@ const ( // HTTPTransport is a roundtripper that sets client IP information within request context as // headers on outgoing requests. The attached headers can be picked up and attached to // incoming request contexts with client.HTTPMiddleware. +// +// TODO(@bobheadxi): Migrate to httpcli.Doer and httpcli.Middleware type HTTPTransport struct { RoundTripper http.RoundTripper } @@ -33,6 +35,7 @@ func (t *HTTPTransport) RoundTrip(req *http.Request) (*http.Response, error) { client := FromContext(req.Context()) if client != nil { + req = req.Clone(req.Context()) // RoundTripper should not modify original request req.Header.Set(headerKeyClientIP, client.IP) req.Header.Set(headerKeyForwardedFor, client.ForwardedFor) } @@ -60,6 +63,15 @@ func InternalHTTPMiddleware(next http.Handler) http.Handler { // httpMiddleware wraps the given handle func and attaches client IP data indicated in // incoming requests to the request header. +// +// hasCloudflareProxy enables a variety of features that assume we are behind +// a Cloudflare WAF and can trust certain header values. We have a debug endpoint +// that lets you confirm the presence of various headers: +// +// curl --silent https://sourcegraph.com/-/debug/headers | grep Cf- +// +// Documentation for available headers is available at +// https://developers.cloudflare.com/fundamentals/reference/http-request-headers func httpMiddleware(next http.Handler, hasCloudflareProxy bool) http.Handler { forwardedForHeaders := []string{headerKeyForwardedFor} if hasCloudflareProxy { @@ -77,10 +89,24 @@ func httpMiddleware(next http.Handler, hasCloudflareProxy bool) http.Handler { } } + var wafIPCountryCode string + if hasCloudflareProxy { + // Use trusted Cloudflare-provided country code of the request. + // https://developers.cloudflare.com/fundamentals/reference/http-request-headers/#cf-ipcountry + // + // Cloudflare uses the "XX" code to indicate that the country info + // is unknown. + if cfIPCountry := req.Header.Get("CF-IPCountry"); cfIPCountry != "" && cfIPCountry != "XX" { + wafIPCountryCode = cfIPCountry + } + } + ctxWithClient := WithClient(req.Context(), &Client{ IP: strings.Split(req.RemoteAddr, ":")[0], ForwardedFor: req.Header.Get(headerKeyForwardedFor), UserAgent: req.Header.Get(headerKeyUserAgent), + + wafIPCountryCode: wafIPCountryCode, }) next.ServeHTTP(rw, req.WithContext(ctxWithClient)) }) diff --git a/internal/requestinteraction/BUILD.bazel b/internal/requestinteraction/BUILD.bazel new file mode 100644 index 0000000000000..d6aee25f6a3ee --- /dev/null +++ b/internal/requestinteraction/BUILD.bazel @@ -0,0 +1,17 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "requestinteraction", + srcs = [ + "client.go", + "grpc.go", + "http.go", + ], + importpath = "github.com/sourcegraph/sourcegraph/internal/requestinteraction", + visibility = ["//:__subpackages__"], + deps = [ + "//internal/grpc/propagator", + "@com_github_sourcegraph_log//:log", + "@org_golang_google_grpc//metadata", + ], +) diff --git a/internal/requestinteraction/client.go b/internal/requestinteraction/client.go new file mode 100644 index 0000000000000..df2c5bb830944 --- /dev/null +++ b/internal/requestinteraction/client.go @@ -0,0 +1,38 @@ +package requestinteraction + +import ( + "context" + + "github.com/sourcegraph/log" +) + +type requestInteractionKey struct{} + +// Interaction carries information about the interaction associated with a +// request - a sort of manually instrumented trace. +type Interaction struct { + // ID identifies the interaction + ID string +} + +func FromContext(ctx context.Context) *Interaction { + ip, ok := ctx.Value(requestInteractionKey{}).(*Interaction) + if !ok || ip == nil { + return nil + } + return ip +} + +// WithClient adds client IP information to context for propagation. +func WithClient(ctx context.Context, client *Interaction) context.Context { + return context.WithValue(ctx, requestInteractionKey{}, client) +} + +func (c *Interaction) LogFields() []log.Field { + if c == nil { + return []log.Field{log.String("requestInteraction", "<nil>")} + } + return []log.Field{ + log.String("requestInteraction.id", c.ID), + } +} diff --git a/internal/requestinteraction/grpc.go b/internal/requestinteraction/grpc.go new file mode 100644 index 0000000000000..7b05214d97d18 --- /dev/null +++ b/internal/requestinteraction/grpc.go @@ -0,0 +1,35 @@ +package requestinteraction + +import ( + "context" + + "google.golang.org/grpc/metadata" + + internalgrpc "github.com/sourcegraph/sourcegraph/internal/grpc/propagator" +) + +type Propagator struct{} + +func (Propagator) FromContext(ctx context.Context) metadata.MD { + interaction := FromContext(ctx) + if interaction == nil { + return metadata.New(nil) + } + + return metadata.Pairs( + headerKeyInteractionID, interaction.ID, + ) +} + +func (Propagator) InjectContext(ctx context.Context, md metadata.MD) context.Context { + if vals := md.Get(headerKeyInteractionID); len(vals) > 0 { + id := vals[0] + return WithClient(ctx, &Interaction{ + ID: id, + }) + } + + return ctx +} + +var _ internalgrpc.Propagator = Propagator{} diff --git a/internal/requestinteraction/http.go b/internal/requestinteraction/http.go new file mode 100644 index 0000000000000..32f947bfd2581 --- /dev/null +++ b/internal/requestinteraction/http.go @@ -0,0 +1,48 @@ +package requestinteraction + +import ( + "net/http" +) + +const ( + // Sourcegraph-specific header key for propagating an interaction ID. + headerKeyInteractionID = "X-Sourcegraph-Interaction-ID" +) + +// TODO(@bobheadxi): Migrate to httpcli.Doer and httpcli.Middleware +type HTTPTransport struct { + RoundTripper http.RoundTripper +} + +var _ http.RoundTripper = &HTTPTransport{} + +func (t *HTTPTransport) RoundTrip(req *http.Request) (*http.Response, error) { + if t.RoundTripper == nil { + t.RoundTripper = http.DefaultTransport + } + + interaction := FromContext(req.Context()) + if interaction != nil { + req = req.Clone(req.Context()) // RoundTripper should not modify original request + req.Header.Set(headerKeyInteractionID, interaction.ID) + } + + return t.RoundTripper.RoundTrip(req) +} + +func HTTPMiddleware(next http.Handler) http.Handler { + return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { + interactionID := req.Header.Get(headerKeyInteractionID) + + // If empty, nothing to do, just pass through + if interactionID == "" { + next.ServeHTTP(rw, req) + return + } + + ctxWithClient := WithClient(req.Context(), &Interaction{ + ID: interactionID, + }) + next.ServeHTTP(rw, req.WithContext(ctxWithClient)) + }) +} diff --git a/internal/resetonce/BUILD.bazel b/internal/resetonce/BUILD.bazel deleted file mode 100644 index 3eb19560000b8..0000000000000 --- a/internal/resetonce/BUILD.bazel +++ /dev/null @@ -1,8 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "resetonce", - srcs = ["resetable_once.go"], - importpath = "github.com/sourcegraph/sourcegraph/internal/resetonce", - visibility = ["//:__subpackages__"], -) diff --git a/internal/resetonce/resetable_once.go b/internal/resetonce/resetable_once.go deleted file mode 100644 index 5e7cb1afaf554..0000000000000 --- a/internal/resetonce/resetable_once.go +++ /dev/null @@ -1,34 +0,0 @@ -package resetonce - -import ( - "sync" - "sync/atomic" -) - -// Once is a copy of `sync.Once` with a `Reset` method, inspired by -// https://github.com/matryer/resync/blob/master/once.go -type Once struct { - done uint32 - m sync.Mutex -} - -func (o *Once) Do(f func()) { - if atomic.LoadUint32(&o.done) == 0 { - o.doSlow(f) - } -} - -func (o *Once) doSlow(f func()) { - o.m.Lock() - defer o.m.Unlock() - if o.done == 0 { - defer atomic.StoreUint32(&o.done, 1) - f() - } -} - -func (o *Once) Reset() { - o.m.Lock() - defer o.m.Unlock() - atomic.StoreUint32(&o.done, 0) -} diff --git a/internal/search/backend/index_options.go b/internal/search/backend/index_options.go index ccb619ae690f1..5cd580af1e5ac 100644 --- a/internal/search/backend/index_options.go +++ b/internal/search/backend/index_options.go @@ -58,6 +58,8 @@ type ZoektIndexOptions struct { Error string `json:",omitempty"` LanguageMap map[string]ctags_config.ParserType + + ShardConcurrency int32 `json:",omitempty"` } func (o *ZoektIndexOptions) FromProto(p *proto.ZoektIndexOptions) { @@ -87,6 +89,7 @@ func (o *ZoektIndexOptions) FromProto(p *proto.ZoektIndexOptions) { languageMap[entry.Language] = uint8(entry.Ctags.Number()) } o.LanguageMap = languageMap + o.ShardConcurrency = p.GetShardConcurrency() } func (o *ZoektIndexOptions) ToProto() *proto.ZoektIndexOptions { @@ -116,6 +119,7 @@ func (o *ZoektIndexOptions) ToProto() *proto.ZoektIndexOptions { DocumentRanksVersion: o.DocumentRanksVersion, Error: o.Error, LanguageMap: languageMap, + ShardConcurrency: o.ShardConcurrency, } } @@ -212,6 +216,7 @@ func getIndexOptions( DocumentRanksVersion: opts.DocumentRanksVersion, LanguageMap: ctags_config.CreateEngineMap(*c), + ShardConcurrency: int32(c.SearchIndexShardConcurrency), } // Set of branch names. Always index HEAD diff --git a/internal/search/backend/index_options_test.go b/internal/search/backend/index_options_test.go index 339a23abd6580..2ff79d4ac8ee1 100644 --- a/internal/search/backend/index_options_test.go +++ b/internal/search/backend/index_options_test.go @@ -440,3 +440,24 @@ func TestGetIndexOptions_batch(t *testing.T) { t.Fatal("mismatch (-want, +got):\n", diff) } } +func TestGetIndexOptions_concurrency(t *testing.T) { + repos := []api.RepoID{1, 2, 3} + getRepoIndexOptions := func(repo api.RepoID) (*RepoIndexOptions, error) { + return &RepoIndexOptions{ + GetVersion: func(branch string) (string, error) { + return fmt.Sprintf("!%s-%d", branch, repo), nil + }, + }, nil + } + getSearchContextRevs := func(api.RepoID) ([]string, error) { return nil, nil } + + wantConcurrency := 27 + config := &schema.SiteConfiguration{SearchIndexShardConcurrency: wantConcurrency} + options := GetIndexOptions(config, getRepoIndexOptions, getSearchContextRevs, repos...) + + for _, got := range options { + if wantConcurrency != int(got.ShardConcurrency) { + t.Fatalf("wrong shard concurrency, want: %d, got: %d", wantConcurrency, got.ShardConcurrency) + } + } +} diff --git a/internal/search/client/client.go b/internal/search/client/client.go index 30ad715a09d64..6a97c466613b1 100644 --- a/internal/search/client/client.go +++ b/internal/search/client/client.go @@ -231,6 +231,8 @@ func SearchTypeFromString(patternType string) (query.SearchType, error) { return query.SearchTypeLucky, nil case "keyword": return query.SearchTypeKeyword, nil + case "newStandardRC1": + return query.SearchTypeNewStandardRC1, nil default: return -1, errors.Errorf("unrecognized patternType %q", patternType) } @@ -252,8 +254,10 @@ func detectSearchType(version string, patternType *string) (query.SearchType, er searchType = query.SearchTypeLiteral case "V3": searchType = query.SearchTypeStandard + case "V4-rc1": + searchType = query.SearchTypeNewStandardRC1 default: - return -1, errors.Errorf("unrecognized version: want \"V1\", \"V2\", or \"V3\", got %q", version) + return -1, errors.Errorf("unrecognized version: want \"V1\", \"V2\", \"V3\", or \"V4-rc1\", got %q", version) } } return searchType, nil @@ -281,6 +285,8 @@ func overrideSearchType(input string, searchType query.SearchType) query.SearchT searchType = query.SearchTypeLucky case "keyword": searchType = query.SearchTypeKeyword + case "newStandardRC1": + searchType = query.SearchTypeNewStandardRC1 } }) return searchType @@ -297,7 +303,6 @@ func ToFeatures(flagSet *featureflag.FlagSet, logger log.Logger) *search.Feature // client/web/src/featureFlags/featureFlags.ts to allow overriding. return &search.Features{ ContentBasedLangFilters: flagSet.GetBoolOr("search-content-based-lang-detection", false), - UseZoektParser: flagSet.GetBoolOr("search-new-keyword", false), Debug: flagSet.GetBoolOr("search-debug", false), } } diff --git a/internal/search/client/client_test.go b/internal/search/client/client_test.go index 2b42d41314eb7..b8483e84c5a37 100644 --- a/internal/search/client/client_test.go +++ b/internal/search/client/client_test.go @@ -30,6 +30,7 @@ func TestDetectSearchType(t *testing.T) { {"V1, no pattern type", "V1", nil, "", query.SearchTypeRegex}, {"V2, no pattern type", "V2", nil, "", query.SearchTypeLiteral}, {"V3, no pattern type", "V3", nil, "", query.SearchTypeStandard}, + {"V4-rc1, no pattern type", "V4-rc1", nil, "", query.SearchTypeNewStandardRC1}, {"V2, no pattern type, input does not produce parse error", "V2", nil, "/-/godoc", query.SearchTypeLiteral}, {"V1, regexp pattern type", "V1", &typeRegexp, "", query.SearchTypeRegex}, {"V2, regexp pattern type", "V2", &typeRegexp, "", query.SearchTypeRegex}, @@ -67,9 +68,9 @@ func TestDetectSearchType(t *testing.T) { patternType: &typeInvalid, errorString: `unrecognized patternType "invalid"`, }, { - version: "V4", + version: "V99", patternType: nil, - errorString: "unrecognized version: want \"V1\", \"V2\", or \"V3\", got \"V4\"", + errorString: "unrecognized version: want \"V1\", \"V2\", \"V3\", or \"V4-rc1\", got \"V99\"", }} for _, tc := range cases { diff --git a/internal/search/job/jobutil/exhaustive_job.go b/internal/search/job/jobutil/exhaustive_job.go index 54bac14f55e5a..f90f011ccb016 100644 --- a/internal/search/job/jobutil/exhaustive_job.go +++ b/internal/search/job/jobutil/exhaustive_job.go @@ -23,8 +23,6 @@ type Exhaustive struct { // // It will return an error if the input query is not supported by Exhaustive. func NewExhaustive(inputs *search.Inputs) (Exhaustive, error) { - // TODO(keegan) a bunch of tests around this after branch cut pls - if inputs.Protocol != search.Exhaustive { return Exhaustive{}, errors.New("only works for exhaustive search inputs") } @@ -46,15 +44,12 @@ func NewExhaustive(inputs *search.Inputs) (Exhaustive, error) { return Exhaustive{}, errors.Errorf("expected a simple expression (no and/or/etc). Got %v", b.Pattern) } - // no predicates - if inputs.Query.Exists(query.FieldRepoHasFile) { - return Exhaustive{}, errors.Errorf("repoHasFile is not supported") - } - if pred, ok := hasPredicates(query.FieldRepo, inputs.Query); ok { - return Exhaustive{}, errors.Errorf("repo: predicates are not supported. Got %v", pred) - } + // We don't support file: predicates, such as file:has.content(), because the + // search breaks in unexpected ways. For example, for interactive search + // file:has.content() is translated to an AND query which we don't support in + // Search Jobs yet. if pred, ok := hasPredicates(query.FieldFile, inputs.Query); ok { - return Exhaustive{}, errors.Errorf("field: predicates are not supported. Got %v", pred) + return Exhaustive{}, errors.Errorf("file: predicates are not supported. Got %v", pred) } // This is a very weak protection but should be enough to catch simple misuse. diff --git a/internal/search/job/jobutil/exhaustive_job_test.go b/internal/search/job/jobutil/exhaustive_job_test.go index 2b273186c0339..d674fbe528f2f 100644 --- a/internal/search/job/jobutil/exhaustive_job_test.go +++ b/internal/search/job/jobutil/exhaustive_job_test.go @@ -106,6 +106,56 @@ func TestNewExhaustive(t *testing.T) { (numRepos . 1) (pathRegexps . []) (indexed . false)) +`), + }, + { + Name: "repo:has.file predicate", + Query: "type:file index:no foo repo:has.file(go.mod)", + WantPager: autogold.Expect(` +(REPOPAGER + (containsRefGlobs . false) + (repoOpts.useIndex . no) + (repoOpts.hasFileContent[0].path . go.mod) + (PARTIALREPOS + (SEARCHERTEXTSEARCH + (useFullDeadline . true) + (patternInfo . TextPatternInfo{"foo",re,nopath,filematchlimit:1000000}) + (numRepos . 0) + (pathRegexps . []) + (indexed . false)))) +`), + WantJob: autogold.Expect(` +(SEARCHERTEXTSEARCH + (useFullDeadline . true) + (patternInfo . TextPatternInfo{"foo",re,nopath,filematchlimit:1000000}) + (numRepos . 1) + (pathRegexps . []) + (indexed . false)) +`), + }, + { + Name: "repo:has.meta predicate", + Query: "type:file index:no foo repo:has.meta(cognition)", + WantPager: autogold.Expect(` +(REPOPAGER + (containsRefGlobs . false) + (repoOpts.useIndex . no) + (repoOpts.hasKVPs[0].key . cognition) + (PARTIALREPOS + (SEARCHERTEXTSEARCH + (useFullDeadline . true) + (patternInfo . TextPatternInfo{"foo",re,nopath,filematchlimit:1000000}) + (numRepos . 0) + (pathRegexps . []) + (indexed . false)))) +`), + WantJob: autogold.Expect(` +(SEARCHERTEXTSEARCH + (useFullDeadline . true) + (patternInfo . TextPatternInfo{"foo",re,nopath,filematchlimit:1000000}) + (numRepos . 1) + (pathRegexps . []) + (indexed . false)) `), }, } @@ -157,10 +207,11 @@ func TestNewExhaustive_negative(t *testing.T) { // catch-all regex {query: `type:file index:no r:.* .*`, isPatterntypeRegex: true}, {query: `type:file index:no r:repo .*`, isPatterntypeRegex: true}, - // predicates - {query: `type:file index:no repohasfile:foo.bar content`}, - {query: `type:file index:no file:has.content("content")`}, - {query: `type:file index:no repo:has.path("src") content`}, + // file predicates + {query: `type:file index:no file:has.content(content)`}, + {query: `type:file index:no file:has.owner(owner)`}, + {query: `type:file index:no file:contains.content(content)`}, + {query: `type:file index:no file:has.contributor(contributor)`}, } for _, c := range tc { diff --git a/internal/search/job/jobutil/job.go b/internal/search/job/jobutil/job.go index 00c8544440165..aaa9b688fb66f 100644 --- a/internal/search/job/jobutil/job.go +++ b/internal/search/job/jobutil/job.go @@ -622,20 +622,6 @@ func mapSlice(values []string, f func(string) string) []string { return res } -func count(b query.Basic, p search.Protocol) int { - if count := b.Count(); count != nil { - return *count - } - - switch p { - case search.Batch: - return limits.DefaultMaxSearchResults - case search.Streaming: - return limits.DefaultMaxSearchResultsStreaming - } - panic("unreachable") -} - // toTextPatternInfo converts a an atomic query to internal values that drive // text search. An atomic query is a Basic query where the Pattern is either // nil, or comprises only one Pattern node (hence, an atom, and not an @@ -823,7 +809,7 @@ func (b *jobBuilder) newZoektGlobalSearch(typ search.IndexedRequestType) (job.Jo FileMatchLimit: b.fileMatchLimit, Select: b.selector, Features: *b.features, - KeywordScoring: b.patternType == query.SearchTypeKeyword, + PatternType: b.patternType, } switch typ { @@ -854,7 +840,7 @@ func (b *jobBuilder) newZoektSearch(typ search.IndexedRequestType) (job.Job, err FileMatchLimit: b.fileMatchLimit, Select: b.selector, Features: *b.features, - KeywordScoring: b.patternType == query.SearchTypeKeyword, + PatternType: b.patternType, } switch typ { diff --git a/internal/search/job/jobutil/job_test.go b/internal/search/job/jobutil/job_test.go index 4efb25ecc4371..09f90be0e134c 100644 --- a/internal/search/job/jobutil/job_test.go +++ b/internal/search/job/jobutil/job_test.go @@ -1029,19 +1029,27 @@ func overrideSearchType(input string, searchType query.SearchType) query.SearchT } func Test_computeResultTypes(t *testing.T) { - test := func(input string) string { - plan, _ := query.Pipeline(query.Init(input, query.SearchTypeStandard)) + test := func(input string, searchType query.SearchType) string { + plan, _ := query.Pipeline(query.Init(input, searchType)) b := plan[0] - resultTypes := computeResultTypes(b, query.SearchTypeStandard) + resultTypes := computeResultTypes(b, searchType) return resultTypes.String() } - t.Run("only search file content when type not set", func(t *testing.T) { - autogold.ExpectFile(t, autogold.Raw(test("path:foo content:bar"))) + t.Run("standard, only search file content when type not set", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("path:foo content:bar", query.SearchTypeStandard))) + }) + + t.Run("standard, plain pattern searches repo path file content", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("path:foo bar", query.SearchTypeStandard))) + }) + + t.Run("newStandardRC1, only search file content when type not set", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("path:foo content:bar", query.SearchTypeNewStandardRC1))) }) - t.Run("plain pattern searches repo path file content", func(t *testing.T) { - autogold.ExpectFile(t, autogold.Raw(test("path:foo bar"))) + t.Run("newStandardRC1, plain pattern searches repo path file content", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("path:foo bar", query.SearchTypeNewStandardRC1))) }) } diff --git a/internal/search/job/jobutil/log_job.go b/internal/search/job/jobutil/log_job.go index d5f70d862e54e..a715a1a350f0b 100644 --- a/internal/search/job/jobutil/log_job.go +++ b/internal/search/job/jobutil/log_job.go @@ -150,7 +150,7 @@ func (l *LogJob) logEvent(ctx context.Context, clients job.RuntimeClients, durat // New event events.Record(ctx, "search.latencies", telemetry.Action(types[0]), &telemetry.EventParameters{ Metadata: telemetry.EventMetadata{ - "durationMs": duration.Milliseconds(), + "durationMs": float64(duration.Milliseconds()), }, }) // Legacy event diff --git a/internal/search/job/jobutil/sub_repo_perms_job.go b/internal/search/job/jobutil/sub_repo_perms_job.go index a28a4f71766f2..b5b310270b59c 100644 --- a/internal/search/job/jobutil/sub_repo_perms_job.go +++ b/internal/search/job/jobutil/sub_repo_perms_job.go @@ -103,7 +103,7 @@ func applySubRepoFiltering(ctx context.Context, checker authz.SubRepoPermissionC enabled, err := authz.SubRepoEnabledForRepo(ctx, checker, m.RepoName().Name) if err != nil { // If an error occurs while checking sub-repo perms, we omit it from the results - logger.Error("Could not determine if sub-repo permissions are enabled for repo, skipping", log.String("repoName", string(m.RepoName().Name))) + logger.Error("Could not determine if sub-repo permissions are enabled for repo, skipping", log.Error(err), log.String("repoName", string(m.RepoName().Name))) errCache[m.RepoName().Name] = struct{}{} continue } diff --git a/internal/search/job/jobutil/testdata/Test_computeResultTypes/only_search_file_content_when_type_not_set.golden b/internal/search/job/jobutil/testdata/Test_computeResultTypes/newStandardRC1,_only_search_file_content_when_type_not_set.golden similarity index 100% rename from internal/search/job/jobutil/testdata/Test_computeResultTypes/only_search_file_content_when_type_not_set.golden rename to internal/search/job/jobutil/testdata/Test_computeResultTypes/newStandardRC1,_only_search_file_content_when_type_not_set.golden diff --git a/internal/search/job/jobutil/testdata/Test_computeResultTypes/plain_pattern_searches_repo_path_file_content.golden b/internal/search/job/jobutil/testdata/Test_computeResultTypes/newStandardRC1,_plain_pattern_searches_repo_path_file_content.golden similarity index 100% rename from internal/search/job/jobutil/testdata/Test_computeResultTypes/plain_pattern_searches_repo_path_file_content.golden rename to internal/search/job/jobutil/testdata/Test_computeResultTypes/newStandardRC1,_plain_pattern_searches_repo_path_file_content.golden diff --git a/internal/search/job/jobutil/testdata/Test_computeResultTypes/standard,_only_search_file_content_when_type_not_set.golden b/internal/search/job/jobutil/testdata/Test_computeResultTypes/standard,_only_search_file_content_when_type_not_set.golden new file mode 100644 index 0000000000000..1a010b1c0f081 --- /dev/null +++ b/internal/search/job/jobutil/testdata/Test_computeResultTypes/standard,_only_search_file_content_when_type_not_set.golden @@ -0,0 +1 @@ +file \ No newline at end of file diff --git a/internal/search/job/jobutil/testdata/Test_computeResultTypes/standard,_plain_pattern_searches_repo_path_file_content.golden b/internal/search/job/jobutil/testdata/Test_computeResultTypes/standard,_plain_pattern_searches_repo_path_file_content.golden new file mode 100644 index 0000000000000..b806262a3ba6b --- /dev/null +++ b/internal/search/job/jobutil/testdata/Test_computeResultTypes/standard,_plain_pattern_searches_repo_path_file_content.golden @@ -0,0 +1 @@ +file|path|repo \ No newline at end of file diff --git a/internal/search/query/parser.go b/internal/search/query/parser.go index 6b4dec939556e..e956ebb7b9d34 100644 --- a/internal/search/query/parser.go +++ b/internal/search/query/parser.go @@ -1094,7 +1094,7 @@ func (p *parser) parseAnd() ([]Node, error) { left, err = p.parseLeaves(Regexp) case SearchTypeLiteral, SearchTypeStructural: left, err = p.parseLeaves(Literal) - case SearchTypeStandard, SearchTypeLucky: + case SearchTypeStandard, SearchTypeLucky, SearchTypeNewStandardRC1: left, err = p.parseLeaves(Literal | Standard) default: left, err = p.parseLeaves(Literal | Standard) @@ -1190,7 +1190,7 @@ func Parse(in string, searchType SearchType) ([]Node, error) { nodes = hoistedNodes } } - if searchType == SearchTypeLiteral || searchType == SearchTypeStandard { + if searchType == SearchTypeLiteral || searchType == SearchTypeStandard || searchType == SearchTypeNewStandardRC1 { err = validatePureLiteralPattern(nodes, parser.balanced == 0) if err != nil { return nil, err diff --git a/internal/search/query/parser_test.go b/internal/search/query/parser_test.go index 4ed55af7fbbb6..42788e16f22df 100644 --- a/internal/search/query/parser_test.go +++ b/internal/search/query/parser_test.go @@ -817,3 +817,26 @@ func TestParseStandard(t *testing.T) { autogold.ExpectFile(t, autogold.Raw(test("(sancerre and /pouilly-fume/)"))) }) } + +func TestParseNewStandard(t *testing.T) { + test := func(input string) string { + result, err := Parse(input, SearchTypeNewStandardRC1) + if err != nil { + return err.Error() + } + jsonStr, _ := PrettyJSON(result) + return jsonStr + } + + t.Run("patterns are literal and slash-delimited patterns slash...slash are regexp", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("anjou /saumur/"))) + }) + + t.Run("quoted patterns are still literal", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test(`"veneto"`))) + }) + + t.Run("parens around slash...slash", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("(sancerre and /pouilly-fume/)"))) + }) +} diff --git a/internal/search/query/predicate.go b/internal/search/query/predicate.go index e5f5dc0423aa2..939498ae72216 100644 --- a/internal/search/query/predicate.go +++ b/internal/search/query/predicate.go @@ -35,13 +35,13 @@ var DefaultPredicateRegistry = PredicateRegistry{ "contains.commit.after": func() Predicate { return &RepoContainsCommitAfterPredicate{} }, "has.commit.after": func() Predicate { return &RepoContainsCommitAfterPredicate{} }, "has.description": func() Predicate { return &RepoHasDescriptionPredicate{} }, - "has.tag": func() Predicate { return &RepoHasTagPredicate{} }, - "has": func() Predicate { return &RepoHasKVPPredicate{} }, - "has.key": func() Predicate { return &RepoHasKeyPredicate{} }, "has.meta": func() Predicate { return &RepoHasMetaPredicate{} }, "has.topic": func() Predicate { return &RepoHasTopicPredicate{} }, // Deprecated predicates + "has.tag": func() Predicate { return &RepoHasTagPredicate{} }, + "has": func() Predicate { return &RepoHasKVPPredicate{} }, + "has.key": func() Predicate { return &RepoHasKeyPredicate{} }, "contains": func() Predicate { return &RepoContainsPredicate{} }, }, FieldFile: { diff --git a/internal/search/query/query.go b/internal/search/query/query.go index 44aff85801899..527d08f54c5b5 100644 --- a/internal/search/query/query.go +++ b/internal/search/query/query.go @@ -101,6 +101,8 @@ func For(searchType SearchType) step { processType = succeeds(escapeParensHeuristic, substituteConcat(fuzzyRegexp)) case SearchTypeStructural: processType = succeeds(labelStructural, ellipsesForHoles, substituteConcat(space)) + case SearchTypeNewStandardRC1: + processType = succeeds(substituteConcat(and)) } normalize := succeeds(LowercaseFieldNames, SubstituteAliases(searchType), SubstituteCountAll) return Sequence(normalize, processType) diff --git a/internal/search/query/testdata/TestConcat/#09.golden b/internal/search/query/testdata/TestConcat/#09.golden new file mode 100644 index 0000000000000..2c46f482a5cea --- /dev/null +++ b/internal/search/query/testdata/TestConcat/#09.golden @@ -0,0 +1,74 @@ +[ + { + "and": [ + { + "value": "alsace", + "negated": false, + "labels": [ + "Regexp" + ], + "range": { + "start": { + "line": 0, + "column": 0 + }, + "end": { + "line": 0, + "column": 8 + } + } + }, + { + "value": "bourgogne", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 9 + }, + "end": { + "line": 0, + "column": 18 + } + } + }, + { + "value": "bordeaux", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 19 + }, + "end": { + "line": 0, + "column": 27 + } + } + }, + { + "value": "champagne", + "negated": false, + "labels": [ + "Regexp" + ], + "range": { + "start": { + "line": 0, + "column": 28 + }, + "end": { + "line": 0, + "column": 39 + } + } + } + ] + } +] \ No newline at end of file diff --git a/internal/search/query/testdata/TestConcat/#10.golden b/internal/search/query/testdata/TestConcat/#10.golden new file mode 100644 index 0000000000000..22fd6b3958528 --- /dev/null +++ b/internal/search/query/testdata/TestConcat/#10.golden @@ -0,0 +1,57 @@ +[ + { + "and": [ + { + "value": "alsace", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 0 + }, + "end": { + "line": 0, + "column": 6 + } + } + }, + { + "value": "bourgogne", + "negated": false, + "labels": [ + "Regexp" + ], + "range": { + "start": { + "line": 0, + "column": 7 + }, + "end": { + "line": 0, + "column": 18 + } + } + }, + { + "value": "bordeaux", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 19 + }, + "end": { + "line": 0, + "column": 27 + } + } + } + ] + } +] \ No newline at end of file diff --git a/internal/search/query/testdata/TestConcat/#11.golden b/internal/search/query/testdata/TestConcat/#11.golden new file mode 100644 index 0000000000000..c94f18d79bbae --- /dev/null +++ b/internal/search/query/testdata/TestConcat/#11.golden @@ -0,0 +1,108 @@ +[ + { + "and": [ + { + "value": "a", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 0 + }, + "end": { + "line": 0, + "column": 1 + } + } + }, + { + "value": "b", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 2 + }, + "end": { + "line": 0, + "column": 3 + } + } + }, + { + "value": "c", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 4 + }, + "end": { + "line": 0, + "column": 5 + } + } + }, + { + "value": "d", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 6 + }, + "end": { + "line": 0, + "column": 7 + } + } + }, + { + "value": "e", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 8 + }, + "end": { + "line": 0, + "column": 9 + } + } + }, + { + "value": "f", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 10 + }, + "end": { + "line": 0, + "column": 11 + } + } + } + ] + } +] \ No newline at end of file diff --git a/internal/search/query/testdata/TestConcat/#12.golden b/internal/search/query/testdata/TestConcat/#12.golden new file mode 100644 index 0000000000000..57bef12f0ad99 --- /dev/null +++ b/internal/search/query/testdata/TestConcat/#12.golden @@ -0,0 +1,70 @@ +[ + { + "value": "a", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 1 + }, + "end": { + "line": 0, + "column": 2 + } + } + }, + { + "value": "b", + "negated": true, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 3 + }, + "end": { + "line": 0, + "column": 8 + } + } + }, + { + "value": "c", + "negated": true, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 9 + }, + "end": { + "line": 0, + "column": 14 + } + } + }, + { + "value": "d", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 15 + }, + "end": { + "line": 0, + "column": 16 + } + } + } +] \ No newline at end of file diff --git a/internal/search/query/testdata/TestConcat/#13.golden b/internal/search/query/testdata/TestConcat/#13.golden new file mode 100644 index 0000000000000..2e28afc32ce32 --- /dev/null +++ b/internal/search/query/testdata/TestConcat/#13.golden @@ -0,0 +1,41 @@ +[ + { + "and": [ + { + "value": "(((a b c)))", + "negated": false, + "labels": [ + "HeuristicParensAsPatterns", + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 0 + }, + "end": { + "line": 0, + "column": 11 + } + } + }, + { + "value": "d", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 16 + }, + "end": { + "line": 0, + "column": 17 + } + } + } + ] + } +] \ No newline at end of file diff --git a/internal/search/query/testdata/TestParseNewStandard/parens_around_slash...slash.golden b/internal/search/query/testdata/TestParseNewStandard/parens_around_slash...slash.golden new file mode 100644 index 0000000000000..85b67ba814533 --- /dev/null +++ b/internal/search/query/testdata/TestParseNewStandard/parens_around_slash...slash.golden @@ -0,0 +1,40 @@ +[ + { + "and": [ + { + "value": "sancerre", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 1 + }, + "end": { + "line": 0, + "column": 9 + } + } + }, + { + "value": "pouilly-fume", + "negated": false, + "labels": [ + "Regexp" + ], + "range": { + "start": { + "line": 0, + "column": 14 + }, + "end": { + "line": 0, + "column": 28 + } + } + } + ] + } +] \ No newline at end of file diff --git a/internal/search/query/testdata/TestParseNewStandard/patterns_are_literal_and_slash-delimited_patterns_slash...slash_are_regexp.golden b/internal/search/query/testdata/TestParseNewStandard/patterns_are_literal_and_slash-delimited_patterns_slash...slash_are_regexp.golden new file mode 100644 index 0000000000000..1a906b5a87bbb --- /dev/null +++ b/internal/search/query/testdata/TestParseNewStandard/patterns_are_literal_and_slash-delimited_patterns_slash...slash_are_regexp.golden @@ -0,0 +1,40 @@ +[ + { + "concat": [ + { + "value": "anjou", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 0 + }, + "end": { + "line": 0, + "column": 5 + } + } + }, + { + "value": "saumur", + "negated": false, + "labels": [ + "Regexp" + ], + "range": { + "start": { + "line": 0, + "column": 6 + }, + "end": { + "line": 0, + "column": 14 + } + } + } + ] + } +] \ No newline at end of file diff --git a/internal/search/query/testdata/TestParseNewStandard/quoted_patterns_are_still_literal.golden b/internal/search/query/testdata/TestParseNewStandard/quoted_patterns_are_still_literal.golden new file mode 100644 index 0000000000000..8d4b12b14c594 --- /dev/null +++ b/internal/search/query/testdata/TestParseNewStandard/quoted_patterns_are_still_literal.golden @@ -0,0 +1,19 @@ +[ + { + "value": "\"veneto\"", + "negated": false, + "labels": [ + "Literal" + ], + "range": { + "start": { + "line": 0, + "column": 0 + }, + "end": { + "line": 0, + "column": 8 + } + } + } +] \ No newline at end of file diff --git a/internal/search/query/transformer.go b/internal/search/query/transformer.go index d0c79946a1553..8f647a96f43f4 100644 --- a/internal/search/query/transformer.go +++ b/internal/search/query/transformer.go @@ -376,6 +376,15 @@ func space(patterns []Pattern) []Node { } } +// and concatenates patterns with AND. +func and(patterns []Pattern) []Node { + p := make([]Node, 0, len(patterns)) + for _, pattern := range patterns { + p = append(p, pattern) + } + return NewOperator(p, And) +} + // substituteConcat returns a function that concatenates all contiguous patterns // in the tree, rooted by a concat operator. Concat operators containing negated // patterns are lifted out: (concat "a" (not "b")) -> ("a" (not "b")) diff --git a/internal/search/query/transformer_test.go b/internal/search/query/transformer_test.go index 8a930b9088a01..82caf2e5014cf 100644 --- a/internal/search/query/transformer_test.go +++ b/internal/search/query/transformer_test.go @@ -27,6 +27,12 @@ func TestSubstituteAliases(t *testing.T) { autogold.Expect(`[{"field":"file","value":"foo","negated":false,"labels":["IsAlias"],"range":{"start":{"line":0,"column":0},"end":{"line":0,"column":8}}}]`). Equal(t, test("path:foo", SearchTypeLiteral)) + + autogold.Expect(`[{"and":[{"field":"repo","value":"repo","negated":false,"labels":["IsAlias"],"range":{"start":{"line":0,"column":0},"end":{"line":0,"column":6}}},{"value":"foo","negated":false,"labels":["Literal"],"range":{"start":{"line":0,"column":7},"end":{"line":0,"column":10}}},{"value":"bar","negated":false,"labels":["Literal"],"range":{"start":{"line":0,"column":11},"end":{"line":0,"column":14}}}]}]`). + Equal(t, test("r:repo foo bar", SearchTypeNewStandardRC1)) + + autogold.Expect(`[{"and":[{"value":"foo","negated":false,"labels":["Literal"],"range":{"start":{"line":0,"column":0},"end":{"line":0,"column":3}}},{"value":"bar","negated":false,"labels":["Literal"],"range":{"start":{"line":0,"column":4},"end":{"line":0,"column":7}}},{"value":"bas","negated":false,"labels":["Regexp"],"range":{"start":{"line":0,"column":8},"end":{"line":0,"column":13}}}]}]`). + Equal(t, test("foo bar /bas/", SearchTypeNewStandardRC1)) } func TestLowercaseFieldNames(t *testing.T) { @@ -186,6 +192,26 @@ func TestConcat(t *testing.T) { t.Run("", func(t *testing.T) { autogold.ExpectFile(t, autogold.Raw(test(`alsace /bourgogne/ bordeaux`, SearchTypeLucky))) }) + + t.Run("", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test(`/alsace/ bourgogne bordeaux /champagne/`, SearchTypeNewStandardRC1))) + }) + + t.Run("", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test(`alsace /bourgogne/ bordeaux`, SearchTypeNewStandardRC1))) + }) + + t.Run("", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("a b c d e f", SearchTypeNewStandardRC1))) + }) + + t.Run("", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("(a not b not c d)", SearchTypeNewStandardRC1))) + }) + + t.Run("", func(t *testing.T) { + autogold.ExpectFile(t, autogold.Raw(test("(((a b c))) and d", SearchTypeNewStandardRC1))) + }) } func TestEllipsesForHoles(t *testing.T) { diff --git a/internal/search/query/types.go b/internal/search/query/types.go index d6f7b260be490..7654f120cc4a6 100644 --- a/internal/search/query/types.go +++ b/internal/search/query/types.go @@ -36,6 +36,7 @@ const ( SearchTypeLucky SearchTypeStandard SearchTypeKeyword + SearchTypeNewStandardRC1 ) func (s SearchType) String() string { @@ -52,6 +53,8 @@ func (s SearchType) String() string { return "lucky" case SearchTypeKeyword: return "keyword" + case SearchTypeNewStandardRC1: + return "newStandardRC1" default: return fmt.Sprintf("unknown{%d}", s) } diff --git a/internal/search/result/BUILD.bazel b/internal/search/result/BUILD.bazel index 7e9a7784320a0..7f1602a84c467 100644 --- a/internal/search/result/BUILD.bazel +++ b/internal/search/result/BUILD.bazel @@ -11,7 +11,6 @@ go_library( "file.go", "highlight.go", "match.go", - "merge.go", "merger.go", "owner.go", "range.go", diff --git a/internal/search/result/merge.go b/internal/search/result/merge.go deleted file mode 100644 index 1512b8fcdbd0f..0000000000000 --- a/internal/search/result/merge.go +++ /dev/null @@ -1,27 +0,0 @@ -package result - -// Intersect performs a merge of match results, merging line matches for files -// contained in both result sets. -func Intersect(left, right []Match) []Match { - rightMap := make(map[Key]Match, len(right)) - for _, r := range right { - rightMap[r.Key()] = r - } - - merged := left[:0] - for _, l := range left { - r := rightMap[l.Key()] - if r == nil { - continue - } - switch leftMatch := l.(type) { - // key matches, so we know to convert to respective type - case *FileMatch: - leftMatch.AppendMatches(r.(*FileMatch)) - case *CommitMatch: - leftMatch.AppendMatches(r.(*CommitMatch)) - } - merged = append(merged, l) - } - return merged -} diff --git a/internal/search/streaming/progress.go b/internal/search/streaming/progress.go index cafbb075ffa2e..f8e49dfe4aca5 100644 --- a/internal/search/streaming/progress.go +++ b/internal/search/streaming/progress.go @@ -108,11 +108,3 @@ func (c *Stats) String() string { func (c *Stats) Equal(other *Stats) bool { return reflect.DeepEqual(c, other) } - -// Deref returns the zero-valued stats if its receiver is nil -func (c *Stats) Deref() Stats { - if c != nil { - return *c - } - return Stats{} -} diff --git a/internal/search/symbol/BUILD.bazel b/internal/search/symbol/BUILD.bazel index 63586f0d3e802..7df76a51b260d 100644 --- a/internal/search/symbol/BUILD.bazel +++ b/internal/search/symbol/BUILD.bazel @@ -14,7 +14,6 @@ go_library( "//internal/search/result", "//internal/search/zoekt", "//internal/symbols", - "//internal/syncx", "//internal/trace/policy", "//internal/types", "//lib/errors", diff --git a/internal/search/symbol/symbol.go b/internal/search/symbol/symbol.go index 9ce5cf1d9d1d0..000bdfd710170 100644 --- a/internal/search/symbol/symbol.go +++ b/internal/search/symbol/symbol.go @@ -3,6 +3,7 @@ package symbol import ( "context" "regexp/syntax" //nolint:depguard // zoekt requires this pkg + "sync" "time" "github.com/RoaringBitmap/roaring" @@ -17,7 +18,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/search/result" zoektutil "github.com/sourcegraph/sourcegraph/internal/search/zoekt" "github.com/sourcegraph/sourcegraph/internal/symbols" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/internal/trace/policy" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -28,7 +28,7 @@ const DefaultSymbolLimit = 100 // NOTE: this lives inside a syncx.OnceValue because search.Indexed depends on // conf.Get, and running conf.Get() at init time can cause a deadlock. So, // we construct it lazily instead. -var DefaultZoektSymbolsClient = syncx.OnceValue(func() *ZoektSymbolsClient { +var DefaultZoektSymbolsClient = sync.OnceValue(func() *ZoektSymbolsClient { return &ZoektSymbolsClient{ subRepoPermsChecker: authz.DefaultSubRepoPermsChecker, zoektStreamer: search.Indexed(), diff --git a/internal/search/types.go b/internal/search/types.go index 8f3b304cab8b8..6a5ca13c31526 100644 --- a/internal/search/types.go +++ b/internal/search/types.go @@ -197,8 +197,7 @@ type ZoektParameters struct { // Features are feature flags that can affect behaviour of searcher. Features Features - // EXPERIMENTAL: If true, use keyword-style scoring instead of Zoekt's default scoring formula. - KeywordScoring bool + PatternType query.SearchType } // ToSearchOptions converts the parameters to options for the Zoekt search API. @@ -218,7 +217,7 @@ func (o *ZoektParameters) ToSearchOptions(ctx context.Context) (searchOpts *zoek Trace: policy.ShouldTrace(ctx), MaxWallTime: defaultTimeout, ChunkMatches: true, - UseKeywordScoring: o.KeywordScoring, + UseKeywordScoring: o.PatternType == query.SearchTypeKeyword, } // These are reasonable default amounts of work to do per shard and @@ -229,7 +228,7 @@ func (o *ZoektParameters) ToSearchOptions(ctx context.Context) (searchOpts *zoek // are evaluating to deliver a better keyword-based search experience. For now // these are separate, but we might combine them in the future. Both profit from // higher defaults. - if o.KeywordScoring || o.Features.UseZoektParser { + if searchOpts.UseKeywordScoring || o.PatternType == query.SearchTypeNewStandardRC1 { // Keyword searches tends to match much more broadly than code searches, so we need to // consider more candidates to ensure we don't miss highly-ranked documents searchOpts.ShardMaxMatchCount *= 10 @@ -261,7 +260,7 @@ func (o *ZoektParameters) ToSearchOptions(ctx context.Context) (searchOpts *zoek // This enables our stream based ranking, where we wait a certain amount // of time to collect results before ranking. - searchOpts.FlushWallTime = conf.SearchFlushWallTime(o.KeywordScoring) + searchOpts.FlushWallTime = conf.SearchFlushWallTime(searchOpts.UseKeywordScoring) // Only use document ranks if the jobs to calculate the ranks are enabled. This // is to make sure we don't use outdated ranks for scoring in Zoekt. @@ -431,10 +430,6 @@ type Features struct { // currently just supported by Zoekt. ContentBasedLangFilters bool `json:"search-content-based-lang-detection"` - // UseZoektParser when true will use a new way to interpret queries optimized for - // keyword search. This is currently just supported by Zoekt. - UseZoektParser bool `json:"search-new-keyword"` - // Debug when true will set the Debug field on FileMatches. This may grow // from here. For now we treat this like a feature flag for convenience. Debug bool `json:"debug"` diff --git a/internal/search/types_test.go b/internal/search/types_test.go index af8a9bf7e998a..b7ed6482daec8 100644 --- a/internal/search/types_test.go +++ b/internal/search/types_test.go @@ -10,6 +10,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/search/filter" "github.com/sourcegraph/sourcegraph/internal/search/limits" + "github.com/sourcegraph/sourcegraph/internal/search/query" "github.com/sourcegraph/sourcegraph/schema" ) @@ -154,7 +155,7 @@ func TestZoektParameters(t *testing.T) { context: context.Background(), params: &ZoektParameters{ FileMatchLimit: limits.DefaultMaxSearchResultsStreaming, - KeywordScoring: true, + PatternType: query.SearchTypeKeyword, }, want: &zoekt.SearchOptions{ ShardMaxMatchCount: 100000, diff --git a/internal/search/zoekt/BUILD.bazel b/internal/search/zoekt/BUILD.bazel index 62e1bf1f0b31e..6891be04bc1b3 100644 --- a/internal/search/zoekt/BUILD.bazel +++ b/internal/search/zoekt/BUILD.bazel @@ -29,7 +29,6 @@ go_library( "//internal/search/streaming", "//internal/trace", "//internal/types", - "//internal/xcontext", "//lib/errors", "@com_github_go_enry_go_enry_v2//:go-enry", "@com_github_grafana_regexp//:regexp", diff --git a/internal/search/zoekt/indexed_search.go b/internal/search/zoekt/indexed_search.go index ffbb4eef27214..f3593dc0c9248 100644 --- a/internal/search/zoekt/indexed_search.go +++ b/internal/search/zoekt/indexed_search.go @@ -28,7 +28,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/search/streaming" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/types" - "github.com/sourcegraph/sourcegraph/internal/xcontext" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -596,7 +595,7 @@ func zoektFileMatchToSymbolResults(repoName types.MinimalRepo, inputRev string, // contextWithoutDeadline returns a context which will cancel if the cOld is // canceled. func contextWithoutDeadline(cOld context.Context) (context.Context, context.CancelFunc) { - cNew := xcontext.Detach(cOld) + cNew := context.WithoutCancel(cOld) cNew, cancel := context.WithCancel(cNew) go func() { diff --git a/internal/search/zoekt/query.go b/internal/search/zoekt/query.go index e42815e25e62a..384179802f0e3 100644 --- a/internal/search/zoekt/query.go +++ b/internal/search/zoekt/query.go @@ -18,28 +18,15 @@ func QueryToZoektQuery(b query.Basic, resultTypes result.Types, feat *search.Fea isCaseSensitive := b.IsCaseSensitive() if b.Pattern != nil { - if feat.UseZoektParser { - q, err = toZoektPatternNew( - b.Pattern, - isCaseSensitive, - resultTypes.Has(result.TypeFile), - resultTypes.Has(result.TypePath), - typ, - ) - if err != nil { - return nil, err - } - } else { - q, err = toZoektPattern( - b.Pattern, - isCaseSensitive, - resultTypes.Has(result.TypeFile), - resultTypes.Has(result.TypePath), - typ, - ) - if err != nil { - return nil, err - } + q, err = toZoektPattern( + b.Pattern, + isCaseSensitive, + resultTypes.Has(result.TypeFile), + resultTypes.Has(result.TypePath), + typ, + ) + if err != nil { + return nil, err } } diff --git a/internal/searcher/v1/BUILD.bazel b/internal/searcher/v1/BUILD.bazel index 0439865b9d042..db9c33da5050c 100644 --- a/internal/searcher/v1/BUILD.bazel +++ b/internal/searcher/v1/BUILD.bazel @@ -2,7 +2,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@rules_buf//buf:defs.bzl", "buf_lint_test") load("@rules_proto//proto:defs.bzl", "proto_library") -load("//dev:proto.bzl", "write_proto_stubs_to_source") exports_files(["buf.gen.yaml"]) diff --git a/internal/service/svcmain/BUILD.bazel b/internal/service/svcmain/BUILD.bazel index 67a0fbc74fbcd..8d99590864858 100644 --- a/internal/service/svcmain/BUILD.bazel +++ b/internal/service/svcmain/BUILD.bazel @@ -16,7 +16,6 @@ go_library( "//internal/profiler", "//internal/service", "//internal/singleprogram", - "//internal/syncx", "//internal/tracer", "//internal/version", "@com_github_getsentry_sentry_go//:sentry-go", diff --git a/internal/service/svcmain/svcmain.go b/internal/service/svcmain/svcmain.go index 5308b5ab51cd4..c309ef58a01b7 100644 --- a/internal/service/svcmain/svcmain.go +++ b/internal/service/svcmain/svcmain.go @@ -23,7 +23,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/profiler" sgservice "github.com/sourcegraph/sourcegraph/internal/service" "github.com/sourcegraph/sourcegraph/internal/singleprogram" - "github.com/sourcegraph/sourcegraph/internal/syncx" "github.com/sourcegraph/sourcegraph/internal/tracer" "github.com/sourcegraph/sourcegraph/internal/version" ) @@ -233,7 +232,7 @@ func run( obctx := observation.ContextWithLogger(log.Scoped(service.Name()), obctx) // ensure ready is only called once and always call it. - ready := syncx.OnceFunc(allReadyWG.Done) + ready := sync.OnceFunc(allReadyWG.Done) defer ready() // Don't run executors for Cody App diff --git a/internal/session/BUILD.bazel b/internal/session/BUILD.bazel index 054ef23373c6c..1c1fc52a44695 100644 --- a/internal/session/BUILD.bazel +++ b/internal/session/BUILD.bazel @@ -16,8 +16,10 @@ go_library( "//internal/database", "//internal/env", "//internal/errcode", + "//internal/licensing", "//internal/redispool", "//internal/trace", + "//internal/types", "//lib/errors", "@com_github_boj_redistore//:redistore", "@com_github_gorilla_securecookie//:securecookie", @@ -38,6 +40,8 @@ go_test( "//internal/database", "//internal/database/dbmocks", "//internal/errcode", + "//internal/license", + "//internal/licensing", "//internal/types", "//lib/errors", "@com_github_sourcegraph_log//logtest", diff --git a/internal/session/session.go b/internal/session/session.go index 0e34fa9e2ba18..262b3ae52d0c1 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -15,13 +15,16 @@ import ( "go.opentelemetry.io/otel/attribute" "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/errcode" + "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/redispool" "github.com/sourcegraph/sourcegraph/internal/trace" + "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/inconshreveable/log15" @@ -241,6 +244,24 @@ func GetData(r *http.Request, key string, value any) error { return nil } +func SetActorFromUser(ctx context.Context, w http.ResponseWriter, r *http.Request, user *types.User, expiryPeriod time.Duration) (context.Context, error) { + info, err := licensing.GetConfiguredProductLicenseInfo() + if err != nil { + return ctx, err + } + + if info.IsExpired() && !user.SiteAdmin { + return ctx, errors.New("Sourcegraph license is expired. Only admins are allowed to sign in.") + } + + // Write the session cookie + actor := sgactor.Actor{ + UID: user.ID, + } + + return ctx, SetActor(w, r, &actor, expiryPeriod, user.CreatedAt) +} + // SetActor sets the actor in the session, or removes it if actor == nil. If no session exists, a // new session is created. // @@ -439,6 +460,16 @@ func authenticateByCookie(logger log.Logger, db database.DB, r *http.Request, w return ctx // not authenticated } + licenseInfo, err := licensing.GetConfiguredProductLicenseInfo() + if err != nil { + return ctx + } + + if licenseInfo.IsExpired() && !usr.SiteAdmin { + _ = deleteSession(w, r) // Delete session since only admins are allowed + return ctx + } + // Check that the session is still valid if info.LastActive.Before(usr.InvalidatedSessionsAt) { span.SetAttributes(attribute.Bool("expired", true)) diff --git a/internal/session/session_test.go b/internal/session/session_test.go index 151e7b95749e6..0454ca09a886d 100644 --- a/internal/session/session_test.go +++ b/internal/session/session_test.go @@ -16,6 +16,8 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/errcode" + "github.com/sourcegraph/sourcegraph/internal/license" + "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -278,10 +280,12 @@ func TestCookieMiddleware(t *testing.T) { { req: httptest.NewRequest("GET", "/", nil), expActor: &actor.Actor{}, - }, { + }, + { req: authedReqs[0], expActor: actors[0], - }, { + }, + { req: authedReqs[1], expActor: &actor.Actor{}, deleted: true, @@ -305,7 +309,6 @@ func TestCookieMiddleware(t *testing.T) { t.Errorf("got deleted %v, want %v", deleted, testcase.deleted) } }) - } } @@ -475,3 +478,90 @@ func TestOldUserSessionSucceeds(t *testing.T) { t.Fatal("user creation date was not set") } } + +func TestExpiredLicenseOnlyAllowsAdmins(t *testing.T) { + licensing.MockGetConfiguredProductLicenseInfo = func() (*license.Info, string, error) { + return &license.Info{ + ExpiresAt: time.Now().Add(-1 * time.Hour), + }, "", nil + } + + logger := logtest.Scoped(t) + + cleanup := ResetMockSessionStore(t) + defer cleanup() + + userCreatedAt := time.Now() + + var adminUID, regularUID int32 = 123, 456 + + users := dbmocks.NewStrictMockUserStore() + users.GetByIDFunc.SetDefaultHook(func(ctx context.Context, id int32) (*types.User, error) { + user := &types.User{ID: id, CreatedAt: userCreatedAt} + if id == adminUID { + user.SiteAdmin = true + } + return user, nil + }) + + db := dbmocks.NewStrictMockDB() + db.UsersFunc.SetDefaultReturn(users) + + testcases := map[string]struct { + UID int32 + WantActor bool + }{ + "admin user is allowed": { + UID: adminUID, + WantActor: true, + }, + "regular user is not allowed": { + UID: regularUID, + WantActor: false, + }, + } + + for name, tc := range testcases { + t.Run(name, func(t *testing.T) { + // Start new session for the admin user + w := httptest.NewRecorder() + actr := &actor.Actor{UID: tc.UID, FromSessionCookie: true} + if err := SetActor(w, httptest.NewRequest("GET", "/", nil), actr, time.Second, userCreatedAt); err != nil { + t.Fatal(err) + } + var authCookies []*http.Cookie + for _, cookie := range w.Result().Cookies() { + if cookie.Expires.After(time.Now()) || cookie.MaxAge > 0 { + authCookies = append(authCookies, cookie) + } + } + + // Create authed request with session cookie + authedReq := httptest.NewRequest("GET", "/", nil) + for _, cookie := range authCookies { + authedReq.AddCookie(cookie) + } + if len(authedReq.Cookies()) != 1 { + t.Fatal("expected exactly 1 authed cookie") + } + + httpRec := httptest.NewRecorder() + gotActor := actor.FromContext(authenticateByCookie(logger, db, authedReq, httpRec)) + + if tc.WantActor && !reflect.DeepEqual(gotActor, actr) { + t.Errorf("didn't find actor %v != %v", gotActor, actr) + } else if !tc.WantActor && reflect.DeepEqual(gotActor, actr) { + t.Errorf("found actor %v == %v", gotActor, actr) + } + + if !tc.WantActor && len(httpRec.Result().Cookies()) != 1 { + t.Errorf("should have received remove cookie instruction") + } else if !tc.WantActor && httpRec.Result().Cookies()[0].Expires.After(time.Now()) { + t.Errorf("cookie expiration should be in the past") + } + if tc.WantActor && len(httpRec.Result().Cookies()) == 1 { + t.Errorf("should not have received remove cookie instruction") + } + }) + } +} diff --git a/internal/settings/settings_test.go b/internal/settings/settings_test.go index 826650d79c37e..ccd362385f3f5 100644 --- a/internal/settings/settings_test.go +++ b/internal/settings/settings_test.go @@ -154,16 +154,16 @@ func TestMergeSettings(t *testing.T) { }, { name: "merge int", left: &schema.Settings{ - SearchContextLines: 0, - CodeIntelligenceAutoIndexPopularRepoLimit: 1, + SearchContextLines: 0, + HistoryDefaultPageSize: 1, }, right: &schema.Settings{ - SearchContextLines: 1, - CodeIntelligenceAutoIndexPopularRepoLimit: 0, // This is the zero value, so will not override a previous non-zero value + SearchContextLines: 1, + HistoryDefaultPageSize: 0, // This is the zero value, so will not override a previous non-zero value }, expected: &schema.Settings{ - SearchContextLines: 1, - CodeIntelligenceAutoIndexPopularRepoLimit: 1, // This is the zero value, so will not override a previous non-zero value + SearchContextLines: 1, + HistoryDefaultPageSize: 1, // This is the zero value, so will not override a previous non-zero value }, }, { name: "deep merge struct pointer", diff --git a/internal/symbols/BUILD.bazel b/internal/symbols/BUILD.bazel index 75e5cc68617c2..9dd08f92d67b8 100644 --- a/internal/symbols/BUILD.bazel +++ b/internal/symbols/BUILD.bazel @@ -16,15 +16,12 @@ go_library( "//internal/grpc/defaults", "//internal/httpcli", "//internal/limiter", - "//internal/resetonce", "//internal/search", "//internal/search/result", "//internal/symbols/v1:symbols", "//internal/trace", "//internal/types", "//lib/errors", - "@com_github_gobwas_glob//:glob", - "@com_github_sourcegraph_go_ctags//:go-ctags", "@com_github_sourcegraph_log//:log", "@io_opentelemetry_go_otel//attribute", "@org_golang_google_grpc//:go_default_library", diff --git a/internal/symbols/client.go b/internal/symbols/client.go index 3af0f65d082df..61cb53bee8af4 100644 --- a/internal/symbols/client.go +++ b/internal/symbols/client.go @@ -7,10 +7,7 @@ import ( "io" "net/http" "strings" - "time" - "github.com/gobwas/glob" - "github.com/sourcegraph/go-ctags" "github.com/sourcegraph/log" "go.opentelemetry.io/otel/attribute" "google.golang.org/grpc" @@ -26,7 +23,6 @@ import ( "github.com/sourcegraph/sourcegraph/internal/grpc/defaults" "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/limiter" - "github.com/sourcegraph/sourcegraph/internal/resetonce" "github.com/sourcegraph/sourcegraph/internal/search" "github.com/sourcegraph/sourcegraph/internal/search/result" proto "github.com/sourcegraph/sourcegraph/internal/symbols/v1" @@ -80,94 +76,6 @@ type Client struct { // function since we expect the client to be set at runtime once we have a // database connection. SubRepoPermsChecker func() authz.SubRepoPermissionChecker - - langMappingOnce resetonce.Once - langMappingCache map[string][]glob.Glob -} - -func (c *Client) ListLanguageMappings(ctx context.Context, repo api.RepoName) (_ map[string][]glob.Glob, err error) { - c.langMappingOnce.Do(func() { - var mappings map[string][]string - - if conf.IsGRPCEnabled(ctx) { - mappings, err = c.listLanguageMappingsGRPC(ctx, repo) - } else { - mappings, err = c.listLanguageMappingsJSON(ctx, repo) - } - - if err != nil { - err = errors.Wrap(err, "fetching language mappings") - return - } - - globs := make(map[string][]glob.Glob, len(ctags.SupportedLanguages)) - - for _, allowedLanguage := range ctags.SupportedLanguages { - for _, pattern := range mappings[allowedLanguage] { - var compiled glob.Glob - compiled, err = glob.Compile(pattern) - if err != nil { - return - } - - globs[allowedLanguage] = append(globs[allowedLanguage], compiled) - } - } - - c.langMappingCache = globs - time.AfterFunc(time.Minute*10, c.langMappingOnce.Reset) - }) - - return c.langMappingCache, nil -} - -func (c *Client) listLanguageMappingsGRPC(ctx context.Context, repository api.RepoName) (map[string][]string, error) { - // TODO@ggilmore: This address doesn't need the repository name for anything order than dialing - // an arbitrary symbols host. We should remove this requirement from this method. - conn, err := c.getGRPCConn(string(repository)) - if err != nil { - return nil, errors.Wrap(err, "getting gRPC connection to symbols server") - } - - client := proto.NewSymbolsServiceClient(conn) - resp, err := client.ListLanguages(ctx, &proto.ListLanguagesRequest{}) - if err != nil { - return nil, translateGRPCError(err) - } - - mappings := make(map[string][]string, len(resp.LanguageFileNameMap)) - for language, fp := range resp.LanguageFileNameMap { - mappings[language] = fp.Patterns - } - - return mappings, nil -} - -func (c *Client) listLanguageMappingsJSON(ctx context.Context, repository api.RepoName) (map[string][]string, error) { - // TODO@ggilmore: This address doesn't need the repository name for anything order than dialing - // an arbitrary symbols host. We should remove this requirement from this method. - - var resp *http.Response - resp, err := c.httpPost(ctx, "list-languages", repository, nil) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - // best-effort inclusion of body in error message - body, _ := io.ReadAll(io.LimitReader(resp.Body, 200)) - err = errors.Errorf( - "Symbol.ListLanguageMappings http status %d: %s", - resp.StatusCode, - string(body), - ) - return nil, err - } - - mapping := make(map[string][]string) - err = json.NewDecoder(resp.Body).Decode(&mapping) - return mapping, err } // Search performs a symbol search on the symbols service. diff --git a/internal/symbols/client_test.go b/internal/symbols/client_test.go index b66a80f90fb96..c4b38bf84fdc6 100644 --- a/internal/symbols/client_test.go +++ b/internal/symbols/client_test.go @@ -197,7 +197,6 @@ func TestDefinitionWithFiltering(t *testing.T) { type mockSymbolsServer struct { mockSearchGRPC func(ctx context.Context, request *proto.SearchRequest) (*proto.SearchResponse, error) mockLocalCodeIntelGRPC func(request *proto.LocalCodeIntelRequest, ss proto.SymbolsService_LocalCodeIntelServer) error - mockListLanguagesGRPC func(ctx context.Context, request *proto.ListLanguagesRequest) (*proto.ListLanguagesResponse, error) mockSymbolInfoGRPC func(ctx context.Context, request *proto.SymbolInfoRequest) (*proto.SymbolInfoResponse, error) mockHealthzGRPC func(ctx context.Context, request *proto.HealthzRequest) (*proto.HealthzResponse, error) @@ -243,14 +242,6 @@ func (m *mockSymbolsServer) LocalCodeIntel(r *proto.LocalCodeIntelRequest, ss pr return errors.Newf("grpc: method %q not implemented", "LocalCodeIntel") } -func (m *mockSymbolsServer) ListLanguages(ctx context.Context, r *proto.ListLanguagesRequest) (*proto.ListLanguagesResponse, error) { - if m.mockListLanguagesGRPC != nil { - return m.mockListLanguagesGRPC(ctx, r) - } - - return nil, errors.Newf("grpc: method %q not implemented", "ListLanguages") -} - func (m *mockSymbolsServer) SymbolInfo(ctx context.Context, r *proto.SymbolInfoRequest) (*proto.SymbolInfoResponse, error) { if m.mockSymbolInfoGRPC != nil { return m.mockSymbolInfoGRPC(ctx, r) diff --git a/internal/symbols/v1/BUILD.bazel b/internal/symbols/v1/BUILD.bazel index 6e5c6b84ba562..a4b2d91c596ca 100644 --- a/internal/symbols/v1/BUILD.bazel +++ b/internal/symbols/v1/BUILD.bazel @@ -3,7 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@rules_buf//buf:defs.bzl", "buf_lint_test") load("@rules_proto//proto:defs.bzl", "proto_library") -load("//dev:proto.bzl", "write_proto_stubs_to_source") exports_files(["buf.gen.yaml"]) diff --git a/internal/symbols/v1/symbols.pb.go b/internal/symbols/v1/symbols.pb.go index b5ab0e6fde1bc..bd8193cac1776 100644 --- a/internal/symbols/v1/symbols.pb.go +++ b/internal/symbols/v1/symbols.pb.go @@ -34,8 +34,8 @@ type SearchRequest struct { Query string `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"` // is_reg_exp, if true, will treat the Pattern as a regular expression IsRegExp bool `protobuf:"varint,4,opt,name=is_reg_exp,json=isRegExp,proto3" json:"is_reg_exp,omitempty"` - // is_case_sensitive, if false, will ignore the case of query and file pattern when - // finding matches + // is_case_sensitive, if false, will ignore the case of query and file pattern + // when finding matches IsCaseSensitive bool `protobuf:"varint,5,opt,name=is_case_sensitive,json=isCaseSensitive,proto3" json:"is_case_sensitive,omitempty"` // include_patterns is a list of regexes that symbol's file paths // need to match to get included in the result @@ -304,103 +304,13 @@ func (x *LocalCodeIntelResponse) GetSymbols() []*LocalCodeIntelResponse_Symbol { return nil } -// ListLanguagesRequest is the request to the ListLanguages method. -type ListLanguagesRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListLanguagesRequest) Reset() { - *x = ListLanguagesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListLanguagesRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListLanguagesRequest) ProtoMessage() {} - -func (x *ListLanguagesRequest) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListLanguagesRequest.ProtoReflect.Descriptor instead. -func (*ListLanguagesRequest) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{4} -} - -// ListLanguagesResponse is the response from the ListLanguages method. -type ListLanguagesResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // language_file_name_map is a of map of language names to - // glob patterns that match files of that language. - // - // Example: "Ruby" -> ["*.rb", "*.ruby"] - LanguageFileNameMap map[string]*ListLanguagesResponse_GlobFilePatterns `protobuf:"bytes,1,rep,name=language_file_name_map,json=languageFileNameMap,proto3" json:"language_file_name_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` -} - -func (x *ListLanguagesResponse) Reset() { - *x = ListLanguagesResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListLanguagesResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListLanguagesResponse) ProtoMessage() {} - -func (x *ListLanguagesResponse) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListLanguagesResponse.ProtoReflect.Descriptor instead. -func (*ListLanguagesResponse) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{5} -} - -func (x *ListLanguagesResponse) GetLanguageFileNameMap() map[string]*ListLanguagesResponse_GlobFilePatterns { - if x != nil { - return x.LanguageFileNameMap - } - return nil -} - type SymbolInfoRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // repo_commit_path is the repo, commit, and path to the file to get symbol information for + // repo_commit_path is the repo, commit, and path to the file to get symbol + // information for RepoCommitPath *RepoCommitPath `protobuf:"bytes,1,opt,name=repo_commit_path,json=repoCommitPath,proto3" json:"repo_commit_path,omitempty"` // point is the point in the file to get symbol information for Point *Point `protobuf:"bytes,2,opt,name=point,proto3" json:"point,omitempty"` @@ -409,7 +319,7 @@ type SymbolInfoRequest struct { func (x *SymbolInfoRequest) Reset() { *x = SymbolInfoRequest{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[6] + mi := &file_symbols_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -422,7 +332,7 @@ func (x *SymbolInfoRequest) String() string { func (*SymbolInfoRequest) ProtoMessage() {} func (x *SymbolInfoRequest) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[6] + mi := &file_symbols_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -435,7 +345,7 @@ func (x *SymbolInfoRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SymbolInfoRequest.ProtoReflect.Descriptor instead. func (*SymbolInfoRequest) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{6} + return file_symbols_proto_rawDescGZIP(), []int{4} } func (x *SymbolInfoRequest) GetRepoCommitPath() *RepoCommitPath { @@ -458,15 +368,15 @@ type SymbolInfoResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // result is the definition / hover information for the symbol at the given point in the file, - // if available. + // result is the definition / hover information for the symbol at the given + // point in the file, if available. Result *SymbolInfoResponse_DefinitionResult `protobuf:"bytes,1,opt,name=result,proto3,oneof" json:"result,omitempty"` } func (x *SymbolInfoResponse) Reset() { *x = SymbolInfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[7] + mi := &file_symbols_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -479,7 +389,7 @@ func (x *SymbolInfoResponse) String() string { func (*SymbolInfoResponse) ProtoMessage() {} func (x *SymbolInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[7] + mi := &file_symbols_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -492,7 +402,7 @@ func (x *SymbolInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use SymbolInfoResponse.ProtoReflect.Descriptor instead. func (*SymbolInfoResponse) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{7} + return file_symbols_proto_rawDescGZIP(), []int{5} } func (x *SymbolInfoResponse) GetResult() *SymbolInfoResponse_DefinitionResult { @@ -520,7 +430,7 @@ type RepoCommitPath struct { func (x *RepoCommitPath) Reset() { *x = RepoCommitPath{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[8] + mi := &file_symbols_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -533,7 +443,7 @@ func (x *RepoCommitPath) String() string { func (*RepoCommitPath) ProtoMessage() {} func (x *RepoCommitPath) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[8] + mi := &file_symbols_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -546,7 +456,7 @@ func (x *RepoCommitPath) ProtoReflect() protoreflect.Message { // Deprecated: Use RepoCommitPath.ProtoReflect.Descriptor instead. func (*RepoCommitPath) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{8} + return file_symbols_proto_rawDescGZIP(), []int{6} } func (x *RepoCommitPath) GetRepo() string { @@ -587,7 +497,7 @@ type Range struct { func (x *Range) Reset() { *x = Range{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[9] + mi := &file_symbols_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -600,7 +510,7 @@ func (x *Range) String() string { func (*Range) ProtoMessage() {} func (x *Range) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[9] + mi := &file_symbols_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -613,7 +523,7 @@ func (x *Range) ProtoReflect() protoreflect.Message { // Deprecated: Use Range.ProtoReflect.Descriptor instead. func (*Range) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{9} + return file_symbols_proto_rawDescGZIP(), []int{7} } func (x *Range) GetRow() int32 { @@ -652,7 +562,7 @@ type Point struct { func (x *Point) Reset() { *x = Point{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[10] + mi := &file_symbols_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -665,7 +575,7 @@ func (x *Point) String() string { func (*Point) ProtoMessage() {} func (x *Point) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[10] + mi := &file_symbols_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -678,7 +588,7 @@ func (x *Point) ProtoReflect() protoreflect.Message { // Deprecated: Use Point.ProtoReflect.Descriptor instead. func (*Point) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{10} + return file_symbols_proto_rawDescGZIP(), []int{8} } func (x *Point) GetRow() int32 { @@ -695,8 +605,10 @@ func (x *Point) GetColumn() int32 { return 0 } -// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should use instead of this. -// See https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more information. +// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should +// use instead of this. See +// https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more +// information. type HealthzRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -706,7 +618,7 @@ type HealthzRequest struct { func (x *HealthzRequest) Reset() { *x = HealthzRequest{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[11] + mi := &file_symbols_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -719,7 +631,7 @@ func (x *HealthzRequest) String() string { func (*HealthzRequest) ProtoMessage() {} func (x *HealthzRequest) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[11] + mi := &file_symbols_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -732,11 +644,13 @@ func (x *HealthzRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use HealthzRequest.ProtoReflect.Descriptor instead. func (*HealthzRequest) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{11} + return file_symbols_proto_rawDescGZIP(), []int{9} } -// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should use instead of this. -// See https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more information. +// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should +// use instead of this. See +// https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more +// information. type HealthzResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -746,7 +660,7 @@ type HealthzResponse struct { func (x *HealthzResponse) Reset() { *x = HealthzResponse{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[12] + mi := &file_symbols_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -759,7 +673,7 @@ func (x *HealthzResponse) String() string { func (*HealthzResponse) ProtoMessage() {} func (x *HealthzResponse) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[12] + mi := &file_symbols_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -772,7 +686,7 @@ func (x *HealthzResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use HealthzResponse.ProtoReflect.Descriptor instead. func (*HealthzResponse) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{12} + return file_symbols_proto_rawDescGZIP(), []int{10} } // Symbol is a code symbol @@ -799,15 +713,15 @@ type SearchResponse_Symbol struct { ParentKind string `protobuf:"bytes,8,opt,name=parent_kind,json=parentKind,proto3" json:"parent_kind,omitempty"` // signature is the signature of the symbol (TODO@ggilmore - what is this?) Signature string `protobuf:"bytes,9,opt,name=signature,proto3" json:"signature,omitempty"` - // file_limited indicates that the search ran into the limit set by "first" in the request, and so the result - // set may be incomplete. + // file_limited indicates that the search ran into the limit set by "first" + // in the request, and so the result set may be incomplete. FileLimited bool `protobuf:"varint,10,opt,name=file_limited,json=fileLimited,proto3" json:"file_limited,omitempty"` } func (x *SearchResponse_Symbol) Reset() { *x = SearchResponse_Symbol{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[13] + mi := &file_symbols_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -820,7 +734,7 @@ func (x *SearchResponse_Symbol) String() string { func (*SearchResponse_Symbol) ProtoMessage() {} func (x *SearchResponse_Symbol) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[13] + mi := &file_symbols_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -924,7 +838,7 @@ type LocalCodeIntelResponse_Symbol struct { func (x *LocalCodeIntelResponse_Symbol) Reset() { *x = LocalCodeIntelResponse_Symbol{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[14] + mi := &file_symbols_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -937,7 +851,7 @@ func (x *LocalCodeIntelResponse_Symbol) String() string { func (*LocalCodeIntelResponse_Symbol) ProtoMessage() {} func (x *LocalCodeIntelResponse_Symbol) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[14] + mi := &file_symbols_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -981,59 +895,13 @@ func (x *LocalCodeIntelResponse_Symbol) GetRefs() []*Range { return nil } -type ListLanguagesResponse_GlobFilePatterns struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Patterns []string `protobuf:"bytes,1,rep,name=patterns,proto3" json:"patterns,omitempty"` -} - -func (x *ListLanguagesResponse_GlobFilePatterns) Reset() { - *x = ListLanguagesResponse_GlobFilePatterns{} - if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListLanguagesResponse_GlobFilePatterns) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListLanguagesResponse_GlobFilePatterns) ProtoMessage() {} - -func (x *ListLanguagesResponse_GlobFilePatterns) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListLanguagesResponse_GlobFilePatterns.ProtoReflect.Descriptor instead. -func (*ListLanguagesResponse_GlobFilePatterns) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{5, 0} -} - -func (x *ListLanguagesResponse_GlobFilePatterns) GetPatterns() []string { - if x != nil { - return x.Patterns - } - return nil -} - type SymbolInfoResponse_Definition struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // repo_commit_path is the repository name, commit, and file path for the symbol's definition. + // repo_commit_path is the repository name, commit, and file path for the + // symbol's definition. RepoCommitPath *RepoCommitPath `protobuf:"bytes,1,opt,name=repo_commit_path,json=repoCommitPath,proto3" json:"repo_commit_path,omitempty"` // range is the range of the symbol's definition, if it is known. Range *Range `protobuf:"bytes,2,opt,name=range,proto3,oneof" json:"range,omitempty"` @@ -1042,7 +910,7 @@ type SymbolInfoResponse_Definition struct { func (x *SymbolInfoResponse_Definition) Reset() { *x = SymbolInfoResponse_Definition{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[17] + mi := &file_symbols_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1055,7 +923,7 @@ func (x *SymbolInfoResponse_Definition) String() string { func (*SymbolInfoResponse_Definition) ProtoMessage() {} func (x *SymbolInfoResponse_Definition) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[17] + mi := &file_symbols_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1068,7 +936,7 @@ func (x *SymbolInfoResponse_Definition) ProtoReflect() protoreflect.Message { // Deprecated: Use SymbolInfoResponse_Definition.ProtoReflect.Descriptor instead. func (*SymbolInfoResponse_Definition) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{7, 0} + return file_symbols_proto_rawDescGZIP(), []int{5, 0} } func (x *SymbolInfoResponse_Definition) GetRepoCommitPath() *RepoCommitPath { @@ -1090,7 +958,8 @@ type SymbolInfoResponse_DefinitionResult struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // definition is the information associated with the location of the symbol's definition. + // definition is the information associated with the location of the + // symbol's definition. Definition *SymbolInfoResponse_Definition `protobuf:"bytes,1,opt,name=definition,proto3" json:"definition,omitempty"` // hover is the hover text associated with the symbol Hover *string `protobuf:"bytes,2,opt,name=hover,proto3,oneof" json:"hover,omitempty"` @@ -1099,7 +968,7 @@ type SymbolInfoResponse_DefinitionResult struct { func (x *SymbolInfoResponse_DefinitionResult) Reset() { *x = SymbolInfoResponse_DefinitionResult{} if protoimpl.UnsafeEnabled { - mi := &file_symbols_proto_msgTypes[18] + mi := &file_symbols_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1112,7 +981,7 @@ func (x *SymbolInfoResponse_DefinitionResult) String() string { func (*SymbolInfoResponse_DefinitionResult) ProtoMessage() {} func (x *SymbolInfoResponse_DefinitionResult) ProtoReflect() protoreflect.Message { - mi := &file_symbols_proto_msgTypes[18] + mi := &file_symbols_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1125,7 +994,7 @@ func (x *SymbolInfoResponse_DefinitionResult) ProtoReflect() protoreflect.Messag // Deprecated: Use SymbolInfoResponse_DefinitionResult.ProtoReflect.Descriptor instead. func (*SymbolInfoResponse_DefinitionResult) Descriptor() ([]byte, []int) { - return file_symbols_proto_rawDescGZIP(), []int{7, 1} + return file_symbols_proto_rawDescGZIP(), []int{5, 1} } func (x *SymbolInfoResponse_DefinitionResult) GetDefinition() *SymbolInfoResponse_Definition { @@ -1213,105 +1082,79 @@ var file_symbols_proto_rawDesc = []byte{ 0x61, 0x6e, 0x67, 0x65, 0x52, 0x03, 0x64, 0x65, 0x66, 0x12, 0x25, 0x0a, 0x04, 0x72, 0x65, 0x66, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x04, 0x72, 0x65, 0x66, 0x73, - 0x22, 0x16, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xb4, 0x02, 0x0a, 0x15, 0x4c, 0x69, 0x73, - 0x74, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x6f, 0x0a, 0x16, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x5f, 0x66, - 0x69, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, - 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x46, 0x69, - 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, - 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, - 0x4d, 0x61, 0x70, 0x1a, 0x2e, 0x0a, 0x10, 0x47, 0x6c, 0x6f, 0x62, 0x46, 0x69, 0x6c, 0x65, 0x50, - 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, - 0x72, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, - 0x72, 0x6e, 0x73, 0x1a, 0x7a, 0x0a, 0x18, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x46, - 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x48, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x32, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x2e, 0x47, 0x6c, 0x6f, 0x62, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x74, - 0x65, 0x72, 0x6e, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, - 0x82, 0x01, 0x0a, 0x11, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x5f, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x70, - 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x52, 0x0e, 0x72, 0x65, 0x70, - 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x05, 0x70, - 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x79, 0x6d, - 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x05, 0x70, - 0x6f, 0x69, 0x6e, 0x74, 0x22, 0xff, 0x02, 0x0a, 0x12, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4c, 0x0a, 0x06, 0x72, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x73, 0x79, - 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x48, 0x00, 0x52, 0x06, - 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x88, 0x01, 0x01, 0x1a, 0x8a, 0x01, 0x0a, 0x0a, 0x44, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x10, 0x72, 0x65, 0x70, 0x6f, - 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, - 0x52, 0x65, 0x70, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x52, 0x0e, - 0x72, 0x65, 0x70, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x2c, - 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, - 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, - 0x48, 0x00, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, - 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x1a, 0x82, 0x01, 0x0a, 0x10, 0x44, 0x65, 0x66, 0x69, 0x6e, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x49, 0x0a, 0x0a, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x29, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6d, - 0x62, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, - 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x64, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x88, 0x01, - 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x42, 0x09, 0x0a, 0x07, 0x5f, - 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x50, 0x0a, 0x0e, 0x52, 0x65, 0x70, 0x6f, 0x43, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x65, 0x70, 0x6f, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x65, 0x70, 0x6f, 0x12, 0x16, 0x0a, 0x06, - 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0x49, 0x0a, 0x05, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x72, 0x6f, 0x77, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6c, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, 0x6e, - 0x67, 0x74, 0x68, 0x22, 0x31, 0x0a, 0x05, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, - 0x72, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x6f, 0x77, 0x12, 0x16, - 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x10, 0x0a, 0x0e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, - 0x7a, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x11, 0x0a, 0x0f, 0x48, 0x65, 0x61, 0x6c, - 0x74, 0x68, 0x7a, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x9d, 0x03, 0x0a, 0x0e, - 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x41, - 0x0a, 0x06, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x19, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, - 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, - 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x5b, 0x0a, 0x0e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, - 0x74, 0x65, 0x6c, 0x12, 0x21, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, - 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6c, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, - 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x74, - 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x56, - 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x73, 0x12, - 0x20, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, - 0x74, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x21, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0a, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, - 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, - 0x31, 0x2e, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, - 0x2e, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x07, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x7a, - 0x12, 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, - 0x61, 0x6c, 0x74, 0x68, 0x7a, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x73, - 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, - 0x7a, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x38, 0x5a, 0x36, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x73, 0x79, 0x6d, 0x62, 0x6f, - 0x6c, 0x73, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x82, 0x01, 0x0a, 0x11, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x10, 0x72, 0x65, 0x70, 0x6f, 0x5f, 0x63, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, + 0x70, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x52, 0x0e, 0x72, 0x65, + 0x70, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x05, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x79, + 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x05, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x22, 0xff, 0x02, 0x0a, 0x12, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4c, 0x0a, 0x06, + 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x73, + 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x48, 0x00, 0x52, + 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x88, 0x01, 0x01, 0x1a, 0x8a, 0x01, 0x0a, 0x0a, 0x44, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x10, 0x72, 0x65, 0x70, + 0x6f, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, + 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x52, + 0x0e, 0x72, 0x65, 0x70, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, + 0x2c, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, + 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x61, 0x6e, 0x67, + 0x65, 0x48, 0x00, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, + 0x06, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x1a, 0x82, 0x01, 0x0a, 0x10, 0x44, 0x65, 0x66, 0x69, + 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x49, 0x0a, 0x0a, + 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x29, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, + 0x6d, 0x62, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x2e, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x64, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x88, + 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x50, 0x0a, 0x0e, 0x52, 0x65, 0x70, 0x6f, 0x43, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x65, 0x70, + 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x65, 0x70, 0x6f, 0x12, 0x16, 0x0a, + 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0x49, 0x0a, 0x05, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x72, 0x6f, 0x77, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x16, 0x0a, 0x06, + 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, + 0x6e, 0x67, 0x74, 0x68, 0x22, 0x31, 0x0a, 0x05, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x10, 0x0a, + 0x03, 0x72, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x6f, 0x77, 0x12, + 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x10, 0x0a, 0x0e, 0x48, 0x65, 0x61, 0x6c, 0x74, + 0x68, 0x7a, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x11, 0x0a, 0x0f, 0x48, 0x65, 0x61, + 0x6c, 0x74, 0x68, 0x7a, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xc5, 0x02, 0x0a, + 0x0e, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, + 0x41, 0x0a, 0x06, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x19, 0x2e, 0x73, 0x79, 0x6d, 0x62, + 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, + 0x31, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x0e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x64, 0x65, 0x49, + 0x6e, 0x74, 0x65, 0x6c, 0x12, 0x21, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, + 0x31, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6c, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, + 0x74, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, + 0x4d, 0x0a, 0x0a, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x2e, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6d, 0x62, 0x6f, + 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x73, + 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x44, + 0x0a, 0x07, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x7a, 0x12, 0x1a, 0x2e, 0x73, 0x79, 0x6d, 0x62, + 0x6f, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x7a, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2e, + 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x7a, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2f, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x2f, 0x76, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1326,59 +1169,51 @@ func file_symbols_proto_rawDescGZIP() []byte { return file_symbols_proto_rawDescData } -var file_symbols_proto_msgTypes = make([]protoimpl.MessageInfo, 19) +var file_symbols_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_symbols_proto_goTypes = []interface{}{ - (*SearchRequest)(nil), // 0: symbols.v1.SearchRequest - (*SearchResponse)(nil), // 1: symbols.v1.SearchResponse - (*LocalCodeIntelRequest)(nil), // 2: symbols.v1.LocalCodeIntelRequest - (*LocalCodeIntelResponse)(nil), // 3: symbols.v1.LocalCodeIntelResponse - (*ListLanguagesRequest)(nil), // 4: symbols.v1.ListLanguagesRequest - (*ListLanguagesResponse)(nil), // 5: symbols.v1.ListLanguagesResponse - (*SymbolInfoRequest)(nil), // 6: symbols.v1.SymbolInfoRequest - (*SymbolInfoResponse)(nil), // 7: symbols.v1.SymbolInfoResponse - (*RepoCommitPath)(nil), // 8: symbols.v1.RepoCommitPath - (*Range)(nil), // 9: symbols.v1.Range - (*Point)(nil), // 10: symbols.v1.Point - (*HealthzRequest)(nil), // 11: symbols.v1.HealthzRequest - (*HealthzResponse)(nil), // 12: symbols.v1.HealthzResponse - (*SearchResponse_Symbol)(nil), // 13: symbols.v1.SearchResponse.Symbol - (*LocalCodeIntelResponse_Symbol)(nil), // 14: symbols.v1.LocalCodeIntelResponse.Symbol - (*ListLanguagesResponse_GlobFilePatterns)(nil), // 15: symbols.v1.ListLanguagesResponse.GlobFilePatterns - nil, // 16: symbols.v1.ListLanguagesResponse.LanguageFileNameMapEntry - (*SymbolInfoResponse_Definition)(nil), // 17: symbols.v1.SymbolInfoResponse.Definition - (*SymbolInfoResponse_DefinitionResult)(nil), // 18: symbols.v1.SymbolInfoResponse.DefinitionResult - (*durationpb.Duration)(nil), // 19: google.protobuf.Duration + (*SearchRequest)(nil), // 0: symbols.v1.SearchRequest + (*SearchResponse)(nil), // 1: symbols.v1.SearchResponse + (*LocalCodeIntelRequest)(nil), // 2: symbols.v1.LocalCodeIntelRequest + (*LocalCodeIntelResponse)(nil), // 3: symbols.v1.LocalCodeIntelResponse + (*SymbolInfoRequest)(nil), // 4: symbols.v1.SymbolInfoRequest + (*SymbolInfoResponse)(nil), // 5: symbols.v1.SymbolInfoResponse + (*RepoCommitPath)(nil), // 6: symbols.v1.RepoCommitPath + (*Range)(nil), // 7: symbols.v1.Range + (*Point)(nil), // 8: symbols.v1.Point + (*HealthzRequest)(nil), // 9: symbols.v1.HealthzRequest + (*HealthzResponse)(nil), // 10: symbols.v1.HealthzResponse + (*SearchResponse_Symbol)(nil), // 11: symbols.v1.SearchResponse.Symbol + (*LocalCodeIntelResponse_Symbol)(nil), // 12: symbols.v1.LocalCodeIntelResponse.Symbol + (*SymbolInfoResponse_Definition)(nil), // 13: symbols.v1.SymbolInfoResponse.Definition + (*SymbolInfoResponse_DefinitionResult)(nil), // 14: symbols.v1.SymbolInfoResponse.DefinitionResult + (*durationpb.Duration)(nil), // 15: google.protobuf.Duration } var file_symbols_proto_depIdxs = []int32{ - 19, // 0: symbols.v1.SearchRequest.timeout:type_name -> google.protobuf.Duration - 13, // 1: symbols.v1.SearchResponse.symbols:type_name -> symbols.v1.SearchResponse.Symbol - 8, // 2: symbols.v1.LocalCodeIntelRequest.repo_commit_path:type_name -> symbols.v1.RepoCommitPath - 14, // 3: symbols.v1.LocalCodeIntelResponse.symbols:type_name -> symbols.v1.LocalCodeIntelResponse.Symbol - 16, // 4: symbols.v1.ListLanguagesResponse.language_file_name_map:type_name -> symbols.v1.ListLanguagesResponse.LanguageFileNameMapEntry - 8, // 5: symbols.v1.SymbolInfoRequest.repo_commit_path:type_name -> symbols.v1.RepoCommitPath - 10, // 6: symbols.v1.SymbolInfoRequest.point:type_name -> symbols.v1.Point - 18, // 7: symbols.v1.SymbolInfoResponse.result:type_name -> symbols.v1.SymbolInfoResponse.DefinitionResult - 9, // 8: symbols.v1.LocalCodeIntelResponse.Symbol.def:type_name -> symbols.v1.Range - 9, // 9: symbols.v1.LocalCodeIntelResponse.Symbol.refs:type_name -> symbols.v1.Range - 15, // 10: symbols.v1.ListLanguagesResponse.LanguageFileNameMapEntry.value:type_name -> symbols.v1.ListLanguagesResponse.GlobFilePatterns - 8, // 11: symbols.v1.SymbolInfoResponse.Definition.repo_commit_path:type_name -> symbols.v1.RepoCommitPath - 9, // 12: symbols.v1.SymbolInfoResponse.Definition.range:type_name -> symbols.v1.Range - 17, // 13: symbols.v1.SymbolInfoResponse.DefinitionResult.definition:type_name -> symbols.v1.SymbolInfoResponse.Definition - 0, // 14: symbols.v1.SymbolsService.Search:input_type -> symbols.v1.SearchRequest - 2, // 15: symbols.v1.SymbolsService.LocalCodeIntel:input_type -> symbols.v1.LocalCodeIntelRequest - 4, // 16: symbols.v1.SymbolsService.ListLanguages:input_type -> symbols.v1.ListLanguagesRequest - 6, // 17: symbols.v1.SymbolsService.SymbolInfo:input_type -> symbols.v1.SymbolInfoRequest - 11, // 18: symbols.v1.SymbolsService.Healthz:input_type -> symbols.v1.HealthzRequest - 1, // 19: symbols.v1.SymbolsService.Search:output_type -> symbols.v1.SearchResponse - 3, // 20: symbols.v1.SymbolsService.LocalCodeIntel:output_type -> symbols.v1.LocalCodeIntelResponse - 5, // 21: symbols.v1.SymbolsService.ListLanguages:output_type -> symbols.v1.ListLanguagesResponse - 7, // 22: symbols.v1.SymbolsService.SymbolInfo:output_type -> symbols.v1.SymbolInfoResponse - 12, // 23: symbols.v1.SymbolsService.Healthz:output_type -> symbols.v1.HealthzResponse - 19, // [19:24] is the sub-list for method output_type - 14, // [14:19] is the sub-list for method input_type - 14, // [14:14] is the sub-list for extension type_name - 14, // [14:14] is the sub-list for extension extendee - 0, // [0:14] is the sub-list for field type_name + 15, // 0: symbols.v1.SearchRequest.timeout:type_name -> google.protobuf.Duration + 11, // 1: symbols.v1.SearchResponse.symbols:type_name -> symbols.v1.SearchResponse.Symbol + 6, // 2: symbols.v1.LocalCodeIntelRequest.repo_commit_path:type_name -> symbols.v1.RepoCommitPath + 12, // 3: symbols.v1.LocalCodeIntelResponse.symbols:type_name -> symbols.v1.LocalCodeIntelResponse.Symbol + 6, // 4: symbols.v1.SymbolInfoRequest.repo_commit_path:type_name -> symbols.v1.RepoCommitPath + 8, // 5: symbols.v1.SymbolInfoRequest.point:type_name -> symbols.v1.Point + 14, // 6: symbols.v1.SymbolInfoResponse.result:type_name -> symbols.v1.SymbolInfoResponse.DefinitionResult + 7, // 7: symbols.v1.LocalCodeIntelResponse.Symbol.def:type_name -> symbols.v1.Range + 7, // 8: symbols.v1.LocalCodeIntelResponse.Symbol.refs:type_name -> symbols.v1.Range + 6, // 9: symbols.v1.SymbolInfoResponse.Definition.repo_commit_path:type_name -> symbols.v1.RepoCommitPath + 7, // 10: symbols.v1.SymbolInfoResponse.Definition.range:type_name -> symbols.v1.Range + 13, // 11: symbols.v1.SymbolInfoResponse.DefinitionResult.definition:type_name -> symbols.v1.SymbolInfoResponse.Definition + 0, // 12: symbols.v1.SymbolsService.Search:input_type -> symbols.v1.SearchRequest + 2, // 13: symbols.v1.SymbolsService.LocalCodeIntel:input_type -> symbols.v1.LocalCodeIntelRequest + 4, // 14: symbols.v1.SymbolsService.SymbolInfo:input_type -> symbols.v1.SymbolInfoRequest + 9, // 15: symbols.v1.SymbolsService.Healthz:input_type -> symbols.v1.HealthzRequest + 1, // 16: symbols.v1.SymbolsService.Search:output_type -> symbols.v1.SearchResponse + 3, // 17: symbols.v1.SymbolsService.LocalCodeIntel:output_type -> symbols.v1.LocalCodeIntelResponse + 5, // 18: symbols.v1.SymbolsService.SymbolInfo:output_type -> symbols.v1.SymbolInfoResponse + 10, // 19: symbols.v1.SymbolsService.Healthz:output_type -> symbols.v1.HealthzResponse + 16, // [16:20] is the sub-list for method output_type + 12, // [12:16] is the sub-list for method input_type + 12, // [12:12] is the sub-list for extension type_name + 12, // [12:12] is the sub-list for extension extendee + 0, // [0:12] is the sub-list for field type_name } func init() { file_symbols_proto_init() } @@ -1436,30 +1271,6 @@ func file_symbols_proto_init() { } } file_symbols_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListLanguagesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_symbols_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListLanguagesResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_symbols_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SymbolInfoRequest); i { case 0: return &v.state @@ -1471,7 +1282,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SymbolInfoResponse); i { case 0: return &v.state @@ -1483,7 +1294,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RepoCommitPath); i { case 0: return &v.state @@ -1495,7 +1306,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Range); i { case 0: return &v.state @@ -1507,7 +1318,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Point); i { case 0: return &v.state @@ -1519,7 +1330,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HealthzRequest); i { case 0: return &v.state @@ -1531,7 +1342,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HealthzResponse); i { case 0: return &v.state @@ -1543,7 +1354,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SearchResponse_Symbol); i { case 0: return &v.state @@ -1555,7 +1366,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LocalCodeIntelResponse_Symbol); i { case 0: return &v.state @@ -1567,19 +1378,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListLanguagesResponse_GlobFilePatterns); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_symbols_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SymbolInfoResponse_Definition); i { case 0: return &v.state @@ -1591,7 +1390,7 @@ func file_symbols_proto_init() { return nil } } - file_symbols_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_symbols_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SymbolInfoResponse_DefinitionResult); i { case 0: return &v.state @@ -1605,16 +1404,16 @@ func file_symbols_proto_init() { } } file_symbols_proto_msgTypes[1].OneofWrappers = []interface{}{} - file_symbols_proto_msgTypes[7].OneofWrappers = []interface{}{} - file_symbols_proto_msgTypes[17].OneofWrappers = []interface{}{} - file_symbols_proto_msgTypes[18].OneofWrappers = []interface{}{} + file_symbols_proto_msgTypes[5].OneofWrappers = []interface{}{} + file_symbols_proto_msgTypes[13].OneofWrappers = []interface{}{} + file_symbols_proto_msgTypes[14].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_symbols_proto_rawDesc, NumEnums: 0, - NumMessages: 19, + NumMessages: 15, NumExtensions: 0, NumServices: 1, }, diff --git a/internal/symbols/v1/symbols.proto b/internal/symbols/v1/symbols.proto index 2d861b6801d7f..c521821223473 100644 --- a/internal/symbols/v1/symbols.proto +++ b/internal/symbols/v1/symbols.proto @@ -9,7 +9,6 @@ option go_package = "github.com/sourcegraph/sourcegraph/internal/symbols/v1"; service SymbolsService { rpc Search(SearchRequest) returns (SearchResponse) {} rpc LocalCodeIntel(LocalCodeIntelRequest) returns (stream LocalCodeIntelResponse) {} - rpc ListLanguages(ListLanguagesRequest) returns (ListLanguagesResponse) {} rpc SymbolInfo(SymbolInfoRequest) returns (SymbolInfoResponse) {} rpc Healthz(HealthzRequest) returns (HealthzResponse) {} } @@ -27,8 +26,8 @@ message SearchRequest { // is_reg_exp, if true, will treat the Pattern as a regular expression bool is_reg_exp = 4; - // is_case_sensitive, if false, will ignore the case of query and file pattern when - // finding matches + // is_case_sensitive, if false, will ignore the case of query and file pattern + // when finding matches bool is_case_sensitive = 5; // include_patterns is a list of regexes that symbol's file paths @@ -79,8 +78,8 @@ message SearchResponse { // signature is the signature of the symbol (TODO@ggilmore - what is this?) string signature = 9; - // file_limited indicates that the search ran into the limit set by "first" in the request, and so the result - // set may be incomplete. + // file_limited indicates that the search ran into the limit set by "first" + // in the request, and so the result set may be incomplete. bool file_limited = 10; } @@ -115,26 +114,9 @@ message LocalCodeIntelResponse { repeated Symbol symbols = 1; } -// ListLanguagesRequest is the request to the ListLanguages method. -message ListLanguagesRequest { - // All fields are empty. -} - -// ListLanguagesResponse is the response from the ListLanguages method. -message ListLanguagesResponse { - message GlobFilePatterns { - repeated string patterns = 1; - } - - // language_file_name_map is a of map of language names to - // glob patterns that match files of that language. - // - // Example: "Ruby" -> ["*.rb", "*.ruby"] - map<string, GlobFilePatterns> language_file_name_map = 1; -} - message SymbolInfoRequest { - // repo_commit_path is the repo, commit, and path to the file to get symbol information for + // repo_commit_path is the repo, commit, and path to the file to get symbol + // information for RepoCommitPath repo_commit_path = 1; // point is the point in the file to get symbol information for @@ -144,7 +126,8 @@ message SymbolInfoRequest { // SymbolInfoResponse is the response from the SymbolInfo method. message SymbolInfoResponse { message Definition { - // repo_commit_path is the repository name, commit, and file path for the symbol's definition. + // repo_commit_path is the repository name, commit, and file path for the + // symbol's definition. RepoCommitPath repo_commit_path = 1; // range is the range of the symbol's definition, if it is known. @@ -152,15 +135,16 @@ message SymbolInfoResponse { } message DefinitionResult { - // definition is the information associated with the location of the symbol's definition. + // definition is the information associated with the location of the + // symbol's definition. Definition definition = 1; // hover is the hover text associated with the symbol optional string hover = 2; } - // result is the definition / hover information for the symbol at the given point in the file, - // if available. + // result is the definition / hover information for the symbol at the given + // point in the file, if available. optional DefinitionResult result = 1; } @@ -195,10 +179,14 @@ message Point { int32 column = 2; } -// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should use instead of this. -// See https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more information. +// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should +// use instead of this. See +// https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more +// information. message HealthzRequest {} -// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should use instead of this. -// See https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more information. +// TODO@ggilmore: Note - GRPC has its own healthchecking protocol that we should +// use instead of this. See +// https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more +// information. message HealthzResponse {} diff --git a/internal/symbols/v1/symbols_grpc.pb.go b/internal/symbols/v1/symbols_grpc.pb.go index 4f0caa1006b73..146c2b4c7efbd 100644 --- a/internal/symbols/v1/symbols_grpc.pb.go +++ b/internal/symbols/v1/symbols_grpc.pb.go @@ -21,7 +21,6 @@ const _ = grpc.SupportPackageIsVersion7 const ( SymbolsService_Search_FullMethodName = "/symbols.v1.SymbolsService/Search" SymbolsService_LocalCodeIntel_FullMethodName = "/symbols.v1.SymbolsService/LocalCodeIntel" - SymbolsService_ListLanguages_FullMethodName = "/symbols.v1.SymbolsService/ListLanguages" SymbolsService_SymbolInfo_FullMethodName = "/symbols.v1.SymbolsService/SymbolInfo" SymbolsService_Healthz_FullMethodName = "/symbols.v1.SymbolsService/Healthz" ) @@ -32,7 +31,6 @@ const ( type SymbolsServiceClient interface { Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (*SearchResponse, error) LocalCodeIntel(ctx context.Context, in *LocalCodeIntelRequest, opts ...grpc.CallOption) (SymbolsService_LocalCodeIntelClient, error) - ListLanguages(ctx context.Context, in *ListLanguagesRequest, opts ...grpc.CallOption) (*ListLanguagesResponse, error) SymbolInfo(ctx context.Context, in *SymbolInfoRequest, opts ...grpc.CallOption) (*SymbolInfoResponse, error) Healthz(ctx context.Context, in *HealthzRequest, opts ...grpc.CallOption) (*HealthzResponse, error) } @@ -86,15 +84,6 @@ func (x *symbolsServiceLocalCodeIntelClient) Recv() (*LocalCodeIntelResponse, er return m, nil } -func (c *symbolsServiceClient) ListLanguages(ctx context.Context, in *ListLanguagesRequest, opts ...grpc.CallOption) (*ListLanguagesResponse, error) { - out := new(ListLanguagesResponse) - err := c.cc.Invoke(ctx, SymbolsService_ListLanguages_FullMethodName, in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *symbolsServiceClient) SymbolInfo(ctx context.Context, in *SymbolInfoRequest, opts ...grpc.CallOption) (*SymbolInfoResponse, error) { out := new(SymbolInfoResponse) err := c.cc.Invoke(ctx, SymbolsService_SymbolInfo_FullMethodName, in, out, opts...) @@ -119,7 +108,6 @@ func (c *symbolsServiceClient) Healthz(ctx context.Context, in *HealthzRequest, type SymbolsServiceServer interface { Search(context.Context, *SearchRequest) (*SearchResponse, error) LocalCodeIntel(*LocalCodeIntelRequest, SymbolsService_LocalCodeIntelServer) error - ListLanguages(context.Context, *ListLanguagesRequest) (*ListLanguagesResponse, error) SymbolInfo(context.Context, *SymbolInfoRequest) (*SymbolInfoResponse, error) Healthz(context.Context, *HealthzRequest) (*HealthzResponse, error) mustEmbedUnimplementedSymbolsServiceServer() @@ -135,9 +123,6 @@ func (UnimplementedSymbolsServiceServer) Search(context.Context, *SearchRequest) func (UnimplementedSymbolsServiceServer) LocalCodeIntel(*LocalCodeIntelRequest, SymbolsService_LocalCodeIntelServer) error { return status.Errorf(codes.Unimplemented, "method LocalCodeIntel not implemented") } -func (UnimplementedSymbolsServiceServer) ListLanguages(context.Context, *ListLanguagesRequest) (*ListLanguagesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ListLanguages not implemented") -} func (UnimplementedSymbolsServiceServer) SymbolInfo(context.Context, *SymbolInfoRequest) (*SymbolInfoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SymbolInfo not implemented") } @@ -196,24 +181,6 @@ func (x *symbolsServiceLocalCodeIntelServer) Send(m *LocalCodeIntelResponse) err return x.ServerStream.SendMsg(m) } -func _SymbolsService_ListLanguages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListLanguagesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(SymbolsServiceServer).ListLanguages(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: SymbolsService_ListLanguages_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(SymbolsServiceServer).ListLanguages(ctx, req.(*ListLanguagesRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _SymbolsService_SymbolInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(SymbolInfoRequest) if err := dec(in); err != nil { @@ -261,10 +228,6 @@ var SymbolsService_ServiceDesc = grpc.ServiceDesc{ MethodName: "Search", Handler: _SymbolsService_Search_Handler, }, - { - MethodName: "ListLanguages", - Handler: _SymbolsService_ListLanguages_Handler, - }, { MethodName: "SymbolInfo", Handler: _SymbolsService_SymbolInfo_Handler, diff --git a/internal/syncx/BUILD.bazel b/internal/syncx/BUILD.bazel deleted file mode 100644 index ec3d20a3c345f..0000000000000 --- a/internal/syncx/BUILD.bazel +++ /dev/null @@ -1,16 +0,0 @@ -load("//dev:go_defs.bzl", "go_test") -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "syncx", - srcs = ["oncefunc.go"], - importpath = "github.com/sourcegraph/sourcegraph/internal/syncx", - visibility = ["//:__subpackages__"], -) - -go_test( - name = "syncx_test", - timeout = "short", - srcs = ["oncefunc_test.go"], - deps = [":syncx"], -) diff --git a/internal/syncx/oncefunc.go b/internal/syncx/oncefunc.go deleted file mode 100644 index d074ae54ef064..0000000000000 --- a/internal/syncx/oncefunc.go +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2022 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// package syncx contains an accepted proposal for the sync package in go1.20. -// See https://github.com/golang/go/issues/56102 and https://go.dev/cl/451356 -package syncx - -import "sync" - -// OnceFunc returns a function that invokes f only once. The returned function -// may be called concurrently. -// -// If f panics, the returned function will panic with the same value on every call. -func OnceFunc(f func()) func() { - var once sync.Once - var valid bool - var p any - return func() { - once.Do(func() { - defer func() { - p = recover() - if !valid { - // Re-panic immediately so on the first call the user gets a - // complete stack trace into f. - panic(p) - } - }() - f() - valid = true // Set only if f does not panic - }) - if !valid { - panic(p) - } - } -} - -// OnceValue returns a function that invokes f only once and returns the value -// returned by f. The returned function may be called concurrently. -// -// If f panics, the returned function will panic with the same value on every call. -func OnceValue[T any](f func() T) func() T { - var once sync.Once - var valid bool - var p any - var result T - return func() T { - once.Do(func() { - defer func() { - p = recover() - if !valid { - panic(p) - } - }() - result = f() - valid = true - }) - if !valid { - panic(p) - } - return result - } -} - -// OnceValues returns a function that invokes f only once and returns the values -// returned by f. The returned function may be called concurrently. -// -// If f panics, the returned function will panic with the same value on every call. -func OnceValues[T1, T2 any](f func() (T1, T2)) func() (T1, T2) { - var once sync.Once - var valid bool - var p any - var r1 T1 - var r2 T2 - return func() (T1, T2) { - once.Do(func() { - defer func() { - p = recover() - if !valid { - panic(p) - } - }() - r1, r2 = f() - valid = true - }) - if !valid { - panic(p) - } - return r1, r2 - } -} diff --git a/internal/syncx/oncefunc_test.go b/internal/syncx/oncefunc_test.go deleted file mode 100644 index 05e4f822dfd89..0000000000000 --- a/internal/syncx/oncefunc_test.go +++ /dev/null @@ -1,160 +0,0 @@ -// Copyright 2022 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package syncx_test - -import ( - "bytes" - "runtime/debug" - "sync" - "testing" - - "github.com/sourcegraph/sourcegraph/internal/syncx" -) - -// We assume that the Once.Do tests have already covered parallelism. - -func TestOnceFunc(t *testing.T) { - calls := 0 - f := syncx.OnceFunc(func() { calls++ }) - allocs := testing.AllocsPerRun(10, f) - if calls != 1 { - t.Errorf("want calls==1, got %d", calls) - } - if allocs != 0 { - t.Errorf("want 0 allocations per call, got %v", allocs) - } -} - -func TestOnceValue(t *testing.T) { - calls := 0 - f := syncx.OnceValue(func() int { - calls++ - return calls - }) - allocs := testing.AllocsPerRun(10, func() { f() }) - value := f() - if calls != 1 { - t.Errorf("want calls==1, got %d", calls) - } - if value != 1 { - t.Errorf("want value==1, got %d", value) - } - if allocs != 0 { - t.Errorf("want 0 allocations per call, got %v", allocs) - } -} - -func TestOnceValues(t *testing.T) { - calls := 0 - f := syncx.OnceValues(func() (int, int) { - calls++ - return calls, calls + 1 - }) - allocs := testing.AllocsPerRun(10, func() { f() }) - v1, v2 := f() - if calls != 1 { - t.Errorf("want calls==1, got %d", calls) - } - if v1 != 1 || v2 != 2 { - t.Errorf("want v1==1 and v2==2, got %d and %d", v1, v2) - } - if allocs != 0 { - t.Errorf("want 0 allocations per call, got %v", allocs) - } -} - -func testOncePanic(t *testing.T, calls *int, f func()) { - // Check that the each call to f panics with the same value, but the - // underlying function is only called once. - for _, label := range []string{"first time", "second time"} { - var p any - panicked := true - func() { - defer func() { - p = recover() - }() - f() - panicked = false - }() - if !panicked { - t.Fatalf("%s: f did not panic", label) - } - if p != "x" { - t.Fatalf("%s: want panic %v, got %v", label, "x", p) - } - } - if *calls != 1 { - t.Errorf("want calls==1, got %d", *calls) - } -} - -func TestOnceFuncPanic(t *testing.T) { - calls := 0 - f := syncx.OnceFunc(func() { - calls++ - panic("x") - }) - testOncePanic(t, &calls, f) -} - -func TestOnceValuePanic(t *testing.T) { - calls := 0 - f := syncx.OnceValue(func() int { - calls++ - panic("x") - }) - testOncePanic(t, &calls, func() { f() }) -} - -func TestOnceValuesPanic(t *testing.T) { - calls := 0 - f := syncx.OnceValues(func() (int, int) { - calls++ - panic("x") - }) - testOncePanic(t, &calls, func() { f() }) -} - -func TestOnceFuncPanicTraceback(t *testing.T) { - // Test that on the first invocation of a OnceFunc, the stack trace goes all - // the way to the origin of the panic. - f := syncx.OnceFunc(onceFuncPanic) - - defer func() { - if p := recover(); p != "x" { - t.Fatalf("want panic %v, got %v", "x", p) - } - stack := debug.Stack() - // Add second case for bazel binary names - want := []string{"syncx_test.onceFuncPanic", "syncx_test_test.onceFuncPanic"} - if !bytes.Contains(stack, []byte(want[0])) && !bytes.Contains(stack, []byte(want[1])) { - t.Fatalf("want stack containing %v, got:\n%s", want, string(stack)) - } - }() - f() -} - -func onceFuncPanic() { - panic("x") -} - -func BenchmarkOnceFunc(b *testing.B) { - b.Run("OnceFunc", func(b *testing.B) { - b.ReportAllocs() - f := syncx.OnceFunc(func() {}) - for i := 0; i < b.N; i++ { - f() - } - }) - // Versus open-coding with Once.Do - b.Run("Once", func(b *testing.B) { - b.ReportAllocs() - var once sync.Once - f := func() {} - for i := 0; i < b.N; i++ { - once.Do(f) - } - }) -} diff --git a/internal/telemetry/sensitivemetadataallowlist/BUILD.bazel b/internal/telemetry/sensitivemetadataallowlist/BUILD.bazel index 622aa6a46f3ef..eb4f99b3be336 100644 --- a/internal/telemetry/sensitivemetadataallowlist/BUILD.bazel +++ b/internal/telemetry/sensitivemetadataallowlist/BUILD.bazel @@ -5,12 +5,13 @@ go_library( name = "sensitivemetadataallowlist", srcs = [ "redact.go", - "sensitiviemetadataallowlist.go", + "sensitivemetadataallowlist.go", ], importpath = "github.com/sourcegraph/sourcegraph/internal/telemetry/sensitivemetadataallowlist", visibility = ["//:__subpackages__"], deps = [ "//cmd/frontend/envvar", + "//internal/env", "//internal/telemetry", "//internal/telemetrygateway/v1:telemetrygateway", "//lib/errors", @@ -28,6 +29,7 @@ go_test( "//internal/telemetry", "//internal/telemetrygateway/v1:telemetrygateway", "//lib/pointers", + "@com_github_hexops_autogold_v2//:autogold", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", "@org_golang_google_protobuf//types/known/structpb", diff --git a/internal/telemetry/sensitivemetadataallowlist/sensitiviemetadataallowlist.go b/internal/telemetry/sensitivemetadataallowlist/sensitivemetadataallowlist.go similarity index 67% rename from internal/telemetry/sensitivemetadataallowlist/sensitiviemetadataallowlist.go rename to internal/telemetry/sensitivemetadataallowlist/sensitivemetadataallowlist.go index 6df601b2c09bf..6ae345fb0a039 100644 --- a/internal/telemetry/sensitivemetadataallowlist/sensitiviemetadataallowlist.go +++ b/internal/telemetry/sensitivemetadataallowlist/sensitivemetadataallowlist.go @@ -2,24 +2,36 @@ package sensitivemetadataallowlist import ( "fmt" + "strings" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/lib/errors" + "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/telemetry" telemetrygatewayv1 "github.com/sourcegraph/sourcegraph/internal/telemetrygateway/v1" ) +var rawAdditionalAllowedEventTypes = env.Get("SRC_TELEMETRY_SENSITIVEMETADATA_ADDITIONAL_ALLOWED_EVENT_TYPES", "", + "Additional event types to include in sensitivemetadataallowlist.AllowedEventTypes, in comma-separated '${feature}::${action}' format.") +var additionalAllowedEventTypes = func() []EventType { + types, err := parseAdditionalAllowedEventTypes(rawAdditionalAllowedEventTypes) + if err != nil { + panic(err) + } + return types +}() + // AllowedEventTypes denotes a list of all events allowed to export sensitive // telemetry metadata. func AllowedEventTypes() EventTypes { - return eventTypes( + return eventTypes(append(additionalAllowedEventTypes, // Example event for testing. EventType{ Feature: string(telemetry.FeatureExample), Action: string(telemetry.ActionExample), }, - ) + )...) } type EventTypes struct { @@ -85,3 +97,24 @@ func init() { panic(errors.Wrap(err, "AllowedEvents has invalid event(s)")) } } + +func parseAdditionalAllowedEventTypes(config string) ([]EventType, error) { + if len(config) == 0 { + return nil, nil + } + + var types []EventType + for _, rawType := range strings.Split(config, ",") { + parts := strings.SplitN(rawType, "::", 2) + if len(parts) != 2 { + return nil, errors.Newf( + "cannot parse SRC_TELEMETRY_SENSITIVEMETADATA_ADDITIONAL_ALLOWED_EVENT_TYPES value %q", + rawType) + } + types = append(types, EventType{ + Feature: parts[0], + Action: parts[1], + }) + } + return types, nil +} diff --git a/internal/telemetry/sensitivemetadataallowlist/sensitivemetadataallowlist_test.go b/internal/telemetry/sensitivemetadataallowlist/sensitivemetadataallowlist_test.go index b38340aa81276..83ffdaf00e751 100644 --- a/internal/telemetry/sensitivemetadataallowlist/sensitivemetadataallowlist_test.go +++ b/internal/telemetry/sensitivemetadataallowlist/sensitivemetadataallowlist_test.go @@ -3,6 +3,7 @@ package sensitivemetadataallowlist import ( "testing" + "github.com/hexops/autogold/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -22,3 +23,52 @@ func TestIsAllowed(t *testing.T) { Action: "disallowedAction", })) } + +func TestParseAdditionalAllowedEventTypes(t *testing.T) { + for _, tc := range []struct { + name string + config string + + expect autogold.Value + expectError autogold.Value + }{ + { + name: "invalid", + config: "asdf,foobar", + expectError: autogold.Expect(`cannot parse SRC_TELEMETRY_SENSITIVEMETADATA_ADDITIONAL_ALLOWED_EVENT_TYPES value "asdf"`), + }, + { + name: "1 type", + config: "foo::bar", + expect: autogold.Expect([]EventType{{ + Feature: "foo", + Action: "bar", + }}), + }, + { + name: "multiple types", + config: "foo::bar,baz.bar::bar.baz", + expect: autogold.Expect([]EventType{ + { + Feature: "foo", + Action: "bar", + }, + { + Feature: "baz.bar", + Action: "bar.baz", + }, + }), + }, + } { + t.Run(tc.name, func(t *testing.T) { + got, err := parseAdditionalAllowedEventTypes(tc.config) + if tc.expectError != nil { + require.Error(t, err) + tc.expectError.Equal(t, err.Error()) + } else { + assert.NoError(t, err) + tc.expect.Equal(t, got) + } + }) + } +} diff --git a/internal/telemetry/teestore/teestore_test.go b/internal/telemetry/teestore/teestore_test.go index c38db5e6324a8..342afe3ffbf8d 100644 --- a/internal/telemetry/teestore/teestore_test.go +++ b/internal/telemetry/teestore/teestore_test.go @@ -227,7 +227,7 @@ func TestToEventLogs(t *testing.T) { }, }, Parameters: &telemetrygatewayv1.EventParameters{ - Metadata: map[string]int64{"public": 2}, + Metadata: map[string]float64{"public": 2}, PrivateMetadata: &structpb.Struct{Fields: map[string]*structpb.Value{ "private": structpb.NewStringValue("sensitive-data"), }}, @@ -295,7 +295,7 @@ func TestToEventLogs(t *testing.T) { }, }, Parameters: &telemetrygatewayv1.EventParameters{ - Metadata: map[string]int64{"public": 2}, + Metadata: map[string]float64{"public": 2}, PrivateMetadata: &structpb.Struct{Fields: map[string]*structpb.Value{ "private": structpb.NewStringValue("sensitive-data"), }}, diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go index c4a7993d2e397..bcfb00d1eca31 100644 --- a/internal/telemetry/telemetry.go +++ b/internal/telemetry/telemetry.go @@ -15,11 +15,11 @@ type constString string // EventMetadata is secure, PII-free metadata that can be attached to events. // Keys must be const strings. -type EventMetadata map[constString]int64 +type EventMetadata map[constString]float64 // MetadataBool returns 1 for true and 0 for false, for use in EventMetadata's // restricted int64 values. -func MetadataBool(value bool) int64 { +func MetadataBool(value bool) float64 { if value { return 1 // true } diff --git a/internal/telemetry/telemetrygateway.go b/internal/telemetry/telemetrygateway.go index f06fd229dbd5a..2aa8b9d24037b 100644 --- a/internal/telemetry/telemetrygateway.go +++ b/internal/telemetry/telemetrygateway.go @@ -37,11 +37,11 @@ func newTelemetryGatewayEvent( } event.Parameters = &telemetrygatewayv1.EventParameters{ Version: int32(parameters.Version), - Metadata: func() map[string]int64 { + Metadata: func() map[string]float64 { if len(parameters.Metadata) == 0 { return nil } - m := make(map[string]int64, len(parameters.Metadata)) + m := make(map[string]float64, len(parameters.Metadata)) for k, v := range parameters.Metadata { m[string(k)] = v } diff --git a/internal/telemetry/telemetrygateway_test.go b/internal/telemetry/telemetrygateway_test.go index ac08947078757..3139450ba4caf 100644 --- a/internal/telemetry/telemetrygateway_test.go +++ b/internal/telemetry/telemetrygateway_test.go @@ -119,7 +119,7 @@ func TestMakeRawEvent(t *testing.T) { "product": "EXAMPLE" }, "metadata": { - "foobar": "3" + "foobar": 3 }, "privateMetadata": { "barbaz": "hello world!" diff --git a/internal/telemetrygateway/v1/BUILD.bazel b/internal/telemetrygateway/v1/BUILD.bazel index 488dadf54023a..5ae6b2f665087 100644 --- a/internal/telemetrygateway/v1/BUILD.bazel +++ b/internal/telemetrygateway/v1/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@rules_buf//buf:defs.bzl", "buf_lint_test") load("@rules_proto//proto:defs.bzl", "proto_library") -load("//dev:proto.bzl", "write_proto_stubs_to_source") +load("@rules_proto_grpc//doc:defs.bzl", "doc_template_compile") proto_library( name = "v1_proto", @@ -54,6 +54,8 @@ go_library( deps = [ "//internal/actor", "//internal/featureflag", + "//internal/requestclient", + "//internal/requestinteraction", "//internal/trace", "//lib/pointers", "@com_github_google_uuid//:uuid", @@ -86,6 +88,7 @@ go_test( embed = [":telemetrygateway"], deps = [ "//internal/actor", + "//internal/requestclient", "//internal/trace", "//internal/trace/tracetest", "//lib/pointers", @@ -99,8 +102,6 @@ go_test( ], ) -load("@rules_proto_grpc//doc:defs.bzl", "doc_template_compile") - doc_template_compile( name = "protocol.md", protos = [":v1_proto"], diff --git a/internal/telemetrygateway/v1/backcompat_test.go b/internal/telemetrygateway/v1/backcompat_test.go index f5630a1ddd9b1..b560272eb34a1 100644 --- a/internal/telemetrygateway/v1/backcompat_test.go +++ b/internal/telemetrygateway/v1/backcompat_test.go @@ -39,6 +39,9 @@ var ( tid, _ := (tracetest.StaticTraceIDGenerator{}).NewIDs(context.Background()) return pointers.Ptr(tid.String()) }(), + Geolocation: &telemetrygatewayv1.EventInteraction_Geolocation{ + CountryCode: "US", + }, }, Source: &telemetrygatewayv1.EventSource{ Server: &telemetrygatewayv1.EventSource_Server{ @@ -50,8 +53,11 @@ var ( }, }, Parameters: &telemetrygatewayv1.EventParameters{ - Version: 1, - Metadata: map[string]int64{"metadata": 1}, + Version: 1, + Metadata: map[string]float64{ + "metadata": 1, + "float": 1.3, + }, PrivateMetadata: must(structpb.NewStruct(map[string]any{"private": "data"})), BillingMetadata: &telemetrygatewayv1.EventBillingMetadata{ Product: "Product", diff --git a/internal/telemetrygateway/v1/event.go b/internal/telemetrygateway/v1/event.go index 3c835ca14e593..174ac84c8c7a4 100644 --- a/internal/telemetrygateway/v1/event.go +++ b/internal/telemetrygateway/v1/event.go @@ -10,6 +10,8 @@ import ( "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/featureflag" + "github.com/sourcegraph/sourcegraph/internal/requestclient" + "github.com/sourcegraph/sourcegraph/internal/requestinteraction" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/lib/pointers" ) @@ -29,12 +31,37 @@ func NewEventWithDefaults(ctx context.Context, now time.Time, newEventID func() // request where the event is being created, as they should all happen // within the interaction, even when recording a set of events e.g. from // buffering. - eventTrace := trace.FromContext(ctx).SpanContext() - if !eventTrace.IsValid() { + var traceID *string + if eventTrace := trace.FromContext(ctx).SpanContext(); eventTrace.IsValid() { + traceID = pointers.Ptr(eventTrace.TraceID().String()) + } + + // Get the interaction ID if provided + var interactionID *string + if it := requestinteraction.FromContext(ctx); it != nil { + interactionID = pointers.Ptr(it.ID) + } + + // Get geolocation of request client, if there is one. + var geolocation *EventInteraction_Geolocation + if rc := requestclient.FromContext(ctx); rc != nil { + if cc, err := rc.OriginCountryCode(); err == nil { + geolocation = &EventInteraction_Geolocation{ + CountryCode: cc, + } + } + } + + // If we have nothing interesting to show, leave out Interaction + // entirely. + if traceID == nil && interactionID == nil && geolocation == nil { return nil } + return &EventInteraction{ - TraceId: pointers.Ptr(eventTrace.TraceID().String()), + TraceId: traceID, + InteractionId: interactionID, + Geolocation: geolocation, } }(), User: func() *EventUser { diff --git a/internal/telemetrygateway/v1/event_test.go b/internal/telemetrygateway/v1/event_test.go index 49a5cd657f1f3..b534e839dcdcc 100644 --- a/internal/telemetrygateway/v1/event_test.go +++ b/internal/telemetrygateway/v1/event_test.go @@ -12,6 +12,7 @@ import ( "google.golang.org/protobuf/encoding/protojson" "github.com/sourcegraph/sourcegraph/internal/actor" + "github.com/sourcegraph/sourcegraph/internal/requestclient" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/trace/tracetest" @@ -66,6 +67,41 @@ func TestNewEventWithDefaults(t *testing.T) { "user": { "userId": "123" } +}`).Equal(t, string(jsondata)) + }) + + t.Run("extract geolocation", func(t *testing.T) { + // Atach a request client + ctx := requestclient.WithClient(context.Background(), &requestclient.Client{ + IP: "93.184.216.34", // ping -c1 example.net + }) + + // NOTE: We can't test the feature flag part easily because + // featureflag.GetEvaluatedFlagSet depends on Redis, and the package + // is not designed for it to easily be stubbed out for testing. + // Since it's used for existing telemetry, we trust it works. + + got := telemetrygatewayv1.NewEventWithDefaults(ctx, staticTime, func() string { return "id" }) + assert.NotNil(t, got.Interaction) + + protodata, err := protojson.Marshal(got) + require.NoError(t, err) + + // Protojson output isn't stable by injecting randomized whitespace, + // so we re-marshal it to stabilize the output for golden tests. + // https://github.com/golang/protobuf/issues/1082 + var gotJSON map[string]any + require.NoError(t, json.Unmarshal(protodata, &gotJSON)) + jsondata, err := json.MarshalIndent(gotJSON, "", " ") + require.NoError(t, err) + autogold.Expect(`{ + "id": "id", + "interaction": { + "geolocation": { + "countryCode": "GB" + } + }, + "timestamp": "2023-02-24T14:48:30Z" }`).Equal(t, string(jsondata)) }) } diff --git a/internal/telemetrygateway/v1/protoc-gen-doc.tmpl b/internal/telemetrygateway/v1/protoc-gen-doc.tmpl index a06dedda0a3cb..aa7e7ec026822 100644 --- a/internal/telemetrygateway/v1/protoc-gen-doc.tmpl +++ b/internal/telemetrygateway/v1/protoc-gen-doc.tmpl @@ -8,6 +8,8 @@ This page contains generated documentation for telemetry event data that gets exported to Sourcegraph from individual Sourcegraph instances. +> WARNING: This page primarily pertains to the new telemetry system introduced in Sourcegraph 5.2.1 - refer to [DEPRECATED: Telemetry](deprecated.md) for the legacy system which may still be in use if a callsite has not been migrated yet. + ## Table of Contents {{range .Files}} {{$file_name := .Name}}- [{{.Name}}](#{{.Name | anchor}}) diff --git a/internal/telemetrygateway/v1/telemetrygateway.pb.go b/internal/telemetrygateway/v1/telemetrygateway.pb.go index 7db52d176e580..653b1eecd0d6d 100644 --- a/internal/telemetrygateway/v1/telemetrygateway.pb.go +++ b/internal/telemetrygateway/v1/telemetrygateway.pb.go @@ -508,9 +508,16 @@ type EventParameters struct { // event's metadata, beginning at 0. Useful for denoting if the shape of // metadata has changed in any way. Version int32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` + // Legacy metadata format that only accepted int64 - use the new metadata + // field instead, which accepts float values. Values sent through this proto + // field will be merged into the new metadata attributes. + // + // We don't use a [deprecated = true] tag because we use this field to handle + // accepting exporters sending metadata in this format. + LegacyMetadata map[string]int64 `protobuf:"bytes,2,rep,name=legacy_metadata,json=legacyMetadata,proto3" json:"legacy_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // Strictly typed metadata, restricted to integer values to avoid accidentally // exporting sensitive or private data. - Metadata map[string]int64 `protobuf:"bytes,2,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Metadata map[string]float64 `protobuf:"bytes,5,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` // Additional potentially sensitive metadata - i.e. not restricted to integer // values. // @@ -565,7 +572,14 @@ func (x *EventParameters) GetVersion() int32 { return 0 } -func (x *EventParameters) GetMetadata() map[string]int64 { +func (x *EventParameters) GetLegacyMetadata() map[string]int64 { + if x != nil { + return x.LegacyMetadata + } + return nil +} + +func (x *EventParameters) GetMetadata() map[string]float64 { if x != nil { return x.Metadata } @@ -881,6 +895,11 @@ type EventInteraction struct { // OpenTelemetry trace ID representing the interaction associated with the event. TraceId *string `protobuf:"bytes,1,opt,name=trace_id,json=traceId,proto3,oneof" json:"trace_id,omitempty"` + // Custom interaction ID representing the interaction associated with the event. + InteractionId *string `protobuf:"bytes,2,opt,name=interaction_id,json=interactionId,proto3,oneof" json:"interaction_id,omitempty"` + // Geolocation associated with the interaction, typically inferred from the + // originating client's IP address (which we do not collect). + Geolocation *EventInteraction_Geolocation `protobuf:"bytes,3,opt,name=geolocation,proto3,oneof" json:"geolocation,omitempty"` } func (x *EventInteraction) Reset() { @@ -922,6 +941,20 @@ func (x *EventInteraction) GetTraceId() string { return "" } +func (x *EventInteraction) GetInteractionId() string { + if x != nil && x.InteractionId != nil { + return *x.InteractionId + } + return "" +} + +func (x *EventInteraction) GetGeolocation() *EventInteraction_Geolocation { + if x != nil { + return x.Geolocation + } + return nil +} + type Identifier_LicensedInstanceIdentifier struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1179,6 +1212,54 @@ func (x *EventSource_Client) GetVersion() string { return "" } +type EventInteraction_Geolocation struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Inferred ISO 3166-1 alpha-2 or alpha-3 country code + CountryCode string `protobuf:"bytes,1,opt,name=country_code,json=countryCode,proto3" json:"country_code,omitempty"` +} + +func (x *EventInteraction_Geolocation) Reset() { + *x = EventInteraction_Geolocation{} + if protoimpl.UnsafeEnabled { + mi := &file_telemetrygateway_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EventInteraction_Geolocation) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EventInteraction_Geolocation) ProtoMessage() {} + +func (x *EventInteraction_Geolocation) ProtoReflect() protoreflect.Message { + mi := &file_telemetrygateway_proto_msgTypes[20] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use EventInteraction_Geolocation.ProtoReflect.Descriptor instead. +func (*EventInteraction_Geolocation) Descriptor() ([]byte, []int) { + return file_telemetrygateway_proto_rawDescGZIP(), []int{11, 0} +} + +func (x *EventInteraction_Geolocation) GetCountryCode() string { + if x != nil { + return x.CountryCode + } + return "" +} + var File_telemetrygateway_proto protoreflect.FileDescriptor var file_telemetrygateway_proto_rawDesc = []byte{ @@ -1300,102 +1381,126 @@ var file_telemetrygateway_proto_rawDesc = []byte{ 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x63, 0x6c, 0x69, - 0x65, 0x6e, 0x74, 0x22, 0x86, 0x03, 0x0a, 0x0f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x72, + 0x65, 0x6e, 0x74, 0x22, 0xac, 0x04, 0x0a, 0x0f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x12, 0x4e, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, - 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, - 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0x12, 0x47, 0x0a, 0x10, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, - 0x72, 0x75, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x88, 0x01, 0x01, 0x12, 0x59, 0x0a, 0x10, 0x62, 0x69, - 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, - 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x48, - 0x01, 0x52, 0x0f, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, - 0x74, 0x61, 0x88, 0x01, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x62, 0x69, 0x6c, 0x6c, - 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x4c, 0x0a, 0x14, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x12, 0x1a, - 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x7c, 0x0a, 0x09, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x11, 0x61, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, - 0x75, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x01, 0x52, 0x0f, 0x61, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x55, 0x73, 0x65, - 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, - 0x69, 0x64, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x96, 0x01, 0x0a, 0x11, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x47, - 0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, + 0x6e, 0x12, 0x61, 0x0a, 0x0f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x6d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x74, 0x65, 0x6c, + 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, + 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, + 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x12, 0x4e, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, + 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x12, 0x47, 0x0a, 0x10, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, + 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x88, 0x01, 0x01, 0x12, 0x59, 0x0a, + 0x10, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, + 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x48, 0x01, 0x52, 0x0f, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x88, 0x01, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x4c, 0x65, 0x67, 0x61, + 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x70, 0x72, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x13, 0x0a, + 0x11, 0x5f, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x22, 0x4c, 0x0a, 0x14, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x69, 0x6c, 0x6c, 0x69, + 0x6e, 0x67, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, + 0x6f, 0x64, 0x75, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, + 0x64, 0x75, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, + 0x22, 0x7c, 0x0a, 0x09, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1c, 0x0a, + 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, + 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x11, 0x61, + 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0f, 0x61, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, + 0x6f, 0x75, 0x73, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x61, 0x6e, 0x6f, + 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x96, + 0x01, 0x0a, 0x11, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x46, + 0x6c, 0x61, 0x67, 0x73, 0x12, 0x47, 0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, + 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x46, + 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x2e, 0x46, 0x6c, 0x61, 0x67, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x1a, 0x38, 0x0a, + 0x0a, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xed, 0x03, 0x0a, 0x16, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x12, 0x15, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x00, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x10, 0x66, 0x69, 0x72, + 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0e, 0x66, 0x69, 0x72, 0x73, 0x74, 0x53, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x63, 0x6f, 0x68, 0x6f, + 0x72, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x08, 0x63, + 0x6f, 0x68, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x72, 0x65, + 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x08, + 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0f, 0x6c, + 0x61, 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x11, 0x64, 0x65, 0x76, 0x69, + 0x63, 0x65, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x0f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x10, 0x73, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, + 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x11, 0x73, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x46, + 0x69, 0x72, 0x73, 0x74, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x75, + 0x72, 0x6c, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x63, 0x6f, 0x68, 0x6f, + 0x72, 0x74, 0x5f, 0x69, 0x64, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, + 0x65, 0x72, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x64, 0x65, 0x76, 0x69, 0x63, + 0x65, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x42, 0x13, 0x0a, 0x11, + 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, + 0x72, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x69, + 0x72, 0x73, 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x22, 0x9a, 0x02, 0x0a, 0x10, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x08, + 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, + 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x65, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a, 0x0e, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x58, 0x0a, 0x0b, 0x67, 0x65, 0x6f, 0x6c, + 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, - 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, - 0x46, 0x6c, 0x61, 0x67, 0x73, 0x2e, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6c, 0x61, 0x67, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0xed, 0x03, 0x0a, 0x16, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x72, 0x6b, 0x65, - 0x74, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x15, 0x0a, 0x03, - 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x03, 0x75, 0x72, 0x6c, - 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x10, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, - 0x0e, 0x66, 0x69, 0x72, 0x73, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x72, 0x6c, 0x88, - 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x63, 0x6f, 0x68, 0x6f, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x08, 0x63, 0x6f, 0x68, 0x6f, 0x72, 0x74, 0x49, - 0x64, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x08, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, - 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, - 0x52, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x72, 0x6c, 0x88, - 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x11, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x73, - 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, - 0x0f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x10, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, - 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, - 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, - 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x11, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x66, - 0x69, 0x72, 0x73, 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, - 0x52, 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x72, 0x73, 0x74, 0x55, 0x72, - 0x6c, 0x88, 0x01, 0x01, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x13, 0x0a, 0x11, - 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x72, - 0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x63, 0x6f, 0x68, 0x6f, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x42, - 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, 0x42, 0x12, 0x0a, 0x10, - 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x72, 0x6c, - 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x72, 0x42, 0x14, 0x0a, 0x12, 0x5f, - 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x75, 0x72, - 0x6c, 0x22, 0x3f, 0x0a, 0x10, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x65, - 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, - 0x69, 0x64, 0x32, 0x85, 0x01, 0x0a, 0x18, 0x54, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x65, 0x72, - 0x79, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, - 0x69, 0x0a, 0x0c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, - 0x28, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, - 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x74, 0x65, 0x6c, 0x65, - 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, - 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, 0x70, 0x68, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, - 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x6f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x48, 0x02, 0x52, 0x0b, 0x67, 0x65, 0x6f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, + 0x01, 0x01, 0x1a, 0x30, 0x0a, 0x0b, 0x47, 0x65, 0x6f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x64, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, + 0x43, 0x6f, 0x64, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, + 0x64, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x69, 0x64, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x67, 0x65, 0x6f, 0x6c, 0x6f, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x85, 0x01, 0x0a, 0x18, 0x54, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, + 0x65, 0x72, 0x79, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x69, 0x0a, 0x0c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, + 0x73, 0x12, 0x28, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, + 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x74, 0x65, + 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x76, + 0x31, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x41, 0x5a, 0x3f, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, + 0x70, 0x68, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x6c, 0x65, + 0x6d, 0x65, 0x74, 0x72, 0x79, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2f, 0x76, 0x31, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1410,7 +1515,7 @@ func file_telemetrygateway_proto_rawDescGZIP() []byte { return file_telemetrygateway_proto_rawDescData } -var file_telemetrygateway_proto_msgTypes = make([]protoimpl.MessageInfo, 19) +var file_telemetrygateway_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_telemetrygateway_proto_goTypes = []interface{}{ (*Identifier)(nil), // 0: telemetrygateway.v1.Identifier (*RecordEventsRequestMetadata)(nil), // 1: telemetrygateway.v1.RecordEventsRequestMetadata @@ -1429,10 +1534,12 @@ var file_telemetrygateway_proto_goTypes = []interface{}{ (*RecordEventsRequest_EventsPayload)(nil), // 14: telemetrygateway.v1.RecordEventsRequest.EventsPayload (*EventSource_Server)(nil), // 15: telemetrygateway.v1.EventSource.Server (*EventSource_Client)(nil), // 16: telemetrygateway.v1.EventSource.Client - nil, // 17: telemetrygateway.v1.EventParameters.MetadataEntry - nil, // 18: telemetrygateway.v1.EventFeatureFlags.FlagsEntry - (*timestamppb.Timestamp)(nil), // 19: google.protobuf.Timestamp - (*structpb.Struct)(nil), // 20: google.protobuf.Struct + nil, // 17: telemetrygateway.v1.EventParameters.LegacyMetadataEntry + nil, // 18: telemetrygateway.v1.EventParameters.MetadataEntry + nil, // 19: telemetrygateway.v1.EventFeatureFlags.FlagsEntry + (*EventInteraction_Geolocation)(nil), // 20: telemetrygateway.v1.EventInteraction.Geolocation + (*timestamppb.Timestamp)(nil), // 21: google.protobuf.Timestamp + (*structpb.Struct)(nil), // 22: google.protobuf.Struct } var file_telemetrygateway_proto_depIdxs = []int32{ 12, // 0: telemetrygateway.v1.Identifier.licensed_instance:type_name -> telemetrygateway.v1.Identifier.LicensedInstanceIdentifier @@ -1440,7 +1547,7 @@ var file_telemetrygateway_proto_depIdxs = []int32{ 0, // 2: telemetrygateway.v1.RecordEventsRequestMetadata.identifier:type_name -> telemetrygateway.v1.Identifier 1, // 3: telemetrygateway.v1.RecordEventsRequest.metadata:type_name -> telemetrygateway.v1.RecordEventsRequestMetadata 14, // 4: telemetrygateway.v1.RecordEventsRequest.events:type_name -> telemetrygateway.v1.RecordEventsRequest.EventsPayload - 19, // 5: telemetrygateway.v1.Event.timestamp:type_name -> google.protobuf.Timestamp + 21, // 5: telemetrygateway.v1.Event.timestamp:type_name -> google.protobuf.Timestamp 5, // 6: telemetrygateway.v1.Event.source:type_name -> telemetrygateway.v1.EventSource 6, // 7: telemetrygateway.v1.Event.parameters:type_name -> telemetrygateway.v1.EventParameters 8, // 8: telemetrygateway.v1.Event.user:type_name -> telemetrygateway.v1.EventUser @@ -1449,18 +1556,20 @@ var file_telemetrygateway_proto_depIdxs = []int32{ 11, // 11: telemetrygateway.v1.Event.interaction:type_name -> telemetrygateway.v1.EventInteraction 15, // 12: telemetrygateway.v1.EventSource.server:type_name -> telemetrygateway.v1.EventSource.Server 16, // 13: telemetrygateway.v1.EventSource.client:type_name -> telemetrygateway.v1.EventSource.Client - 17, // 14: telemetrygateway.v1.EventParameters.metadata:type_name -> telemetrygateway.v1.EventParameters.MetadataEntry - 20, // 15: telemetrygateway.v1.EventParameters.private_metadata:type_name -> google.protobuf.Struct - 7, // 16: telemetrygateway.v1.EventParameters.billing_metadata:type_name -> telemetrygateway.v1.EventBillingMetadata - 18, // 17: telemetrygateway.v1.EventFeatureFlags.flags:type_name -> telemetrygateway.v1.EventFeatureFlags.FlagsEntry - 4, // 18: telemetrygateway.v1.RecordEventsRequest.EventsPayload.events:type_name -> telemetrygateway.v1.Event - 2, // 19: telemetrygateway.v1.TelemeteryGatewayService.RecordEvents:input_type -> telemetrygateway.v1.RecordEventsRequest - 3, // 20: telemetrygateway.v1.TelemeteryGatewayService.RecordEvents:output_type -> telemetrygateway.v1.RecordEventsResponse - 20, // [20:21] is the sub-list for method output_type - 19, // [19:20] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 17, // 14: telemetrygateway.v1.EventParameters.legacy_metadata:type_name -> telemetrygateway.v1.EventParameters.LegacyMetadataEntry + 18, // 15: telemetrygateway.v1.EventParameters.metadata:type_name -> telemetrygateway.v1.EventParameters.MetadataEntry + 22, // 16: telemetrygateway.v1.EventParameters.private_metadata:type_name -> google.protobuf.Struct + 7, // 17: telemetrygateway.v1.EventParameters.billing_metadata:type_name -> telemetrygateway.v1.EventBillingMetadata + 19, // 18: telemetrygateway.v1.EventFeatureFlags.flags:type_name -> telemetrygateway.v1.EventFeatureFlags.FlagsEntry + 20, // 19: telemetrygateway.v1.EventInteraction.geolocation:type_name -> telemetrygateway.v1.EventInteraction.Geolocation + 4, // 20: telemetrygateway.v1.RecordEventsRequest.EventsPayload.events:type_name -> telemetrygateway.v1.Event + 2, // 21: telemetrygateway.v1.TelemeteryGatewayService.RecordEvents:input_type -> telemetrygateway.v1.RecordEventsRequest + 3, // 22: telemetrygateway.v1.TelemeteryGatewayService.RecordEvents:output_type -> telemetrygateway.v1.RecordEventsResponse + 22, // [22:23] is the sub-list for method output_type + 21, // [21:22] is the sub-list for method input_type + 21, // [21:21] is the sub-list for extension type_name + 21, // [21:21] is the sub-list for extension extendee + 0, // [0:21] is the sub-list for field type_name } func init() { file_telemetrygateway_proto_init() } @@ -1673,6 +1782,18 @@ func file_telemetrygateway_proto_init() { return nil } } + file_telemetrygateway_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EventInteraction_Geolocation); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } file_telemetrygateway_proto_msgTypes[0].OneofWrappers = []interface{}{ (*Identifier_LicensedInstance)(nil), @@ -1695,7 +1816,7 @@ func file_telemetrygateway_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_telemetrygateway_proto_rawDesc, NumEnums: 0, - NumMessages: 19, + NumMessages: 21, NumExtensions: 0, NumServices: 1, }, diff --git a/internal/telemetrygateway/v1/telemetrygateway.proto b/internal/telemetrygateway/v1/telemetrygateway.proto index 73ae796841b84..1df2a3707bb63 100644 --- a/internal/telemetrygateway/v1/telemetrygateway.proto +++ b/internal/telemetrygateway/v1/telemetrygateway.proto @@ -130,9 +130,18 @@ message EventParameters { // event's metadata, beginning at 0. Useful for denoting if the shape of // metadata has changed in any way. int32 version = 1; + + // Legacy metadata format that only accepted int64 - use the new metadata + // field instead, which accepts float values. Values sent through this proto + // field will be merged into the new metadata attributes. + // + // We don't use a [deprecated = true] tag because we use this field to handle + // accepting exporters sending metadata in this format. + map<string, int64> legacy_metadata = 2; // Strictly typed metadata, restricted to integer values to avoid accidentally // exporting sensitive or private data. - map<string, int64> metadata = 2; + map<string, double> metadata = 5; + // Additional potentially sensitive metadata - i.e. not restricted to integer // values. // @@ -204,4 +213,14 @@ message EventMarketingTracking { message EventInteraction { // OpenTelemetry trace ID representing the interaction associated with the event. optional string trace_id = 1; + // Custom interaction ID representing the interaction associated with the event. + optional string interaction_id = 2; + + message Geolocation { + // Inferred ISO 3166-1 alpha-2 or alpha-3 country code + string country_code = 1; + } + // Geolocation associated with the interaction, typically inferred from the + // originating client's IP address (which we do not collect). + optional Geolocation geolocation = 3; } diff --git a/internal/telemetrygateway/v1/testdata/snapshots/2023-11-16.pb b/internal/telemetrygateway/v1/testdata/snapshots/2023-11-16.pb new file mode 100644 index 0000000000000..cdd57aef44ab8 --- /dev/null +++ b/internal/telemetrygateway/v1/testdata/snapshots/2023-11-16.pb @@ -0,0 +1,14 @@ + +1234ΎœγŸFeature"Action* + +dev +CLIENTVERSION2: +metadata + +privatedata" +ProductCategory:  anonymousB + +featuretrueJ8 +valuevaluevalue"value*value2value:valueBvalueR( + 01020304050607080102040810203040 +US \ No newline at end of file diff --git a/internal/telemetrygateway/v1/testdata/snapshots/2023-11-28.pb b/internal/telemetrygateway/v1/testdata/snapshots/2023-11-28.pb new file mode 100644 index 0000000000000..be41482b7b177 Binary files /dev/null and b/internal/telemetrygateway/v1/testdata/snapshots/2023-11-28.pb differ diff --git a/internal/types/secret.go b/internal/types/secret.go index 95a3b6ee6b4a0..bd0f4b2ed0865 100644 --- a/internal/types/secret.go +++ b/internal/types/secret.go @@ -66,6 +66,7 @@ func (e *ExternalService) RedactedConfig(ctx context.Context) (string, error) { es.redactString(c.Token, "token") case *schema.BitbucketCloudConnection: es.redactString(c.AppPassword, "appPassword") + es.redactString(c.AccessToken, "accessToken") case *schema.AWSCodeCommitConnection: es.redactString(c.SecretAccessKey, "secretAccessKey") es.redactString(c.GitCredentials.Password, "gitCredentials", "password") @@ -184,10 +185,21 @@ func (e *ExternalService) UnredactConfig(ctx context.Context, old *ExternalServi es.unredactString(c.Token, o.Token, "token") case *schema.BitbucketCloudConnection: o := oldCfg.(*schema.BitbucketCloudConnection) - es.unredactString(c.AppPassword, o.AppPassword, "appPassword") if c.Url != o.Url { - return errCodeHostIdentityChanged{"apiUrl", "appPassword"} + var redactedProperty string + if c.AppPassword == RedactedSecret { + redactedProperty = "appPassword" + } + if c.AccessToken == RedactedSecret { + redactedProperty = "accessToken" + } + + if redactedProperty != "" { + return errCodeHostIdentityChanged{"apiUrl", redactedProperty} + } } + es.unredactString(c.AppPassword, o.AppPassword, "appPassword") + es.unredactString(c.AccessToken, o.AccessToken, "accessToken") case *schema.AWSCodeCommitConnection: o := oldCfg.(*schema.AWSCodeCommitConnection) es.unredactString(c.SecretAccessKey, o.SecretAccessKey, "secretAccessKey") diff --git a/internal/types/typestest/typestest.go b/internal/types/typestest/typestest.go index d64f6837b256b..a506a8c9de5b5 100644 --- a/internal/types/typestest/typestest.go +++ b/internal/types/typestest/typestest.go @@ -1,7 +1,7 @@ package typestest import ( - "sort" + "encoding/json" "strconv" "testing" "time" @@ -117,6 +117,20 @@ func MakeGitLabExternalService() *types.ExternalService { } } +func MakeExternalService(t *testing.T, variant extsvc.Variant, config any) *types.ExternalService { + t.Helper() + + bs, err := json.Marshal(config) + if err != nil { + t.Fatal(err) + } + + return &types.ExternalService{ + Kind: variant.AsKind(), + Config: extsvc.NewUnencryptedConfig(string(bs)), + } +} + // MakeExternalServices creates one configured external service per kind and returns the list. func MakeExternalServices() types.ExternalServices { clock := timeutil.NewFakeClock(time.Now(), 0) @@ -218,36 +232,15 @@ func ExternalServicesToMap(es types.ExternalServices) map[string]*types.External // Opt contains functional options to be used in tests. var Opt = struct { - ExternalServiceID func(int64) func(*types.ExternalService) - ExternalServiceModifiedAt func(time.Time) func(*types.ExternalService) - ExternalServiceDeletedAt func(time.Time) func(*types.ExternalService) - RepoID func(api.RepoID) func(*types.Repo) - RepoName func(api.RepoName) func(*types.Repo) - RepoCreatedAt func(time.Time) func(*types.Repo) - RepoModifiedAt func(time.Time) func(*types.Repo) - RepoDeletedAt func(time.Time) func(*types.Repo) - RepoSources func(...string) func(*types.Repo) - RepoMetadata func(any) func(*types.Repo) - RepoArchived func(bool) func(*types.Repo) - RepoExternalID func(string) func(*types.Repo) + RepoID func(api.RepoID) func(*types.Repo) + RepoName func(api.RepoName) func(*types.Repo) + RepoCreatedAt func(time.Time) func(*types.Repo) + RepoModifiedAt func(time.Time) func(*types.Repo) + RepoDeletedAt func(time.Time) func(*types.Repo) + RepoSources func(...string) func(*types.Repo) + RepoArchived func(bool) func(*types.Repo) + RepoExternalID func(string) func(*types.Repo) }{ - ExternalServiceID: func(n int64) func(*types.ExternalService) { - return func(e *types.ExternalService) { - e.ID = n - } - }, - ExternalServiceModifiedAt: func(ts time.Time) func(*types.ExternalService) { - return func(e *types.ExternalService) { - e.UpdatedAt = ts - e.DeletedAt = time.Time{} - } - }, - ExternalServiceDeletedAt: func(ts time.Time) func(*types.ExternalService) { - return func(e *types.ExternalService) { - e.UpdatedAt = ts - e.DeletedAt = ts - } - }, RepoID: func(n api.RepoID) func(*types.Repo) { return func(r *types.Repo) { r.ID = n @@ -286,11 +279,6 @@ var Opt = struct { } } }, - RepoMetadata: func(md any) func(*types.Repo) { - return func(r *types.Repo) { - r.Metadata = md - } - }, RepoArchived: func(b bool) func(*types.Repo) { return func(r *types.Repo) { r.Archived = b @@ -310,60 +298,14 @@ var Opt = struct { // A ReposAssertion performs an assertion on the given Repos. type ReposAssertion func(testing.TB, types.Repos) -// An ExternalServicesAssertion performs an assertion on the given -// types.ExternalServices. -type ExternalServicesAssertion func(testing.TB, types.ExternalServices) - -// Assert contains assertion functions to be used in tests. -var Assert = struct { - ReposEqual func(...*types.Repo) ReposAssertion - ReposOrderedBy func(func(a, b *types.Repo) bool) ReposAssertion - ExternalServicesEqual func(...*types.ExternalService) ExternalServicesAssertion - ExternalServicesOrderedBy func(func(a, b *types.ExternalService) bool) ExternalServicesAssertion -}{ - ReposEqual: func(rs ...*types.Repo) ReposAssertion { - want := types.Repos(rs) - return func(t testing.TB, have types.Repos) { - t.Helper() - // Exclude auto-generated IDs from equality tests - opts := cmpopts.IgnoreFields(types.Repo{}, "ID", "CreatedAt", "UpdatedAt") - if diff := cmp.Diff(want, have, opts); diff != "" { - t.Errorf("repos (-want +got): %s", diff) - } +func AssertReposEqual(rs ...*types.Repo) ReposAssertion { + want := types.Repos(rs) + return func(t testing.TB, have types.Repos) { + t.Helper() + // Exclude auto-generated IDs from equality tests + opts := cmpopts.IgnoreFields(types.Repo{}, "ID", "CreatedAt", "UpdatedAt") + if diff := cmp.Diff(want, have, opts); diff != "" { + t.Errorf("repos (-want +got): %s", diff) } - }, - ReposOrderedBy: func(ord func(a, b *types.Repo) bool) ReposAssertion { - return func(t testing.TB, have types.Repos) { - t.Helper() - want := have.Clone() - sort.Slice(want, func(i, j int) bool { - return ord(want[i], want[j]) - }) - if diff := cmp.Diff(want, have); diff != "" { - t.Errorf("repos (-want +got): %s", cmp.Diff(want, have)) - } - } - }, - ExternalServicesEqual: func(es ...*types.ExternalService) ExternalServicesAssertion { - want := types.ExternalServices(es) - return func(t testing.TB, have types.ExternalServices) { - t.Helper() - opts := cmpopts.IgnoreFields(types.ExternalService{}, "ID", "CreatedAt", "UpdatedAt") - if diff := cmp.Diff(want, have, opts); diff != "" { - t.Errorf("external services (-want +got): %s", diff) - } - } - }, - ExternalServicesOrderedBy: func(ord func(a, b *types.ExternalService) bool) ExternalServicesAssertion { - return func(t testing.TB, have types.ExternalServices) { - t.Helper() - want := have.Clone() - sort.Slice(want, func(i, j int) bool { - return ord(want[i], want[j]) - }) - if diff := cmp.Diff(want, have); diff != "" { - t.Errorf("external services (-want +got): %s", cmp.Diff(want, have)) - } - } - }, + } } diff --git a/internal/updatecheck/client.go b/internal/updatecheck/client.go index 1aafafecd75ed..cf541803ef7ed 100644 --- a/internal/updatecheck/client.go +++ b/internal/updatecheck/client.go @@ -601,11 +601,13 @@ func updateBody(ctx context.Context, logger log.Logger, db database.DB) (io.Read if err != nil { logFunc("getAndMarshalBatchChangesUsageJSON failed", log.Error(err)) } - r.GrowthStatistics, err = getAndMarshalGrowthStatisticsJSON(ctx, db) - if err != nil { - logFunc("getAndMarshalGrowthStatisticsJSON failed", log.Error(err)) + // We don't bother doing this on Sourcegraph.com as it is expensive and not needed. + if !envvar.SourcegraphDotComMode() { + r.GrowthStatistics, err = getAndMarshalGrowthStatisticsJSON(ctx, db) + if err != nil { + logFunc("getAndMarshalGrowthStatisticsJSON failed", log.Error(err)) + } } - r.SavedSearches, err = getAndMarshalSavedSearchesJSON(ctx, db) if err != nil { logFunc("getAndMarshalSavedSearchesJSON failed", log.Error(err)) @@ -671,9 +673,12 @@ func updateBody(ctx context.Context, logger log.Logger, db database.DB) (io.Read logFunc("getAndMarshalIDEExtensionsUsageJSON failed", log.Error(err)) } - r.MigratedExtensionsUsage, err = getAndMarshalMigratedExtensionsUsageJSON(ctx, db) - if err != nil { - logFunc("getAndMarshalMigratedExtensionsUsageJSON failed", log.Error(err)) + // We don't bother doing this on Sourcegraph.com as it is expensive and not needed. + if !envvar.SourcegraphDotComMode() { + r.MigratedExtensionsUsage, err = getAndMarshalMigratedExtensionsUsageJSON(ctx, db) + if err != nil { + logFunc("getAndMarshalMigratedExtensionsUsageJSON failed", log.Error(err)) + } } r.CodeHostVersions, err = getAndMarshalCodeHostVersionsJSON(ctx, db) @@ -720,23 +725,26 @@ func updateBody(ctx context.Context, logger log.Logger, db database.DB) (io.Read } }() - wg.Add(1) - go func() { - defer wg.Done() - r.NewCodeIntelUsage, err = getAndMarshalAggregatedCodeIntelUsageJSON(ctx, db) - if err != nil { - logFunc("getAndMarshalAggregatedCodeIntelUsageJSON failed", log.Error(err)) - } - }() + // We don't bother doing these on Sourcegraph.com as they are expensive and not needed. + if !envvar.SourcegraphDotComMode() { + wg.Add(1) + go func() { + defer wg.Done() + r.NewCodeIntelUsage, err = getAndMarshalAggregatedCodeIntelUsageJSON(ctx, db) + if err != nil { + logFunc("getAndMarshalAggregatedCodeIntelUsageJSON failed", log.Error(err)) + } + }() - wg.Add(1) - go func() { - defer wg.Done() - r.SearchUsage, err = getAndMarshalAggregatedSearchUsageJSON(ctx, db) - if err != nil { - logFunc("getAndMarshalAggregatedSearchUsageJSON failed", log.Error(err)) - } - }() + wg.Add(1) + go func() { + defer wg.Done() + r.SearchUsage, err = getAndMarshalAggregatedSearchUsageJSON(ctx, db) + if err != nil { + logFunc("getAndMarshalAggregatedSearchUsageJSON failed", log.Error(err)) + } + }() + } wg.Wait() diff --git a/internal/updatecheck/handler.go b/internal/updatecheck/handler.go index 6fe4e7cd41be6..1086e72644e20 100644 --- a/internal/updatecheck/handler.go +++ b/internal/updatecheck/handler.go @@ -36,17 +36,17 @@ var ( // non-cluster, non-docker-compose, and non-pure-docker installations what the latest // version is. The version here _must_ be available at https://hub.docker.com/r/sourcegraph/server/tags/ // before landing in master. - latestReleaseDockerServerImageBuild = newPingResponse("5.2.2") + latestReleaseDockerServerImageBuild = newPingResponse("5.2.3") // latestReleaseKubernetesBuild is only used by sourcegraph.com to tell existing Sourcegraph // cluster deployments what the latest version is. The version here _must_ be available in // a tag at https://github.com/sourcegraph/deploy-sourcegraph before landing in master. - latestReleaseKubernetesBuild = newPingResponse("5.2.2") + latestReleaseKubernetesBuild = newPingResponse("5.2.3") // latestReleaseDockerComposeOrPureDocker is only used by sourcegraph.com to tell existing Sourcegraph // Docker Compose or Pure Docker deployments what the latest version is. The version here _must_ be // available in a tag at https://github.com/sourcegraph/deploy-sourcegraph-docker before landing in master. - latestReleaseDockerComposeOrPureDocker = newPingResponse("5.2.2") + latestReleaseDockerComposeOrPureDocker = newPingResponse("5.2.3") // latestReleaseApp is only used by sourcegraph.com to tell existing Sourcegraph // App instances what the latest version is. The version here _must_ be available for download/released diff --git a/internal/webhooks/outbound/BUILD.bazel b/internal/webhooks/outbound/BUILD.bazel index edf00af8ab84e..1dabb7b88f968 100644 --- a/internal/webhooks/outbound/BUILD.bazel +++ b/internal/webhooks/outbound/BUILD.bazel @@ -15,7 +15,6 @@ go_library( "//internal/encryption", "//internal/encryption/keyring", "//lib/errors", - "@com_github_grafana_regexp//:regexp", "@io_gitea_code_gitea//modules/hostmatcher", ], ) diff --git a/internal/webhooks/outbound/outbound.go b/internal/webhooks/outbound/outbound.go index 597f381881166..a8611af3d17d2 100644 --- a/internal/webhooks/outbound/outbound.go +++ b/internal/webhooks/outbound/outbound.go @@ -6,8 +6,6 @@ import ( "net/url" "strings" - "github.com/grafana/regexp" - "code.gitea.io/gitea/modules/hostmatcher" "github.com/sourcegraph/sourcegraph/internal/database" @@ -55,63 +53,111 @@ func (s *outboundWebhookService) Enqueue( return nil } -// Based on https://www.ietf.org/archive/id/draft-chapin-rfc2606bis-00.html -const reservedTLDs = "localhost|local|test|example|invalid|localdomain|domain|lan|home|host|corp" - -// CheckAddress validates the intended destination address for a webhook, checking that -// it's not invalid, local, a bad IP, or anything else. -func CheckAddress(address string) error { - // Try to interpret address as a URL, as an IP with a port, or as an IP without a port. - u, uErr := url.Parse(address) - // If it's an IP with a port, ipStr will contain the IP address without the port. If - // it doesn't have a port, the function will error and ipStr will be an empty string. - // We'll also try to parse it from the full address for that case. - ipStr, _, _ := net.SplitHostPort(address) - ip1 := net.ParseIP(ipStr) - ip2 := net.ParseIP(address) - - if ip1 != nil || ip2 != nil { - // Address is likely an IP address - var ip net.IP - if ip1 != nil { - ip = ip1 +var errIllegalAddr = errors.New("Address must not be private, link-local or loopback") + +type DNSResolver interface { + LookupHost(hostname string) ([]string, error) +} + +type resolver struct{} + +func (r *resolver) LookupHost(hostname string) ([]string, error) { + return net.LookupHost(hostname) +} + +type mockResolver struct{} + +func (m *mockResolver) LookupHost(hostname string) ([]string, error) { + switch hostname { + case "sourcegraph.local": + return []string{"127.0.0.1"}, nil + case "localhost": + return []string{"127.0.0.1"}, nil + case "sourcegraph.com": + return []string{"1.2.3.4"}, nil + default: + return []string{}, errors.Newf("no such host: %s", hostname) + } +} + +var defaultResolver DNSResolver = &resolver{} + +type denyRule struct { + pattern string + builtin string +} + +var defaultDenylist = []denyRule{ + {builtin: "loopback"}, + {pattern: "169.254.169.254"}, +} + +var old []denyRule + +func SetTestDenyList() { + old = defaultDenylist + defaultDenylist = []denyRule{ + {pattern: "169.254.169.254"}, + } +} + +func ResetDenyList() { + defaultDenylist = old +} + +// CheckURL validates the intended destination URL for a webhook, ensuring that +// the hostname is not invalid, a bad IP, or anything else. +func CheckURL(dest string) error { + u, uErr := url.Parse(dest) + if uErr != nil { + return errors.Newf("Could not parse provided URL %s", dest) + } + + if !strings.HasPrefix(u.Scheme, "http") || u.Host == "" { + return errors.Newf("Unsupported URL provided %s", dest) + } + + // This will validate if the IP address is external. Private, loopback and other + // non-external IP addresses are not allowed. + hostAllowList := hostmatcher.ParseHostMatchList("", "") + for _, denyRule := range defaultDenylist { + if denyRule.builtin != "" { + hostAllowList.AppendBuiltin(denyRule.builtin) } else { - ip = ip2 + hostAllowList.AppendPattern(denyRule.pattern) } + } - if ip.To4() == nil && ip.To16() == nil { - return errors.New("Not a valid IPv4 or IPv6 address") - } + var addrs []string + var err error - // This will match any valid non-private unicast IP, aka any public host. It will filter out: - // - Unspecified (zero'd) IP addresses - // - Link-local addresses - // - Loopback (localhost) addresses - hostAllowList := hostmatcher.ParseHostMatchList("", hostmatcher.MatchBuiltinExternal) + ip := net.ParseIP(u.Hostname()) - if !hostAllowList.MatchIPAddr(ip) { - return errors.New("Must not be unspecified, private, link-local, or loopback address") + if ip != nil { + if isIllegalIP(ip, hostAllowList) { + return errIllegalAddr } - return nil - } else if uErr != nil { - return errors.New("Could not parse address") - } else { - // Address is likely a URL - if u.Scheme != "http" && u.Scheme != "https" { - return errors.New("Must use http or https scheme") - } + } - if u.Hostname() == "" || u.Hostname() == "localhost" { - return errors.New("Must not be localhost") - } + // we have to deal with a hostname + addrs, err = defaultResolver.LookupHost(u.Hostname()) + if err != nil || len(addrs) == 0 { + return errors.New("Could not resolve hostname") + } - parts := strings.Split(u.Hostname(), ".") - tld := strings.ToLower(parts[len(parts)-1]) - if match, _ := regexp.MatchString(reservedTLDs, tld); match { - return errors.New("Must not be a reserved TLD") + for _, addr := range addrs { + if ip := net.ParseIP(addr); ip != nil { + if isIllegalIP(ip, hostAllowList) { + return errIllegalAddr + } } - - return nil } + + return nil +} + +func isIllegalIP(ip net.IP, hostAllowList *hostmatcher.HostMatchList) bool { + // if we do not match the IP address, it's not in the allow list + return hostAllowList.MatchIPAddr(ip) } diff --git a/internal/webhooks/outbound/outbound_test.go b/internal/webhooks/outbound/outbound_test.go index 8aecd0097dbfb..bd9dd1158f280 100644 --- a/internal/webhooks/outbound/outbound_test.go +++ b/internal/webhooks/outbound/outbound_test.go @@ -40,6 +40,8 @@ func TestEnqueueWebhook(t *testing.T) { } func TestCheckAddress(t *testing.T) { + defaultResolver = &mockResolver{} + t.Run("Invalid Addresses", func(t *testing.T) { badURLS := []string{ // No scheme @@ -54,7 +56,7 @@ func TestCheckAddress(t *testing.T) { "http://localhost:3000", "127.0.0.1", "::1", - // Unspecificed IP + // Unspecified IP string(net.IPv4zero), string(net.IPv6zero), // Private IP @@ -62,14 +64,15 @@ func TestCheckAddress(t *testing.T) { "192.168.255.255", "fd00::1", // Link-local IP - "169.254.0.0", - // Reserved TLD - "http://somesite.local/some-endpoint", - "https://somesite.test/some-endpoint", + "169.254.169.254", + // Resolves to localhost + "https://sourcegraph.local", + // Invalid domain + "https://invalid.domain", } for _, badURL := range badURLS { - err := CheckAddress(badURL) + err := CheckURL(badURL) if !assert.Error(t, err) { t.Fatalf("expected error, got nil for url '%v'", badURL) } @@ -78,17 +81,15 @@ func TestCheckAddress(t *testing.T) { t.Run("Valid Addresses", func(t *testing.T) { goodURLS := []string{ - "http://somesite.com/some-endpoint", - "https://my.webhooks.site/receiver", - "https://my.webhooks.site:3000/receiver", - "1.2.3.4", - "1.2.3.4:2000", - "2001:0db8:0000:0000:0000:8a2e:0370:7334", - "2001:db8::8a2e:370:7334", + "https://sourcegraph.com", + "https://1.2.3.4", + "https://1.2.3.4:2000", + "https://[2001:0db8:0000:0000:0000:8a2e:0370:7334]", + "http://[2001:db8::8a2e:370:7334]", } for _, goodURL := range goodURLS { - err := CheckAddress(goodURL) + err := CheckURL(goodURL) if err != nil { t.Fatalf("expected nil, got err for url '%v': %v", goodURL, err) } diff --git a/internal/xcontext/BUILD.bazel b/internal/xcontext/BUILD.bazel deleted file mode 100644 index 420cfb3c110e4..0000000000000 --- a/internal/xcontext/BUILD.bazel +++ /dev/null @@ -1,8 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "xcontext", - srcs = ["detach.go"], - importpath = "github.com/sourcegraph/sourcegraph/internal/xcontext", - visibility = ["//:__subpackages__"], -) diff --git a/internal/xcontext/detach.go b/internal/xcontext/detach.go deleted file mode 100644 index 70466103872f2..0000000000000 --- a/internal/xcontext/detach.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package xcontext is a package to offer the extra functionality we need -// from contexts that is not available from the standard context package. -// -// Copied from an internal golang package: -// https://github.com/golang/tools/blob/a01290f9844baeb2bacb81f21640f46b78680918/internal/xcontext/xcontext.go#L7 -package xcontext - -import ( - "context" - "time" -) - -// Detach returns a context that keeps all the values of its parent context -// but detaches from the cancellation and error handling. -func Detach(ctx context.Context) context.Context { return detachedContext{ctx} } - -type detachedContext struct{ parent context.Context } - -func (v detachedContext) Deadline() (time.Time, bool) { return time.Time{}, false } -func (v detachedContext) Done() <-chan struct{} { return nil } -func (v detachedContext) Err() error { return nil } -func (v detachedContext) Value(key interface{}) interface{} { return v.parent.Value(key) } diff --git a/lib/cliutil/completions/options.go b/lib/cliutil/completions/options.go index 9ca5d1d3f22ff..283d924421eca 100644 --- a/lib/cliutil/completions/options.go +++ b/lib/cliutil/completions/options.go @@ -6,15 +6,63 @@ import ( "github.com/urfave/cli/v2" ) -// CompleteOptions provides autocompletions based on the options returned by -// generateOptions. generateOptions must not write to output, or reference any resources -// that are initialized elsewhere. -func CompleteOptions(generateOptions func() (options []string)) cli.BashCompleteFunc { - return func(cmd *cli.Context) { - for _, opt := range generateOptions() { - fmt.Fprintf(cmd.App.Writer, "%s\n", opt) +// defaultCompletions renders the default completions for a command. +func defaultCompletions() cli.BashCompleteFunc { + return func(c *cli.Context) { cli.DefaultCompleteWithFlags(c.Command)(c) } +} + +// CompleteArgs provides autocompletions based on the options returned by +// generateOptions. generateOptions is provided for every argument. +// +// generateOptions must not write to output, or reference any +// resources that are initialized elsewhere. +func CompleteArgs(generateOptions func() (options []string)) cli.BashCompleteFunc { + return func(c *cli.Context) { + CompletePositionalArgs(func(_ cli.Args) (options []string) { + return generateOptions() + })(c) + } +} + +// CompletePositionalArgs provides autocompletions for multiple positional +// arguments based on the options returned by the corresponding options generator. +// If there are more arguments than generators, no completion is provided. +// +// Each generator must not write to output, or reference any resources that are +// initialized elsewhere. +func CompletePositionalArgs(generators ...func(args cli.Args) (options []string)) cli.BashCompleteFunc { + return func(c *cli.Context) { + // Let default handler deal with flag completions if the latest argument + // looks like the start of a flag + if c.NArg() > 0 { + if f := c.Args().Get(c.NArg() - 1); f == "-" || f == "--" { + defaultCompletions()(c) + return + } + } + + // More arguments than positional options generators, we have no more + // completions to offer + if len(generators) <= c.NArg() { + return + } + + // Generate the options for this posarg + opts := generators[c.NArg()](c.Args()) + + // If there are no options, render the previous options if we can, as + // user may be typing the previous argument + if len(opts) == 0 && c.NArg() >= 1 { + opts = generators[c.NArg()-1](c.Args()) + } + + // Render the options + for _, opt := range opts { + fmt.Fprintf(c.App.Writer, "%s\n", opt) + } + // Also render default completions if there are no args yet + if c.Args().Len() == 0 { + defaultCompletions()(c) } - // Also render default completions to support flags - cli.DefaultCompleteWithFlags(cmd.Command)(cmd) } } diff --git a/lib/codeintel/tools/lsif-visualize/internal/visualization/visualizer.go b/lib/codeintel/tools/lsif-visualize/internal/visualization/visualizer.go index dafebaa4e182c..228dd08593037 100644 --- a/lib/codeintel/tools/lsif-visualize/internal/visualization/visualizer.go +++ b/lib/codeintel/tools/lsif-visualize/internal/visualization/visualizer.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "io" + "slices" "strings" "github.com/grafana/regexp" @@ -39,7 +40,7 @@ func (v *Visualizer) Visualize(indexFile io.Reader, fromID, subgraphDepth int, e return true } - if contains(lineContext.Element.Label, exclude) { + if slices.Contains(exclude, lineContext.Element.Label) { return true } @@ -67,14 +68,14 @@ func (v *Visualizer) Visualize(indexFile io.Reader, fromID, subgraphDepth int, e } vertex, _ := v.Context.Stasher.Vertex(edge.OutV) - if contains(vertex.Element.Label, exclude) { + if slices.Contains(exclude, vertex.Element.Label) { return true } return forEachInV(edge, func(inV int) bool { if _, ok := vertices[inV]; ok { vertex, _ = v.Context.Stasher.Vertex(inV) - if contains(vertex.Element.Label, exclude) { + if slices.Contains(exclude, vertex.Element.Label) { return true } fmt.Printf("\tv%d -> v%d [label=\"(%d) %s\"];\n", edge.OutV, inV, lineContext.Element.ID, lineContext.Element.Label) @@ -102,12 +103,3 @@ func getReachableVerticesAtDepth(from int, forwardEdges, backwardEdges map[int][ getReachableVerticesAtDepth(v, forwardEdges, backwardEdges, depth-1, vertices) } } - -func contains(s string, ss []string) bool { - for _, str := range ss { - if str == s { - return true - } - } - return false -} diff --git a/lib/go.mod b/lib/go.mod index 301f89d0b2cc1..f858630252cb2 100644 --- a/lib/go.mod +++ b/lib/go.mod @@ -15,7 +15,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db github.com/hexops/autogold/v2 v2.0.3 - github.com/jackc/pgconn v1.10.1 + github.com/jackc/pgconn v1.14.0 github.com/json-iterator/go v1.1.12 github.com/klauspost/pgzip v1.2.5 github.com/mattn/go-isatty v0.0.18 @@ -28,18 +28,23 @@ require ( github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb github.com/sourcegraph/scip v0.3.1-0.20230627154934-45df7f6d33fc - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.23.7 github.com/xeipuuv/gojsonschema v1.2.0 golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 - golang.org/x/sys v0.8.0 - golang.org/x/term v0.6.0 - google.golang.org/protobuf v1.29.1 + golang.org/x/sys v0.14.0 + golang.org/x/term v0.14.0 + google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools v2.2.0+incompatible ) +require ( + google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect +) + require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Masterminds/goutils v1.1.1 // indirect @@ -56,15 +61,15 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect - github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect + github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect github.com/getsentry/sentry-go v0.25.0 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/google/uuid v1.3.1 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.4.0 // indirect github.com/gorilla/css v1.0.0 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect github.com/hexops/valast v1.4.3 // indirect @@ -74,8 +79,8 @@ require ( github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.1.1 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f // indirect github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753 // indirect @@ -114,13 +119,14 @@ require ( go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.7.0 // indirect - golang.org/x/mod v0.9.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/tools v0.6.0 // indirect - google.golang.org/genproto v0.0.0-20230227214838-9b19f0bdc514 // indirect - google.golang.org/grpc v1.53.0 // indirect + golang.org/x/crypto v0.15.0 // indirect + golang.org/x/mod v0.11.0 // indirect + golang.org/x/net v0.18.0 // indirect + golang.org/x/sync v0.5.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.10.0 // indirect + google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/grpc v1.59.0 // indirect gotest.tools/v3 v3.0.3 // indirect mvdan.cc/gofumpt v0.4.0 // indirect ) diff --git a/lib/go.sum b/lib/go.sum index f5fa36a337172..e4b4d5e3e0504 100644 --- a/lib/go.sum +++ b/lib/go.sum @@ -66,8 +66,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY= -github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= +github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= @@ -106,8 +106,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -125,8 +125,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA= @@ -154,8 +154,8 @@ github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= -github.com/jackc/pgconn v1.10.1 h1:DzdIHIjG1AxGwoEEqS+mGsURyjt4enSmqzACXvVzOT8= -github.com/jackc/pgconn v1.10.1/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= +github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= @@ -170,10 +170,12 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.1.1 h1:7PQ/4gLoqnl87ZxL7xjO0DR5gYuviDCZxQJsUlFW1eI= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= @@ -327,8 +329,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY= github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -374,8 +376,9 @@ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o= golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= @@ -387,8 +390,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -405,8 +408,9 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -416,8 +420,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -444,15 +449,17 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= +golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -460,8 +467,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -478,8 +486,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= +golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -491,16 +499,20 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20230227214838-9b19f0bdc514 h1:rtNKfB++wz5mtDY2t5C8TXlU5y52ojSu7tZo0z7u8eQ= -google.golang.org/genproto v0.0.0-20230227214838-9b19f0bdc514/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -513,8 +525,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= -google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/lib/managedservicesplatform/example/BUILD.bazel b/lib/managedservicesplatform/example/BUILD.bazel deleted file mode 100644 index 5bfaa5ad2e727..0000000000000 --- a/lib/managedservicesplatform/example/BUILD.bazel +++ /dev/null @@ -1,18 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") - -go_library( - name = "example_lib", - srcs = ["main.go"], - importpath = "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/example", - visibility = ["//visibility:private"], - deps = [ - "//lib/managedservicesplatform/example/internal/example", - "//lib/managedservicesplatform/service", - ], -) - -go_binary( - name = "example", - embed = [":example_lib"], - visibility = ["//visibility:public"], -) diff --git a/lib/managedservicesplatform/example/internal/example/BUILD.bazel b/lib/managedservicesplatform/example/internal/example/BUILD.bazel deleted file mode 100644 index 237ea1c247088..0000000000000 --- a/lib/managedservicesplatform/example/internal/example/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "example", - srcs = ["example.go"], - importpath = "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/example/internal/example", - visibility = ["//lib/managedservicesplatform/example:__subpackages__"], - deps = [ - "//lib/background", - "//lib/errors", - "//lib/managedservicesplatform/service", - "@com_github_sourcegraph_log//:log", - ], -) diff --git a/lib/managedservicesplatform/example/internal/example/example.go b/lib/managedservicesplatform/example/internal/example/example.go deleted file mode 100644 index 08cf2aef6139a..0000000000000 --- a/lib/managedservicesplatform/example/internal/example/example.go +++ /dev/null @@ -1,70 +0,0 @@ -package example - -import ( - "context" - "fmt" - "net/http" - "time" - - "github.com/sourcegraph/log" - - "github.com/sourcegraph/sourcegraph/lib/background" - "github.com/sourcegraph/sourcegraph/lib/errors" - "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/service" -) - -type Config struct { - Variable int -} - -func (c *Config) Load(env *service.Env) { - c.Variable = env.GetInt("VARIABLE", "13", "variable value") -} - -type Service struct{} - -var _ service.Service[Config] = Service{} - -func (s Service) Name() string { return "example" } -func (s Service) Version() string { return "dev" } -func (s Service) Initialize( - ctx context.Context, - logger log.Logger, - contract service.Contract, - config Config, -) (background.CombinedRoutine, error) { - logger.Info("starting service") - - return background.CombinedRoutine{ - &httpRoutine{ - log: logger, - Server: &http.Server{ - Addr: fmt.Sprintf(":%d", contract.Port), - Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(fmt.Sprintf("Variable: %d", config.Variable))) - }), - }, - }, - }, nil -} - -type httpRoutine struct { - log log.Logger - *http.Server -} - -func (s *httpRoutine) Start() { - if err := s.Server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { - s.log.Error("error stopping server", log.Error(err)) - } -} - -func (s *httpRoutine) Stop() { - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) - defer cancel() - if err := s.Server.Shutdown(ctx); err != nil { - s.log.Error("error shutting down server", log.Error(err)) - } else { - s.log.Info("server stopped") - } -} diff --git a/lib/managedservicesplatform/example/main.go b/lib/managedservicesplatform/example/main.go deleted file mode 100644 index e0bd68a123923..0000000000000 --- a/lib/managedservicesplatform/example/main.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/example/internal/example" - "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/service" -) - -func main() { - service.Run[example.Config](example.Service{}) -} diff --git a/lib/managedservicesplatform/go.mod b/lib/managedservicesplatform/go.mod new file mode 100644 index 0000000000000..a83240499b824 --- /dev/null +++ b/lib/managedservicesplatform/go.mod @@ -0,0 +1,92 @@ +module github.com/sourcegraph/sourcegraph/lib/managedservicesplatform + +go 1.19 + +replace github.com/sourcegraph/sourcegraph/lib => ../ + +require ( + cloud.google.com/go/cloudsqlconn v1.5.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.41.0 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.17.0 + github.com/getsentry/sentry-go v0.25.0 + github.com/jackc/pgx/v5 v5.5.0 + github.com/prometheus/client_golang v1.16.0 + github.com/sourcegraph/conc v0.2.0 + github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb + github.com/sourcegraph/sourcegraph/lib v0.0.0-20231122233253-1f857814717c + go.opentelemetry.io/contrib/detectors/gcp v1.17.0 + go.opentelemetry.io/contrib/propagators/jaeger v1.17.0 + go.opentelemetry.io/contrib/propagators/ot v1.17.0 + go.opentelemetry.io/otel v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 + go.opentelemetry.io/otel/exporters/prometheus v0.39.0 + go.opentelemetry.io/otel/sdk v1.16.0 + go.opentelemetry.io/otel/sdk/metric v0.39.0 +) + +require ( + cloud.google.com/go/compute v1.23.2 // indirect + cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect + cloud.google.com/go/monitoring v1.16.2 // indirect + cloud.google.com/go/trace v1.10.3 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.41.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/fatih/color v1.15.0 // indirect + github.com/go-logr/logr v1.3.0 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.4.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.14.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.11.1 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect + go.opentelemetry.io/proto/otlp v1.0.0 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.24.0 // indirect + golang.org/x/crypto v0.15.0 // indirect + golang.org/x/net v0.18.0 // indirect + golang.org/x/oauth2 v0.14.0 // indirect + golang.org/x/sync v0.5.0 // indirect + golang.org/x/sys v0.14.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.4.0 // indirect + google.golang.org/api v0.150.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/grpc v1.59.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect +) diff --git a/lib/managedservicesplatform/go.sum b/lib/managedservicesplatform/go.sum new file mode 100644 index 0000000000000..201c864cae9b3 --- /dev/null +++ b/lib/managedservicesplatform/go.sum @@ -0,0 +1,409 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68= +cloud.google.com/go/cloudsqlconn v1.5.1 h1:rMtPv66pkuk2K1ciCicjZY8Ma1DSyOYSoqwPUw/Timo= +cloud.google.com/go/cloudsqlconn v1.5.1/go.mod h1:DPWjhwD5Fhv43M0RP/+7J37xo4PByfNWCzMlKa9OBwE= +cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers= +cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= +cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= +cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8= +cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU= +cloud.google.com/go/longrunning v0.5.3 h1:maKa7O9YTzmVzwdlRKr981U1Ys2auup6rpeMt8y3+RU= +cloud.google.com/go/monitoring v1.16.2 h1:gx7BDZcoRqX5DfuJzw9LdhVjEkqCLmDXScdnrmIy9ik= +cloud.google.com/go/monitoring v1.16.2/go.mod h1:B44KGwi4ZCF8Rk/5n+FWeispDXoKSk9oss2QNlXJBgc= +cloud.google.com/go/trace v1.10.3 h1:yiQ2EdegdiZDPwNPoUqGYAMd0wNValT/NRsC1XGyBJ0= +cloud.google.com/go/trace v1.10.3/go.mod h1:Ke1bgfc73RV3wUFml+uQp7EsDw4dGaETLxB7Iq/r4CY= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 h1:tk85AYGwOf6VNtoOQi8w/kVDi2vmPxp3/OU2FsUpdcA= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.41.0 h1:VahL5SjDdCas8mMKARolw2vvBsuLc5oV7XNSbxeMQP8= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.41.0/go.mod h1:T8qLlq6KznHWwp8FEbfw+p7mX/+dezSvUy3PXfTnp4c= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.17.0 h1:DwGeS/9k9xdpnvVQuJF+L9bYNFvBCmCWlDA8d8opoZY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.17.0/go.mod h1:SUVNJAkkyRKeM3L46/NhFGIz+Kx1zetN09qUs1XbMx8= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.41.0 h1:ZJwvlTjB8GycSRpysdcRv3FztommLDUfgii0VUUp5ys= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.41.0 h1:MWQ81b2TkSLbDpLINiKdZdoht1VMEHCKr4BSZpb/KQ8= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.41.0/go.mod h1:lz6DEePTxmjvYMtusOoS3qDAErC0STi/wmvqJucKY28= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= +github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= +github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= +github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= +github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= +github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= +github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= +github.com/jackc/pgx/v5 v5.5.0 h1:NxstgwndsTRy7eq9/kqYc/BZh5w2hHJV86wjvO+1xPw= +github.com/jackc/pgx/v5 v5.5.0/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/microsoft/go-mssqldb v1.6.0 h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67NNNpc= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sourcegraph/conc v0.2.0 h1:96VpOCAtXDCQ8Oycz0ftHqdPyMi8w12ltN4L2noYg7s= +github.com/sourcegraph/conc v0.2.0/go.mod h1:8lmPpTLA0hsWqw4lw7wS1e694U2tMjRrc1Asvupb4QM= +github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb h1:tHKdC+bXxxGJ0cy/R06kg6Z0zqwVGOWMx8uWsIwsaoY= +github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb/go.mod h1:IDp09QkoqS8Z3CyN2RW6vXjgABkNpDbyjLIHNQwQ8P8= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/detectors/gcp v1.17.0 h1:SsuF2+gqrnmTKSz+KLXcx3A4A7PZXqbuRZbm4I6HcX0= +go.opentelemetry.io/contrib/detectors/gcp v1.17.0/go.mod h1:kYzEwPGh9npjtpbJ+Qq/gN7ARi2PkvkvYARA/kWqkMs= +go.opentelemetry.io/contrib/propagators/jaeger v1.17.0 h1:Zbpbmwav32Ea5jSotpmkWEl3a6Xvd4tw/3xxGO1i05Y= +go.opentelemetry.io/contrib/propagators/jaeger v1.17.0/go.mod h1:tcTUAlmO8nuInPDSBVfG+CP6Mzjy5+gNV4mPxMbL0IA= +go.opentelemetry.io/contrib/propagators/ot v1.17.0 h1:ufo2Vsz8l76eI47jFjuVyjyB3Ae2DmfiCV/o6Vc8ii0= +go.opentelemetry.io/contrib/propagators/ot v1.17.0/go.mod h1:SbKPj5XGp8K/sGm05XblaIABgMgw2jDczP8gGeuaVLk= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0= +golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= +golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.150.0 h1:Z9k22qD289SZ8gCJrk4DrWXkNjtfvKAUo/l1ma8eBYE= +google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/lib/managedservicesplatform/runtime/BUILD.bazel b/lib/managedservicesplatform/runtime/BUILD.bazel new file mode 100644 index 0000000000000..4ec9c28908347 --- /dev/null +++ b/lib/managedservicesplatform/runtime/BUILD.bazel @@ -0,0 +1,25 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "runtime", + srcs = [ + "config.go", + "contract.go", + "env.go", + "sanitycheck.go", + "service.go", + ], + importpath = "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/runtime", + visibility = ["//visibility:public"], + deps = [ + "//lib/background", + "//lib/errors", + "//lib/managedservicesplatform/runtime/internal/opentelemetry", + "//lib/pointers", + "@com_github_getsentry_sentry_go//:sentry-go", + "@com_github_jackc_pgx_v5//:pgx", + "@com_github_jackc_pgx_v5//stdlib", + "@com_github_sourcegraph_log//:log", + "@com_google_cloud_go_cloudsqlconn//:cloudsqlconn", + ], +) diff --git a/lib/managedservicesplatform/runtime/config.go b/lib/managedservicesplatform/runtime/config.go new file mode 100644 index 0000000000000..915d78e9b4532 --- /dev/null +++ b/lib/managedservicesplatform/runtime/config.go @@ -0,0 +1,9 @@ +package runtime + +type ConfigLoader[ConfigT any] interface { + *ConfigT + + // Load should populate ConfigT with values from env. Errors should be added + // to env using env.AddError(). + Load(env *Env) +} diff --git a/lib/managedservicesplatform/runtime/contract.go b/lib/managedservicesplatform/runtime/contract.go new file mode 100644 index 0000000000000..9edce027d3605 --- /dev/null +++ b/lib/managedservicesplatform/runtime/contract.go @@ -0,0 +1,122 @@ +package runtime + +import ( + "bytes" + "context" + "database/sql" + "fmt" + "net" + "text/template" + + "cloud.google.com/go/cloudsqlconn" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/stdlib" + + "github.com/sourcegraph/sourcegraph/lib/errors" + "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/runtime/internal/opentelemetry" + "github.com/sourcegraph/sourcegraph/lib/pointers" +) + +// Contract loads standardized MSP-provisioned (Managed Services Platform) +// configuration. +type Contract struct { + // Indicate if we are running in a MSP environment. + MSP bool + // Port is the port the service must listen on. + Port int + // ExternalDNSName is the DNS name the service uses, if one is configured. + ExternalDNSName *string + // RedisEndpoint is the full Redis address, including any prerequisite + // authentication. + RedisEndpoint *string + + postgreSQLContract + + opentelemetryContract opentelemetry.Config + + sentryDSN *string +} + +type postgreSQLContract struct { + customDSNTemplate *string + + instanceConnectionName *string + user *string +} + +func newContract(env *Env) Contract { + defaultGCPProjectID := pointers.Deref(env.GetOptional("GOOGLE_CLOUD_PROJECT", "GCP project ID"), "") + + return Contract{ + MSP: env.GetBool("MSP", "false", "indicates if we are running in a MSP environment"), + Port: env.GetInt("PORT", "", "service port"), + ExternalDNSName: env.GetOptional("EXTERNAL_DNS_NAME", "external DNS name provisioned for the service"), + RedisEndpoint: env.GetOptional("REDIS_ENDPOINT", "full Redis address, including any prerequisite authentication"), + postgreSQLContract: postgreSQLContract{ + customDSNTemplate: env.GetOptional("PGDSN", + "custom PostgreSQL DSN with templatized database, e.g. 'user=foo database={{ .Database }}'"), + + instanceConnectionName: env.GetOptional("PGINSTANCE", "Cloud SQL instance connection name"), + user: env.GetOptional("PGUSER", "Cloud SQL user"), + }, + opentelemetryContract: opentelemetry.Config{ + GCPProjectID: pointers.Deref( + env.GetOptional("OTEL_GCP_PROJECT_ID", "GCP project ID for OpenTelemetry export"), + defaultGCPProjectID), + }, + sentryDSN: env.GetOptional("SENTRY_DSN", "Sentry error reporting DSN"), + } +} + +// GetPostgreSQLDB returns a standard library DB pointing to the configured +// PostgreSQL database. In MSP, we connect to a Cloud SQL instance over IAM auth. +// +// In development, the connection can be overridden with the PGDSN environment +// variable. +func (c postgreSQLContract) GetPostgreSQLDB(ctx context.Context, database string) (*sql.DB, error) { + if c.customDSNTemplate != nil { + tmpl, err := template.New("PGDSN").Parse(*c.customDSNTemplate) + if err != nil { + return nil, errors.Wrap(err, "PGDSN is not a valid template") + } + var dsn bytes.Buffer + if err := tmpl.Execute(&dsn, struct{ Database string }{Database: database}); err != nil { + return nil, errors.Wrap(err, "PGDSN template is invalid") + } + return sql.Open("pgx", dsn.String()) + } + + config, err := c.getCloudSQLConnConfig(ctx, database) + if err != nil { + return nil, errors.Wrap(err, "get CloudSQL connection config") + } + return sql.Open("pgx", stdlib.RegisterConnConfig(config)) +} + +// getCloudSQLConnConfig generates a pgx connection configuration for using +// a Cloud SQL instance using IAM auth. +func (c postgreSQLContract) getCloudSQLConnConfig(ctx context.Context, database string) (*pgx.ConnConfig, error) { + if c.instanceConnectionName == nil || c.user == nil { + return nil, errors.New("missing required PostgreSQL configuration") + } + + // https://github.com/GoogleCloudPlatform/cloud-sql-go-connector?tab=readme-ov-file#automatic-iam-database-authentication + dsn := fmt.Sprintf("user=%s dbname=%s", *c.user, database) + config, err := pgx.ParseConfig(dsn) + if err != nil { + return nil, errors.Wrap(err, "pgx.ParseConfig") + } + d, err := cloudsqlconn.NewDialer(ctx, + cloudsqlconn.WithIAMAuthN(), + // MSP uses private IP + cloudsqlconn.WithDefaultDialOptions(cloudsqlconn.WithPrivateIP())) + if err != nil { + return nil, errors.Wrap(err, "cloudsqlconn.NewDialer") + } + // Use the Cloud SQL connector to handle connecting to the instance. + // This approach does *NOT* require the Cloud SQL proxy. + config.DialFunc = func(ctx context.Context, _, _ string) (net.Conn, error) { + return d.Dial(ctx, *c.instanceConnectionName) + } + return config, nil +} diff --git a/lib/managedservicesplatform/service/config.go b/lib/managedservicesplatform/runtime/env.go similarity index 85% rename from lib/managedservicesplatform/service/config.go rename to lib/managedservicesplatform/runtime/env.go index d95626f3f08e4..38849bd5526ee 100644 --- a/lib/managedservicesplatform/service/config.go +++ b/lib/managedservicesplatform/runtime/env.go @@ -1,4 +1,4 @@ -package service +package runtime import ( "os" @@ -9,29 +9,6 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" ) -// Contract loads standardized MSP-provisioned configuration. -type Contract struct { - // Port is the port the service must listen on. - Port int - // ExternalDNSName is the DNS name the service uses, if one is configured. - ExternalDNSName *string -} - -func newContract(env *Env) Contract { - return Contract{ - Port: env.GetInt("PORT", "", "service port"), - ExternalDNSName: env.GetOptional("EXTERNAL_DNS_NAME", "external DNS name provisioned for the service"), - } -} - -type ConfigLoader[ConfigT any] interface { - *ConfigT - - // Load should populate ConfigT with values from env. Errors should be added - // to env using env.AddError(). - Load(env *Env) -} - type Env struct { errs []error env map[string]string @@ -53,6 +30,7 @@ func newEnv() (*Env, error) { }, nil } +// TODO: Try to use third param description to generate docs. func (e *Env) get(name, defaultValue, _ string) string { v, ok := e.env[name] if !ok { diff --git a/lib/managedservicesplatform/runtime/internal/opentelemetry/BUILD.bazel b/lib/managedservicesplatform/runtime/internal/opentelemetry/BUILD.bazel new file mode 100644 index 0000000000000..5e54e25bc4d92 --- /dev/null +++ b/lib/managedservicesplatform/runtime/internal/opentelemetry/BUILD.bazel @@ -0,0 +1,32 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "opentelemetry", + srcs = [ + "metrics.go", + "opentelemetry.go", + "tracing.go", + ], + importpath = "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/runtime/internal/opentelemetry", + visibility = ["//lib/managedservicesplatform/runtime:__subpackages__"], + deps = [ + "//lib/errors", + "@com_github_googlecloudplatform_opentelemetry_operations_go_exporter_metric//:metric", + "@com_github_googlecloudplatform_opentelemetry_operations_go_exporter_trace//:trace", + "@com_github_prometheus_client_golang//prometheus", + "@com_github_sourcegraph_conc//:conc", + "@com_github_sourcegraph_log//:log", + "@io_opentelemetry_go_contrib_detectors_gcp//:gcp", + "@io_opentelemetry_go_contrib_propagators_jaeger//:jaeger", + "@io_opentelemetry_go_contrib_propagators_ot//:ot", + "@io_opentelemetry_go_otel//:otel", + "@io_opentelemetry_go_otel//propagation", + "@io_opentelemetry_go_otel//semconv/v1.21.0:v1_21_0", + "@io_opentelemetry_go_otel_exporters_otlp_otlptrace//:otlptrace", + "@io_opentelemetry_go_otel_exporters_otlp_otlptrace_otlptracegrpc//:otlptracegrpc", + "@io_opentelemetry_go_otel_exporters_prometheus//:prometheus", + "@io_opentelemetry_go_otel_sdk//resource", + "@io_opentelemetry_go_otel_sdk//trace", + "@io_opentelemetry_go_otel_sdk_metric//:metric", + ], +) diff --git a/lib/managedservicesplatform/runtime/internal/opentelemetry/metrics.go b/lib/managedservicesplatform/runtime/internal/opentelemetry/metrics.go new file mode 100644 index 0000000000000..737a5a64151c9 --- /dev/null +++ b/lib/managedservicesplatform/runtime/internal/opentelemetry/metrics.go @@ -0,0 +1,63 @@ +package opentelemetry + +import ( + "context" + "time" + + gcpmetricexporter "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric" + "github.com/prometheus/client_golang/prometheus" + "github.com/sourcegraph/log" + "go.opentelemetry.io/otel" + otelprometheus "go.opentelemetry.io/otel/exporters/prometheus" + sdkmetric "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/resource" + + "github.com/sourcegraph/sourcegraph/lib/errors" +) + +func maybeEnableMetrics(_ context.Context, logger log.Logger, config Config, res *resource.Resource) (func(), error) { + var reader sdkmetric.Reader + if config.GCPProjectID != "" { + logger.Debug("initializing GCP trace exporter", log.String("projectID", config.GCPProjectID)) + exporter, err := gcpmetricexporter.New( + gcpmetricexporter.WithProjectID(config.GCPProjectID)) + if err != nil { + return nil, errors.Wrap(err, "gcpmetricexporter.New") + } + reader = sdkmetric.NewPeriodicReader(exporter, + sdkmetric.WithInterval(30*time.Second)) + } else { + logger.Debug("initializing Prometheus exporter") + var err error + reader, err = otelprometheus.New( + otelprometheus.WithRegisterer(prometheus.DefaultRegisterer)) + if err != nil { + return nil, errors.Wrap(err, "exporters.NewPrometheusExporter") + } + // TODO(@bobheadxi) + // Must register promhttp.Handler() somewhere to enable collection in + // this mode. + } + + // Create and set global tracer + provider := sdkmetric.NewMeterProvider( + sdkmetric.WithReader(reader), + sdkmetric.WithResource(res)) + otel.SetMeterProvider(provider) + + logger.Info("metrics configured") + return func() { + shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + + start := time.Now() + logger.Debug("shutting down metrics") + if err := provider.ForceFlush(shutdownCtx); err != nil { + logger.Warn("error occurred force-flushing metrics", log.Error(err)) + } + if err := provider.Shutdown(shutdownCtx); err != nil { + logger.Warn("error occurred shutting down metrics", log.Error(err)) + } + logger.Info("metrics shut down", log.Duration("elapsed", time.Since(start))) + }, nil +} diff --git a/lib/managedservicesplatform/runtime/internal/opentelemetry/opentelemetry.go b/lib/managedservicesplatform/runtime/internal/opentelemetry/opentelemetry.go new file mode 100644 index 0000000000000..9cfd8ae3e9ae2 --- /dev/null +++ b/lib/managedservicesplatform/runtime/internal/opentelemetry/opentelemetry.go @@ -0,0 +1,64 @@ +package opentelemetry + +import ( + "context" + + "github.com/sourcegraph/conc" + "github.com/sourcegraph/log" + "github.com/sourcegraph/sourcegraph/lib/errors" + gcpdetector "go.opentelemetry.io/contrib/detectors/gcp" + "go.opentelemetry.io/otel/sdk/resource" + semconv "go.opentelemetry.io/otel/semconv/v1.21.0" +) + +type Config struct { + GCPProjectID string +} + +// Init initializes OpenTelemetry integrations. If config.GCPProjectID is set, +// all OpenTelemetry integrations will point to a GCP exporter - otherwise, a +// local dev default is chosen: +// +// - traces: OTLP exporter +// - metrics: Prometheus exporter +func Init(ctx context.Context, logger log.Logger, config Config, r log.Resource) (func(), error) { + res, err := getOpenTelemetryResource(ctx, r) + if err != nil { + return nil, errors.Wrap(err, "init resource") + } + + shutdownTracing, err := maybeEnableTracing(ctx, logger, config, res) + if err != nil { + return nil, errors.Wrap(err, "enable tracing") + } + + shutdownMetrics, err := maybeEnableMetrics(ctx, logger, config, res) + if err != nil { + return nil, errors.Wrap(err, "enable metrics") + } + + return func() { + logger.Debug("shutting down OpenTelemetry") + var wg conc.WaitGroup + wg.Go(shutdownTracing) + wg.Go(shutdownMetrics) + wg.Wait() + }, nil +} + +func getOpenTelemetryResource(ctx context.Context, r log.Resource) (*resource.Resource, error) { + // Identify your application using resource detection + return resource.New(ctx, + // Use the GCP resource detector to detect information about the GCP platform + resource.WithDetectors(gcpdetector.NewDetector()), + // Use the default detectors + resource.WithTelemetrySDK(), + // Add our own attributes + resource.WithAttributes( + semconv.ServiceNameKey.String(r.Name), + semconv.ServiceVersionKey.String(r.Version), + semconv.ServiceInstanceIDKey.String(r.InstanceID), + semconv.ServiceNamespaceKey.String(r.Namespace), + ), + ) +} diff --git a/lib/managedservicesplatform/runtime/internal/opentelemetry/tracing.go b/lib/managedservicesplatform/runtime/internal/opentelemetry/tracing.go new file mode 100644 index 0000000000000..5ddae11a43869 --- /dev/null +++ b/lib/managedservicesplatform/runtime/internal/opentelemetry/tracing.go @@ -0,0 +1,92 @@ +package opentelemetry + +import ( + "context" + "time" + + "github.com/sourcegraph/log" + + gcptraceexporter "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace" + jaegerpropagator "go.opentelemetry.io/contrib/propagators/jaeger" + otpropagator "go.opentelemetry.io/contrib/propagators/ot" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" + "go.opentelemetry.io/otel/propagation" + "go.opentelemetry.io/otel/sdk/resource" + sdktrace "go.opentelemetry.io/otel/sdk/trace" + + "github.com/sourcegraph/sourcegraph/lib/errors" +) + +// maybeEnableTracing configures OpenTelemetry tracing if the GOOGLE_CLOUD_PROJECT is set. +// It differs from Sourcegraph's default tracing because we need to export directly to GCP, +// and the use case is more niche as a standalone service. +// +// Based on https://cloud.google.com/trace/docs/setup/go-ot +func maybeEnableTracing(ctx context.Context, logger log.Logger, config Config, res *resource.Resource) (func(), error) { + // Set globals + otel.SetTextMapPropagator(defaultPropagator()) + otel.SetErrorHandler(otel.ErrorHandlerFunc(func(err error) { + logger.Debug("OpenTelemetry error", log.Error(err)) + })) + + // Initialize exporter + var exporter sdktrace.SpanExporter + if config.GCPProjectID != "" { + logger.Debug("initializing GCP trace exporter", log.String("projectID", config.GCPProjectID)) + var err error + exporter, err = gcptraceexporter.New( + gcptraceexporter.WithProjectID(config.GCPProjectID), + gcptraceexporter.WithErrorHandler(otel.ErrorHandlerFunc(func(err error) { + logger.Warn("gcptraceexporter error", log.Error(err)) + })), + ) + if err != nil { + return nil, errors.Wrap(err, "gcptraceexporter.New") + } + } else { + logger.Debug("initializing OTLP exporter") + var err error + exporter, err = otlptrace.New(ctx, otlptracegrpc.NewClient()) // no opts, use OTLP convention + if err != nil { + return nil, errors.Wrap(err, "otlptrace.New") + } + } + + // Create and set global tracer + provider := sdktrace.NewTracerProvider( + sdktrace.WithBatcher(exporter), + sdktrace.WithResource(res)) + otel.SetTracerProvider(provider) + + logger.Info("tracing configured") + return func() { + shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + + start := time.Now() + logger.Debug("shutting down tracing") + if err := provider.ForceFlush(shutdownCtx); err != nil { + logger.Warn("error occurred force-flushing traces", log.Error(err)) + } + if err := provider.Shutdown(shutdownCtx); err != nil { + logger.Warn("error occured shutting down tracing", log.Error(err)) + } + logger.Info("tracing shut down", log.Duration("elapsed", time.Since(start))) + }, nil +} + +// defaultPropagator returns a propagator that supports a bunch of common formats like +// W3C Trace Context, W3C Baggage, OpenTracing, and Jaeger (the latter two being +// the more commonly used legacy formats at Sourcegraph). This helps ensure +// propagation between services continues to work. +func defaultPropagator() propagation.TextMapPropagator { + return propagation.NewCompositeTextMapPropagator( + jaegerpropagator.Jaeger{}, + otpropagator.OT{}, + // W3C Trace Context format (https://www.w3.org/TR/trace-context/) + propagation.TraceContext{}, + propagation.Baggage{}, + ) +} diff --git a/lib/managedservicesplatform/service/sanitycheck.go b/lib/managedservicesplatform/runtime/sanitycheck.go similarity index 94% rename from lib/managedservicesplatform/service/sanitycheck.go rename to lib/managedservicesplatform/runtime/sanitycheck.go index bdec514ef861c..2dc84a81fc97f 100644 --- a/lib/managedservicesplatform/service/sanitycheck.go +++ b/lib/managedservicesplatform/runtime/sanitycheck.go @@ -1,4 +1,4 @@ -package service +package runtime import ( "fmt" diff --git a/lib/managedservicesplatform/service/service.go b/lib/managedservicesplatform/runtime/service.go similarity index 56% rename from lib/managedservicesplatform/service/service.go rename to lib/managedservicesplatform/runtime/service.go index 628c6a15559e6..c140936d3877f 100644 --- a/lib/managedservicesplatform/service/service.go +++ b/lib/managedservicesplatform/runtime/service.go @@ -1,10 +1,13 @@ -package service +package runtime import ( "context" + "github.com/getsentry/sentry-go" "github.com/sourcegraph/log" + "github.com/sourcegraph/sourcegraph/lib/background" + "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/runtime/internal/opentelemetry" ) type Service[ConfigT any] interface { @@ -20,21 +23,28 @@ type Service[ConfigT any] interface { ) (background.CombinedRoutine, error) } -// Run handles the entire lifecycle of the program running Service. -func Run[ +// Start handles the entire lifecycle of the program running Service, and should +// be the only thing called in a MSP program's main package, for example: +// +// runtime.Start[example.Config](example.Service{}) +// +// Where example.Config is your runtime.ConfigLoader implementation, and +// example.Service is your runtime.Service implementation. +func Start[ ConfigT any, LoaderT ConfigLoader[ConfigT], ](service Service[ConfigT]) { passSanityCheck() - r := log.Resource{ + // Resource representing the service + res := log.Resource{ Name: service.Name(), Version: service.Version(), Namespace: "", InstanceID: "", } - liblog := log.Init(r) + liblog := log.Init(res, log.NewSentrySink()) defer liblog.Sync() ctx := context.Background() @@ -52,11 +62,31 @@ func Run[ config.Load(env) contract := newContract(env) + // Enable Sentry error log reporting + if contract.sentryDSN != nil { + liblog.Update(func() log.SinksConfig { + return log.SinksConfig{ + Sentry: &log.SentrySink{ + ClientOptions: sentry.ClientOptions{ + Dsn: *contract.sentryDSN, + }, + }, + } + })() + } + // Check for environment errors if err := env.validate(); err != nil { logger.Fatal("environment configuration error encountered", log.Error(err)) } + // Initialize things dependent on configuration being loaded + otelCleanup, err := opentelemetry.Init(ctx, logger, contract.opentelemetryContract, res) + if err != nil { + logger.Fatal("failed to initialize OpenTelemetry", log.Error(err)) + } + defer otelCleanup() + // Initialize the service routine, err := service.Initialize( ctx, diff --git a/lib/managedservicesplatform/service/BUILD.bazel b/lib/managedservicesplatform/service/BUILD.bazel deleted file mode 100644 index 01f3d9ae34f1d..0000000000000 --- a/lib/managedservicesplatform/service/BUILD.bazel +++ /dev/null @@ -1,17 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "service", - srcs = [ - "config.go", - "sanitycheck.go", - "service.go", - ], - importpath = "github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/service", - visibility = ["//visibility:public"], - deps = [ - "//lib/background", - "//lib/errors", - "@com_github_sourcegraph_log//:log", - ], -) diff --git a/lib/pointers/ptr.go b/lib/pointers/ptr.go index 1cc9384330ed5..642cf7eb3825f 100644 --- a/lib/pointers/ptr.go +++ b/lib/pointers/ptr.go @@ -1,5 +1,7 @@ package pointers +import "fmt" + // Ptr returns a pointer to any value. // Useful in tests or when pointer without a variable is needed. func Ptr[T any](val T) *T { @@ -46,3 +48,8 @@ type numberType interface { func Float64[T numberType](v T) *float64 { return Ptr(float64(v)) } + +// Stringf is an alias for Ptr(fmt.Sprintf(format, a...)) +func Stringf(format string, a ...any) *string { + return Ptr(fmt.Sprintf(format, a...)) +} diff --git a/linter_deps.bzl b/linter_deps.bzl index 33459d31c1763..0c7a8f0186b75 100644 --- a/linter_deps.bzl +++ b/linter_deps.bzl @@ -1,184 +1,184 @@ load("@bazel_gazelle//:deps.bzl", "go_repository") def linter_dependencies(): - go_repository( - name = "com_github_timakin_bodyclose", - build_file_proto_mode = "disable_global", - importpath = "github.com/timakin/bodyclose", - sum = "h1:ig99OeTyDwQWhPe2iw9lwfQVF1KB3Q4fpP3X7/2VBG8=", - version = "v0.0.0-20200424151742-cb6215831a94", - ) - - go_repository( - name = "com_github_ashanbrown_forbidigo", - build_file_proto_mode = "disable_global", - importpath = "github.com/ashanbrown/forbidigo", - sum = "h1:WXhzLjOlnuDYPYQo/eFlcFMi8X/kLfvWLYu6CSoebis=", - version = "v1.5.1", - ) - - go_repository( - name = "com_github_gostaticanalysis_analysisutil", - build_file_proto_mode = "disable_global", - importpath = "github.com/gostaticanalysis/analysisutil", - version = "v0.7.1", - sum = "h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=", - ) - - go_repository( - name = "com_github_gostaticanalysis_comment", - build_file_proto_mode = "disable_global", - importpath = "github.com/gostaticanalysis/comment", - version = "v1.4.2", - sum = "h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q=", - ) - - go_repository( - name = "com_github_gordonklaus_ineffassign", - build_file_proto_mode = "disable_global", - importpath = "github.com/gordonklaus/ineffassign", - version = "v0.0.0-20230107090616-13ace0543b28", - sum = "h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U=", - ) - - go_repository( - name = "com_github_go_critic_go_critic", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-critic/go-critic", - version = "v0.6.7", - sum = "h1:1evPrElnLQ2LZtJfmNDzlieDhjnq36SLgNzisx06oPM=", - ) - - go_repository( - name = "com_github_go_toolsmith_astcast", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/astcast", - version = "v1.1.0", - sum = "h1:+JN9xZV1A+Re+95pgnMgDboWNVnIMMQXwfBwLRPgSC8=", - ) - - go_repository( - name = "com_github_go_toolsmith_astcopy", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/astcopy", - version = "v1.0.2", - sum = "h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0=", - ) - - go_repository( - name = "com_github_go_toolsmith_astequal", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/astequal", - version = "v1.1.0", - sum = "h1:kHKm1AWqClYn15R0K1KKE4RG614D46n+nqUQ06E1dTw=", - ) - - go_repository( - name = "com_github_go_toolsmith_astfmt", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/astfmt", - version = "v1.1.0", - sum = "h1:iJVPDPp6/7AaeLJEruMsBUlOYCmvg0MoCfJprsOmcco=", - ) - - go_repository( - name = "com_github_go_toolsmith_astp", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/astp", - version = "v1.1.0", - sum = "h1:dXPuCl6u2llURjdPLLDxJeZInAeZ0/eZwFJmqZMnpQA=", - ) - - go_repository( - name = "com_github_go_toolsmith_pkgload", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/pkgload", - version = "v1.0.2-0.20220101231613-e814995d17c5", - sum = "h1:eD9POs68PHkwrx7hAB78z1cb6PfGq/jyWn3wJywsH1o=", - ) - - go_repository( - name = "com_github_go_toolsmith_strparse", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/strparse", - version = "v1.1.0", - sum = "h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQiyP2Bvw=", - ) - - go_repository( - name = "com_github_go_toolsmith_typep", - build_file_proto_mode = "disable_global", - importpath = "github.com/go-toolsmith/typep", - version = "v1.1.0", - sum = "h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus=", - ) - - go_repository( - name = "com_github_quasilyte_go_ruleguard", - importpath = "github.com/quasilyte/go-ruleguard", - version = "v0.3.19", - sum = "h1:tfMnabXle/HzOb5Xe9CUZYWXKfkS1KwRmZyPmD9nVcc=", - ) - - go_repository( - name = "com_github_quasilyte_gogrep", - importpath = "github.com/quasilyte/gogrep", - version = "v0.5.0", - sum = "h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo=", - ) - - go_repository( - name = "com_github_quasilyte_regex_syntax", - importpath = "github.com/quasilyte/regex/syntax", - version = "v0.0.0-20200407221936-30656e2c4a95", - sum = "h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY=", - ) - - go_repository( - name = "com_github_quasilyte_stdinfo", - importpath = "github.com/quasilyte/stdinfo", - version = "v0.0.0-20220114132959-f7386bf02567", - sum = "h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs=", - ) - - go_repository( - name = "org_golang_x_exp_typeparams", - importpath = "golang.org/x/exp/typeparams", - version = "v0.0.0-20230203172020-98cc5a0785f9", - sum = "h1:6WHiuFL9FNjg8RljAaT7FNUuKDbvMqS1i5cr2OE2sLQ=", - ) - - go_repository( - name = "com_github_kyoh86_exportloopref", - importpath = "github.com/kyoh86/exportloopref", - version = "v0.1.11", - sum = "h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ=", - ) - - go_repository( - name = "co_honnef_go_tools", - importpath = "honnef.co/go/tools", - version = "v0.4.3", - sum = "h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw=", - ) - - go_repository( - name ="com_github_openpeedeep_depguard_v2", - importpath = "github.com/OpenPeeDeeP/depguard/v2", - version = "v2.0.1", - sum = "h1:yr9ZswukmNxl/hmJHEoLEjCF1d+f2pQrC0m1jzVljAE=", - ) - - go_repository( - name ="cc_mvdan_unparam", - importpath = "mvdan.cc/unparam", - version = "v0.0.0-20230312165513-e84e2d14e3b8", - sum = "h1:VuJo4Mt0EVPychre4fNlDWDuE5AjXtPJpRUWqZDQhaI=", - ) - - go_repository( - name ="com_4d63_gocheckcompilerdirectives", - importpath = "4d63.com/gocheckcompilerdirectives", - version = "v1.2.1", - sum = "h1:AHcMYuw56NPjq/2y615IGg2kYkBdTvOaojYCBcRE7MA=", - ) + go_repository( + name = "com_github_timakin_bodyclose", + build_file_proto_mode = "disable_global", + importpath = "github.com/timakin/bodyclose", + sum = "h1:ig99OeTyDwQWhPe2iw9lwfQVF1KB3Q4fpP3X7/2VBG8=", + version = "v0.0.0-20200424151742-cb6215831a94", + ) + + go_repository( + name = "com_github_ashanbrown_forbidigo", + build_file_proto_mode = "disable_global", + importpath = "github.com/ashanbrown/forbidigo", + sum = "h1:WXhzLjOlnuDYPYQo/eFlcFMi8X/kLfvWLYu6CSoebis=", + version = "v1.5.1", + ) + + go_repository( + name = "com_github_gostaticanalysis_analysisutil", + build_file_proto_mode = "disable_global", + importpath = "github.com/gostaticanalysis/analysisutil", + version = "v0.7.1", + sum = "h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=", + ) + + go_repository( + name = "com_github_gostaticanalysis_comment", + build_file_proto_mode = "disable_global", + importpath = "github.com/gostaticanalysis/comment", + version = "v1.4.2", + sum = "h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q=", + ) + + go_repository( + name = "com_github_gordonklaus_ineffassign", + build_file_proto_mode = "disable_global", + importpath = "github.com/gordonklaus/ineffassign", + version = "v0.0.0-20230107090616-13ace0543b28", + sum = "h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U=", + ) + + go_repository( + name = "com_github_go_critic_go_critic", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-critic/go-critic", + version = "v0.6.7", + sum = "h1:1evPrElnLQ2LZtJfmNDzlieDhjnq36SLgNzisx06oPM=", + ) + + go_repository( + name = "com_github_go_toolsmith_astcast", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/astcast", + version = "v1.1.0", + sum = "h1:+JN9xZV1A+Re+95pgnMgDboWNVnIMMQXwfBwLRPgSC8=", + ) + + go_repository( + name = "com_github_go_toolsmith_astcopy", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/astcopy", + version = "v1.0.2", + sum = "h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0=", + ) + + go_repository( + name = "com_github_go_toolsmith_astequal", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/astequal", + version = "v1.1.0", + sum = "h1:kHKm1AWqClYn15R0K1KKE4RG614D46n+nqUQ06E1dTw=", + ) + + go_repository( + name = "com_github_go_toolsmith_astfmt", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/astfmt", + version = "v1.1.0", + sum = "h1:iJVPDPp6/7AaeLJEruMsBUlOYCmvg0MoCfJprsOmcco=", + ) + + go_repository( + name = "com_github_go_toolsmith_astp", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/astp", + version = "v1.1.0", + sum = "h1:dXPuCl6u2llURjdPLLDxJeZInAeZ0/eZwFJmqZMnpQA=", + ) + + go_repository( + name = "com_github_go_toolsmith_pkgload", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/pkgload", + version = "v1.0.2-0.20220101231613-e814995d17c5", + sum = "h1:eD9POs68PHkwrx7hAB78z1cb6PfGq/jyWn3wJywsH1o=", + ) + + go_repository( + name = "com_github_go_toolsmith_strparse", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/strparse", + version = "v1.1.0", + sum = "h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQiyP2Bvw=", + ) + + go_repository( + name = "com_github_go_toolsmith_typep", + build_file_proto_mode = "disable_global", + importpath = "github.com/go-toolsmith/typep", + version = "v1.1.0", + sum = "h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus=", + ) + + go_repository( + name = "com_github_quasilyte_go_ruleguard", + importpath = "github.com/quasilyte/go-ruleguard", + version = "v0.3.19", + sum = "h1:tfMnabXle/HzOb5Xe9CUZYWXKfkS1KwRmZyPmD9nVcc=", + ) + + go_repository( + name = "com_github_quasilyte_gogrep", + importpath = "github.com/quasilyte/gogrep", + version = "v0.5.0", + sum = "h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo=", + ) + + go_repository( + name = "com_github_quasilyte_regex_syntax", + importpath = "github.com/quasilyte/regex/syntax", + version = "v0.0.0-20200407221936-30656e2c4a95", + sum = "h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY=", + ) + + go_repository( + name = "com_github_quasilyte_stdinfo", + importpath = "github.com/quasilyte/stdinfo", + version = "v0.0.0-20220114132959-f7386bf02567", + sum = "h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs=", + ) + + go_repository( + name = "org_golang_x_exp_typeparams", + importpath = "golang.org/x/exp/typeparams", + version = "v0.0.0-20230203172020-98cc5a0785f9", + sum = "h1:6WHiuFL9FNjg8RljAaT7FNUuKDbvMqS1i5cr2OE2sLQ=", + ) + + go_repository( + name = "com_github_kyoh86_exportloopref", + importpath = "github.com/kyoh86/exportloopref", + version = "v0.1.11", + sum = "h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ=", + ) + + go_repository( + name = "co_honnef_go_tools", + importpath = "honnef.co/go/tools", + version = "v0.4.3", + sum = "h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw=", + ) + + go_repository( + name = "com_github_openpeedeep_depguard_v2", + importpath = "github.com/OpenPeeDeeP/depguard/v2", + version = "v2.0.1", + sum = "h1:yr9ZswukmNxl/hmJHEoLEjCF1d+f2pQrC0m1jzVljAE=", + ) + + go_repository( + name = "cc_mvdan_unparam", + importpath = "mvdan.cc/unparam", + version = "v0.0.0-20230312165513-e84e2d14e3b8", + sum = "h1:VuJo4Mt0EVPychre4fNlDWDuE5AjXtPJpRUWqZDQhaI=", + ) + + go_repository( + name = "com_4d63_gocheckcompilerdirectives", + importpath = "4d63.com/gocheckcompilerdirectives", + version = "v1.2.1", + sum = "h1:AHcMYuw56NPjq/2y615IGg2kYkBdTvOaojYCBcRE7MA=", + ) diff --git a/migrations/BUILD.bazel b/migrations/BUILD.bazel index 53b9671a14083..f393acbd30bdc 100644 --- a/migrations/BUILD.bazel +++ b/migrations/BUILD.bazel @@ -1,5 +1,4 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") -load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") # Important warning: if you add files to that package, you *must* # add them manually to the scrs attribute, because of the gazelle:ignore diff --git a/migrations/frontend/1695152835_add_index_for_upload_indexers/down.sql b/migrations/frontend/1695152835_add_index_for_upload_indexers/down.sql new file mode 100644 index 0000000000000..89dad4d606cbe --- /dev/null +++ b/migrations/frontend/1695152835_add_index_for_upload_indexers/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS lsif_uploads_repository_id_indexer; diff --git a/migrations/frontend/1695152835_add_index_for_upload_indexers/metadata.yaml b/migrations/frontend/1695152835_add_index_for_upload_indexers/metadata.yaml new file mode 100644 index 0000000000000..60434ff45d2e0 --- /dev/null +++ b/migrations/frontend/1695152835_add_index_for_upload_indexers/metadata.yaml @@ -0,0 +1,3 @@ +name: Add index for indexers +parents: [1691759644, 1693825517] +createIndexConcurrently: true diff --git a/migrations/frontend/1695152835_add_index_for_upload_indexers/up.sql b/migrations/frontend/1695152835_add_index_for_upload_indexers/up.sql new file mode 100644 index 0000000000000..79aafa9945e71 --- /dev/null +++ b/migrations/frontend/1695152835_add_index_for_upload_indexers/up.sql @@ -0,0 +1 @@ +CREATE INDEX CONCURRENTLY IF NOT EXISTS lsif_uploads_repository_id_indexer ON lsif_uploads(repository_id, indexer); diff --git a/migrations/frontend/1695152902_add_index_for_index_indexers/down.sql b/migrations/frontend/1695152902_add_index_for_index_indexers/down.sql new file mode 100644 index 0000000000000..d313dc3a33ebf --- /dev/null +++ b/migrations/frontend/1695152902_add_index_for_index_indexers/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS lsif_indexes_repository_id_indexer; diff --git a/migrations/frontend/1695152902_add_index_for_index_indexers/metadata.yaml b/migrations/frontend/1695152902_add_index_for_index_indexers/metadata.yaml new file mode 100644 index 0000000000000..232955dfc7a8a --- /dev/null +++ b/migrations/frontend/1695152902_add_index_for_index_indexers/metadata.yaml @@ -0,0 +1,3 @@ +name: Add index for index indexers +parents: [1695152835] +createIndexConcurrently: true diff --git a/migrations/frontend/1695152902_add_index_for_index_indexers/up.sql b/migrations/frontend/1695152902_add_index_for_index_indexers/up.sql new file mode 100644 index 0000000000000..b2638bd9229e7 --- /dev/null +++ b/migrations/frontend/1695152902_add_index_for_index_indexers/up.sql @@ -0,0 +1 @@ +CREATE INDEX CONCURRENTLY IF NOT EXISTS lsif_indexes_repository_id_indexer ON lsif_indexes(repository_id, indexer); diff --git a/migrations/frontend/1700613818_add_embeddings_jobs_index/down.sql b/migrations/frontend/1700613818_add_embeddings_jobs_index/down.sql new file mode 100644 index 0000000000000..05bf7ab825544 --- /dev/null +++ b/migrations/frontend/1700613818_add_embeddings_jobs_index/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS repo_embedding_jobs_repo diff --git a/migrations/frontend/1700613818_add_embeddings_jobs_index/metadata.yaml b/migrations/frontend/1700613818_add_embeddings_jobs_index/metadata.yaml new file mode 100644 index 0000000000000..248305a2227d1 --- /dev/null +++ b/migrations/frontend/1700613818_add_embeddings_jobs_index/metadata.yaml @@ -0,0 +1,2 @@ +name: add_repo_embedding_jobs_index +parents: [1698836192] diff --git a/migrations/frontend/1700613818_add_embeddings_jobs_index/up.sql b/migrations/frontend/1700613818_add_embeddings_jobs_index/up.sql new file mode 100644 index 0000000000000..93cd21f6d19ac --- /dev/null +++ b/migrations/frontend/1700613818_add_embeddings_jobs_index/up.sql @@ -0,0 +1 @@ +CREATE INDEX IF NOT EXISTS repo_embedding_jobs_repo ON repo_embedding_jobs USING btree (repo_id, revision) diff --git a/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/down.sql b/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/down.sql new file mode 100644 index 0000000000000..14a0b9a313e4c --- /dev/null +++ b/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/down.sql @@ -0,0 +1,206 @@ +-- Drop +DROP TABLE IF EXISTS gitserver_repos_statistics; + +-- Recreate the table +CREATE TABLE IF NOT EXISTS gitserver_repos_statistics ( + shard_id text PRIMARY KEY, + + total BIGINT NOT NULL DEFAULT 0, + not_cloned BIGINT NOT NULL DEFAULT 0, + cloning BIGINT NOT NULL DEFAULT 0, + cloned BIGINT NOT NULL DEFAULT 0, + failed_fetch BIGINT NOT NULL DEFAULT 0, + corrupted BIGINT NOT NULL DEFAULT 0 +); + +COMMENT ON COLUMN gitserver_repos_statistics.shard_id IS 'ID of this gitserver shard. If an empty string then the repositories havent been assigned a shard.'; +COMMENT ON COLUMN gitserver_repos_statistics.total IS 'Number of repositories in gitserver_repos table on this shard'; +COMMENT ON COLUMN gitserver_repos_statistics.not_cloned IS 'Number of repositories in gitserver_repos table on this shard that are not cloned yet'; +COMMENT ON COLUMN gitserver_repos_statistics.cloning IS 'Number of repositories in gitserver_repos table on this shard that cloning'; +COMMENT ON COLUMN gitserver_repos_statistics.cloned IS 'Number of repositories in gitserver_repos table on this shard that are cloned'; +COMMENT ON COLUMN gitserver_repos_statistics.failed_fetch IS 'Number of repositories in gitserver_repos table on this shard where last_error is set'; +COMMENT ON COLUMN gitserver_repos_statistics.corrupted IS 'Number of repositories that are NOT soft-deleted and not blocked and have corrupted_at set in gitserver_repos table'; + +-- Insert initial values into gitserver_repos_statistics +INSERT INTO + gitserver_repos_statistics (shard_id, total, not_cloned, cloning, cloned, failed_fetch) +SELECT + shard_id, + COUNT(*) AS total, + COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned, + COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning, + COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned, + COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch +FROM + gitserver_repos +GROUP BY shard_id +ON CONFLICT(shard_id) +DO UPDATE +SET + total = gitserver_repos_statistics.total + excluded.total, + not_cloned = gitserver_repos_statistics.not_cloned + excluded.not_cloned, + cloning = gitserver_repos_statistics.cloning + excluded.cloning, + cloned = gitserver_repos_statistics.cloned + excluded.cloned, + failed_fetch = gitserver_repos_statistics.failed_fetch + excluded.failed_fetch +; + +-- Now restore triggers + +-- UPDATE +CREATE OR REPLACE FUNCTION recalc_gitserver_repos_statistics_on_update() RETURNS trigger + LANGUAGE plpgsql + AS $$ BEGIN + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT + newtab.shard_id AS shard_id, + COUNT(*) AS total, + COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned, + COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning, + COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned, + COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch, + COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL) AS corrupted + FROM + newtab + GROUP BY newtab.shard_id + ON CONFLICT(shard_id) DO + UPDATE + SET + total = grs.total + (excluded.total - (SELECT COUNT(*) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), + not_cloned = grs.not_cloned + (excluded.not_cloned - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'not_cloned') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), + cloning = grs.cloning + (excluded.cloning - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'cloning') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), + cloned = grs.cloned + (excluded.cloned - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'cloned') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), + failed_fetch = grs.failed_fetch + (excluded.failed_fetch - (SELECT COUNT(*) FILTER(WHERE ot.last_error IS NOT NULL) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), + corrupted = grs.corrupted + (excluded.corrupted - (SELECT COUNT(*) FILTER(WHERE ot.corrupted_at IS NOT NULL) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)) + ; + + WITH moved AS ( + SELECT + oldtab.shard_id AS shard_id, + COUNT(*) AS total, + COUNT(*) FILTER(WHERE oldtab.clone_status = 'not_cloned') AS not_cloned, + COUNT(*) FILTER(WHERE oldtab.clone_status = 'cloning') AS cloning, + COUNT(*) FILTER(WHERE oldtab.clone_status = 'cloned') AS cloned, + COUNT(*) FILTER(WHERE oldtab.last_error IS NOT NULL) AS failed_fetch, + COUNT(*) FILTER(WHERE oldtab.corrupted_at IS NOT NULL) AS corrupted + FROM + oldtab + JOIN newtab ON newtab.repo_id = oldtab.repo_id + WHERE + oldtab.shard_id != newtab.shard_id + GROUP BY oldtab.shard_id + ) + UPDATE gitserver_repos_statistics grs + SET + total = grs.total - moved.total, + not_cloned = grs.not_cloned - moved.not_cloned, + cloning = grs.cloning - moved.cloning, + cloned = grs.cloned - moved.cloned, + failed_fetch = grs.failed_fetch - moved.failed_fetch, + corrupted = grs.corrupted - moved.corrupted + FROM moved + WHERE moved.shard_id = grs.shard_id; + + WITH diff(not_cloned, cloning, cloned, failed_fetch, corrupted) AS ( + VALUES ( + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'not_cloned') + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'not_cloned') + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloning') + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloning') + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloned') + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloned') + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.last_error IS NOT NULL) + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.last_error IS NOT NULL) + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.corrupted_at IS NOT NULL) + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.corrupted_at IS NOT NULL) + ) + ) + ) + INSERT INTO repo_statistics (not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT not_cloned, cloning, cloned, failed_fetch, corrupted + FROM diff + WHERE + not_cloned != 0 + OR cloning != 0 + OR cloned != 0 + OR failed_fetch != 0 + OR corrupted != 0 + ; + + RETURN NULL; + END +$$; +DROP TRIGGER IF EXISTS trig_recalc_gitserver_repos_statistics_on_update ON gitserver_repos; +CREATE TRIGGER trig_recalc_gitserver_repos_statistics_on_update +AFTER UPDATE ON gitserver_repos +REFERENCING OLD TABLE AS oldtab NEW TABLE AS newtab +FOR EACH STATEMENT EXECUTE FUNCTION recalc_gitserver_repos_statistics_on_update(); + +-- INSERT +CREATE OR REPLACE FUNCTION recalc_gitserver_repos_statistics_on_insert() RETURNS trigger + LANGUAGE plpgsql + AS $$ BEGIN + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch) + SELECT + shard_id, + COUNT(*) AS total, + COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned, + COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning, + COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned, + COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch + FROM + newtab + GROUP BY shard_id + ON CONFLICT(shard_id) + DO UPDATE + SET + total = grs.total + excluded.total, + not_cloned = grs.not_cloned + excluded.not_cloned, + cloning = grs.cloning + excluded.cloning, + cloned = grs.cloned + excluded.cloned, + failed_fetch = grs.failed_fetch + excluded.failed_fetch + ; + + RETURN NULL; + END +$$; +DROP TRIGGER IF EXISTS trig_recalc_gitserver_repos_statistics_on_insert ON gitserver_repos; +CREATE TRIGGER trig_recalc_gitserver_repos_statistics_on_insert +AFTER INSERT ON gitserver_repos +REFERENCING NEW TABLE AS newtab +FOR EACH STATEMENT EXECUTE FUNCTION recalc_gitserver_repos_statistics_on_insert(); + +-- DELETE +CREATE OR REPLACE FUNCTION recalc_gitserver_repos_statistics_on_delete() RETURNS trigger + LANGUAGE plpgsql + AS $$ BEGIN + UPDATE gitserver_repos_statistics grs + SET + total = grs.total - (SELECT COUNT(*) FROM oldtab WHERE oldtab.shard_id = grs.shard_id), + not_cloned = grs.not_cloned - (SELECT COUNT(*) FILTER(WHERE clone_status = 'not_cloned') FROM oldtab WHERE oldtab.shard_id = grs.shard_id), + cloning = grs.cloning - (SELECT COUNT(*) FILTER(WHERE clone_status = 'cloning') FROM oldtab WHERE oldtab.shard_id = grs.shard_id), + cloned = grs.cloned - (SELECT COUNT(*) FILTER(WHERE clone_status = 'cloned') FROM oldtab WHERE oldtab.shard_id = grs.shard_id), + failed_fetch = grs.cloned - (SELECT COUNT(*) FILTER(WHERE last_error IS NOT NULL) FROM oldtab WHERE oldtab.shard_id = grs.shard_id) + ; + + RETURN NULL; + END +$$; +DROP TRIGGER IF EXISTS trig_recalc_gitserver_repos_statistics_on_delete ON gitserver_repos; +CREATE TRIGGER trig_recalc_gitserver_repos_statistics_on_delete +AFTER DELETE ON gitserver_repos REFERENCING +OLD TABLE AS oldtab +FOR EACH STATEMENT EXECUTE FUNCTION recalc_gitserver_repos_statistics_on_delete(); diff --git a/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/metadata.yaml b/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/metadata.yaml new file mode 100644 index 0000000000000..e186bfd5ad6b3 --- /dev/null +++ b/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/metadata.yaml @@ -0,0 +1,2 @@ +name: turn_gitserver_repos_statistics_into_append_only +parents: [1698836192] diff --git a/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/up.sql b/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/up.sql new file mode 100644 index 0000000000000..1722226e821d0 --- /dev/null +++ b/migrations/frontend/1700645180_turn_gitserver_repos_statistics_into_append_only/up.sql @@ -0,0 +1,188 @@ +---------------------------------------------- +-- Drop the data, which locks the table. +---------------------------------------------- +DROP TABLE IF EXISTS gitserver_repos_statistics; + +---------------------------------------------- +-- Recreate the table, but `shard_id` is now not a primary key anymore +---------------------------------------------- +CREATE TABLE IF NOT EXISTS gitserver_repos_statistics ( + shard_id text, + + total BIGINT NOT NULL DEFAULT 0, + not_cloned BIGINT NOT NULL DEFAULT 0, + cloning BIGINT NOT NULL DEFAULT 0, + cloned BIGINT NOT NULL DEFAULT 0, + failed_fetch BIGINT NOT NULL DEFAULT 0, + corrupted BIGINT NOT NULL DEFAULT 0 +); +COMMENT ON COLUMN gitserver_repos_statistics.shard_id IS 'ID of this gitserver shard. If an empty string then the repositories havent been assigned a shard.'; +COMMENT ON COLUMN gitserver_repos_statistics.total IS 'Number of repositories in gitserver_repos table on this shard'; +COMMENT ON COLUMN gitserver_repos_statistics.not_cloned IS 'Number of repositories in gitserver_repos table on this shard that are not cloned yet'; +COMMENT ON COLUMN gitserver_repos_statistics.cloning IS 'Number of repositories in gitserver_repos table on this shard that cloning'; +COMMENT ON COLUMN gitserver_repos_statistics.cloned IS 'Number of repositories in gitserver_repos table on this shard that are cloned'; +COMMENT ON COLUMN gitserver_repos_statistics.failed_fetch IS 'Number of repositories in gitserver_repos table on this shard where last_error is set'; +COMMENT ON COLUMN gitserver_repos_statistics.corrupted IS 'Number of repositories that are NOT soft-deleted and not blocked and have corrupted_at set in gitserver_repos table'; + +---------------------------------------------- +-- Add index on shard_id +---------------------------------------------- +CREATE INDEX IF NOT EXISTS gitserver_repos_statistics_shard_id ON gitserver_repos_statistics(shard_id); + +---------------------------------------------- +-- Add index on shard_id +---------------------------------------------- +INSERT INTO + gitserver_repos_statistics (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) +SELECT + shard_id, + COUNT(*) AS total, + COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned, + COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning, + COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned, + COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch, + COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL) AS corrupted +FROM + gitserver_repos +GROUP BY shard_id +; + +---------------------------------------------- +-- Now we replace the triggers... +---------------------------------------------- + +------------------------------------------------------------------ +-- INSERT +------------------------------------------------------------------ +CREATE OR REPLACE FUNCTION recalc_gitserver_repos_statistics_on_insert() RETURNS trigger + LANGUAGE plpgsql + AS $$ BEGIN + ------------------------------------------------- + -- THIS IS CHANGED TO APPEND + ------------------------------------------------- + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT + shard_id, + COUNT(*) AS total, + COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned, + COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning, + COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned, + COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch, + COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL) AS corrupted + FROM + newtab + GROUP BY shard_id + ; + + RETURN NULL; + END +$$; + +------------------------------------------------------------------ +-- UPDATE +------------------------------------------------------------------ +CREATE OR REPLACE FUNCTION recalc_gitserver_repos_statistics_on_update() RETURNS trigger + LANGUAGE plpgsql + AS $$ BEGIN + + ------------------------------------------------- + -- THIS IS CHANGED TO APPEND + ------------------------------------------------- + WITH diff(shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) AS ( + SELECT + COALESCE(newtab.shard_id, oldtab.shard_id) AS shard_id, + COUNT(newtab.repo_id) - COUNT(oldtab.repo_id) AS total, + COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'not_cloned') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'not_cloned') AS not_cloned, + COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'cloning') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'cloning') AS cloning, + COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'cloned') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'cloned') AS cloned, + COUNT(newtab.repo_id) FILTER (WHERE newtab.last_error IS NOT NULL) - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.last_error IS NOT NULL) AS failed_fetch, + COUNT(newtab.repo_id) FILTER (WHERE newtab.corrupted_at IS NOT NULL) - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.corrupted_at IS NOT NULL) AS corrupted + FROM + newtab + FULL OUTER JOIN + oldtab ON newtab.repo_id = oldtab.repo_id AND newtab.shard_id = oldtab.shard_id + GROUP BY + COALESCE(newtab.shard_id, oldtab.shard_id) + ) + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted + FROM diff + WHERE + total != 0 + OR not_cloned != 0 + OR cloning != 0 + OR cloned != 0 + OR failed_fetch != 0 + OR corrupted != 0 + ; + + ------------------------------------------------- + -- UNCHANGED + ------------------------------------------------- + WITH diff(not_cloned, cloning, cloned, failed_fetch, corrupted) AS ( + VALUES ( + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'not_cloned') + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'not_cloned') + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloning') + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloning') + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.clone_status = 'cloned') + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.clone_status = 'cloned') + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.last_error IS NOT NULL) + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.last_error IS NOT NULL) + ), + ( + (SELECT COUNT(*) FROM newtab JOIN repo r ON newtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND newtab.corrupted_at IS NOT NULL) + - + (SELECT COUNT(*) FROM oldtab JOIN repo r ON oldtab.repo_id = r.id WHERE r.deleted_at is NULL AND r.blocked IS NULL AND oldtab.corrupted_at IS NOT NULL) + ) + + ) + ) + INSERT INTO repo_statistics (not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT not_cloned, cloning, cloned, failed_fetch, corrupted + FROM diff + WHERE + not_cloned != 0 + OR cloning != 0 + OR cloned != 0 + OR failed_fetch != 0 + OR corrupted != 0 + ; + + RETURN NULL; + END +$$; + + +------------------------------------------------------------------ +-- DELETE +------------------------------------------------------------------ +CREATE OR REPLACE FUNCTION recalc_gitserver_repos_statistics_on_delete() RETURNS trigger + LANGUAGE plpgsql + AS $$ BEGIN + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT + oldtab.shard_id, + (-COUNT(*)), + (-COUNT(*) FILTER(WHERE clone_status = 'not_cloned')), + (-COUNT(*) FILTER(WHERE clone_status = 'cloning')), + (-COUNT(*) FILTER(WHERE clone_status = 'cloned')), + (-COUNT(*) FILTER(WHERE last_error IS NOT NULL)), + (-COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL)) + FROM oldtab + GROUP BY oldtab.shard_id; + + RETURN NULL; + END +$$; diff --git a/migrations/frontend/squashed.sql b/migrations/frontend/squashed.sql index 46e613159c538..ebda64d47e328 100644 --- a/migrations/frontend/squashed.sql +++ b/migrations/frontend/squashed.sql @@ -487,14 +487,17 @@ $$; CREATE FUNCTION recalc_gitserver_repos_statistics_on_delete() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN - UPDATE gitserver_repos_statistics grs - SET - total = grs.total - (SELECT COUNT(*) FROM oldtab WHERE oldtab.shard_id = grs.shard_id), - not_cloned = grs.not_cloned - (SELECT COUNT(*) FILTER(WHERE clone_status = 'not_cloned') FROM oldtab WHERE oldtab.shard_id = grs.shard_id), - cloning = grs.cloning - (SELECT COUNT(*) FILTER(WHERE clone_status = 'cloning') FROM oldtab WHERE oldtab.shard_id = grs.shard_id), - cloned = grs.cloned - (SELECT COUNT(*) FILTER(WHERE clone_status = 'cloned') FROM oldtab WHERE oldtab.shard_id = grs.shard_id), - failed_fetch = grs.cloned - (SELECT COUNT(*) FILTER(WHERE last_error IS NOT NULL) FROM oldtab WHERE oldtab.shard_id = grs.shard_id) - ; + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT + oldtab.shard_id, + (-COUNT(*)), + (-COUNT(*) FILTER(WHERE clone_status = 'not_cloned')), + (-COUNT(*) FILTER(WHERE clone_status = 'cloning')), + (-COUNT(*) FILTER(WHERE clone_status = 'cloned')), + (-COUNT(*) FILTER(WHERE last_error IS NOT NULL)), + (-COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL)) + FROM oldtab + GROUP BY oldtab.shard_id; RETURN NULL; END @@ -503,25 +506,21 @@ $$; CREATE FUNCTION recalc_gitserver_repos_statistics_on_insert() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN - INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch) + ------------------------------------------------- + -- THIS IS CHANGED TO APPEND + ------------------------------------------------- + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) SELECT shard_id, COUNT(*) AS total, COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned, COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning, COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned, - COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch + COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch, + COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL) AS corrupted FROM newtab GROUP BY shard_id - ON CONFLICT(shard_id) - DO UPDATE - SET - total = grs.total + excluded.total, - not_cloned = grs.not_cloned + excluded.not_cloned, - cloning = grs.cloning + excluded.cloning, - cloned = grs.cloned + excluded.cloned, - failed_fetch = grs.failed_fetch + excluded.failed_fetch ; RETURN NULL; @@ -531,61 +530,40 @@ $$; CREATE FUNCTION recalc_gitserver_repos_statistics_on_update() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN - INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) - SELECT - newtab.shard_id AS shard_id, - COUNT(*) AS total, - COUNT(*) FILTER(WHERE clone_status = 'not_cloned') AS not_cloned, - COUNT(*) FILTER(WHERE clone_status = 'cloning') AS cloning, - COUNT(*) FILTER(WHERE clone_status = 'cloned') AS cloned, - COUNT(*) FILTER(WHERE last_error IS NOT NULL) AS failed_fetch, - COUNT(*) FILTER(WHERE corrupted_at IS NOT NULL) AS corrupted - FROM - newtab - GROUP BY newtab.shard_id - ON CONFLICT(shard_id) DO - UPDATE - SET - total = grs.total + (excluded.total - (SELECT COUNT(*) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), - not_cloned = grs.not_cloned + (excluded.not_cloned - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'not_cloned') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), - cloning = grs.cloning + (excluded.cloning - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'cloning') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), - cloned = grs.cloned + (excluded.cloned - (SELECT COUNT(*) FILTER(WHERE ot.clone_status = 'cloned') FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), - failed_fetch = grs.failed_fetch + (excluded.failed_fetch - (SELECT COUNT(*) FILTER(WHERE ot.last_error IS NOT NULL) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)), - corrupted = grs.corrupted + (excluded.corrupted - (SELECT COUNT(*) FILTER(WHERE ot.corrupted_at IS NOT NULL) FROM oldtab ot WHERE ot.shard_id = excluded.shard_id)) - ; ------------------------------------------------- - -- IMPORTANT: THIS IS CHANGED TO INCLUDE `corrupted` + -- THIS IS CHANGED TO APPEND ------------------------------------------------- - WITH moved AS ( + WITH diff(shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) AS ( SELECT - oldtab.shard_id AS shard_id, - COUNT(*) AS total, - COUNT(*) FILTER(WHERE oldtab.clone_status = 'not_cloned') AS not_cloned, - COUNT(*) FILTER(WHERE oldtab.clone_status = 'cloning') AS cloning, - COUNT(*) FILTER(WHERE oldtab.clone_status = 'cloned') AS cloned, - COUNT(*) FILTER(WHERE oldtab.last_error IS NOT NULL) AS failed_fetch, - COUNT(*) FILTER(WHERE oldtab.corrupted_at IS NOT NULL) AS corrupted + COALESCE(newtab.shard_id, oldtab.shard_id) AS shard_id, + COUNT(newtab.repo_id) - COUNT(oldtab.repo_id) AS total, + COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'not_cloned') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'not_cloned') AS not_cloned, + COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'cloning') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'cloning') AS cloning, + COUNT(newtab.repo_id) FILTER (WHERE newtab.clone_status = 'cloned') - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.clone_status = 'cloned') AS cloned, + COUNT(newtab.repo_id) FILTER (WHERE newtab.last_error IS NOT NULL) - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.last_error IS NOT NULL) AS failed_fetch, + COUNT(newtab.repo_id) FILTER (WHERE newtab.corrupted_at IS NOT NULL) - COUNT(oldtab.repo_id) FILTER (WHERE oldtab.corrupted_at IS NOT NULL) AS corrupted FROM - oldtab - JOIN newtab ON newtab.repo_id = oldtab.repo_id - WHERE - oldtab.shard_id != newtab.shard_id - GROUP BY oldtab.shard_id + newtab + FULL OUTER JOIN + oldtab ON newtab.repo_id = oldtab.repo_id AND newtab.shard_id = oldtab.shard_id + GROUP BY + COALESCE(newtab.shard_id, oldtab.shard_id) ) - UPDATE gitserver_repos_statistics grs - SET - total = grs.total - moved.total, - not_cloned = grs.not_cloned - moved.not_cloned, - cloning = grs.cloning - moved.cloning, - cloned = grs.cloned - moved.cloned, - failed_fetch = grs.failed_fetch - moved.failed_fetch, - corrupted = grs.corrupted - moved.corrupted - FROM moved - WHERE moved.shard_id = grs.shard_id; + INSERT INTO gitserver_repos_statistics AS grs (shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted) + SELECT shard_id, total, not_cloned, cloning, cloned, failed_fetch, corrupted + FROM diff + WHERE + total != 0 + OR not_cloned != 0 + OR cloning != 0 + OR cloned != 0 + OR failed_fetch != 0 + OR corrupted != 0 + ; ------------------------------------------------- - -- IMPORTANT: THIS IS CHANGED TO INCLUDE `corrupted` + -- UNCHANGED ------------------------------------------------- WITH diff(not_cloned, cloning, cloned, failed_fetch, corrupted) AS ( VALUES ( @@ -2837,7 +2815,7 @@ COMMENT ON COLUMN gitserver_repos.corrupted_at IS 'Timestamp of when repo corrup COMMENT ON COLUMN gitserver_repos.corruption_logs IS 'Log output of repo corruptions that have been detected - encoded as json'; CREATE TABLE gitserver_repos_statistics ( - shard_id text NOT NULL, + shard_id text, total bigint DEFAULT 0 NOT NULL, not_cloned bigint DEFAULT 0 NOT NULL, cloning bigint DEFAULT 0 NOT NULL, @@ -5556,9 +5534,6 @@ ALTER TABLE ONLY gitserver_relocator_jobs ALTER TABLE ONLY gitserver_repos ADD CONSTRAINT gitserver_repos_pkey PRIMARY KEY (repo_id); -ALTER TABLE ONLY gitserver_repos_statistics - ADD CONSTRAINT gitserver_repos_statistics_pkey PRIMARY KEY (shard_id); - ALTER TABLE ONLY gitserver_repos_sync_output ADD CONSTRAINT gitserver_repos_sync_output_pkey PRIMARY KEY (repo_id); @@ -6094,6 +6069,8 @@ CREATE INDEX gitserver_repos_not_explicitly_cloned_idx ON gitserver_repos USING CREATE INDEX gitserver_repos_shard_id ON gitserver_repos USING btree (shard_id, repo_id); +CREATE INDEX gitserver_repos_statistics_shard_id ON gitserver_repos_statistics USING btree (shard_id); + CREATE INDEX idx_repo_topics ON repo USING gin (topics); CREATE INDEX insights_query_runner_jobs_cost_idx ON insights_query_runner_jobs USING btree (cost); @@ -6140,6 +6117,8 @@ CREATE INDEX lsif_indexes_queued_at_id ON lsif_indexes USING btree (queued_at DE CREATE INDEX lsif_indexes_repository_id_commit ON lsif_indexes USING btree (repository_id, commit); +CREATE INDEX lsif_indexes_repository_id_indexer ON lsif_indexes USING btree (repository_id, indexer); + CREATE INDEX lsif_indexes_state ON lsif_indexes USING btree (state); CREATE INDEX lsif_nearest_uploads_links_repository_id_ancestor_commit_bytea ON lsif_nearest_uploads_links USING btree (repository_id, ancestor_commit_bytea); @@ -6174,6 +6153,8 @@ CREATE INDEX lsif_uploads_repository_id_commit ON lsif_uploads USING btree (repo CREATE UNIQUE INDEX lsif_uploads_repository_id_commit_root_indexer ON lsif_uploads USING btree (repository_id, commit, root, indexer) WHERE (state = 'completed'::text); +CREATE INDEX lsif_uploads_repository_id_indexer ON lsif_uploads USING btree (repository_id, indexer); + CREATE INDEX lsif_uploads_state ON lsif_uploads USING btree (state); CREATE INDEX lsif_uploads_uploaded_at_id ON lsif_uploads USING btree (uploaded_at DESC, id) WHERE (state <> 'deleted'::text); @@ -6264,6 +6245,8 @@ CREATE INDEX repo_description_trgm_idx ON repo USING gin (lower(description) gin CREATE INDEX repo_dotcom_indexable_repos_idx ON repo USING btree (stars DESC NULLS LAST) INCLUDE (id, name) WHERE ((deleted_at IS NULL) AND (blocked IS NULL) AND (((stars >= 5) AND (NOT COALESCE(fork, false)) AND (NOT archived)) OR (lower((name)::text) ~ '^(src\.fedoraproject\.org|maven|npm|jdk)'::text))); +CREATE INDEX repo_embedding_jobs_repo ON repo_embedding_jobs USING btree (repo_id, revision); + CREATE UNIQUE INDEX repo_external_unique_idx ON repo USING btree (external_service_type, external_service_id, external_id); CREATE INDEX repo_fork ON repo USING btree (fork); diff --git a/monitoring/BUILD.bazel b/monitoring/BUILD.bazel index cc7431a01e6c0..e4eb1fdff1d7c 100644 --- a/monitoring/BUILD.bazel +++ b/monitoring/BUILD.bazel @@ -79,7 +79,6 @@ genrule( "outputs/grafana/embeddings.json", "outputs/grafana/executor.json", "outputs/grafana/frontend.json", - "outputs/grafana/github.json", "outputs/grafana/gitserver.json", "outputs/grafana/home.json", "outputs/grafana/otel-collector.json", @@ -103,7 +102,6 @@ genrule( "outputs/prometheus/embeddings_alert_rules.yml", "outputs/prometheus/executor_alert_rules.yml", "outputs/prometheus/frontend_alert_rules.yml", - "outputs/prometheus/github_alert_rules.yml", "outputs/prometheus/gitserver_alert_rules.yml", "outputs/prometheus/otel_collector_alert_rules.yml", "outputs/prometheus/postgres_alert_rules.yml", diff --git a/monitoring/command/generate.go b/monitoring/command/generate.go index c5703abe94a89..a859ad8dd0775 100644 --- a/monitoring/command/generate.go +++ b/monitoring/command/generate.go @@ -107,7 +107,7 @@ func Generate(cmdRoot string, sgRoot string) *cli.Command { Usage: "If non-empty, indicates whether or not to generate multi-instance assets with the provided labels to group on. The standard per-instance monitoring assets will NOT be generated.", }, }, - BashComplete: completions.CompleteOptions(func() (options []string) { + BashComplete: completions.CompleteArgs(func() (options []string) { return definitions.Default().Names() }), Action: func(c *cli.Context) error { diff --git a/monitoring/definitions/BUILD.bazel b/monitoring/definitions/BUILD.bazel index 43692f7805e34..8e9db0b9b7a99 100644 --- a/monitoring/definitions/BUILD.bazel +++ b/monitoring/definitions/BUILD.bazel @@ -14,7 +14,6 @@ go_library( "executor.go", "frontend.go", "git_server.go", - "github.go", "otel_collector.go", "postgres.go", "precise_code_intel_worker.go", diff --git a/monitoring/definitions/dashboards.go b/monitoring/definitions/dashboards.go index bc5d0680e1947..38a1a58ee2df7 100644 --- a/monitoring/definitions/dashboards.go +++ b/monitoring/definitions/dashboards.go @@ -12,7 +12,6 @@ func Default() Dashboards { return []*monitoring.Dashboard{ Frontend(), GitServer(), - GitHub(), Postgres(), PreciseCodeIntelWorker(), Redis(), diff --git a/monitoring/definitions/embeddings.go b/monitoring/definitions/embeddings.go index ed320859f08b4..1db19c32bf0f7 100644 --- a/monitoring/definitions/embeddings.go +++ b/monitoring/definitions/embeddings.go @@ -29,7 +29,7 @@ func Embeddings() *monitoring.Dashboard { HumanServiceName: "embeddings", InstanceFilterRegex: `${instance:regex}`, }, monitoring.ObservableOwnerDevOps), - shared.NewDatabaseConnectionsMonitoringGroup(containerName), + shared.NewDatabaseConnectionsMonitoringGroup(containerName, monitoring.ObservableOwnerCody), shared.NewFrontendInternalAPIErrorResponseMonitoringGroup(containerName, monitoring.ObservableOwnerCody, nil), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerCody, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerCody, nil), diff --git a/monitoring/definitions/frontend.go b/monitoring/definitions/frontend.go index e603fbd71c6e2..a79fa7c544d25 100644 --- a/monitoring/definitions/frontend.go +++ b/monitoring/definitions/frontend.go @@ -694,7 +694,7 @@ func Frontend() *monitoring.Dashboard { }, // Resource monitoring - shared.NewDatabaseConnectionsMonitoringGroup("frontend"), + shared.NewDatabaseConnectionsMonitoringGroup("frontend", monitoring.ObservableOwnerDevOps), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerDevOps, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerDevOps, nil), shared.NewGolangMonitoringGroup(containerName, monitoring.ObservableOwnerDevOps, nil), diff --git a/monitoring/definitions/git_server.go b/monitoring/definitions/git_server.go index ad681aff25ce3..6a6799245c66c 100644 --- a/monitoring/definitions/git_server.go +++ b/monitoring/definitions/git_server.go @@ -566,7 +566,7 @@ func GitServer() *monitoring.Dashboard { shared.CodeIntelligence.NewNpmGroup(containerName), shared.HTTP.NewHandlersGroup(containerName), - shared.NewDatabaseConnectionsMonitoringGroup(containerName), + shared.NewDatabaseConnectionsMonitoringGroup(containerName, monitoring.ObservableOwnerSource), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerSource, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerSource, provisioningIndicatorsOptions), shared.NewGolangMonitoringGroup(containerName, monitoring.ObservableOwnerSource, nil), diff --git a/monitoring/definitions/github.go b/monitoring/definitions/github.go deleted file mode 100644 index f437bc9417ed1..0000000000000 --- a/monitoring/definitions/github.go +++ /dev/null @@ -1,80 +0,0 @@ -package definitions - -import ( - "time" - - "github.com/sourcegraph/sourcegraph/monitoring/monitoring" -) - -func GitHub() *monitoring.Dashboard { - return &monitoring.Dashboard{ - Name: "github", - Title: "GitHub", - Description: "Dashboard to track requests and global concurrency locks for talking to github.com.", - Groups: []monitoring.Group{ - { - Title: "GitHub API monitoring", - Rows: []monitoring.Row{ - { - { - Name: "src_githubcom_concurrency_lock_waiting_requests", - Description: "number of requests waiting on the global mutex", - Query: `max(src_githubcom_concurrency_lock_waiting_requests)`, - Warning: monitoring.Alert().GreaterOrEqual(100).For(5 * time.Minute), - Panel: monitoring.Panel().LegendFormat("requests waiting"), - Owner: monitoring.ObservableOwnerSource, - NextSteps: ` - - **Check container logs for network connection issues and log entries from the githubcom-concurrency-limiter logger. - - **Check redis-store health. - - **Check GitHub status.`, - }, - }, - { - { - Name: "src_githubcom_concurrency_lock_failed_lock_requests", - Description: "number of lock failures", - Query: `sum(rate(src_githubcom_concurrency_lock_failed_lock_requests[5m]))`, - Warning: monitoring.Alert().GreaterOrEqual(100).For(5 * time.Minute), - Panel: monitoring.Panel().LegendFormat("failed lock requests"), - Owner: monitoring.ObservableOwnerSource, - NextSteps: ` - - **Check container logs for network connection issues and log entries from the githubcom-concurrency-limiter logger. - - **Check redis-store health.`, - }, - { - Name: "src_githubcom_concurrency_lock_failed_unlock_requests", - Description: "number of unlock failures", - Query: `sum(rate(src_githubcom_concurrency_lock_failed_unlock_requests[5m]))`, - Warning: monitoring.Alert().GreaterOrEqual(100).For(5 * time.Minute), - Panel: monitoring.Panel().LegendFormat("failed unlock requests"), - Owner: monitoring.ObservableOwnerSource, - NextSteps: ` - - **Check container logs for network connection issues and log entries from the githubcom-concurrency-limiter logger. - - **Check redis-store health.`, - }, - }, - { - { - Name: "src_githubcom_concurrency_lock_requests", - Description: "number of locks taken global mutex", - Query: `sum(rate(src_githubcom_concurrency_lock_requests[5m]))`, - NoAlert: true, - Panel: monitoring.Panel().LegendFormat("number of requests"), - Owner: monitoring.ObservableOwnerSource, - Interpretation: "A high number of locks indicates heavy usage of the GitHub API. This might not be a problem, but you should check if request counts are expected.", - }, - { - Name: "src_githubcom_concurrency_lock_acquire_duration_seconds_latency_p75", - Description: "75 percentile latency of src_githubcom_concurrency_lock_acquire_duration_seconds", - Query: `histogram_quantile(0.75, sum(rate(src_githubcom_concurrency_lock_acquire_duration_seconds_bucket[5m])) by (le))`, - NoAlert: true, - Panel: monitoring.Panel().LegendFormat("lock acquire latency").Unit(monitoring.Milliseconds), - Owner: monitoring.ObservableOwnerSource, - Interpretation: `99 percentile latency of acquiring the global GitHub concurrency lock.`, - }, - }, - }, - }, - }, - } -} diff --git a/monitoring/definitions/precise_code_intel_worker.go b/monitoring/definitions/precise_code_intel_worker.go index 7453d33a83b90..13e7f51d219db 100644 --- a/monitoring/definitions/precise_code_intel_worker.go +++ b/monitoring/definitions/precise_code_intel_worker.go @@ -23,7 +23,7 @@ func PreciseCodeIntelWorker() *monitoring.Dashboard { // Resource monitoring shared.NewFrontendInternalAPIErrorResponseMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), - shared.NewDatabaseConnectionsMonitoringGroup(containerName), + shared.NewDatabaseConnectionsMonitoringGroup(containerName, monitoring.ObservableOwnerDevOps), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), shared.NewGolangMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), diff --git a/monitoring/definitions/prometheus.go b/monitoring/definitions/prometheus.go index 6addc53caa1f0..f87932ad5f468 100644 --- a/monitoring/definitions/prometheus.go +++ b/monitoring/definitions/prometheus.go @@ -173,55 +173,6 @@ func Prometheus() *monitoring.Dashboard { }, }, }, - { - // Google Managed Prometheus must be in the name here - Cloud attaches - // additional rows here for Centralized Observability: - // - // https://handbook.sourcegraph.com/departments/cloud/technical-docs/observability/ - Title: "Google Managed Prometheus (only available for `sourcegraph/prometheus-gcp`)", - Hidden: true, - Rows: []monitoring.Row{ - { - { - Name: "samples_exported", - Description: "samples exported to GMP every 5m", - Query: `rate(gcm_export_samples_sent_total[5m])`, - Panel: monitoring.Panel().LegendFormat("samples"), - MultiInstance: true, - NoAlert: true, - Owner: monitoring.ObservableOwnerCloud, - Interpretation: ` - A high value indicates that large numbers of samples are being exported, potentially impacting costs. - In [Sourcegraph Cloud centralized observability](https://handbook.sourcegraph.com/departments/cloud/technical-docs/observability/), high values can be investigated by: - - - going to per-instance self-hosted dashboards for Prometheus in (Internals -> Metrics cardinality). - - querying for 'monitoring_googleapis_com:billing_samples_ingested', for example: - - ''' - topk(10, sum by(metric_type, project_id) (rate(monitoring_googleapis_com:billing_samples_ingested[1h]))) - ''' - - This is required because GMP does not allow queries aggregating on '__name__' - - See [Anthos metrics](https://cloud.google.com/monitoring/api/metrics_anthos) for more details about 'gcm_export_samples_sent_total'. - `, - }, - { - Name: "pending_exports", - Description: "samples pending export to GMP per minute", - Query: `sum_over_time(gcm_export_pending_requests[1m])`, - Panel: monitoring.Panel().LegendFormat("pending exports"), - NoAlert: true, - Owner: monitoring.ObservableOwnerCloud, - Interpretation: ` - A high value indicates exports are taking a long time. - - See ['gmc_*' Anthos metrics](https://cloud.google.com/monitoring/api/metrics_anthos) for more details about 'gcm_export_pending_requests'. - `, - }, - }, - }, - }, shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerDevOps, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerDevOps, nil), diff --git a/monitoring/definitions/repo_updater.go b/monitoring/definitions/repo_updater.go index 00b4ed55e8875..71de356b4e526 100644 --- a/monitoring/definitions/repo_updater.go +++ b/monitoring/definitions/repo_updater.go @@ -602,7 +602,7 @@ func RepoUpdater() *monitoring.Dashboard { }, monitoring.ObservableOwnerDevOps), shared.HTTP.NewHandlersGroup(containerName), shared.NewFrontendInternalAPIErrorResponseMonitoringGroup(containerName, monitoring.ObservableOwnerSource, nil), - shared.NewDatabaseConnectionsMonitoringGroup(containerName), + shared.NewDatabaseConnectionsMonitoringGroup(containerName, monitoring.ObservableOwnerSource), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerSource, containerMonitoringOptions), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerSource, nil), shared.NewGolangMonitoringGroup(containerName, monitoring.ObservableOwnerSource, nil), diff --git a/monitoring/definitions/searcher.go b/monitoring/definitions/searcher.go index c62bcbd3183f3..1265d4f700b24 100644 --- a/monitoring/definitions/searcher.go +++ b/monitoring/definitions/searcher.go @@ -244,7 +244,7 @@ regularly above 0 it is a sign for further investigation.`, HumanServiceName: "searcher", InstanceFilterRegex: `${instance:regex}`, }, monitoring.ObservableOwnerDevOps), - shared.NewDatabaseConnectionsMonitoringGroup(containerName), + shared.NewDatabaseConnectionsMonitoringGroup(containerName, monitoring.ObservableOwnerDevOps), shared.NewFrontendInternalAPIErrorResponseMonitoringGroup(containerName, monitoring.ObservableOwnerSearchCore, nil), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerSearchCore, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerSearchCore, nil), diff --git a/monitoring/definitions/shared/dbconns.go b/monitoring/definitions/shared/dbconns.go index ec3e6f2e8d7a4..97f71d500cb86 100644 --- a/monitoring/definitions/shared/dbconns.go +++ b/monitoring/definitions/shared/dbconns.go @@ -10,7 +10,7 @@ import ( // Database connections monitoring overview. const TitleDatabaseConnectionsMonitoring = "Database connections" -func DatabaseConnectionsMonitoring(app string) []monitoring.Row { +func DatabaseConnectionsMonitoring(app string, owner monitoring.ObservableOwner) []monitoring.Row { return []monitoring.Row{ { { @@ -19,7 +19,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Query: fmt.Sprintf(`sum by (app_name, db_name) (src_pgsql_conns_max_open{app_name=%q})`, app), Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}"), NoAlert: true, - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, Interpretation: "none", }, { @@ -28,7 +28,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Query: fmt.Sprintf(`sum by (app_name, db_name) (src_pgsql_conns_open{app_name=%q})`, app), Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}"), NoAlert: true, - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, Interpretation: "none", }, }, @@ -39,7 +39,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Query: fmt.Sprintf(`sum by (app_name, db_name) (src_pgsql_conns_in_use{app_name=%q})`, app), Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}"), NoAlert: true, - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, Interpretation: "none", }, { @@ -48,7 +48,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Query: fmt.Sprintf(`sum by (app_name, db_name) (src_pgsql_conns_idle{app_name=%q})`, app), Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}"), NoAlert: true, - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, Interpretation: "none", }, }, @@ -65,7 +65,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}").Unit(monitoring.Seconds), Warning: monitoring.Alert().GreaterOrEqual(0.05).For(10 * time.Minute), Critical: monitoring.Alert().GreaterOrEqual(0.10).For(15 * time.Minute), - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, NextSteps: ` - Increase SRC_PGSQL_MAX_OPEN together with giving more memory to the database if needed - Scale up Postgres memory / cpus [See our scaling guide](https://docs.sourcegraph.com/admin/config/postgres-conf) @@ -79,7 +79,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Query: fmt.Sprintf(`sum by (app_name, db_name) (increase(src_pgsql_conns_closed_max_idle{app_name=%q}[5m]))`, app), Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}"), NoAlert: true, - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, Interpretation: "none", }, { @@ -88,7 +88,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Query: fmt.Sprintf(`sum by (app_name, db_name) (increase(src_pgsql_conns_closed_max_lifetime{app_name=%q}[5m]))`, app), Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}"), NoAlert: true, - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, Interpretation: "none", }, { @@ -97,7 +97,7 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { Query: fmt.Sprintf(`sum by (app_name, db_name) (increase(src_pgsql_conns_closed_max_idle_time{app_name=%q}[5m]))`, app), Panel: monitoring.Panel().LegendFormat("dbname={{db_name}}"), NoAlert: true, - Owner: monitoring.ObservableOwnerDevOps, + Owner: owner, Interpretation: "none", }, }, @@ -106,10 +106,10 @@ func DatabaseConnectionsMonitoring(app string) []monitoring.Row { // NewDatabaseConnectionsMonitoringGroup creates a group containing panels displaying // database monitoring metrics for the given container. -func NewDatabaseConnectionsMonitoringGroup(containerName string) monitoring.Group { +func NewDatabaseConnectionsMonitoringGroup(containerName string, owner monitoring.ObservableOwner) monitoring.Group { return monitoring.Group{ Title: TitleDatabaseConnectionsMonitoring, Hidden: true, - Rows: DatabaseConnectionsMonitoring(containerName), + Rows: DatabaseConnectionsMonitoring(containerName, owner), } } diff --git a/monitoring/definitions/symbols.go b/monitoring/definitions/symbols.go index 17b87ceba1ad5..62ae728c35475 100644 --- a/monitoring/definitions/symbols.go +++ b/monitoring/definitions/symbols.go @@ -62,7 +62,7 @@ func Symbols() *monitoring.Dashboard { HumanServiceName: "symbols", InstanceFilterRegex: `${instance:regex}`, }, monitoring.ObservableOwnerDevOps), - shared.NewDatabaseConnectionsMonitoringGroup(containerName), + shared.NewDatabaseConnectionsMonitoringGroup(containerName, monitoring.ObservableOwnerDevOps), shared.NewFrontendInternalAPIErrorResponseMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), diff --git a/monitoring/definitions/worker.go b/monitoring/definitions/worker.go index 8cf09a2d0da43..35c48d99e4f19 100644 --- a/monitoring/definitions/worker.go +++ b/monitoring/definitions/worker.go @@ -254,7 +254,7 @@ func Worker() *monitoring.Dashboard { // Resource monitoring shared.NewFrontendInternalAPIErrorResponseMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), - shared.NewDatabaseConnectionsMonitoringGroup(containerName), + shared.NewDatabaseConnectionsMonitoringGroup(containerName, monitoring.ObservableOwnerDevOps), shared.NewContainerMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), shared.NewProvisioningIndicatorsGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), shared.NewGolangMonitoringGroup(containerName, monitoring.ObservableOwnerCodeIntel, nil), diff --git a/monitoring/go.mod b/monitoring/go.mod index ebce8f2f611da..46fffce4919c9 100644 --- a/monitoring/go.mod +++ b/monitoring/go.mod @@ -11,9 +11,9 @@ require ( github.com/prometheus/prometheus v0.40.5 github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb github.com/sourcegraph/sourcegraph/lib v0.0.0-20230613175844-f031949c72f5 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.23.7 - golang.org/x/text v0.13.0 + golang.org/x/text v0.14.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -40,17 +40,17 @@ require ( github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/gobwas/ws v1.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/uuid v1.3.1 // indirect + github.com/google/uuid v1.4.0 // indirect github.com/gosimple/slug v1.12.0 // indirect github.com/gosimple/unidecode v1.0.1 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.10.1 // indirect + github.com/jackc/pgconn v1.14.0 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.1.1 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect @@ -68,10 +68,9 @@ require ( go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.7.0 // indirect + golang.org/x/crypto v0.15.0 // indirect golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect - golang.org/x/oauth2 v0.2.0 // indirect - golang.org/x/sys v0.8.0 // indirect - google.golang.org/protobuf v1.29.1 // indirect + golang.org/x/sys v0.14.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/monitoring/go.sum b/monitoring/go.sum index d84c68669abc8..2e5e233899179 100644 --- a/monitoring/go.sum +++ b/monitoring/go.sum @@ -127,8 +127,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -154,8 +154,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gosimple/slug v1.1.1/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0= @@ -183,8 +183,8 @@ github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= -github.com/jackc/pgconn v1.10.1 h1:DzdIHIjG1AxGwoEEqS+mGsURyjt4enSmqzACXvVzOT8= -github.com/jackc/pgconn v1.10.1/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= +github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= @@ -199,10 +199,12 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.1.1 h1:7PQ/4gLoqnl87ZxL7xjO0DR5gYuviDCZxQJsUlFW1eI= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= @@ -302,8 +304,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY= github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= @@ -312,6 +315,7 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -341,8 +345,10 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -376,6 +382,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -406,15 +413,16 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.2.0 h1:GtQkldQ9m7yvzCL1V+LrYow3Khe0eJH0w7RbX/VbaIU= -golang.org/x/oauth2 v0.2.0/go.mod h1:Cwn6afJ8jrQwYMxQDTpISoXmXW9I6qF6vDeuuoX3Ibs= +golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -425,7 +433,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -466,12 +475,17 @@ golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -479,8 +493,10 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -528,7 +544,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -611,8 +628,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= -google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/monitoring/monitoring/documentation.go b/monitoring/monitoring/documentation.go index 576a171ed9675..7c4aecefa88bc 100644 --- a/monitoring/monitoring/documentation.go +++ b/monitoring/monitoring/documentation.go @@ -21,7 +21,7 @@ const ( const alertsReferenceHeader = `# Alerts reference -<!-- DO NOT EDIT: generated via: bazel run //dev:write_all_generated --> +<!-- DO NOT EDIT: generated via: bazel run //doc/admin/observability:write_monitoring_docs --> This document contains a complete reference of all alerts in Sourcegraph's monitoring, and next steps for when you find alerts that are firing. If your alert isn't mentioned here, or if the next steps don't help, [contact us](mailto:support@sourcegraph.com) for assistance. @@ -32,7 +32,7 @@ To learn more about Sourcegraph's alerting and how to set up alerts, see [our al const dashboardsHeader = `# Dashboards reference -<!-- DO NOT EDIT: generated via: bazel run //dev:write_all_generated --> +<!-- DO NOT EDIT: generated via: bazel run //doc/admin/observability:write_monitoring_docs --> This document contains a complete reference on Sourcegraph's available dashboards, as well as details on how to interpret the panels and metrics. diff --git a/package.json b/package.json index 951b226572c26..068f0eaa60075 100644 --- a/package.json +++ b/package.json @@ -174,6 +174,7 @@ "@types/stream-json": "^1.7.3", "@types/svgo": "2.6.0", "@types/uuid": "8.0.1", + "@types/whatwg-url": "^11.0.3", "@types/yauzl": "^2.9.2", "@vitejs/plugin-react": "^3.1.0", "abort-controller": "^3.0.0", @@ -261,7 +262,7 @@ "utc-version": "^2.0.2", "vite": "^4.1.4", "vite-plugin-turbosnap": "^1.0.3", - "vitest": "^0.34.6", + "vitest": "1.0.0-beta.4", "vitest-fetch-mock": "^0.2.2", "vsce": "^2.7.0", "wildcard-mock-link": "^2.0.1", @@ -386,6 +387,7 @@ "react-dom": "18.1.0", "react-focus-lock": "^2.7.1", "react-grid-layout": "1.3.4", + "react-icons": "^4.12.0", "react-resizable": "^3.0.4", "react-router-dom": "^6.8.1", "react-spring": "^9.4.2", @@ -411,6 +413,7 @@ "uuid": "^8.3.0", "webext-domain-permission-toggle": "^1.0.1", "webextension-polyfill": "^0.6.0", + "whatwg-url": "^14.0.0", "yaml-ast-parser": "^0.0.43", "zustand": "^3.6.9" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 03da40822d9c4..837b62c7d9f53 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -367,6 +367,9 @@ importers: react-grid-layout: specifier: 1.3.4 version: 1.3.4(react-dom@18.1.0)(react@18.1.0) + react-icons: + specifier: ^4.12.0 + version: 4.12.0(react@18.1.0) react-resizable: specifier: ^3.0.4 version: 3.0.4(react-dom@18.1.0)(react@18.1.0) @@ -442,6 +445,9 @@ importers: webextension-polyfill: specifier: ^0.6.0 version: 0.6.0 + whatwg-url: + specifier: ^14.0.0 + version: 14.0.0 yaml-ast-parser: specifier: ^0.0.43 version: 0.0.43 @@ -598,7 +604,7 @@ importers: version: 8.13.0 '@testing-library/jest-dom': specifier: ^6.1.4 - version: 6.1.4(vitest@0.34.6) + version: 6.1.4(vitest@1.0.0-beta.4) '@testing-library/react-hooks': specifier: ^8.0.0 version: 8.0.0(@types/react@18.0.8)(react-dom@18.1.0)(react@18.1.0) @@ -779,6 +785,9 @@ importers: '@types/uuid': specifier: 8.0.1 version: 8.0.1 + '@types/whatwg-url': + specifier: ^11.0.3 + version: 11.0.3 '@types/yauzl': specifier: ^2.9.2 version: 2.10.0 @@ -1038,11 +1047,11 @@ importers: specifier: ^1.0.3 version: 1.0.3 vitest: - specifier: ^0.34.6 - version: 0.34.6(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4) + specifier: 1.0.0-beta.4 + version: 1.0.0-beta.4(@types/node@20.8.0)(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4) vitest-fetch-mock: specifier: ^0.2.2 - version: 0.2.2(vitest@0.34.6) + version: 0.2.2(vitest@1.0.0-beta.4) vsce: specifier: ^2.7.0 version: 2.7.0 @@ -8429,7 +8438,7 @@ packages: '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.1)(vite@4.4.7) dedent: 1.5.1 fs-extra: 11.1.1 - magic-string: 0.30.4 + magic-string: 0.30.5 svelte: 4.1.1 vite: 4.4.7(@types/node@20.8.0)(sass@1.32.4) transitivePeerDependencies: @@ -8761,7 +8770,7 @@ packages: express: 4.18.2 find-cache-dir: 3.3.2 fs-extra: 11.1.1 - magic-string: 0.30.4 + magic-string: 0.30.5 remark-external-links: 8.0.0 remark-slug: 6.1.0 rollup: 3.26.3 @@ -8802,7 +8811,7 @@ packages: express: 4.18.2 find-cache-dir: 3.3.2 fs-extra: 11.1.1 - magic-string: 0.30.4 + magic-string: 0.30.5 remark-external-links: 8.0.0 remark-slug: 6.1.0 rollup: 3.26.3 @@ -9547,7 +9556,7 @@ packages: '@storybook/react': 7.4.6(react-dom@18.1.0)(react@18.1.0)(typescript@5.2.2) '@vitejs/plugin-react': 3.1.0(vite@4.4.7) ast-types: 0.14.2 - magic-string: 0.30.4 + magic-string: 0.30.5 react: 18.1.0 react-docgen: 6.0.0-alpha.3 react-dom: 18.1.0(react@18.1.0) @@ -9666,7 +9675,7 @@ packages: '@storybook/node-logger': 7.2.0 '@storybook/svelte': 7.2.0(svelte@4.1.1) '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.1)(vite@4.4.7) - magic-string: 0.30.4 + magic-string: 0.30.5 svelte: 4.1.1 sveltedoc-parser: 4.2.1 ts-dedent: 2.2.0 @@ -9852,7 +9861,7 @@ packages: devalue: 4.3.2 esm-env: 1.0.0 kleur: 4.1.5 - magic-string: 0.30.4 + magic-string: 0.30.5 mime: 3.0.0 sade: 1.8.1 set-cookie-parser: 2.6.0 @@ -9891,7 +9900,7 @@ packages: debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 - magic-string: 0.30.4 + magic-string: 0.30.5 svelte: 4.1.1 svelte-hmr: 0.15.2(svelte@4.1.1) vite: 4.4.7(@types/node@20.8.0)(sass@1.32.4) @@ -10043,7 +10052,7 @@ packages: pretty-format: 27.5.1 dev: true - /@testing-library/jest-dom@6.1.4(vitest@0.34.6): + /@testing-library/jest-dom@6.1.4(vitest@1.0.0-beta.4): resolution: {integrity: sha512-wpoYrCYwSZ5/AxcrjLxJmCU6I5QAJXslEeSiMQqaWmP2Kzpd1LvF/qxmAIW2qposULGWq2gw30GgVNFLSc2Jnw==} engines: {node: '>=14', npm: '>=6', yarn: '>=1'} peerDependencies: @@ -10069,7 +10078,7 @@ packages: dom-accessibility-api: 0.5.13 lodash: 4.17.21 redent: 3.0.0 - vitest: 0.34.6(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4) + vitest: 1.0.0-beta.4(@types/node@20.8.0)(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4) dev: true /@testing-library/react-hooks@8.0.0(@types/react@18.0.8)(react-dom@18.1.0)(react@18.1.0): @@ -10899,6 +10908,16 @@ packages: resolution: {integrity: sha512-2kE8rEFgJpbBAPw5JghccEevQb0XVU0tewF/8h7wPQTeCtoJ6h8qmBIwuzUVm2MutmzC/cpCkwxudixoNYDp1A==} dev: true + /@types/webidl-conversions@7.0.3: + resolution: {integrity: sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==} + dev: true + + /@types/whatwg-url@11.0.3: + resolution: {integrity: sha512-z1ELvMijRL1QmU7QuzDkeYXSF2+dXI0ITKoQsIoVKcNBOiK5RMmWy+pYYxJTHFt8vkpZe7UsvRErQwcxZkjoUw==} + dependencies: + '@types/webidl-conversions': 7.0.3 + dev: true + /@types/ws@8.5.3: resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==} dependencies: @@ -11473,11 +11492,11 @@ packages: chai: 4.3.10 dev: true - /@vitest/expect@0.34.6: - resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==} + /@vitest/expect@1.0.0-beta.4: + resolution: {integrity: sha512-JOpNEva2AFxfySH3F+X+hT52Kq/ZdIrGtzWYbj6yRuBuxFqM55n/7/jV4XtQG+XkmehP3OUZGx5zISOU8KHPQw==} dependencies: - '@vitest/spy': 0.34.6 - '@vitest/utils': 0.34.6 + '@vitest/spy': 1.0.0-beta.4 + '@vitest/utils': 1.0.0-beta.4 chai: 4.3.10 dev: true @@ -11489,10 +11508,10 @@ packages: pathe: 1.1.1 dev: true - /@vitest/runner@0.34.6: - resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==} + /@vitest/runner@1.0.0-beta.4: + resolution: {integrity: sha512-rlXCMp5MxMVVVN5hdhzPL9NpIkfZC0EXwAtN5gwBbCBoVRv9dBQiZ5qTw+LaNmugPl8gm76U4e4/nMZS9s6wyw==} dependencies: - '@vitest/utils': 0.34.6 + '@vitest/utils': 1.0.0-beta.4 p-limit: 4.0.0 pathe: 1.1.1 dev: true @@ -11500,15 +11519,15 @@ packages: /@vitest/snapshot@0.33.0: resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==} dependencies: - magic-string: 0.30.4 + magic-string: 0.30.5 pathe: 1.1.1 pretty-format: 29.7.0 dev: true - /@vitest/snapshot@0.34.6: - resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==} + /@vitest/snapshot@1.0.0-beta.4: + resolution: {integrity: sha512-CzmHLGo4RNEQUojYtuEz8wWKp9/p3hvXskejRRJB1iCRH48uWROmoyb2iEQUhgpQw/+WwI4wRP7jek5lp48pRA==} dependencies: - magic-string: 0.30.4 + magic-string: 0.30.5 pathe: 1.1.1 pretty-format: 29.7.0 dev: true @@ -11516,28 +11535,28 @@ packages: /@vitest/spy@0.33.0: resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==} dependencies: - tinyspy: 2.1.1 + tinyspy: 2.2.0 dev: true - /@vitest/spy@0.34.6: - resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==} + /@vitest/spy@1.0.0-beta.4: + resolution: {integrity: sha512-YvKUUl7KucKzLJb8+RTd8H3G24EVPGk+CVMFawwtD/KuYjBzM8RCh3oJTTba6ktLpB8JLVy8NVTNL4Oeigqs8A==} dependencies: - tinyspy: 2.1.1 + tinyspy: 2.2.0 dev: true /@vitest/utils@0.33.0: resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==} dependencies: diff-sequences: 29.6.3 - loupe: 2.3.6 + loupe: 2.3.7 pretty-format: 29.7.0 dev: true - /@vitest/utils@0.34.6: - resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==} + /@vitest/utils@1.0.0-beta.4: + resolution: {integrity: sha512-YY4bhhVqyTxuNwuZJXiCM4/D0Z7Z3H3JDHNM8gXty7EyRUf4iPDQtXzIWe1r4zdTtoFnzFAeMr+891pWlv4SPA==} dependencies: diff-sequences: 29.6.3 - loupe: 2.3.6 + loupe: 2.3.7 pretty-format: 29.7.0 dev: true @@ -12788,7 +12807,7 @@ packages: check-error: 1.0.3 deep-eql: 4.1.3 get-func-name: 2.0.2 - loupe: 2.3.6 + loupe: 2.3.7 pathval: 1.1.1 type-detect: 4.0.8 dev: true @@ -18404,8 +18423,8 @@ packages: signal-exit: 3.0.7 dev: true - /loupe@2.3.6: - resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==} + /loupe@2.3.7: + resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} dependencies: get-func-name: 2.0.2 dev: true @@ -18493,8 +18512,8 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /magic-string@0.30.4: - resolution: {integrity: sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==} + /magic-string@0.30.5: + resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -20858,10 +20877,9 @@ packages: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - /punycode@2.3.0: - resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} + /punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - dev: true /puppeteer-core@2.1.1: resolution: {integrity: sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==} @@ -21173,6 +21191,14 @@ packages: react-resizable: 3.0.4(react-dom@18.1.0)(react@18.1.0) dev: false + /react-icons@4.12.0(react@18.1.0): + resolution: {integrity: sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==} + peerDependencies: + react: '*' + dependencies: + react: 18.1.0 + dev: false + /react-inspector@6.0.2(react@18.1.0): resolution: {integrity: sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ==} peerDependencies: @@ -23414,7 +23440,7 @@ packages: estree-walker: 3.0.3 is-reference: 3.0.2 locate-character: 3.0.0 - magic-string: 0.30.4 + magic-string: 0.30.5 periscopic: 3.1.0 /sveltedoc-parser@4.2.1: @@ -23669,13 +23695,13 @@ packages: engines: {node: '>=14.0.0'} dev: true - /tinypool@0.7.0: - resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==} + /tinypool@0.8.1: + resolution: {integrity: sha512-zBTCK0cCgRROxvs9c0CGK838sPkeokNGdQVUUwHAbynHFlmyJYj825f/oRs528HaIJ97lo0pLIlDUzwN+IorWg==} engines: {node: '>=14.0.0'} dev: true - /tinyspy@2.1.1: - resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==} + /tinyspy@2.2.0: + resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==} engines: {node: '>=14.0.0'} dev: true @@ -23764,9 +23790,16 @@ packages: resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==} engines: {node: '>=14'} dependencies: - punycode: 2.3.0 + punycode: 2.3.1 dev: true + /tr46@5.0.0: + resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==} + engines: {node: '>=18'} + dependencies: + punycode: 2.3.1 + dev: false + /tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -23793,7 +23826,6 @@ packages: /trim@0.0.1: resolution: {integrity: sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==} - deprecated: Use String.prototype.trim() instead dev: true /ts-api-utils@1.0.3(typescript@5.2.2): @@ -24557,9 +24589,9 @@ packages: - terser dev: true - /vite-node@0.34.6(@types/node@20.8.0)(sass@1.32.4): - resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==} - engines: {node: '>=v14.18.0'} + /vite-node@1.0.0-beta.4(@types/node@20.8.0)(sass@1.32.4): + resolution: {integrity: sha512-YODjVvHd2Jih+TGMG3B99ktSyvET9w2cMevorAjcuQ3KKiPhDxEf2bRia2KsDHfnUGIfSpwoUdbcDdJ5xR7epg==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: cac: 6.7.14 @@ -24666,14 +24698,14 @@ packages: vite: 4.4.7(@types/node@20.8.0)(sass@1.32.4) dev: true - /vitest-fetch-mock@0.2.2(vitest@0.34.6): + /vitest-fetch-mock@0.2.2(vitest@1.0.0-beta.4): resolution: {integrity: sha512-XmH6QgTSjCWrqXoPREIdbj40T7i1xnGmAsTAgfckoO75W1IEHKR8hcPCQ7SO16RsdW1t85oUm6pcQRLeBgjVYQ==} engines: {node: '>=14.14.0'} peerDependencies: vitest: '>=0.16.0' dependencies: cross-fetch: 3.1.6 - vitest: 0.34.6(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4) + vitest: 1.0.0-beta.4(@types/node@20.8.0)(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4) transitivePeerDependencies: - encoding dev: true @@ -24725,7 +24757,7 @@ packages: happy-dom: 12.10.1 jsdom: 22.1.0 local-pkg: 0.4.3 - magic-string: 0.30.4 + magic-string: 0.30.5 pathe: 1.1.1 picocolors: 1.0.0 std-env: 3.3.3 @@ -24745,22 +24777,22 @@ packages: - terser dev: true - /vitest@0.34.6(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4): - resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==} - engines: {node: '>=v14.18.0'} + /vitest@1.0.0-beta.4(@types/node@20.8.0)(happy-dom@12.10.1)(jsdom@22.1.0)(sass@1.32.4): + resolution: {integrity: sha512-WOJTqxY3hWqn4yy26SK+cx+BlPBeK/KtY9ALWkD6FLWLhSGY0QFEmarc8sdb/UGZQ8xs5pOvcQQS9JJSV8HH8g==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' + '@types/node': ^18.0.0 || >=20.0.0 '@vitest/browser': '*' '@vitest/ui': '*' happy-dom: '*' jsdom: '*' - playwright: '*' - safaridriver: '*' - webdriverio: '*' peerDependenciesMeta: '@edge-runtime/vm': optional: true + '@types/node': + optional: true '@vitest/browser': optional: true '@vitest/ui': @@ -24769,21 +24801,13 @@ packages: optional: true jsdom: optional: true - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true dependencies: - '@types/chai': 4.3.5 - '@types/chai-subset': 1.3.3 '@types/node': 20.8.0 - '@vitest/expect': 0.34.6 - '@vitest/runner': 0.34.6 - '@vitest/snapshot': 0.34.6 - '@vitest/spy': 0.34.6 - '@vitest/utils': 0.34.6 + '@vitest/expect': 1.0.0-beta.4 + '@vitest/runner': 1.0.0-beta.4 + '@vitest/snapshot': 1.0.0-beta.4 + '@vitest/spy': 1.0.0-beta.4 + '@vitest/utils': 1.0.0-beta.4 acorn: 8.10.0 acorn-walk: 8.2.0 cac: 6.7.14 @@ -24792,15 +24816,15 @@ packages: happy-dom: 12.10.1 jsdom: 22.1.0 local-pkg: 0.4.3 - magic-string: 0.30.4 + magic-string: 0.30.5 pathe: 1.1.1 picocolors: 1.0.0 std-env: 3.3.3 strip-literal: 1.0.1 tinybench: 2.5.0 - tinypool: 0.7.0 + tinypool: 0.8.1 vite: 4.4.7(@types/node@20.8.0)(sass@1.32.4) - vite-node: 0.34.6(@types/node@20.8.0)(sass@1.32.4) + vite-node: 1.0.0-beta.4(@types/node@20.8.0)(sass@1.32.4) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -24954,7 +24978,6 @@ packages: /webidl-conversions@7.0.0: resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} engines: {node: '>=12'} - dev: true /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} @@ -25027,6 +25050,14 @@ packages: webidl-conversions: 7.0.0 dev: true + /whatwg-url@14.0.0: + resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==} + engines: {node: '>=18'} + dependencies: + tr46: 5.0.0 + webidl-conversions: 7.0.0 + dev: false + /whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: diff --git a/schema/azuredevops.schema.json b/schema/azuredevops.schema.json index 508ea4e641fda..bde5315d5078e 100644 --- a/schema/azuredevops.schema.json +++ b/schema/azuredevops.schema.json @@ -19,6 +19,12 @@ "format": "uri", "examples": ["https://dev.azure.com"] }, + "gitURLType": { + "description": "The type of Git URLs to use for cloning and fetching Git repositories.\n\nIf \"http\", Sourcegraph will access repositories using Git URLs of the form http(s)://dev.azure.com/myrepo.git.\n\nIf \"ssh\", Sourcegraph will access repositories using Git URLs of the form git@ssh.dev.azure.com:v3/myrepo. See the documentation for how to provide SSH private keys and known_hosts: https://docs.sourcegraph.com/admin/repo/auth#repositories-that-need-http-s-or-ssh-authentication.", + "type": "string", + "enum": ["http", "ssh"], + "default": "http" + }, "enforcePermissions": { "description": "A flag to enforce Azure DevOps repository access permissions", "type": "boolean", diff --git a/schema/bitbucket_cloud.schema.json b/schema/bitbucket_cloud.schema.json index 42de42d3f6f40..3e06ed6ad1407 100644 --- a/schema/bitbucket_cloud.schema.json +++ b/schema/bitbucket_cloud.schema.json @@ -6,7 +6,26 @@ "allowComments": true, "type": "object", "additionalProperties": false, - "required": ["url", "username", "appPassword"], + "required": ["url"], + "oneOf": [ + { + "allOf": [ + { + "required": ["accessToken"] + }, + { + "not": { "required": ["username"] } + }, + { + "not": { "required": ["appPassword"] } + } + ] + }, + { + "required": ["username", "appPassword"], + "not": { "required": ["accessToken"] } + } + ], "properties": { "url": { "description": "URL of Bitbucket Cloud, such as https://bitbucket.org. Generally, admin should not modify the value of this option because Bitbucket Cloud is a public hosting platform.", @@ -72,6 +91,10 @@ "description": "The app password to use when authenticating to the Bitbucket Cloud. Also set the corresponding \"username\" field.", "type": "string" }, + "accessToken": { + "description": "The workspace access token to use when authenticating with Bitbucket Cloud.", + "type": "string" + }, "gitURLType": { "description": "The type of Git URLs to use for cloning and fetching Git repositories on this Bitbucket Cloud.\n\nIf \"http\", Sourcegraph will access Bitbucket Cloud repositories using Git URLs of the form https://bitbucket.org/myteam/myproject.git.\n\nIf \"ssh\", Sourcegraph will access Bitbucket Cloud repositories using Git URLs of the form git@bitbucket.org:myteam/myproject.git. See the documentation for how to provide SSH private keys and known_hosts: https://docs.sourcegraph.com/admin/repo/auth#repositories-that-need-http-s-or-ssh-authentication.", "type": "string", diff --git a/schema/github.schema.json b/schema/github.schema.json index 4880d69a40ed0..488ec90ba0d0a 100644 --- a/schema/github.schema.json +++ b/schema/github.schema.json @@ -107,7 +107,9 @@ { "required": ["id"] }, { "required": ["pattern"] }, { "required": ["forks"] }, - { "required": ["archived"] } + { "required": ["archived"] }, + { "required": ["stars"] }, + { "required": ["size"] } ], "properties": { "archived": { @@ -132,13 +134,26 @@ "description": "Regular expression which matches against the name of a GitHub repository (\"owner/name\").", "type": "string", "format": "regex" + }, + "size": { + "description": "If set, repositories with a size above the specified one will be excluded.", + "type": "string", + "minLength": 2, + "pattern": "^[<>]{1}[=]{0,1}\\s*\\d+\\s*\\w+$" + }, + "stars": { + "description": "If set, repositories stars less than the specified number will be.", + "type": "string", + "minLength": 2, + "pattern": "^[<>]{1}[=]{0,1}\\s*\\d+$" } } }, "examples": [ [{ "forks": true }], [{ "name": "owner/name" }, { "id": "MDEwOlJlcG9zaXRvcnkxMTczMDM0Mg==" }], - [{ "name": "vuejs/vue" }, { "name": "php/php-src" }, { "pattern": "^topsecretorg/.*" }] + [{ "name": "vuejs/vue" }, { "name": "php/php-src" }, { "pattern": "^topsecretorg/.*" }], + [{ "size": ">= 1GB", "stars": "< 100" }] ] }, "repositoryQuery": { diff --git a/schema/perforce.schema.json b/schema/perforce.schema.json index dc9eff688f572..ecc3845e585f1 100644 --- a/schema/perforce.schema.json +++ b/schema/perforce.schema.json @@ -41,29 +41,6 @@ "default": 1000, "minimum": 1 }, - "rateLimit": { - "description": "Rate limit applied when making background API requests to Perforce.", - "title": "PerforceRateLimit", - "type": "object", - "required": ["enabled", "requestsPerHour"], - "properties": { - "enabled": { - "description": "true if rate limiting is enabled.", - "type": "boolean", - "default": true - }, - "requestsPerHour": { - "description": "Requests per hour permitted. This is an average, calculated per second. Internally, the burst limit is set to 100, which implies that for a requests per hour limit as low as 1, users will continue to be able to send a maximum of 100 requests immediately, provided that the complexity cost of each request is 1.", - "type": "number", - "default": 5000, - "minimum": 0 - } - }, - "default": { - "enabled": true, - "requestsPerHour": 5000 - } - }, "authorization": { "title": "PerforceAuthorization", "description": "If non-null, enforces Perforce depot permissions.", diff --git a/schema/schema.go b/schema/schema.go index 64670e314322d..aacc1096068d9 100644 --- a/schema/schema.go +++ b/schema/schema.go @@ -224,6 +224,12 @@ type AzureDevOpsConnection struct { EnforcePermissions bool `json:"enforcePermissions,omitempty"` // Exclude description: A list of repositories to never mirror from Azure DevOps Services. Exclude []*ExcludedAzureDevOpsServerRepo `json:"exclude,omitempty"` + // GitURLType description: The type of Git URLs to use for cloning and fetching Git repositories. + // + // If "http", Sourcegraph will access repositories using Git URLs of the form http(s)://dev.azure.com/myrepo.git. + // + // If "ssh", Sourcegraph will access repositories using Git URLs of the form git@ssh.dev.azure.com:v3/myrepo. See the documentation for how to provide SSH private keys and known_hosts: https://docs.sourcegraph.com/admin/repo/auth#repositories-that-need-http-s-or-ssh-authentication. + GitURLType string `json:"gitURLType,omitempty"` // Orgs description: An array of organization names identifying Azure DevOps organizations whose repositories should be mirrored on Sourcegraph. Orgs []string `json:"orgs,omitempty"` // Projects description: An array of projects "org/project" strings specifying which Azure DevOps projects' repositories should be mirrored on Sourcegraph. @@ -301,10 +307,12 @@ type BitbucketCloudAuthorization struct { // BitbucketCloudConnection description: Configuration for a connection to Bitbucket Cloud. type BitbucketCloudConnection struct { + // AccessToken description: The workspace access token to use when authenticating with Bitbucket Cloud. + AccessToken string `json:"accessToken,omitempty"` // ApiURL description: The API URL of Bitbucket Cloud, such as https://api.bitbucket.org. Generally, admin should not modify the value of this option because Bitbucket Cloud is a public hosting platform. ApiURL string `json:"apiURL,omitempty"` // AppPassword description: The app password to use when authenticating to the Bitbucket Cloud. Also set the corresponding "username" field. - AppPassword string `json:"appPassword"` + AppPassword string `json:"appPassword,omitempty"` // Authorization description: If non-null, enforces Bitbucket Cloud repository permissions. This requires that there is an item in the [site configuration json](https://docs.sourcegraph.com/admin/config/site_config#auth-providers) `auth.providers` field, of type "bitbucketcloud" with the same `url` field as specified in this `BitbucketCloudConnection`. Authorization *BitbucketCloudAuthorization `json:"authorization,omitempty"` // Exclude description: A list of repositories to never mirror from Bitbucket Cloud. Takes precedence over "teams" configuration. @@ -332,7 +340,7 @@ type BitbucketCloudConnection struct { // Url description: URL of Bitbucket Cloud, such as https://bitbucket.org. Generally, admin should not modify the value of this option because Bitbucket Cloud is a public hosting platform. Url string `json:"url"` // Username description: The username to use when authenticating to the Bitbucket Cloud. Also set the corresponding "appPassword" field. - Username string `json:"username"` + Username string `json:"username,omitempty"` // WebhookSecret description: A shared secret used to authenticate incoming webhooks (minimum 12 characters). WebhookSecret string `json:"webhookSecret,omitempty"` } @@ -592,9 +600,25 @@ type Completions struct { FastChatModelMaxTokens int `json:"fastChatModelMaxTokens,omitempty"` // Model description: DEPRECATED. Use chatModel instead. Model string `json:"model,omitempty"` - // PerUserCodeCompletionsDailyLimit description: If > 0, enables the maximum number of code completions requests allowed to be made by a single user account in a day. On instances that allow anonymous requests, the rate limit is enforced by IP. + // PerCommunityUserChatMonthlyInteractionLimit description: If > 0, enables the maximum number of completions interactions allowed to be made by a single Community user in a month. This is for Cody PLG and applies to Dotcom only. + PerCommunityUserChatMonthlyInteractionLimit int `json:"perCommunityUserChatMonthlyInteractionLimit,omitempty"` + // PerCommunityUserChatMonthlyLLMRequestLimit description: If > 0, limits the number of completions requests allowed for a Community user in a month. This is for Self-serve Cody and applies to Dotcom only. + PerCommunityUserChatMonthlyLLMRequestLimit int `json:"perCommunityUserChatMonthlyLLMRequestLimit,omitempty"` + // PerCommunityUserCodeCompletionsMonthlyInteractionLimit description: If > 0, enables the maximum number of code completions interactions allowed to be made by a single Community user in a month. This is for Cody PLG and applies to Dotcom only. + PerCommunityUserCodeCompletionsMonthlyInteractionLimit int `json:"perCommunityUserCodeCompletionsMonthlyInteractionLimit,omitempty"` + // PerCommunityUserCodeCompletionsMonthlyLLMRequestLimit description: If > 0, limits the number of code completions requests allowed for a Community user in a month. This is for Self-serve Cody and applies to Dotcom only. + PerCommunityUserCodeCompletionsMonthlyLLMRequestLimit int `json:"perCommunityUserCodeCompletionsMonthlyLLMRequestLimit,omitempty"` + // PerProUserChatDailyInteractionLimit description: If > 0, enables the maximum number of completions interactions allowed to be made by a single Pro user in a day. This is for Cody PLG and applies to Dotcom only. + PerProUserChatDailyInteractionLimit int `json:"perProUserChatDailyInteractionLimit,omitempty"` + // PerProUserChatDailyLLMRequestLimit description: If > 0, limits the number of completions requests allowed for a Pro user in a day. This is for Self-serve Cody and applies to Dotcom only. + PerProUserChatDailyLLMRequestLimit int `json:"perProUserChatDailyLLMRequestLimit,omitempty"` + // PerProUserCodeCompletionsDailyInteractionLimit description: If > 0, enables the maximum number of code completions interactions allowed to be made by a single Pro user in a day. This is for Cody PLG and applies to Dotcom only. + PerProUserCodeCompletionsDailyInteractionLimit int `json:"perProUserCodeCompletionsDailyInteractionLimit,omitempty"` + // PerProUserCodeCompletionsDailyLLMRequestLimit description: If > 0, limits the number of code completions requests allowed for a Pro user in a day. This is for Self-serve Cody and applies to Dotcom only. + PerProUserCodeCompletionsDailyLLMRequestLimit int `json:"perProUserCodeCompletionsDailyLLMRequestLimit,omitempty"` + // PerUserCodeCompletionsDailyLimit description: If > 0, limits the number of code completions requests allowed for a user in a day. On instances that allow anonymous requests, we enforce the rate limit by IP. PerUserCodeCompletionsDailyLimit int `json:"perUserCodeCompletionsDailyLimit,omitempty"` - // PerUserDailyLimit description: If > 0, enables the maximum number of completions requests allowed to be made by a single user account in a day. On instances that allow anonymous requests, the rate limit is enforced by IP. + // PerUserDailyLimit description: If > 0, limits the number of completions requests allowed for a user in a day. On instances that allow anonymous requests, we enforce the rate limit by IP. PerUserDailyLimit int `json:"perUserDailyLimit,omitempty"` // Provider description: The external completions provider. Defaults to 'sourcegraph'. Provider string `json:"provider,omitempty"` @@ -680,6 +704,10 @@ type Embeddings struct { MinimumInterval string `json:"minimumInterval,omitempty"` // Model description: The model used for embedding. A default model will be used for each provider, if not set. Model string `json:"model,omitempty"` + // PerCommunityUserEmbeddingsMonthlyLimit description: If > 0, limits the number of tokens allowed to be embedded by a Community user in a month. This is for Self-serve Cody and applies to Dotcom only. + PerCommunityUserEmbeddingsMonthlyLimit int `json:"perCommunityUserEmbeddingsMonthlyLimit,omitempty"` + // PerProUserEmbeddingsMonthlyLimit description: If > 0, limits the number of tokens allowed to be embedded by a Pro user in a month. This is for Self-serve Cody and applies to Dotcom only. + PerProUserEmbeddingsMonthlyLimit int `json:"perProUserEmbeddingsMonthlyLimit,omitempty"` // PolicyRepositoryMatchLimit description: The maximum number of repositories that can be matched by a global embeddings policy PolicyRepositoryMatchLimit *int `json:"policyRepositoryMatchLimit,omitempty"` // Provider description: The provider to use for generating embeddings. Defaults to sourcegraph. @@ -787,6 +815,10 @@ type ExcludedGitHubRepo struct { Name string `json:"name,omitempty"` // Pattern description: Regular expression which matches against the name of a GitHub repository ("owner/name"). Pattern string `json:"pattern,omitempty"` + // Size description: If set, repositories with a size above the specified one will be excluded. + Size string `json:"size,omitempty"` + // Stars description: If set, repositories stars less than the specified number will be. + Stars string `json:"stars,omitempty"` } type ExcludedGitLabProject struct { // EmptyRepos description: Whether to exclude empty repositories. @@ -1888,8 +1920,6 @@ type PerforceConnection struct { P4Port string `json:"p4.port"` // P4User description: The user to be authenticated for p4 CLI (P4USER). P4User string `json:"p4.user"` - // RateLimit description: Rate limit applied when making background API requests to Perforce. - RateLimit *PerforceRateLimit `json:"rateLimit,omitempty"` // RepositoryPathPattern description: The pattern used to generate the corresponding Sourcegraph repository name for a Perforce depot. In the pattern, the variable "{depot}" is replaced with the Perforce depot's path. // // For example, if your Perforce depot path is "//Sourcegraph/" and your Sourcegraph URL is https://src.example.com, then a repositoryPathPattern of "perforce/{depot}" would mean that the Perforce depot is available on Sourcegraph at https://src.example.com/perforce/Sourcegraph. @@ -1898,14 +1928,6 @@ type PerforceConnection struct { RepositoryPathPattern string `json:"repositoryPathPattern,omitempty"` } -// PerforceRateLimit description: Rate limit applied when making background API requests to Perforce. -type PerforceRateLimit struct { - // Enabled description: true if rate limiting is enabled. - Enabled bool `json:"enabled"` - // RequestsPerHour description: Requests per hour permitted. This is an average, calculated per second. Internally, the burst limit is set to 100, which implies that for a requests per hour limit as low as 1, users will continue to be able to send a maximum of 100 requests immediately, provided that the complexity cost of each request is 1. - RequestsPerHour float64 `json:"requestsPerHour"` -} - // PermissionsUserMapping description: Settings for Sourcegraph explicit permissions, which allow the site admin to explicitly manage repository permissions via the GraphQL API. This will mark repositories as restricted by default. type PermissionsUserMapping struct { // BindID description: The type of identifier to identify a user. The default is "email", which uses the email address to identify a user. Use "username" to identify a user by their username. Changing this setting will erase any permissions created for users that do not yet exist. @@ -1993,6 +2015,14 @@ type Ranking struct { // RepoScores description: a map of URI directories to numeric scores for specifying search result importance, like {"github.com": 500, "github.com/sourcegraph": 300, "github.com/sourcegraph/sourcegraph": 100}. Would rank "github.com/sourcegraph/sourcegraph" as 500+300+100=900, and "github.com/other/foo" as 500. RepoScores map[string]float64 `json:"repoScores,omitempty"` } +type RateLimits struct { + // GraphQLMaxAliases description: Maximum number of aliases allowed in a GraphQL query + GraphQLMaxAliases int `json:"graphQLMaxAliases,omitempty"` + // GraphQLMaxDepth description: Maximum depth of nested objects allowed for GraphQL queries. Changes to this setting require a restart. + GraphQLMaxDepth int `json:"graphQLMaxDepth,omitempty"` + // GraphQLMaxFieldCount description: Maximum number of estimated fields allowed in a GraphQL response + GraphQLMaxFieldCount int `json:"graphQLMaxFieldCount,omitempty"` +} // RepoPurgeWorker description: Configuration for repository purge worker. type RepoPurgeWorker struct { @@ -2217,8 +2247,6 @@ type Settings struct { CodeIntelMixPreciseAndSearchBasedReferences bool `json:"codeIntel.mixPreciseAndSearchBasedReferences,omitempty"` // CodeIntelTraceExtension description: Whether to enable trace logging on the extension. CodeIntelTraceExtension bool `json:"codeIntel.traceExtension,omitempty"` - // CodeIntelligenceAutoIndexPopularRepoLimit description: Up to this number of repos are auto-indexed automatically. Ordered by star count. - CodeIntelligenceAutoIndexPopularRepoLimit int `json:"codeIntelligence.autoIndexPopularRepoLimit,omitempty"` // ExperimentalFeatures description: Experimental features and settings. ExperimentalFeatures *SettingsExperimentalFeatures `json:"experimentalFeatures,omitempty"` // FileSidebarVisibleByDefault description: Whether the sidebar on the repo view should be open by default. @@ -2314,7 +2342,6 @@ func (v *Settings) UnmarshalJSON(data []byte) error { delete(m, "codeIntel.disableSearchBased") delete(m, "codeIntel.mixPreciseAndSearchBasedReferences") delete(m, "codeIntel.traceExtension") - delete(m, "codeIntelligence.autoIndexPopularRepoLimit") delete(m, "experimentalFeatures") delete(m, "fileSidebarVisibleByDefault") delete(m, "history.defaultPageSize") @@ -2551,6 +2578,8 @@ type SiteConfiguration struct { BatchChangesEnabled *bool `json:"batchChanges.enabled,omitempty"` // BatchChangesEnforceForks description: When enabled, all branches created by batch changes will be pushed to forks of the original repository. BatchChangesEnforceForks bool `json:"batchChanges.enforceForks,omitempty"` + // BatchChangesRejectUnverifiedCommit description: Reject unverified commits when creating a Batch Change + BatchChangesRejectUnverifiedCommit *bool `json:"batchChanges.rejectUnverifiedCommit,omitempty"` // BatchChangesRestrictToAdmins description: When enabled, only site admins can create and apply batch changes. BatchChangesRestrictToAdmins *bool `json:"batchChanges.restrictToAdmins,omitempty"` // BatchChangesRolloutWindows description: Specifies specific windows, which can have associated rate limits, to be used when reconciling published changesets (creating or updating). All days and times are handled in UTC. @@ -2741,7 +2770,8 @@ type SiteConfiguration struct { // PermissionsUserMapping description: Settings for Sourcegraph explicit permissions, which allow the site admin to explicitly manage repository permissions via the GraphQL API. This will mark repositories as restricted by default. PermissionsUserMapping *PermissionsUserMapping `json:"permissions.userMapping,omitempty"` // ProductResearchPageEnabled description: Enables users access to the product research page in their settings. - ProductResearchPageEnabled *bool `json:"productResearchPage.enabled,omitempty"` + ProductResearchPageEnabled *bool `json:"productResearchPage.enabled,omitempty"` + RateLimits *RateLimits `json:"rateLimits,omitempty"` // RedactOutboundRequestHeaders description: Enables redacting sensitive information from outbound requests. Important: We only respect this setting in development environments. In production, we always redact outbound requests. RedactOutboundRequestHeaders *bool `json:"redactOutboundRequestHeaders,omitempty"` // RepoConcurrentExternalServiceSyncers description: The number of concurrent external service syncers that can run. @@ -2754,6 +2784,8 @@ type SiteConfiguration struct { ScimAuthToken string `json:"scim.authToken,omitempty"` // ScimIdentityProvider description: Identity provider used for SCIM support. "STANDARD" should be used unless a more specific value is available ScimIdentityProvider string `json:"scim.identityProvider,omitempty"` + // SearchIndexShardConcurrency description: The number of threads each indexserver should use to index shards. If not set, indexserver will use the number of available CPUs. This is exposed as a safeguard and should usually not require being set. + SearchIndexShardConcurrency int `json:"search.index.shardConcurrency,omitempty"` // SearchIndexSymbolsEnabled description: Whether indexed symbol search is enabled. This is contingent on the indexed search configuration, and is true by default for instances with indexed search enabled. Enabling this will cause every repository to re-index, which is a time consuming (several hours) operation. Additionally, it requires more storage and ram to accommodate the added symbols information in the search index. SearchIndexSymbolsEnabled *bool `json:"search.index.symbols.enabled,omitempty"` // SearchLargeFiles description: A list of file glob patterns where matching files will be indexed and searched regardless of their size. Files still need to be valid utf-8 to be indexed. The glob pattern syntax can be found here: https://github.com/bmatcuk/doublestar#patterns. @@ -2822,6 +2854,7 @@ func (v *SiteConfiguration) UnmarshalJSON(data []byte) error { delete(m, "batchChanges.disableWebhooksWarning") delete(m, "batchChanges.enabled") delete(m, "batchChanges.enforceForks") + delete(m, "batchChanges.rejectUnverifiedCommit") delete(m, "batchChanges.restrictToAdmins") delete(m, "batchChanges.rolloutWindows") delete(m, "branding") @@ -2916,12 +2949,14 @@ func (v *SiteConfiguration) UnmarshalJSON(data []byte) error { delete(m, "permissions.syncUsersMaxConcurrency") delete(m, "permissions.userMapping") delete(m, "productResearchPage.enabled") + delete(m, "rateLimits") delete(m, "redactOutboundRequestHeaders") delete(m, "repoConcurrentExternalServiceSyncers") delete(m, "repoListUpdateInterval") delete(m, "repoPurgeWorker") delete(m, "scim.authToken") delete(m, "scim.identityProvider") + delete(m, "search.index.shardConcurrency") delete(m, "search.index.symbols.enabled") delete(m, "search.largeFiles") delete(m, "search.limits") diff --git a/schema/settings.schema.json b/schema/settings.schema.json index bde5e322f6a41..8d628be76229e 100644 --- a/schema/settings.schema.json +++ b/schema/settings.schema.json @@ -370,12 +370,6 @@ "description": "The timeout (in milliseconds) for un-indexed search requests.", "type": "number" }, - "codeIntelligence.autoIndexPopularRepoLimit": { - "description": "Up to this number of repos are auto-indexed automatically. Ordered by star count.", - "type": "integer", - "minimum": 0, - "default": 0 - }, "search.contextLines": { "description": "The default number of lines to show as context below and above search results. Default is 1.", "type": "integer", @@ -390,7 +384,7 @@ "search.defaultPatternType": { "description": "The default pattern type that search queries will be intepreted as. `lucky` is an experimental mode that will interpret the query in multiple ways.", "type": "string", - "pattern": "standard|literal|regexp|lucky" + "pattern": "standard|literal|regexp|lucky|newStandardRC1" }, "search.defaultCaseSensitive": { "description": "Whether query patterns are treated case sensitively. Patterns are case insensitive by default.", diff --git a/schema/site.schema.json b/schema/site.schema.json index 2a9d8f48e112e..a687f05c8e768 100644 --- a/schema/site.schema.json +++ b/schema/site.schema.json @@ -16,6 +16,12 @@ "group": "Search", "examples": [true] }, + "search.index.shardConcurrency": { + "description": "The number of threads each indexserver should use to index shards. If not set, indexserver will use the number of available CPUs. This is exposed as a safeguard and should usually not require being set.", + "type": "integer", + "group": "Search", + "examples": ["10"] + }, "search.largeFiles": { "description": "A list of file glob patterns where matching files will be indexed and searched regardless of their size. Files still need to be valid utf-8 to be indexed. The glob pattern syntax can be found here: https://github.com/bmatcuk/doublestar#patterns.", "type": "array", @@ -29,7 +35,7 @@ "description": "(debug) controls the amount of symbol search parallelism. Defaults to 20. It is not recommended to change this outside of debugging scenarios. This option will be removed in a future version.", "type": "integer", "group": "Debug", - "examples": [["20"]] + "examples": ["20"] }, "cloneProgress.log": { "description": "Whether clone progress should be logged to a file. If enabled, logs are written to files in the OS default path for temporary files.", @@ -49,6 +55,27 @@ "type": "boolean", "default": false }, + "rateLimits": { + "type": "object", + "additionalProperties": false, + "properties": { + "graphQLMaxDepth": { + "description": "Maximum depth of nested objects allowed for GraphQL queries. Changes to this setting require a restart.", + "type": "integer", + "default": 30 + }, + "graphQLMaxAliases": { + "description": "Maximum number of aliases allowed in a GraphQL query", + "type": "integer", + "default": 500 + }, + "graphQLMaxFieldCount": { + "description": "Maximum number of estimated fields allowed in a GraphQL response", + "type": "integer", + "default": 500000 + } + } + }, "exportUsageTelemetry": { "type": "object", "additionalProperties": false, @@ -965,8 +992,8 @@ }, "patterns": [ { - "match": "^package main$", - "language": "go" + "match": "cobol_.*\\.txt", + "language": "cobol" } ] } @@ -1941,6 +1968,14 @@ } ] }, + "batchChanges.rejectUnverifiedCommit": { + "description": "Reject unverified commits when creating a Batch Change", + "type": "boolean", + "default": false, + "!go": { + "pointer": true + } + }, "gitserver.diskUsageWarningThreshold": { "description": "Disk usage threshold at which to display warning notification. Value is a percentage.", "type": "integer", @@ -2473,6 +2508,16 @@ "type": "string", "format": "uri" }, + "perCommunityUserEmbeddingsMonthlyLimit": { + "description": "If > 0, limits the number of tokens allowed to be embedded by a Community user in a month. This is for Self-serve Cody and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perProUserEmbeddingsMonthlyLimit": { + "description": "If > 0, limits the number of tokens allowed to be embedded by a Pro user in a month. This is for Self-serve Cody and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, "fileFilters": { "description": "Filters that allow you to specify which files in a repository should get embedded.", "type": "object", @@ -2749,12 +2794,52 @@ "description": "The endpoint under which to reach the provider. Currently only used for provider types \"sourcegraph\", \"openai\" and \"anthropic\". The default values are \"https://cody-gateway.sourcegraph.com\", \"https://api.openai.com/v1/chat/completions\", and \"https://api.anthropic.com/v1/complete\" for Sourcegraph, OpenAI, and Anthropic, respectively." }, "perUserDailyLimit": { - "description": "If > 0, enables the maximum number of completions requests allowed to be made by a single user account in a day. On instances that allow anonymous requests, the rate limit is enforced by IP.", + "description": "If > 0, limits the number of completions requests allowed for a user in a day. On instances that allow anonymous requests, we enforce the rate limit by IP.", "type": "integer", "default": 0 }, "perUserCodeCompletionsDailyLimit": { - "description": "If > 0, enables the maximum number of code completions requests allowed to be made by a single user account in a day. On instances that allow anonymous requests, the rate limit is enforced by IP.", + "description": "If > 0, limits the number of code completions requests allowed for a user in a day. On instances that allow anonymous requests, we enforce the rate limit by IP.", + "type": "integer", + "default": 0 + }, + "perCommunityUserChatMonthlyLLMRequestLimit": { + "description": "If > 0, limits the number of completions requests allowed for a Community user in a month. This is for Self-serve Cody and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perCommunityUserCodeCompletionsMonthlyLLMRequestLimit": { + "description": "If > 0, limits the number of code completions requests allowed for a Community user in a month. This is for Self-serve Cody and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perProUserChatDailyLLMRequestLimit": { + "description": "If > 0, limits the number of completions requests allowed for a Pro user in a day. This is for Self-serve Cody and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perProUserCodeCompletionsDailyLLMRequestLimit": { + "description": "If > 0, limits the number of code completions requests allowed for a Pro user in a day. This is for Self-serve Cody and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perCommunityUserChatMonthlyInteractionLimit": { + "description": "If > 0, enables the maximum number of completions interactions allowed to be made by a single Community user in a month. This is for Cody PLG and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perCommunityUserCodeCompletionsMonthlyInteractionLimit": { + "description": "If > 0, enables the maximum number of code completions interactions allowed to be made by a single Community user in a month. This is for Cody PLG and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perProUserChatDailyInteractionLimit": { + "description": "If > 0, enables the maximum number of completions interactions allowed to be made by a single Pro user in a day. This is for Cody PLG and applies to Dotcom only.", + "type": "integer", + "default": 0 + }, + "perProUserCodeCompletionsDailyInteractionLimit": { + "description": "If > 0, enables the maximum number of code completions interactions allowed to be made by a single Pro user in a day. This is for Cody PLG and applies to Dotcom only.", "type": "integer", "default": 0 } diff --git a/sg.config.yaml b/sg.config.yaml index 2fd8c7d1cae38..0d2b40e4aaff5 100644 --- a/sg.config.yaml +++ b/sg.config.yaml @@ -235,6 +235,12 @@ commands: export GCFLAGS='all=-N -l' fi + # Ensure scip-ctags-dev is installed to avoid prompting the user to + # install it manually. + if [ ! -f $(./dev/scip-ctags-install.sh which) ]; then + ./dev/scip-ctags-install.sh + fi + go build -gcflags="$GCFLAGS" -o .bin/symbols github.com/sourcegraph/sourcegraph/cmd/symbols checkBinary: .bin/symbols env: @@ -246,7 +252,6 @@ commands: - lib - internal - cmd/symbols - - cmd/symbols - internal/rockskip embeddings: @@ -363,6 +368,23 @@ commands: - internal - cmd/pings + msp-example: + cmd: .bin/msp-example + install: | + if [ -n "$DELVE" ]; then + export GCFLAGS='all=-N -l' + fi + go build -gcflags="$GCFLAGS" -o .bin/msp-example github.com/sourcegraph/sourcegraph/cmd/msp-example + checkBinary: .bin/msp-example + env: + PORT: '9080' + DIAGNOSTICS_SECRET: sekret + SRC_LOG_LEVEL: debug + STATELESS_MODE: 'true' + watch: + - cmd/msp-example + - lib/managedservicesplatform + searcher: cmd: .bin/searcher install: | diff --git a/shell.nix b/shell.nix index 5f56bbf490df5..7e625ac0a7383 100644 --- a/shell.nix +++ b/shell.nix @@ -100,6 +100,7 @@ mkShell { nodejs-20_x nodejs-20_x.pkgs.pnpm nodejs-20_x.pkgs.typescript + nodejs-20_x.pkgs.typescript-language-server # Rust utils for syntax-highlighter service, currently not pinned to the same versions. cargo diff --git a/src-tauri/README.md b/src-tauri/README.md index 02cd51b8e596a..21447d146cbf2 100644 --- a/src-tauri/README.md +++ b/src-tauri/README.md @@ -4,7 +4,7 @@ This contains all the Tauri code for the Cody App. Currently it consists of star ## Required software -- Rust 1.68.0 +- Rust 1.73.0 - pnpm ## Getting started diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel index e14d052b81fad..a87879f356f28 100644 --- a/testing/BUILD.bazel +++ b/testing/BUILD.bazel @@ -2,6 +2,7 @@ load(":defs.bzl", "server_integration_test") server_integration_test( name = "e2e_test", + timeout = "long", args = [ "$(location //client/web/src/end-to-end:e2e)", "$(rootpath //:mocha_config)", @@ -112,6 +113,7 @@ server_integration_test( port = "7082", runner_src = ":backend_integration_test.sh", tags = [ + "exclusive", "manual", ], ) @@ -165,6 +167,7 @@ server_integration_test( port = "7083", runner_src = ":codeintel_integration_test.sh", tags = [ + "exclusive", "manual", ], ) diff --git a/third-party-licenses/ThirdPartyLicenses.csv b/third-party-licenses/ThirdPartyLicenses.csv index b3799d08a3079..3481219a57834 100644 --- a/third-party-licenses/ThirdPartyLicenses.csv +++ b/third-party-licenses/ThirdPartyLicenses.csv @@ -10,7 +10,6 @@ PNPM,@ardatan/sync-fetch,0.0.1,MIT,"",Approved PNPM,@atlassian/aui,7.10.5,Apache 2.0,"",Approved PNPM,@aw-web-design/x-default-browser,1.4.126,MIT,"",Approved PNPM,@axe-core/puppeteer,4.4.2,Mozilla Public License 2.0,"",Approved -PNPM,@babel/cli,7.20.7,MIT,"",Approved PNPM,@babel/code-frame,7.22.13,MIT,"",Approved PNPM,@babel/compat-data,7.22.20,MIT,"",Approved PNPM,@babel/core,7.23.0,MIT,"",Approved @@ -54,14 +53,13 @@ PNPM,@babel/plugin-proposal-optional-chaining,7.21.0,MIT,"",Approved PNPM,@babel/plugin-proposal-private-property-in-object,7.21.0-placeholder-for-preset-env.2,MIT,"",Approved PNPM,@babel/plugin-proposal-unicode-property-regex,7.18.6,MIT,"",Approved PNPM,@babel/plugin-syntax-async-generators,7.8.4,MIT,"",Approved -PNPM,@babel/plugin-syntax-bigint,7.8.3,MIT,"",Approved PNPM,@babel/plugin-syntax-class-properties,7.12.13,MIT,"",Approved PNPM,@babel/plugin-syntax-class-static-block,7.14.5,MIT,"",Approved PNPM,@babel/plugin-syntax-dynamic-import,7.8.3,MIT,"",Approved PNPM,@babel/plugin-syntax-export-default-from,7.22.5,MIT,"",Approved PNPM,@babel/plugin-syntax-export-namespace-from,7.8.3,MIT,"",Approved PNPM,@babel/plugin-syntax-flow,7.22.5,MIT,"",Approved -PNPM,@babel/plugin-syntax-import-assertions,7.20.0,MIT,"",Approved +PNPM,@babel/plugin-syntax-import-assertions,7.22.5,MIT,"",Approved PNPM,@babel/plugin-syntax-import-attributes,7.22.5,MIT,"",Approved PNPM,@babel/plugin-syntax-import-meta,7.10.4,MIT,"",Approved PNPM,@babel/plugin-syntax-json-strings,7.8.3,MIT,"",Approved @@ -116,10 +114,8 @@ PNPM,@babel/plugin-transform-private-property-in-object,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-property-literals,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-react-display-name,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-react-jsx,7.22.15,MIT,"",Approved -PNPM,@babel/plugin-transform-react-jsx-development,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-react-jsx-self,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-react-jsx-source,7.22.5,MIT,"",Approved -PNPM,@babel/plugin-transform-react-pure-annotations,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-regenerator,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-reserved-words,7.22.5,MIT,"",Approved PNPM,@babel/plugin-transform-runtime,7.21.0,MIT,"",Approved @@ -136,7 +132,6 @@ PNPM,@babel/plugin-transform-unicode-sets-regex,7.22.5,MIT,"",Approved PNPM,@babel/preset-env,7.22.9,MIT,"",Approved PNPM,@babel/preset-flow,7.22.5,MIT,"",Approved PNPM,@babel/preset-modules,0.1.5,MIT,"",Approved -PNPM,@babel/preset-react,7.18.6,MIT,"",Approved PNPM,@babel/preset-typescript,7.21.5,MIT,"",Approved PNPM,@babel/register,7.21.0,MIT,"",Approved PNPM,@babel/regjsgen,0.8.0,MIT,"",Approved @@ -144,7 +139,7 @@ PNPM,@babel/runtime,7.23.1,MIT,"",Approved PNPM,@babel/runtime-corejs3,7.10.3,MIT,"",Approved PNPM,@babel/template,7.22.15,MIT,"",Approved PNPM,@babel/traverse,7.10.5,MIT,"",Approved -PNPM,@babel/types,7.10.5,MIT,"",Approved +PNPM,@babel/types,7.23.0,MIT,"",Approved PNPM,@base2/pretty-print-object,1.0.1,Simplified BSD,"",Approved PNPM,@bcoe/v8-coverage,0.2.3,MIT,"",Approved PNPM,@codemirror/autocomplete,6.1.0,MIT,"",Approved @@ -227,20 +222,11 @@ PNPM,@iarna/toml,2.2.5,ISC,"",Approved PNPM,@isaacs/cliui,8.0.2,ISC,"",Approved PNPM,@istanbuljs/load-nyc-config,1.0.0,ISC,"",Approved PNPM,@istanbuljs/schema,0.1.3,MIT,"",Approved -PNPM,@jest/console,29.7.0,MIT,"",Approved -PNPM,@jest/core,29.7.0,MIT,"",Approved PNPM,@jest/create-cache-key-function,29.7.0,MIT,"",Approved -PNPM,@jest/environment,28.1.3,MIT,"",Approved -PNPM,@jest/expect,29.7.0,MIT,"",Approved -PNPM,@jest/expect-utils,29.7.0,MIT,"",Approved -PNPM,@jest/fake-timers,28.1.3,MIT,"",Approved -PNPM,@jest/globals,29.7.0,MIT,"",Approved -PNPM,@jest/reporters,29.7.0,MIT,"",Approved -PNPM,@jest/schemas,28.1.3,MIT,"",Approved -PNPM,@jest/source-map,29.6.3,MIT,"",Approved -PNPM,@jest/test-result,29.7.0,MIT,"",Approved -PNPM,@jest/test-sequencer,29.7.0,MIT,"",Approved -PNPM,@jest/transform,28.1.3,MIT,"",Approved +PNPM,@jest/environment,29.7.0,MIT,"",Approved +PNPM,@jest/fake-timers,29.7.0,MIT,"",Approved +PNPM,@jest/schemas,29.6.3,MIT,"",Approved +PNPM,@jest/transform,29.7.0,MIT,"",Approved PNPM,@jest/types,26.6.2,MIT,"",Approved PNPM,@joshwooding/vite-plugin-react-docgen-typescript,0.2.1,MIT,"",Approved PNPM,@jridgewell/gen-mapping,0.3.3,MIT,"",Approved @@ -248,7 +234,7 @@ PNPM,@jridgewell/resolve-uri,3.1.1,MIT,"",Approved PNPM,@jridgewell/set-array,1.1.2,MIT,"",Approved PNPM,@jridgewell/source-map,0.3.5,MIT,"",Approved PNPM,@jridgewell/sourcemap-codec,1.4.15,MIT,"",Approved -PNPM,@jridgewell/trace-mapping,0.3.9,MIT,"",Approved +PNPM,@jridgewell/trace-mapping,0.3.19,MIT,"",Approved PNPM,@jsdevtools/ono,7.1.3,MIT,"",Approved PNPM,@juggle/resize-observer,3.3.1,Apache 2.0,"",Approved PNPM,@lezer/common,1.0.0,MIT,"",Approved @@ -272,7 +258,6 @@ PNPM,@mswjs/cookies,0.2.2,MIT,"",Approved PNPM,@mswjs/interceptors,0.17.9,MIT,"",Approved PNPM,@n1ru4l/push-pull-async-iterable-iterator,3.2.0,MIT,"",Approved PNPM,@ndelangen/get-tarball,3.0.9,MIT,"",Approved -PNPM,@nicolo-ribaudo/chokidar-2,2.1.8-no-fsevents.3,MIT,"",Approved PNPM,@nodelib/fs.scandir,2.1.5,MIT,"",Approved PNPM,@nodelib/fs.stat,2.0.5,MIT,"",Approved PNPM,@nodelib/fs.walk,1.2.8,MIT,"",Approved @@ -437,11 +422,11 @@ PNPM,@sentry/utils,7.8.1,New BSD,"",Approved PNPM,@sideway/address,4.1.4,New BSD,"",Approved PNPM,@sideway/formula,3.0.1,New BSD,"",Approved PNPM,@sideway/pinpoint,2.0.0,New BSD,"",Approved -PNPM,@sinclair/typebox,0.24.51,MIT,"",Approved +PNPM,@sinclair/typebox,0.27.8,MIT,"",Approved PNPM,@sindresorhus/fnv1a,1.2.0,MIT,"",Approved PNPM,@sindresorhus/is,4.6.0,MIT,"",Approved -PNPM,@sinonjs/commons,1.8.3,New BSD,"",Approved -PNPM,@sinonjs/fake-timers,9.1.2,New BSD,"",Approved +PNPM,@sinonjs/commons,3.0.0,New BSD,"",Approved +PNPM,@sinonjs/fake-timers,10.3.0,New BSD,"",Approved PNPM,@sinonjs/formatio,5.0.1,New BSD,"",Approved PNPM,@sinonjs/samsam,5.3.1,New BSD,"",Approved PNPM,@sinonjs/text-encoding,0.7.1,(Unlicense OR Apache-2.0),"",Approved @@ -609,7 +594,7 @@ PNPM,@types/istanbul-reports,3.0.1,MIT,"",Approved PNPM,@types/js-cookie,2.2.6,MIT,"",Approved PNPM,@types/js-levenshtein,1.1.1,MIT,"",Approved PNPM,@types/js-yaml,4.0.3,MIT,"",Approved -PNPM,@types/jsdom,16.2.15,MIT,"",Approved +PNPM,@types/jsdom,12.2.4,MIT,"",Approved PNPM,@types/json-schema,7.0.14,MIT,"",Approved PNPM,@types/json-stable-stringify,1.0.32,MIT,"",Approved PNPM,@types/json5,0.0.29,MIT,"",Approved @@ -633,7 +618,6 @@ PNPM,@types/node,20.8.0,MIT,"",Approved PNPM,@types/node-fetch,2.5.10,MIT,"",Approved PNPM,@types/normalize-package-data,2.4.0,MIT,"",Approved PNPM,@types/parse-json,4.0.0,MIT,"",Approved -PNPM,@types/parse5,6.0.3,MIT,"",Approved PNPM,@types/pollyjs__adapter,4.3.0,MIT,"",Approved PNPM,@types/pollyjs__core,4.3.1,MIT,"",Approved PNPM,@types/pollyjs__persister,4.3.0,MIT,"",Approved @@ -666,7 +650,7 @@ PNPM,@types/serve-static,1.15.0,MIT,"",Approved PNPM,@types/set-cookie-parser,2.4.3,MIT,"",Approved PNPM,@types/shelljs,0.8.8,MIT,"",Approved PNPM,@types/signale,1.4.1,MIT,"",Approved -PNPM,@types/simmerjs,0.5.1,MIT,"",Approved +PNPM,@types/simmerjs,0.5.4,MIT,"",Approved PNPM,@types/sinon,9.0.4,MIT,"",Approved PNPM,@types/sinonjs__fake-timers,6.0.1,MIT,"",Approved PNPM,@types/stack-utils,2.0.1,MIT,"",Approved @@ -677,6 +661,8 @@ PNPM,@types/tough-cookie,2.3.5,MIT,"",Approved PNPM,@types/trusted-types,2.0.3,MIT,"",Approved PNPM,@types/unist,2.0.3,MIT,"",Approved PNPM,@types/uuid,8.0.1,MIT,"",Approved +PNPM,@types/webidl-conversions,7.0.3,MIT,"",Approved +PNPM,@types/whatwg-url,11.0.3,MIT,"",Approved PNPM,@types/ws,8.5.3,MIT,"",Approved PNPM,@types/yargs,15.0.3,MIT,"",Approved PNPM,@types/yargs-parser,21.0.0,MIT,"",Approved @@ -745,7 +731,6 @@ PNPM,abbrev,1.1.1,ISC,"",Approved PNPM,abort-controller,3.0.0,MIT,"",Approved PNPM,accepts,1.3.8,MIT,"",Approved PNPM,acorn,8.10.0,MIT,"",Approved -PNPM,acorn-globals,6.0.0,MIT,"",Approved PNPM,acorn-import-assertions,1.9.0,MIT,"",Approved PNPM,acorn-jsx,5.3.2,MIT,"",Approved PNPM,acorn-walk,8.2.0,MIT,"",Approved @@ -804,17 +789,13 @@ PNPM,axios,0.21.4,MIT,"",Approved PNPM,axobject-query,3.2.1,Apache 2.0,"",Approved PNPM,azure-devops-node-api,11.2.0,MIT,"",Approved PNPM,babel-core,7.0.0-bridge.0,MIT,"",Approved -PNPM,babel-jest,29.7.0,MIT,"",Approved PNPM,babel-plugin-istanbul,6.1.1,New BSD,"",Approved -PNPM,babel-plugin-jest-hoist,29.6.3,MIT,"",Approved PNPM,babel-plugin-polyfill-corejs2,0.3.3,MIT,"",Approved PNPM,babel-plugin-polyfill-corejs3,0.6.0,MIT,"",Approved PNPM,babel-plugin-polyfill-regenerator,0.4.1,MIT,"",Approved PNPM,babel-plugin-syntax-trailing-function-commas,7.0.0-beta.0,MIT,"",Approved PNPM,babel-plugin-transform-flow-enums,0.0.2,MIT,"",Approved -PNPM,babel-preset-current-node-syntax,1.0.1,MIT,"",Approved PNPM,babel-preset-fbjs,3.4.0,MIT,"",Approved -PNPM,babel-preset-jest,29.6.3,MIT,"",Approved PNPM,backbone,1.1.2,MIT,"",Approved PNPM,balanced-match,0.4.2,MIT,"",Approved PNPM,base64-js,1.5.1,MIT,"",Approved @@ -838,7 +819,6 @@ PNPM,bplist-parser,0.2.0,MIT,"",Approved PNPM,brace-expansion,1.1.11,MIT,"",Approved PNPM,braces,3.0.2,MIT,"",Approved PNPM,browser-assert,1.2.1,MIT,"",Approved -PNPM,browser-process-hrtime,1.0.0,Simplified BSD,"",Approved PNPM,browser-stdout,1.3.1,ISC,"",Approved PNPM,browserify-zlib,0.2.0,MIT,"",Approved PNPM,browserslist,4.22.1,MIT,"",Approved @@ -871,16 +851,15 @@ PNPM,caniuse-lite,1.0.30001546,CC-BY-4.0,"",Approved PNPM,capital-case,1.0.4,MIT,"",Approved PNPM,capture-stack-trace,1.0.1,MIT,"",Approved PNPM,caseless,0.12.0,Apache 2.0,"",Approved -PNPM,chai,4.3.7,MIT,"",Approved +PNPM,chai,4.3.10,MIT,"",Approved PNPM,chalk,4.1.1,MIT,"",Approved PNPM,change-case,4.1.2,MIT,"",Approved PNPM,change-case-all,1.0.14,MIT,"",Approved -PNPM,char-regex,1.0.2,MIT,"",Approved PNPM,character-entities,1.2.2,MIT,"",Approved PNPM,character-entities-legacy,1.1.2,MIT,"",Approved PNPM,character-reference-invalid,1.1.2,MIT,"",Approved PNPM,chardet,0.7.0,MIT,"",Approved -PNPM,check-error,1.0.2,MIT,"",Approved +PNPM,check-error,1.0.3,MIT,"",Approved PNPM,cheerio,1.0.0-rc.12,MIT,"",Approved PNPM,cheerio-select,2.1.0,Simplified BSD,"",Approved PNPM,chokidar,3.5.1,MIT,"",Approved @@ -892,7 +871,6 @@ PNPM,chrome-webstore-upload,0.2.2,MIT,"",Approved PNPM,chrome-webstore-upload-cli,1.2.0,MIT,"",Approved PNPM,ci-env,1.16.0,MIT,"",Approved PNPM,ci-info,2.0.0,MIT,"",Approved -PNPM,cjs-module-lexer,1.2.2,MIT,"",Approved PNPM,classnames,2.3.2,MIT,"",Approved PNPM,clean-regexp,1.0.0,MIT,"",Approved PNPM,clean-stack,2.0.0,MIT,"",Approved @@ -908,25 +886,24 @@ PNPM,clone,1.0.4,MIT,"",Approved PNPM,clone-deep,4.0.1,MIT,"",Approved PNPM,clone-regexp,2.2.0,MIT,"",Approved PNPM,clone-response,1.0.2,MIT,"",Approved -Go,cloud.google.com/go,v0.110.8,"Apache 2.0,New BSD",cloud.google.com/go,Approved -Go,cloud.google.com/go/bigquery,v1.55.0,Apache 2.0,cloud.google.com/go/bigquery,Approved +Go,cloud.google.com/go,v0.110.9,"Apache 2.0,New BSD",cloud.google.com/go,Approved +Go,cloud.google.com/go/bigquery,v1.56.0,Apache 2.0,cloud.google.com/go/bigquery,Approved +Go,cloud.google.com/go/cloudsqlconn,v1.5.1,Apache 2.0,cloud.google.com/go/cloudsqlconn,Approved Go,cloud.google.com/go/compute/metadata,v0.2.4-0.20230617002413-005d2dfb6b68,Apache 2.0,cloud.google.com/go/compute,Approved -Go,cloud.google.com/go/iam,v1.1.2,Apache 2.0,cloud.google.com/go/iam,Approved -Go,cloud.google.com/go/kms,v1.15.2,Apache 2.0,cloud.google.com/go/kms,Approved -Go,cloud.google.com/go/monitoring,v1.16.0,Apache 2.0,cloud.google.com/go/monitoring,Approved +Go,cloud.google.com/go/iam,v1.1.4,Apache 2.0,cloud.google.com/go/iam,Approved +Go,cloud.google.com/go/kms,v1.15.4,Apache 2.0,cloud.google.com/go/kms,Approved +Go,cloud.google.com/go/monitoring,v1.16.2,Apache 2.0,cloud.google.com/go/monitoring,Approved Go,cloud.google.com/go/profiler,v0.3.1,Apache 2.0,cloud.google.com/go/profiler,Approved Go,cloud.google.com/go/pubsub,v1.33.0,Apache 2.0,cloud.google.com/go/pubsub,Approved -Go,cloud.google.com/go/secretmanager,v1.11.1,Apache 2.0,cloud.google.com/go/secretmanager,Approved +Go,cloud.google.com/go/secretmanager,v1.11.3,Apache 2.0,cloud.google.com/go/secretmanager,Approved Go,cloud.google.com/go/storage,v1.30.1,Apache 2.0,cloud.google.com/go/storage,Approved -Go,cloud.google.com/go/trace,v1.10.1,Apache 2.0,cloud.google.com/go/trace,Approved +Go,cloud.google.com/go/trace,v1.10.3,Apache 2.0,cloud.google.com/go/trace,Approved PNPM,clsx,1.2.1,MIT,"",Approved -PNPM,co,4.6.0,MIT,"",Approved PNPM,code-point-at,1.1.0,MIT,"",Approved PNPM,code-red,1.0.4,MIT,"",Approved Go,code.gitea.io/gitea,v1.18.0,"Apache 2.0,BSD,BSD Zero Clause License,CC0 1.0 Universal,Eclipse Public License 1.0,GNU Lesser General Public License version 2.1,ISC,LGPL,MIT,Mozilla Public License 1.1,New BSD,Simplified BSD,WTFPL,ruby,zlib/libpng license",code.gitea.io/gitea,Approved PNPM,codemirror,5.65.9,MIT,"",Approved PNPM,codemirror-graphql,1.3.2,MIT,"",Approved -PNPM,collect-v8-coverage,1.0.0,MIT,"",Approved PNPM,color-convert,2.0.1,MIT,"",Approved PNPM,color-name,1.1.4,MIT,"",Approved PNPM,colord,2.9.2,MIT,"",Approved @@ -953,7 +930,7 @@ PNPM,console-control-strings,1.1.0,ISC,"",Approved PNPM,constant-case,3.0.4,MIT,"",Approved PNPM,content-disposition,0.5.4,MIT,"",Approved PNPM,content-type,1.0.4,MIT,"",Approved -PNPM,convert-source-map,2.0.0,MIT,"",Approved +PNPM,convert-source-map,1.7.0,MIT,"",Approved PNPM,cookie,0.5.0,MIT,"",Approved PNPM,cookie-signature,1.0.6,MIT,"",Approved PNPM,cookiejar,2.1.3,MIT,"",Approved @@ -967,11 +944,10 @@ PNPM,cosmiconfig,5.2.1,MIT,"",Approved PNPM,cosmiconfig-toml-loader,1.0.0,MIT,"",Approved PNPM,cosmiconfig-typescript-loader,4.3.0,MIT,"",Approved PNPM,create-error-class,3.0.2,MIT,"",Approved -PNPM,create-jest,29.7.0,MIT,"",Approved PNPM,create-require,1.1.1,MIT,"",Approved PNPM,crelt,1.0.5,MIT,"",Approved PNPM,cross-env,7.0.2,MIT,"",Approved -PNPM,cross-fetch,3.1.5,MIT,"",Approved +PNPM,cross-fetch,3.1.6,MIT,"",Approved PNPM,cross-spawn,7.0.3,MIT,"",Approved PNPM,crypto-random-string,2.0.0,MIT,"",Approved PNPM,css-modules-loader-core,1.1.0,ISC,"",Approved @@ -982,8 +958,7 @@ PNPM,css-what,6.1.0,Simplified BSD,"",Approved PNPM,css.escape,1.5.1,MIT,"",Approved PNPM,cssesc,3.0.0,MIT,"",Approved PNPM,csso,4.2.0,MIT,"",Approved -PNPM,cssom,0.5.0,MIT,"",Approved -PNPM,cssstyle,2.3.0,MIT,"",Approved +PNPM,cssstyle,3.0.0,MIT,"",Approved PNPM,csstype,3.1.0,MIT,"",Approved Go,cuelang.org/go,v0.4.3,"Apache 2.0,MIT",cuelang.org/go,Approved PNPM,currently-unhandled,0.4.1,MIT,"",Approved @@ -1001,7 +976,7 @@ PNPM,d3-time-format,2.1.3,New BSD,"",Approved PNPM,d3-voronoi,1.1.4,New BSD,"",Approved PNPM,damerau-levenshtein,1.0.8,Simplified BSD,"",Approved PNPM,data-uri-to-buffer,3.0.1,MIT,"",Approved -PNPM,data-urls,3.0.2,MIT,"",Approved +PNPM,data-urls,4.0.0,MIT,"",Approved PNPM,dataloader,2.1.0,MIT,"",Approved PNPM,date-fns,2.29.3,MIT,"",Approved PNPM,dayjs,1.11.10,MIT,"",Approved @@ -1041,7 +1016,6 @@ PNPM,dequal,2.0.3,MIT,"",Approved PNPM,destroy,1.2.0,MIT,"",Approved PNPM,detect-indent,6.1.0,MIT,"",Approved PNPM,detect-libc,2.0.1,Apache 2.0,"",Approved -PNPM,detect-newline,3.1.0,MIT,"",Approved PNPM,detect-node-es,1.1.0,MIT,"",Approved PNPM,detect-package-manager,2.0.1,MIT,"",Approved PNPM,detect-port,1.3.0,MIT,"",Approved @@ -1058,7 +1032,7 @@ PNPM,dom-serializer,2.0.0,MIT,"",Approved PNPM,domelementtype,2.3.0,Simplified BSD,"",Approved PNPM,domexception,4.0.0,MIT,"",Approved PNPM,domhandler,3.3.0,Simplified BSD,"",Approved -PNPM,dompurify,3.0.4,(MPL-2.0 OR Apache-2.0),"",Approved +PNPM,dompurify,3.0.6,(MPL-2.0 OR Apache-2.0),"",Approved PNPM,domutils,3.1.0,Simplified BSD,"",Approved PNPM,dot-case,3.0.4,MIT,"",Approved PNPM,dotenv,16.3.1,Simplified BSD,"",Approved @@ -1073,7 +1047,6 @@ PNPM,ecdsa-sig-formatter,1.0.11,Apache 2.0,"",Approved PNPM,ee-first,1.1.1,MIT,"",Approved PNPM,ejs,3.1.9,Apache 2.0,"",Approved PNPM,electron-to-chromium,1.4.544,ISC,"",Approved -PNPM,emittery,0.13.1,MIT,"",Approved PNPM,emoji-regex,8.0.0,MIT,"",Approved PNPM,emojis-list,3.0.0,MIT,"",Approved PNPM,encodeurl,1.0.2,MIT,"",Approved @@ -1148,7 +1121,6 @@ PNPM,eventsource,1.1.1,MIT,"",Approved PNPM,execa,7.2.0,MIT,"",Approved PNPM,execall,2.0.0,MIT,"",Approved PNPM,exenv-es6,1.1.1,MIT,"",Approved -PNPM,exit,0.1.2,MIT,"",Approved PNPM,exit-hook,1.1.1,MIT,"",Approved PNPM,expand-template,2.0.3,(MIT OR WTFPL),"",Approved PNPM,expect,27.5.1,MIT,"",Approved @@ -1209,7 +1181,6 @@ PNPM,fromentries,1.3.2,MIT,"",Approved PNPM,fs-constants,1.0.0,MIT,"",Approved PNPM,fs-extra,8.1.0,MIT,"",Approved PNPM,fs-minipass,2.1.0,ISC,"",Approved -PNPM,fs-readdir-recursive,1.1.0,MIT,"",Approved PNPM,fs.realpath,1.0.0,ISC,"",Approved PNPM,ftp,0.3.10,MIT,"",Approved PNPM,function-bind,1.1.2,MIT,"",Approved @@ -1223,7 +1194,7 @@ PNPM,gcp-metadata,3.2.0,Apache 2.0,"",Approved PNPM,generic-names,4.0.0,MIT,"",Approved PNPM,gensync,1.0.0-beta.2,MIT,"",Approved PNPM,get-caller-file,1.0.3,ISC,"",Approved -PNPM,get-func-name,2.0.0,MIT,"",Approved +PNPM,get-func-name,2.0.2,MIT,"",Approved PNPM,get-intrinsic,1.2.2,MIT,"",Approved PNPM,get-monorepo-packages,1.2.0,MIT,"",Approved PNPM,get-nonce,1.0.1,MIT,"",Approved @@ -1237,7 +1208,12 @@ PNPM,get-user-locale,1.5.1,MIT,"",Approved PNPM,giget,1.1.2,MIT,"",Approved PNPM,github-from-package,0.0.0,MIT,"",Approved PNPM,github-slugger,1.4.0,ISC,"",Approved -Go,github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp,v1.16.1,Apache 2.0,github.com/GoogleCloudPlatform/opentelemetry-operations-go,Approved +Go,github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai,v0.3.0,MIT,github.com/Azure/azure-sdk-for-go,Approved +Go,github.com/Azure/azure-sdk-for-go/sdk/azcore,v1.8.0,MIT,github.com/Azure/azure-sdk-for-go,Approved +Go,github.com/Azure/azure-sdk-for-go/sdk/azidentity,v1.4.0,MIT,github.com/Azure/azure-sdk-for-go,Approved +Go,github.com/Azure/azure-sdk-for-go/sdk/internal,v1.3.0,MIT,github.com/Azure/azure-sdk-for-go,Approved +Go,github.com/AzureAD/microsoft-authentication-library-for-go,v1.1.1,MIT,github.com/AzureAD/microsoft-authentication-library-for-go,Approved +Go,github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp,v1.20.0,Apache 2.0,github.com/GoogleCloudPlatform/opentelemetry-operations-go,Approved Go,github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric,v0.41.0,Apache 2.0,github.com/GoogleCloudPlatform/opentelemetry-operations-go,Approved Go,github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace,v1.17.0,Apache 2.0,github.com/GoogleCloudPlatform/opentelemetry-operations-go,Approved Go,github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping,v0.41.0,Apache 2.0,github.com/GoogleCloudPlatform/opentelemetry-operations-go,Approved @@ -1354,7 +1330,7 @@ Go,github.com/go-git/go-billy/v5,v5.4.1,Apache 2.0,github.com/go-git/go-billy,Ap Go,github.com/go-git/go-git/v5,v5.7.0,Apache 2.0,github.com/go-git/go-git,Approved Go,github.com/go-kit/log,v0.2.1,MIT,github.com/go-kit/log,Approved Go,github.com/go-logfmt/logfmt,v0.5.1,MIT,github.com/go-logfmt/logfmt,Approved -Go,github.com/go-logr/logr,v1.2.4,Apache 2.0,github.com/go-logr/logr,Approved +Go,github.com/go-logr/logr,v1.3.0,Apache 2.0,github.com/go-logr/logr,Approved Go,github.com/go-logr/stdr,v1.2.2,Apache 2.0,github.com/go-logr/stdr,Approved Go,github.com/go-openapi/analysis,v0.21.4,Apache 2.0,github.com/go-openapi/analysis,Approved Go,github.com/go-openapi/errors,v0.20.3,Apache 2.0,github.com/go-openapi/errors,Approved @@ -1369,14 +1345,15 @@ Go,github.com/go-openapi/validate,v0.22.0,Apache 2.0,github.com/go-openapi/valid Go,github.com/go-redsync/redsync/v4,v4.8.1,New BSD,github.com/go-redsync/redsync,Approved Go,github.com/go-stack/stack,v1.8.1,MIT,github.com/go-stack/stack,Approved Go,github.com/gobwas/glob,v0.2.3,MIT,github.com/gobwas/glob,Approved -Go,github.com/goccy/go-json,v0.9.11,MIT,github.com/goccy/go-json,Approved +Go,github.com/goccy/go-json,v0.10.2,MIT,github.com/goccy/go-json,Approved Go,github.com/godbus/dbus/v5,v5.0.6,Simplified BSD,github.com/godbus/dbus,Approved Go,github.com/gofrs/uuid,v4.2.0,MIT,github.com/gofrs/uuid,Approved Go,github.com/gogo/protobuf,v1.3.2,New BSD,github.com/gogo/protobuf,Approved Go,github.com/golang-jwt/jwt,v3.2.2,MIT,github.com/golang-jwt/jwt,Approved Go,github.com/golang-jwt/jwt/v4,v4.5.0,MIT,github.com/golang-jwt/jwt,Approved +Go,github.com/golang-jwt/jwt/v5,v5.0.0,MIT,github.com/golang-jwt/jwt,Approved Go,github.com/golang/gddo,v0.0.0-20210115222349-20d68f94ee1f,New BSD,github.com/golang/gddo,Approved -Go,github.com/golang/glog,v1.1.0,Apache 2.0,github.com/golang/glog,Approved +Go,github.com/golang/glog,v1.1.2,Apache 2.0,github.com/golang/glog,Approved Go,github.com/golang/groupcache,v0.0.0-20210331224755-41bb18bfe9da,Apache 2.0,github.com/golang/groupcache,Approved Go,github.com/golang/protobuf,v1.5.3,New BSD,github.com/golang/protobuf,Approved Go,github.com/golang/snappy,v0.0.4,New BSD,github.com/golang/snappy,Approved @@ -1391,12 +1368,11 @@ Go,github.com/google/go-github/v55,v55.0.0,New BSD,github.com/google/go-github,A Go,github.com/google/go-querystring,v1.1.0,New BSD,github.com/google/go-querystring,Approved Go,github.com/google/gofuzz,v1.2.0,Apache 2.0,github.com/google/gofuzz,Approved Go,github.com/google/pprof,v0.0.0-20230602150820-91b7bce49751,"Apache 2.0,ISC",github.com/google/pprof,Approved -Go,github.com/google/s2a-go,v0.1.4,Apache 2.0,github.com/google/s2a-go,Approved -Go,github.com/google/uuid,v1.3.1,New BSD,github.com/google/uuid,Approved -Go,github.com/googleapis/enterprise-certificate-proxy,v0.2.5,Apache 2.0,github.com/googleapis/enterprise-certificate-proxy,Approved +Go,github.com/google/s2a-go,v0.1.7,Apache 2.0,github.com/google/s2a-go,Approved +Go,github.com/google/uuid,v1.4.0,New BSD,github.com/google/uuid,Approved +Go,github.com/googleapis/enterprise-certificate-proxy,v0.3.2,Apache 2.0,github.com/googleapis/enterprise-certificate-proxy,Approved Go,github.com/googleapis/gax-go/v2,v2.12.0,New BSD,github.com/googleapis/gax-go,Approved Go,github.com/gorilla/context,v1.1.1,New BSD,github.com/gorilla/context,Approved -Go,github.com/gorilla/csrf,v1.7.1,New BSD,github.com/gorilla/csrf,Approved Go,github.com/gorilla/css,v1.0.0,New BSD,github.com/gorilla/css,Approved Go,github.com/gorilla/mux,v1.8.0,New BSD,github.com/gorilla/mux,Approved Go,github.com/gorilla/schema,v1.2.0,New BSD,github.com/gorilla/schema,Approved @@ -1437,16 +1413,20 @@ Go,github.com/invopop/jsonschema,v0.7.0,MIT,github.com/invopop/jsonschema,Approv Go,github.com/itchyny/gojq,v0.12.11,MIT,github.com/itchyny/gojq,Approved Go,github.com/itchyny/timefmt-go,v0.1.5,MIT,github.com/itchyny/timefmt-go,Approved Go,github.com/jackc/chunkreader/v2,v2.0.1,MIT,github.com/jackc/chunkreader,Approved -Go,github.com/jackc/pgconn,v1.12.1,MIT,github.com/jackc/pgconn,Approved +Go,github.com/jackc/pgconn,v1.14.0,MIT,github.com/jackc/pgconn,Approved Go,github.com/jackc/pgerrcode,v0.0.0-20220416144525-469b46aa5efa,MIT,github.com/jackc/pgerrcode,Approved Go,github.com/jackc/pgio,v1.0.0,MIT,github.com/jackc/pgio,Approved Go,github.com/jackc/pgpassfile,v1.0.0,MIT,github.com/jackc/pgpassfile,Approved -Go,github.com/jackc/pgproto3/v2,v2.3.0,MIT,github.com/jackc/pgproto3,Approved -Go,github.com/jackc/pgservicefile,v0.0.0-20200714003250-2b9c44734f2b,MIT,github.com/jackc/pgservicefile,Approved -Go,github.com/jackc/pgtype,v1.11.1-0.20220425133820-53266f029fbb,MIT,github.com/jackc/pgtype,Approved -Go,github.com/jackc/pgx/v4,v4.16.1,MIT,github.com/jackc/pgx,Approved +Go,github.com/jackc/pgproto3/v2,v2.3.2,MIT,github.com/jackc/pgproto3,Approved +Go,github.com/jackc/pgservicefile,v0.0.0-20221227161230-091c0ba34f0a,MIT,github.com/jackc/pgservicefile,Approved +Go,github.com/jackc/pgtype,v1.14.0,MIT,github.com/jackc/pgtype,Approved +Go,github.com/jackc/pgx/v4,v4.18.1,MIT,github.com/jackc/pgx,Approved +Go,github.com/jackc/pgx/v5,v5.5.0,MIT,github.com/jackc/pgx,Approved +Go,github.com/jackc/puddle/v2,v2.2.1,MIT,github.com/jackc/puddle,Approved Go,github.com/jbenet/go-context,v0.0.0-20150711004518-d14ea06fba99,MIT,github.com/jbenet/go-context,Approved Go,github.com/jhump/protoreflect,v1.12.1-0.20220417024638-438db461d753,Apache 2.0,github.com/jhump/protoreflect,Approved +Go,github.com/jinzhu/inflection,v1.0.0,MIT,github.com/jinzhu/inflection,Approved +Go,github.com/jinzhu/now,v1.1.5,MIT,github.com/jinzhu/now,Approved Go,github.com/jmespath/go-jmespath,v0.4.0,Apache 2.0,github.com/jmespath/go-jmespath,Approved Go,github.com/joho/godotenv,v1.4.0,MIT,github.com/joho/godotenv,Approved Go,github.com/jonboulle/clockwork,v0.3.0,Apache 2.0,github.com/jonboulle/clockwork,Approved @@ -1469,6 +1449,7 @@ Go,github.com/knadh/koanf,v1.5.0,MIT,github.com/knadh/koanf,Approved Go,github.com/knadh/koanf/v2,v2.0.1,MIT,github.com/knadh/koanf,Approved Go,github.com/kr/pretty,v0.3.1,MIT,github.com/kr/pretty,Approved Go,github.com/kr/text,v0.2.0,MIT,github.com/kr/text,Approved +Go,github.com/kylelemons/godebug,v1.1.0,Apache 2.0,github.com/kylelemons/godebug,Approved Go,github.com/lib/pq,v1.10.7,MIT,github.com/lib/pq,Approved Go,github.com/lucasb-eyer/go-colorful,v1.2.0,MIT,github.com/lucasb-eyer/go-colorful,Approved Go,github.com/machinebox/graphql,v0.2.2,Apache 2.0,github.com/machinebox/graphql,Approved @@ -1507,20 +1488,22 @@ Go,github.com/opencontainers/go-digest,v1.0.0,Apache 2.0,github.com/opencontaine Go,github.com/opencontainers/image-spec,v1.1.0-rc3,Apache 2.0,github.com/opencontainers/image-spec,Approved Go,github.com/opentracing/opentracing-go,v1.2.0,Apache 2.0,github.com/opentracing/opentracing-go,Approved Go,github.com/opsgenie/opsgenie-go-sdk-v2,v1.2.13,Apache 2.0,github.com/opsgenie/opsgenie-go-sdk-v2,Approved +Go,github.com/oschwald/maxminddb-golang,v1.12.0,ISC,github.com/oschwald/maxminddb-golang,Approved Go,github.com/pandatix/go-cvss,v0.5.2,MIT,github.com/pandatix/go-cvss,Approved Go,github.com/peterbourgon/ff,v1.7.1,Apache 2.0,github.com/peterbourgon/ff,Approved Go,github.com/peterbourgon/ff/v3,v3.3.2,Apache 2.0,github.com/peterbourgon/ff,Approved Go,github.com/peterhellberg/link,v1.1.0,MIT,github.com/peterhellberg/link,Approved Go,github.com/pierrec/lz4/v4,v4.1.17,New BSD,github.com/pierrec/lz4,Approved Go,github.com/pjbgf/sha1cd,v0.3.0,Apache 2.0,github.com/pjbgf/sha1cd,Approved +Go,github.com/pkg/browser,v0.0.0-20210911075715-681adbf594b8,Simplified BSD,github.com/pkg/browser,Approved Go,github.com/pkg/errors,v0.9.1,Simplified BSD,github.com/pkg/errors,Approved Go,github.com/pmezard/go-difflib,v1.0.0,New BSD,github.com/pmezard/go-difflib,Approved Go,github.com/pquerna/cachecontrol,v0.1.0,Apache 2.0,github.com/pquerna/cachecontrol,Approved Go,github.com/prometheus/client_golang,v1.16.0,Apache 2.0,github.com/prometheus/client_golang,Approved -Go,github.com/prometheus/client_model,v0.4.0,Apache 2.0,github.com/prometheus/client_model,Approved +Go,github.com/prometheus/client_model,v0.5.0,Apache 2.0,github.com/prometheus/client_model,Approved Go,github.com/prometheus/common,v0.32.1,"Apache 2.0,New BSD",github.com/prometheus/common,Approved Go,github.com/prometheus/common/sigv4,v0.1.0,Apache 2.0,github.com/prometheus/common,Approved -Go,github.com/prometheus/procfs,v0.11.0,Apache 2.0,github.com/prometheus/procfs,Approved +Go,github.com/prometheus/procfs,v0.11.1,Apache 2.0,github.com/prometheus/procfs,Approved Go,github.com/prometheus/prometheus,v0.40.5,Apache 2.0,github.com/prometheus/prometheus,Approved Go,github.com/qdrant/go-client,v1.4.1,Apache 2.0,github.com/qdrant/go-client,Approved Go,github.com/qustavo/sqlhooks/v2,v2.1.0,MIT,github.com/qustavo/sqlhooks,Approved @@ -1533,12 +1516,12 @@ Go,github.com/russellhaering/gosaml2,v0.9.1,Apache 2.0,github.com/russellhaering Go,github.com/russellhaering/goxmldsig,v1.3.0,Apache 2.0,github.com/russellhaering/goxmldsig,Approved Go,github.com/russross/blackfriday/v2,v2.1.0,Simplified BSD,github.com/russross/blackfriday,Approved Go,github.com/sabhiram/go-gitignore,v0.0.0-20210923224102-525f6e181f06,MIT,github.com/sabhiram/go-gitignore,Approved -Go,github.com/schollz/progressbar/v3,v3.8.5,MIT,github.com/schollz/progressbar,Approved +Go,github.com/schollz/progressbar/v3,v3.13.1,MIT,github.com/schollz/progressbar,Approved Go,github.com/scim2/filter-parser/v2,v2.2.0,MIT,github.com/scim2/filter-parser,Approved Go,github.com/segmentio/fasthash,v1.0.3,MIT,github.com/segmentio/fasthash,Approved Go,github.com/segmentio/ksuid,v1.0.4,MIT,github.com/segmentio/ksuid,Approved Go,github.com/sergi/go-diff,v1.3.1,"Apache 2.0,MIT",github.com/sergi/go-diff,Approved -Go,github.com/sirupsen/logrus,v1.9.1,MIT,github.com/sirupsen/logrus,Approved +Go,github.com/sirupsen/logrus,v1.9.3,MIT,github.com/sirupsen/logrus,Approved Go,github.com/skeema/knownhosts,v1.1.1,Apache 2.0,github.com/skeema/knownhosts,Approved Go,github.com/slack-go/slack,v0.10.1,"MIT,Simplified BSD",github.com/slack-go/slack,Approved Go,github.com/smacker/go-tree-sitter,v0.0.0-20220209044044-0d3022e933c3,MIT,github.com/smacker/go-tree-sitter,Approved @@ -1556,13 +1539,15 @@ Go,github.com/sourcegraph/jsonx,v0.0.0-20200629203448-1a936bd500cf,MIT,github.co Go,github.com/sourcegraph/log,v0.0.0-20231018134238-fbadff7458bb,Apache 2.0,github.com/sourcegraph/log,Approved Go,github.com/sourcegraph/managed-services-platform-cdktf/gen/cloudflare,v0.0.0-20230822024612-edb48c530722,MIT,github.com/sourcegraph/managed-services-platform-cdktf,Approved Go,github.com/sourcegraph/managed-services-platform-cdktf/gen/google,v0.0.0-20230822024612-edb48c530722,MIT,github.com/sourcegraph/managed-services-platform-cdktf,Approved +Go,github.com/sourcegraph/managed-services-platform-cdktf/gen/google_beta,v0.0.0-20231106184355-f739cf8e1d49,MIT,github.com/sourcegraph/managed-services-platform-cdktf,Approved +Go,github.com/sourcegraph/managed-services-platform-cdktf/gen/postgresql,v0.0.0-20231121191755-214be625af21,MIT,github.com/sourcegraph/managed-services-platform-cdktf,Approved Go,github.com/sourcegraph/managed-services-platform-cdktf/gen/random,v0.0.0-20230822024612-edb48c530722,MIT,github.com/sourcegraph/managed-services-platform-cdktf,Approved Go,github.com/sourcegraph/mountinfo,v0.0.0-20231018142932-e00da332dac5,Apache 2.0,github.com/sourcegraph/mountinfo,Approved Go,github.com/sourcegraph/run,v0.12.0,Apache 2.0,github.com/sourcegraph/run,Approved Go,github.com/sourcegraph/scip,v0.3.1-0.20230627154934-45df7f6d33fc,Apache 2.0,github.com/sourcegraph/scip,Approved Go,github.com/sourcegraph/tiktoken-go,v0.0.0-20230905173153-caab340cf008,MIT,github.com/sourcegraph/tiktoken-go,Approved Go,github.com/sourcegraph/yaml,v1.0.1-0.20200714132230-56936252f152,MIT,github.com/sourcegraph/yaml,Approved -Go,github.com/sourcegraph/zoekt,v0.0.0-20231031173451-503302fe8ad1,Apache 2.0,github.com/sourcegraph/zoekt,Approved +Go,github.com/sourcegraph/zoekt,v0.0.0-20231121165958-0959170c1623,Apache 2.0,github.com/sourcegraph/zoekt,Approved Go,github.com/spf13/pflag,v1.0.5,New BSD,github.com/spf13/pflag,Approved Go,github.com/stretchr/testify,v1.8.4,MIT,github.com/stretchr/testify,Approved Go,github.com/throttled/throttled/v2,v2.12.0,New BSD,github.com/throttled/throttled,Approved @@ -1653,26 +1638,25 @@ Go,go.uber.org/goleak,v1.2.1,MIT,go.uber.org/goleak,Approved Go,go.uber.org/multierr,v1.11.0,MIT,go.uber.org/multierr,Approved Go,go.uber.org/ratelimit,v0.2.0,MIT,go.uber.org/ratelimit,Approved Go,go.uber.org/zap,v1.26.0,MIT,go.uber.org/zap,Approved -Go,golang.org/x/crypto,v0.14.0,New BSD,golang.org/x/crypto,Approved +Go,golang.org/x/crypto,v0.15.0,New BSD,golang.org/x/crypto,Approved Go,golang.org/x/exp,v0.0.0-20230713183714-613f0c0eb8a1,New BSD,golang.org/x/exp,Approved Go,golang.org/x/mod,v0.12.0,New BSD,golang.org/x/mod,Approved -Go,golang.org/x/net,v0.17.0,New BSD,golang.org/x/net,Approved -Go,golang.org/x/oauth2,v0.10.0,New BSD,golang.org/x/oauth2,Approved -Go,golang.org/x/sync,v0.3.0,New BSD,golang.org/x/sync,Approved -Go,golang.org/x/sys,v0.13.0,New BSD,golang.org/x/sys,Approved -Go,golang.org/x/term,v0.13.0,New BSD,golang.org/x/term,Approved -Go,golang.org/x/text,v0.13.0,New BSD,golang.org/x/text,Approved -Go,golang.org/x/time,v0.3.0,New BSD,golang.org/x/time,Approved +Go,golang.org/x/net,v0.18.0,New BSD,golang.org/x/net,Approved +Go,golang.org/x/oauth2,v0.14.0,New BSD,golang.org/x/oauth2,Approved +Go,golang.org/x/sync,v0.5.0,New BSD,golang.org/x/sync,Approved +Go,golang.org/x/sys,v0.14.0,New BSD,golang.org/x/sys,Approved +Go,golang.org/x/term,v0.14.0,New BSD,golang.org/x/term,Approved +Go,golang.org/x/text,v0.14.0,New BSD,golang.org/x/text,Approved +Go,golang.org/x/time,v0.4.0,New BSD,golang.org/x/time,Approved Go,golang.org/x/xerrors,v0.0.0-20220907171357-04be3eba64a2,New BSD,golang.org/x/xerrors,Approved Go,gonum.org/v1/gonum,v0.13.0,"MIT,New BSD",gonum.org/v1/gonum,Approved PNPM,google-auth-library,5.7.0,Apache 2.0,"",Approved PNPM,google-p12-pem,2.0.2,MIT,"",Approved -Go,google.golang.org/api,v0.132.0,New BSD,google.golang.org/api,Approved -Go,google.golang.org/appengine,v1.6.7,Apache 2.0,google.golang.org/appengine,Approved -Go,google.golang.org/genproto,v0.0.0-20230920204549-e6e6cdab5c13,Apache 2.0,google.golang.org/genproto,Approved -Go,google.golang.org/genproto/googleapis/api,v0.0.0-20230920204549-e6e6cdab5c13,Apache 2.0,google.golang.org/genproto/googleapis,Approved -Go,google.golang.org/genproto/googleapis/rpc,v0.0.0-20230920183334-c177e329c48b,Apache 2.0,google.golang.org/genproto/googleapis,Approved -Go,google.golang.org/grpc,v1.57.1,Apache 2.0,google.golang.org/grpc,Approved +Go,google.golang.org/api,v0.150.0,New BSD,google.golang.org/api,Approved +Go,google.golang.org/genproto,v0.0.0-20231030173426-d783a09b4405,Apache 2.0,google.golang.org/genproto,Approved +Go,google.golang.org/genproto/googleapis/api,v0.0.0-20231016165738-49dd2c1f3d0b,Apache 2.0,google.golang.org/genproto/googleapis,Approved +Go,google.golang.org/genproto/googleapis/rpc,v0.0.0-20231106174013-bbf56f31fb17,Apache 2.0,google.golang.org/genproto/googleapis,Approved +Go,google.golang.org/grpc,v1.59.0,Apache 2.0,google.golang.org/grpc,Approved Go,google.golang.org/protobuf,v1.31.0,New BSD,google.golang.org/protobuf,Approved PNPM,googleapis,47.0.0,Apache 2.0,"",Approved PNPM,googleapis-common,3.2.0,Apache 2.0,"",Approved @@ -1684,6 +1668,8 @@ Go,gopkg.in/square/go-jose.v2,v2.6.0,"Apache 2.0,New BSD",gopkg.in/square/go-jos Go,gopkg.in/warnings.v0,v0.1.2,Simplified BSD,gopkg.in/warnings.v0,Approved Go,gopkg.in/yaml.v2,v2.4.0,"Apache 2.0,MIT",gopkg.in/yaml.v2,Approved Go,gopkg.in/yaml.v3,v3.0.1,MIT,gopkg.in/yaml.v3,Approved +Go,gorm.io/driver/postgres,v1.5.4,MIT,gorm.io/driver/postgres,Approved +Go,gorm.io/gorm,v1.25.5,MIT,gorm.io/gorm,Approved PNPM,got,11.8.5,MIT,"",Approved PNPM,gql2ts,1.10.1,MIT,"",Approved PNPM,graceful-fs,4.2.11,ISC,"",Approved @@ -1701,6 +1687,7 @@ PNPM,gtoken,4.1.1,MIT,"",Approved PNPM,gunzip-maybe,1.4.2,MIT,"",Approved PNPM,gzip-size,5.1.1,MIT,"",Approved PNPM,handlebars,4.7.7,MIT,"",Approved +PNPM,happy-dom,12.10.1,MIT,"",Approved PNPM,hard-rejection,2.1.0,MIT,"",Approved PNPM,harmony-reflect,1.6.1,(Apache-2.0 OR MPL-1.1),"",Approved PNPM,has,1.0.3,MIT,"",Approved @@ -1756,12 +1743,11 @@ PNPM,immutable,3.7.6,New BSD,"",Approved PNPM,import-fresh,3.3.0,MIT,"",Approved PNPM,import-from,4.0.0,MIT,"",Approved PNPM,import-lazy,4.0.0,MIT,"",Approved -PNPM,import-local,3.0.2,MIT,"",Approved PNPM,import-meta-resolve,3.0.0,MIT,"",Approved PNPM,imurmurhash,0.1.4,MIT,"",Approved PNPM,indent-string,2.1.0,MIT,"",Approved PNPM,inflight,1.0.6,ISC,"",Approved -PNPM,inherits,2.0.4,ISC,"",Approved +PNPM,inherits,2.0.1,ISC,"",Approved PNPM,ini,1.3.8,ISC,"",Approved PNPM,inquirer,8.2.5,MIT,"",Approved PNPM,internal-slot,1.0.6,MIT,"",Approved @@ -1795,7 +1781,6 @@ PNPM,is-extglob,2.1.1,MIT,"",Approved PNPM,is-finalizationregistry,1.0.2,MIT,"",Approved PNPM,is-finite,1.0.2,MIT,"",Approved PNPM,is-fullwidth-code-point,3.0.0,MIT,"",Approved -PNPM,is-generator-fn,2.0.0,MIT,"",Approved PNPM,is-generator-function,1.0.10,MIT,"",Approved PNPM,is-glob,4.0.3,MIT,"",Approved PNPM,is-gzip,1.0.0,MIT,"",Approved @@ -1843,9 +1828,8 @@ PNPM,isobject,3.0.1,MIT,"",Approved PNPM,isomorphic-fetch,3.0.0,MIT,"",Approved PNPM,isomorphic-ws,5.0.0,MIT,"",Approved PNPM,istanbul-lib-coverage,3.2.0,New BSD,"",Approved -PNPM,istanbul-lib-instrument,6.0.1,New BSD,"",Approved +PNPM,istanbul-lib-instrument,5.1.0,New BSD,"",Approved PNPM,istanbul-lib-report,3.0.0,New BSD,"",Approved -PNPM,istanbul-lib-source-maps,4.0.0,New BSD,"",Approved PNPM,istanbul-reports,3.1.4,New BSD,"",Approved PNPM,iterall,1.3.0,MIT,"",Approved PNPM,iterare,1.2.1,ISC,"",Approved @@ -1854,34 +1838,16 @@ PNPM,its-fine,1.1.1,MIT,"",Approved PNPM,jackspeak,2.2.2,BlueOak-1.0.0,"",Approved PNPM,jake,10.8.7,Apache 2.0,"",Approved PNPM,javascript-natural-sort,0.7.1,MIT,"",Approved -PNPM,jest,29.7.0,MIT,"",Approved -PNPM,jest-changed-files,29.7.0,MIT,"",Approved -PNPM,jest-circus,29.7.0,MIT,"",Approved -PNPM,jest-cli,29.7.0,MIT,"",Approved -PNPM,jest-config,29.7.0,MIT,"",Approved PNPM,jest-diff,27.5.1,MIT,"",Approved -PNPM,jest-docblock,29.7.0,MIT,"",Approved -PNPM,jest-each,29.7.0,MIT,"",Approved -PNPM,jest-environment-jsdom,28.1.3,MIT,"",Approved PNPM,jest-environment-node,29.7.0,MIT,"",Approved -PNPM,jest-fetch-mock,3.0.3,MIT,"",Approved -PNPM,jest-get-type,27.5.1,MIT,"",Approved +PNPM,jest-get-type,29.6.3,MIT,"",Approved PNPM,jest-haste-map,29.7.0,MIT,"",Approved -PNPM,jest-junit,13.0.0,Apache 2.0,"",Approved -PNPM,jest-leak-detector,29.7.0,MIT,"",Approved PNPM,jest-matcher-utils,27.5.1,MIT,"",Approved -PNPM,jest-message-util,28.1.3,MIT,"",Approved +PNPM,jest-message-util,29.7.0,MIT,"",Approved PNPM,jest-mock,27.5.1,MIT,"",Approved -PNPM,jest-pnp-resolver,1.2.2,MIT,"",Approved PNPM,jest-regex-util,27.5.1,MIT,"",Approved -PNPM,jest-resolve,29.7.0,MIT,"",Approved -PNPM,jest-resolve-dependencies,29.7.0,MIT,"",Approved -PNPM,jest-runner,29.7.0,MIT,"",Approved -PNPM,jest-runtime,29.7.0,MIT,"",Approved -PNPM,jest-snapshot,29.7.0,MIT,"",Approved PNPM,jest-util,27.5.1,MIT,"",Approved PNPM,jest-validate,29.7.0,MIT,"",Approved -PNPM,jest-watcher,29.7.0,MIT,"",Approved PNPM,jest-worker,27.5.1,MIT,"",Approved PNPM,joi,17.11.0,New BSD,"",Approved PNPM,jquery,2.2.4,MIT,"",Approved @@ -1894,7 +1860,7 @@ PNPM,jsc-android,250231.0.0,Simplified BSD,"",Approved PNPM,jsc-safe-url,0.2.4,BSD Zero Clause License,"",Approved PNPM,jscodeshift,0.14.0,MIT,"",Approved PNPM,jsdoc-type-pratt-parser,4.0.0,MIT,"",Approved -PNPM,jsdom,19.0.0,MIT,"",Approved +PNPM,jsdom,22.1.0,MIT,"",Approved PNPM,jsesc,0.5.0,MIT,"",Approved PNPM,json-bigint,0.3.0,MIT,"",Approved PNPM,json-buffer,3.0.1,MIT,"",Approved @@ -1907,7 +1873,7 @@ PNPM,json-stable-stringify,1.0.1,MIT,"",Approved PNPM,json-stable-stringify-without-jsonify,1.0.1,MIT,"",Approved PNPM,json-stringify-safe,5.0.1,ISC,"",Approved PNPM,json-to-pretty-yaml,1.2.2,Apache 2.0,"",Approved -PNPM,json5,1.0.1,MIT,"",Approved +PNPM,json5,2.2.3,MIT,"",Approved PNPM,jsonc-parser,3.2.0,MIT,"",Approved PNPM,jsonfile,4.0.0,MIT,"",Approved PNPM,jsonify,0.0.0,Public Domain,"",Approved @@ -1982,7 +1948,7 @@ PNPM,log-update,4.0.0,MIT,"",Approved PNPM,logkitty,0.7.1,MIT,"",Approved PNPM,loose-envify,1.4.0,MIT,"",Approved PNPM,loud-rejection,1.6.0,MIT,"",Approved -PNPM,loupe,2.3.6,MIT,"",Approved +PNPM,loupe,2.3.7,MIT,"",Approved PNPM,lower-case,2.0.2,MIT,"",Approved PNPM,lower-case-first,2.0.2,MIT,"",Approved PNPM,lowercase-keys,2.0.0,MIT,"",Approved @@ -1995,7 +1961,7 @@ PNPM,luxon,3.2.1,MIT,"",Approved PNPM,lz-string,1.5.0,MIT,"",Approved PNPM,macos-release,2.3.0,MIT,"",Approved PNPM,magic-string,0.27.0,MIT,"",Approved -PNPM,make-dir,3.1.0,MIT,"",Approved +PNPM,make-dir,2.1.0,MIT,"",Approved PNPM,make-error,1.3.6,ISC,"",Approved PNPM,makeerror,1.0.12,New BSD,"",Approved PNPM,map-age-cleaner,0.1.3,MIT,"",Approved @@ -2109,7 +2075,7 @@ PNPM,npmlog,4.1.2,ISC,"",Approved PNPM,nth-check,2.1.1,Simplified BSD,"",Approved PNPM,nullthrows,1.1.1,MIT,"",Approved PNPM,number-is-nan,1.0.1,MIT,"",Approved -PNPM,nwsapi,2.2.2,MIT,"",Approved +PNPM,nwsapi,2.2.7,MIT,"",Approved PNPM,ob1,0.76.8,MIT,"",Approved PNPM,object-assign,4.1.1,MIT,"",Approved PNPM,object-inspect,1.13.1,MIT,"",Approved @@ -2227,7 +2193,6 @@ PNPM,process,0.11.10,MIT,"",Approved PNPM,process-nextick-args,2.0.1,MIT,"",Approved PNPM,progress,2.0.3,MIT,"",Approved PNPM,promise,8.3.0,MIT,"",Approved -PNPM,promise-polyfill,8.2.1,MIT,"",Approved PNPM,prompts,2.4.2,MIT,"",Approved PNPM,prop-types,15.8.1,MIT,"",Approved PNPM,property-information,5.6.0,MIT,"",Approved @@ -2238,10 +2203,9 @@ PNPM,psl,1.8.0,MIT,"",Approved PNPM,pstree.remy,1.1.8,MIT,"",Approved PNPM,pump,3.0.0,MIT,"",Approved PNPM,pumpify,1.5.1,MIT,"",Approved -PNPM,punycode,1.3.2,MIT,"",Approved +PNPM,punycode,2.3.1,MIT,"",Approved PNPM,puppeteer,13.7.0,Apache 2.0,"",Approved PNPM,puppeteer-core,2.1.1,Apache 2.0,"",Approved -PNPM,pure-rand,6.0.4,MIT,"",Approved PNPM,pvtsutils,1.3.2,MIT,"",Approved PNPM,pvutils,1.1.3,MIT,"",Approved PNPM,qs,6.9.3,New BSD,"",Approved @@ -2322,7 +2286,7 @@ PNPM,regexpp,3.2.0,MIT,"",Approved PNPM,regexpu-core,5.3.2,MIT,"",Approved PNPM,registry-auth-token,4.0.0,MIT,"",Approved PNPM,registry-url,5.1.0,MIT,"",Approved -PNPM,regjsparser,0.10.0,Simplified BSD,"",Approved +PNPM,regjsparser,0.9.1,Simplified BSD,"",Approved PNPM,relay-runtime,12.0.0,MIT,"",Approved PNPM,remark-external-links,8.0.0,MIT,"",Approved PNPM,remark-slug,6.1.0,MIT,"",Approved @@ -2341,10 +2305,8 @@ PNPM,resize-observer-polyfill,1.5.1,MIT,"",Approved PNPM,resolve,2.0.0-next.4,MIT,"",Approved PNPM,resolve-alpn,1.2.1,MIT,"",Approved PNPM,resolve-bin,1.0.1,MIT,"",Approved -PNPM,resolve-cwd,3.0.0,MIT,"",Approved PNPM,resolve-from,4.0.0,MIT,"",Approved PNPM,resolve-pathname,2.2.0,MIT,"",Approved -PNPM,resolve.exports,2.0.2,MIT,"",Approved PNPM,response-iterator,0.2.6,MIT,"",Approved PNPM,responselike,2.0.0,MIT,"",Approved PNPM,restore-cursor,1.0.1,MIT,"",Approved @@ -2355,6 +2317,7 @@ PNPM,right-pad,1.0.1,MIT,"",Approved PNPM,rimraf,3.0.2,ISC,"",Approved PNPM,rollup,3.26.3,MIT,"",Approved PNPM,route-recognizer,0.3.4,MIT,"",Approved +PNPM,rrweb-cssom,0.6.0,MIT,"",Approved PNPM,run-applescript,5.0.0,MIT,"",Approved PNPM,run-async,2.4.1,MIT,"",Approved PNPM,run-parallel,1.1.9,MIT,"",Approved @@ -2368,7 +2331,7 @@ PNPM,safer-buffer,2.1.2,MIT,"",Approved PNPM,sander,0.5.1,MIT,"",Approved PNPM,sass,1.32.4,MIT,"",Approved PNPM,sax,1.2.4,ISC,"",Approved -PNPM,saxes,5.0.1,ISC,"",Approved +PNPM,saxes,6.0.0,ISC,"",Approved PNPM,scheduler,0.23.0,MIT,"",Approved PNPM,schema-utils,3.3.0,MIT,"",Approved PNPM,scuid,1.1.0,MIT,"",Approved @@ -2410,7 +2373,7 @@ PNPM,sirv,2.0.3,MIT,"",Approved PNPM,sisteransi,1.0.5,MIT,"",Approved PNPM,skatejs,0.13.17,MIT,"",Approved PNPM,skatejs-template-html,0.0.0,MIT,"",Approved -PNPM,slash,5.0.0,MIT,"",Approved +PNPM,slash,3.0.0,MIT,"",Approved PNPM,slice-ansi,2.1.0,MIT,"",Approved PNPM,slide,1.1.6,ISC,"",Approved PNPM,slugify,1.4.5,MIT,"",Approved @@ -2422,7 +2385,7 @@ PNPM,sorcery,0.11.0,MIT,"",Approved PNPM,sort-keys,2.0.0,MIT,"",Approved PNPM,source-map,0.5.7,New BSD,"",Approved PNPM,source-map-js,1.0.2,New BSD,"",Approved -PNPM,source-map-support,0.5.13,MIT,"",Approved +PNPM,source-map-support,0.5.21,MIT,"",Approved PNPM,sourcegraph,25.7.0,Apache 2.0,https://github.com/sourcegraph/sourcegraph,Approved PNPM,space-separated-tokens,1.1.2,MIT,"",Approved PNPM,spawn-command,0.0.2-1,MIT,"",Approved @@ -2457,7 +2420,6 @@ PNPM,streamsearch,1.1.0,MIT,"",Approved PNPM,strict-event-emitter,0.4.6,MIT,"",Approved PNPM,string-env-interpolation,1.0.1,MIT,"",Approved PNPM,string-hash,1.1.3,CC0-1.0,"",Approved -PNPM,string-length,4.0.2,MIT,"",Approved PNPM,string-width,4.2.3,MIT,"",Approved PNPM,string.prototype.matchall,4.0.8,MIT,"",Approved PNPM,string.prototype.trim,1.2.8,MIT,"",Approved @@ -2465,7 +2427,7 @@ PNPM,string.prototype.trimend,1.0.7,MIT,"",Approved PNPM,string.prototype.trimstart,1.0.7,MIT,"",Approved PNPM,string_decoder,1.3.0,MIT,"",Approved PNPM,strip-ansi,6.0.1,MIT,"",Approved -PNPM,strip-bom,4.0.0,MIT,"",Approved +PNPM,strip-bom,3.0.0,MIT,"",Approved PNPM,strip-eof,1.0.0,MIT,"",Approved PNPM,strip-final-newline,3.0.0,MIT,"",Approved PNPM,strip-indent,1.0.1,MIT,"",Approved @@ -2529,7 +2491,7 @@ PNPM,tiny-invariant,1.3.1,MIT,"",Approved PNPM,tiny-warning,1.0.3,MIT,"",Approved PNPM,tinybench,2.5.0,MIT,"",Approved PNPM,tinypool,0.6.0,MIT,"",Approved -PNPM,tinyspy,2.1.1,MIT,"",Approved +PNPM,tinyspy,2.2.0,MIT,"",Approved PNPM,title-case,3.0.3,MIT,"",Approved PNPM,titleize,3.0.0,MIT,"",Approved PNPM,tmp,0.2.1,MIT,"",Approved @@ -2543,7 +2505,7 @@ PNPM,toidentifier,1.0.1,MIT,"",Approved PNPM,totalist,3.0.0,MIT,"",Approved PNPM,touch,3.1.0,ISC,"",Approved PNPM,tough-cookie,4.1.2,New BSD,"",Approved -PNPM,tr46,3.0.0,MIT,"",Approved +PNPM,tr46,5.0.0,MIT,"",Approved PNPM,tree-kill,1.2.2,MIT,"",Approved PNPM,treeify,1.1.0,MIT,"",Approved PNPM,trim-extra-html-whitespace,1.3.0,Apache 2.0,"",Approved @@ -2640,15 +2602,15 @@ PNPM,vite-plugin-inspect,0.7.35,MIT,"",Approved PNPM,vite-plugin-turbosnap,1.0.3,MIT,"",Approved PNPM,vitefu,0.2.4,MIT,"",Approved PNPM,vitest,0.33.0,MIT,"",Approved +PNPM,vitest-fetch-mock,0.2.2,MIT,"",Approved PNPM,vlq,1.0.1,MIT,"",Approved PNPM,vm2,3.9.10,MIT,"",Approved PNPM,vsce,2.7.0,MIT,"",Approved PNPM,vscode-languageserver-textdocument,1.0.2,MIT,"",Approved PNPM,vscode-languageserver-types,3.17.2,MIT,"",Approved PNPM,vscode-uri,3.0.7,MIT,"",Approved -PNPM,w3c-hr-time,1.0.2,MIT,"",Approved PNPM,w3c-keyname,2.2.4,MIT,"",Approved -PNPM,w3c-xmlserializer,3.0.0,MIT,"",Approved +PNPM,w3c-xmlserializer,4.0.0,MIT,"",Approved PNPM,walker,1.0.8,Apache 2.0,"",Approved PNPM,warning,3.0.0,New BSD,"",Approved PNPM,watchpack,2.4.0,MIT,"",Approved @@ -2667,7 +2629,7 @@ PNPM,webpack-virtual-modules,0.5.0,MIT,"",Approved PNPM,whatwg-encoding,2.0.0,MIT,"",Approved PNPM,whatwg-fetch,3.6.19,MIT,"",Approved PNPM,whatwg-mimetype,3.0.0,MIT,"",Approved -PNPM,whatwg-url,10.0.0,MIT,"",Approved +PNPM,whatwg-url,14.0.0,MIT,"",Approved PNPM,which,1.3.1,ISC,"",Approved PNPM,which-boxed-primitive,1.0.2,MIT,"",Approved PNPM,which-builtin-type,1.1.3,MIT,"",Approved @@ -2685,16 +2647,15 @@ PNPM,wrap-ansi,5.1.0,MIT,"",Approved PNPM,wrappy,1.0.2,ISC,"",Approved PNPM,write-file-atomic,4.0.2,ISC,"",Approved PNPM,write-json-file,2.3.0,MIT,"",Approved -PNPM,ws,8.5.0,MIT,"",Approved +PNPM,ws,7.5.9,MIT,"",Approved PNPM,x2js,3.4.4,Apache 2.0,"",Approved -PNPM,xml,1.0.1,MIT,"",Approved PNPM,xml-name-validator,4.0.0,Apache 2.0,"",Approved PNPM,xml2js,0.4.23,MIT,"",Approved PNPM,xmlbuilder,11.0.1,MIT,"",Approved PNPM,xmlchars,2.2.0,MIT,"",Approved PNPM,xregexp,2.0.0,MIT,"",Approved PNPM,xtend,4.0.2,MIT,"",Approved -PNPM,y18n,5.0.8,ISC,"",Approved +PNPM,y18n,4.0.3,ISC,"",Approved PNPM,yallist,4.0.0,ISC,"",Approved PNPM,yaml,2.3.2,ISC,"",Approved PNPM,yaml-ast-parser,0.0.43,Apache 2.0,"",Approved diff --git a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/BUILD.bazel b/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/BUILD.bazel deleted file mode 100644 index d518110449e66..0000000000000 --- a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/BUILD.bazel +++ /dev/null @@ -1 +0,0 @@ -exports_files(glob(["*.patch"])) diff --git a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/README.md b/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/README.md deleted file mode 100644 index 3da6281adeba3..0000000000000 --- a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/README.md +++ /dev/null @@ -1,36 +0,0 @@ -## How to regenerate a patch - -In the eventuality of having to regenerate this patch if we bump the package version, you can generate a new patch with the following: - -``` - # Shallow clone based on version - git clone --depth 1 --branch v2.16.0 https://github.com/grpc-ecosystem/grpc-gateway.git - cd ./grpc-gateway - - # (Optional) - # Remove bazel version if you need to run using different Bazel version - rm .bazelversion - - # Add Gazelle directive to disable proto compilation - echo '# gazelle:proto disable_global' >> BUILD - - # Run Gazelle update-repos command to update repositories.bzl with - # disable_global flag - bazel run gazelle -- update-repos \ - -from_file=go.mod \ - -to_macro=repositories.bzl%go_repositories \ - --build_file_proto_mode=disable_global - - # Remove BUILD.bazel file with conflicting import - rm runtime/BUILD.bazel - rm runtime/internal/examplepb/BUILD.bazel - - # Run Gazelle fix command to regenerate BUILD.bazel based on diasble_global - bazel run gazelle -- fix - - # Create a patch file for two files that causes the build error: - # - `repositories.bzl` - # - `runtime/BUILD.bazel` - # - `runtime/internal/examplepb/BUILD.bazel` - git diff -u repositories.bzl runtime/BUILD.bazel runtime/internal/examplepb/BUILD.bazel > ../grpc_gateway.patch -``` diff --git a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/grpc_gateway.patch b/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/grpc_gateway.patch deleted file mode 100644 index d6f8d68b7c798..0000000000000 --- a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2/grpc_gateway.patch +++ /dev/null @@ -1,1226 +0,0 @@ -diff --git a/repositories.bzl b/repositories.bzl -index b165cdd..2ff7081 100644 ---- a/repositories.bzl -+++ b/repositories.bzl -@@ -22,6 +22,7 @@ def go_repositories(): - - go_repository( - name = "com_github_antihax_optional", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/antihax/optional", - sum = "h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=", - version = "v1.0.0", -@@ -90,6 +91,7 @@ def go_repositories(): - ) - go_repository( - name = "com_github_census_instrumentation_opencensus_proto", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/census-instrumentation/opencensus-proto", - sum = "h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=", - version = "v0.4.1", -@@ -102,6 +104,7 @@ def go_repositories(): - ) - go_repository( - name = "com_github_cespare_xxhash_v2", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/cespare/xxhash/v2", - sum = "h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=", - version = "v2.2.0", -@@ -134,12 +137,14 @@ def go_repositories(): - - go_repository( - name = "com_github_cncf_udpa_go", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/cncf/udpa/go", - sum = "h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=", - version = "v0.0.0-20220112060539-c52dc94e7fbe", - ) - go_repository( - name = "com_github_cncf_xds_go", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/cncf/xds/go", - sum = "h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=", - version = "v0.0.0-20230310173818-32f1caf87195", -@@ -183,6 +188,7 @@ def go_repositories(): - ) - go_repository( - name = "com_github_creack_pty", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/creack/pty", - sum = "h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=", - version = "v1.1.9", -@@ -209,12 +215,14 @@ def go_repositories(): - - go_repository( - name = "com_github_envoyproxy_go_control_plane", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/envoyproxy/go-control-plane", - sum = "h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o=", - version = "v0.11.0", - ) - go_repository( - name = "com_github_envoyproxy_protoc_gen_validate", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/envoyproxy/protoc-gen-validate", - sum = "h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y=", - version = "v0.10.0", -@@ -290,6 +298,7 @@ def go_repositories(): - - go_repository( - name = "com_github_golang_glog", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/golang/glog", - sum = "h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=", - version = "v1.1.0", -@@ -309,6 +318,7 @@ def go_repositories(): - ) - go_repository( - name = "com_github_golang_protobuf", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/golang/protobuf", - sum = "h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=", - version = "v1.5.3", -@@ -322,6 +332,7 @@ def go_repositories(): - ) - go_repository( - name = "com_github_google_go_cmp", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/google/go-cmp", - sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=", - version = "v0.5.9", -@@ -353,6 +364,7 @@ def go_repositories(): - ) - go_repository( - name = "com_github_google_uuid", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/google/uuid", - sum = "h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=", - version = "v1.3.0", -@@ -599,18 +611,21 @@ def go_repositories(): - - go_repository( - name = "com_github_kr_pretty", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/kr/pretty", - sum = "h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=", - version = "v0.3.1", - ) - go_repository( - name = "com_github_kr_pty", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/kr/pty", - sum = "h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=", - version = "v1.1.1", - ) - go_repository( - name = "com_github_kr_text", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/kr/text", - sum = "h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=", - version = "v0.2.0", -@@ -731,6 +746,7 @@ def go_repositories(): - ) - go_repository( - name = "com_github_pkg_diff", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/pkg/diff", - sum = "h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=", - version = "v0.0.0-20210226163009-20ebb0f2a09e", -@@ -795,6 +811,7 @@ def go_repositories(): - - go_repository( - name = "com_github_rogpeppe_fastuuid", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/rogpeppe/fastuuid", - sum = "h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=", - version = "v1.2.0", -@@ -802,6 +819,7 @@ def go_repositories(): - - go_repository( - name = "com_github_rogpeppe_go_internal", -+ build_file_proto_mode = "disable_global", - importpath = "github.com/rogpeppe/go-internal", - sum = "h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=", - version = "v1.9.0", -@@ -942,18 +960,21 @@ def go_repositories(): - ) - go_repository( - name = "com_google_cloud_go", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go", - sum = "h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=", - version = "v0.110.0", - ) - go_repository( - name = "com_google_cloud_go_accessapproval", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/accessapproval", - sum = "h1:x0cEHro/JFPd7eS4BlEWNTMecIj2HdXjOVB5BtvwER0=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_accesscontextmanager", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/accesscontextmanager", - sum = "h1:MG60JgnEoawHJrbWw0jGdv6HLNSf6gQvYRiXpuzqgEA=", - version = "v1.7.0", -@@ -961,6 +982,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_aiplatform", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/aiplatform", - sum = "h1:zTw+suCVchgZyO+k847wjzdVjWmrAuehxdvcZvJwfGg=", - version = "v1.37.0", -@@ -968,24 +990,28 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_analytics", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/analytics", - sum = "h1:LqAo3tAh2FU9+w/r7vc3hBjU23Kv7GhO/PDIW7kIYgM=", - version = "v0.19.0", - ) - go_repository( - name = "com_google_cloud_go_apigateway", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/apigateway", - sum = "h1:ZI9mVO7x3E9RK/BURm2p1aw9YTBSCQe3klmyP1WxWEg=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_apigeeconnect", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/apigeeconnect", - sum = "h1:sWOmgDyAsi1AZ48XRHcATC0tsi9SkPT7DA/+VCfkaeA=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_apigeeregistry", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/apigeeregistry", - sum = "h1:E43RdhhCxdlV+I161gUY2rI4eOaMzHTA5kNkvRsFXvc=", - version = "v0.6.0", -@@ -999,6 +1025,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_appengine", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/appengine", - sum = "h1:aBGDKmRIaRRoWJ2tAoN0oVSHoWLhtO9aj/NvUyP4aYs=", - version = "v1.7.1", -@@ -1006,12 +1033,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_area120", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/area120", - sum = "h1:ugckkFh4XkHJMPhTIx0CyvdoBxmOpMe8rNs4Ok8GAag=", - version = "v0.7.1", - ) - go_repository( - name = "com_google_cloud_go_artifactregistry", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/artifactregistry", - sum = "h1:o1Q80vqEB6Qp8WLEH3b8FBLNUCrGQ4k5RFj0sn/sgO8=", - version = "v1.13.0", -@@ -1019,36 +1048,42 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_asset", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/asset", - sum = "h1:YAsssO08BqZ6mncbb6FPlj9h6ACS7bJQUOlzciSfbNk=", - version = "v1.13.0", - ) - go_repository( - name = "com_google_cloud_go_assuredworkloads", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/assuredworkloads", - sum = "h1:VLGnVFta+N4WM+ASHbhc14ZOItOabDLH1MSoDv+Xuag=", - version = "v1.10.0", - ) - go_repository( - name = "com_google_cloud_go_automl", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/automl", - sum = "h1:50VugllC+U4IGl3tDNcZaWvApHBTrn/TvyHDJ0wM+Uw=", - version = "v1.12.0", - ) - go_repository( - name = "com_google_cloud_go_baremetalsolution", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/baremetalsolution", - sum = "h1:2AipdYXL0VxMboelTTw8c1UJ7gYu35LZYUbuRv9Q28s=", - version = "v0.5.0", - ) - go_repository( - name = "com_google_cloud_go_batch", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/batch", - sum = "h1:YbMt0E6BtqeD5FvSv1d56jbVsWEzlGm55lYte+M6Mzs=", - version = "v0.7.0", - ) - go_repository( - name = "com_google_cloud_go_beyondcorp", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/beyondcorp", - sum = "h1:UkY2BTZkEUAVrgqnSdOJ4p3y9ZRBPEe1LkjgC8Bj/Pc=", - version = "v0.5.0", -@@ -1056,42 +1091,49 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_bigquery", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/bigquery", - sum = "h1:RscMV6LbnAmhAzD893Lv9nXXy2WCaJmbxYPWDLbGqNQ=", - version = "v1.50.0", - ) - go_repository( - name = "com_google_cloud_go_billing", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/billing", - sum = "h1:JYj28UYF5w6VBAh0gQYlgHJ/OD1oA+JgW29YZQU+UHM=", - version = "v1.13.0", - ) - go_repository( - name = "com_google_cloud_go_binaryauthorization", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/binaryauthorization", - sum = "h1:d3pMDBCCNivxt5a4eaV7FwL7cSH0H7RrEnFrTb1QKWs=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_certificatemanager", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/certificatemanager", - sum = "h1:5C5UWeSt8Jkgp7OWn2rCkLmYurar/vIWIoSQ2+LaTOc=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_channel", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/channel", - sum = "h1:GpcQY5UJKeOekYgsX3QXbzzAc/kRGtBq43fTmyKe6Uw=", - version = "v1.12.0", - ) - go_repository( - name = "com_google_cloud_go_cloudbuild", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/cloudbuild", - sum = "h1:GHQCjV4WlPPVU/j3Rlpc8vNIDwThhd1U9qSY/NPZdko=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_clouddms", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/clouddms", - sum = "h1:E7v4TpDGUyEm1C/4KIrpVSOCTm0P6vWdHT0I4mostRA=", - version = "v1.5.0", -@@ -1099,6 +1141,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_cloudtasks", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/cloudtasks", - sum = "h1:uK5k6abf4yligFgYFnG0ni8msai/dSv6mDmiBulU0hU=", - version = "v1.10.0", -@@ -1106,12 +1149,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_compute", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/compute", - sum = "h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ=", - version = "v1.19.0", - ) - go_repository( - name = "com_google_cloud_go_compute_metadata", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/compute/metadata", - sum = "h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=", - version = "v0.2.3", -@@ -1119,12 +1164,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_contactcenterinsights", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/contactcenterinsights", - sum = "h1:jXIpfcH/VYSE1SYcPzO0n1VVb+sAamiLOgCw45JbOQk=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_container", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/container", - sum = "h1:NKlY/wCDapfVZlbVVaeuu2UZZED5Dy1z4Zx1KhEzm8c=", - version = "v1.15.0", -@@ -1132,6 +1179,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_containeranalysis", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/containeranalysis", - sum = "h1:EQ4FFxNaEAg8PqQCO7bVQfWz9NVwZCUKaM1b3ycfx3U=", - version = "v0.9.0", -@@ -1139,24 +1187,28 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_datacatalog", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/datacatalog", - sum = "h1:4H5IJiyUE0X6ShQBqgFFZvGGcrwGVndTwUSLP4c52gw=", - version = "v1.13.0", - ) - go_repository( - name = "com_google_cloud_go_dataflow", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/dataflow", - sum = "h1:eYyD9o/8Nm6EttsKZaEGD84xC17bNgSKCu0ZxwqUbpg=", - version = "v0.8.0", - ) - go_repository( - name = "com_google_cloud_go_dataform", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/dataform", - sum = "h1:Dyk+fufup1FR6cbHjFpMuP4SfPiF3LI3JtoIIALoq48=", - version = "v0.7.0", - ) - go_repository( - name = "com_google_cloud_go_datafusion", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/datafusion", - sum = "h1:sZjRnS3TWkGsu1LjYPFD/fHeMLZNXDK6PDHi2s2s/bk=", - version = "v1.6.0", -@@ -1164,18 +1216,21 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_datalabeling", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/datalabeling", - sum = "h1:ch4qA2yvddGRUrlfwrNJCr79qLqhS9QBwofPHfFlDIk=", - version = "v0.7.0", - ) - go_repository( - name = "com_google_cloud_go_dataplex", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/dataplex", - sum = "h1:RvoZ5T7gySwm1CHzAw7yY1QwwqaGswunmqEssPxU/AM=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_dataproc", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/dataproc", - sum = "h1:W47qHL3W4BPkAIbk4SWmIERwsWBaNnWm0P2sdx3YgGU=", - version = "v1.12.0", -@@ -1183,6 +1238,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_dataqna", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/dataqna", - sum = "h1:yFzi/YU4YAdjyo7pXkBE2FeHbgz5OQQBVDdbErEHmVQ=", - version = "v0.7.0", -@@ -1190,18 +1246,21 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_datastore", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/datastore", - sum = "h1:iF6I/HaLs3Ado8uRKMvZRvF/ZLkWaWE9i8AiHzbC774=", - version = "v1.11.0", - ) - go_repository( - name = "com_google_cloud_go_datastream", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/datastream", - sum = "h1:BBCBTnWMDwwEzQQmipUXxATa7Cm7CA/gKjKcR2w35T0=", - version = "v1.7.0", - ) - go_repository( - name = "com_google_cloud_go_deploy", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/deploy", - sum = "h1:otshdKEbmsi1ELYeCKNYppwV0UH5xD05drSdBm7ouTk=", - version = "v1.8.0", -@@ -1209,12 +1268,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_dialogflow", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/dialogflow", - sum = "h1:uVlKKzp6G/VtSW0E7IH1Y5o0H48/UOCmqksG2riYCwQ=", - version = "v1.32.0", - ) - go_repository( - name = "com_google_cloud_go_dlp", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/dlp", - sum = "h1:1JoJqezlgu6NWCroBxr4rOZnwNFILXr4cB9dMaSKO4A=", - version = "v1.9.0", -@@ -1222,12 +1283,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_documentai", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/documentai", - sum = "h1:KM3Xh0QQyyEdC8Gs2vhZfU+rt6OCPF0dwVwxKgLmWfI=", - version = "v1.18.0", - ) - go_repository( - name = "com_google_cloud_go_domains", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/domains", - sum = "h1:2ti/o9tlWL4N+wIuWUNH+LbfgpwxPr8J1sv9RHA4bYQ=", - version = "v0.8.0", -@@ -1235,12 +1298,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_edgecontainer", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/edgecontainer", - sum = "h1:O0YVE5v+O0Q/ODXYsQHmHb+sYM8KNjGZw2pjX2Ws41c=", - version = "v1.0.0", - ) - go_repository( - name = "com_google_cloud_go_errorreporting", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/errorreporting", - sum = "h1:kj1XEWMu8P0qlLhm3FwcaFsUvXChV/OraZwA70trRR0=", - version = "v0.3.0", -@@ -1248,18 +1313,21 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_essentialcontacts", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/essentialcontacts", - sum = "h1:gIzEhCoOT7bi+6QZqZIzX1Erj4SswMPIteNvYVlu+pM=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_eventarc", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/eventarc", - sum = "h1:fsJmNeqvqtk74FsaVDU6cH79lyZNCYP8Rrv7EhaB/PU=", - version = "v1.11.0", - ) - go_repository( - name = "com_google_cloud_go_filestore", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/filestore", - sum = "h1:ckTEXN5towyTMu4q0uQ1Mde/JwTHur0gXs8oaIZnKfw=", - version = "v1.6.0", -@@ -1267,24 +1335,28 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_firestore", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/firestore", - sum = "h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_functions", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/functions", - sum = "h1:pPDqtsXG2g9HeOQLoquLbmvmb82Y4Ezdo1GXuotFoWg=", - version = "v1.13.0", - ) - go_repository( - name = "com_google_cloud_go_gaming", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/gaming", - sum = "h1:7vEhFnZmd931Mo7sZ6pJy7uQPDxF7m7v8xtBheG08tc=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_gkebackup", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/gkebackup", - sum = "h1:za3QZvw6ujR0uyqkhomKKKNoXDyqYGPJies3voUK8DA=", - version = "v0.4.0", -@@ -1292,54 +1364,63 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_gkeconnect", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/gkeconnect", - sum = "h1:gXYKciHS/Lgq0GJ5Kc9SzPA35NGc3yqu6SkjonpEr2Q=", - version = "v0.7.0", - ) - go_repository( - name = "com_google_cloud_go_gkehub", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/gkehub", - sum = "h1:TqCSPsEBQ6oZSJgEYZ3XT8x2gUadbvfwI32YB0kuHCs=", - version = "v0.12.0", - ) - go_repository( - name = "com_google_cloud_go_gkemulticloud", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/gkemulticloud", - sum = "h1:8I84Q4vl02rJRsFiinBxl7WCozfdLlUVBQuSrqr9Wtk=", - version = "v0.5.0", - ) - go_repository( - name = "com_google_cloud_go_gsuiteaddons", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/gsuiteaddons", - sum = "h1:1mvhXqJzV0Vg5Fa95QwckljODJJfDFXV4pn+iL50zzA=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_iam", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/iam", - sum = "h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=", - version = "v0.13.0", - ) - go_repository( - name = "com_google_cloud_go_iap", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/iap", - sum = "h1:PxVHFuMxmSZyfntKXHXhd8bo82WJ+LcATenq7HLdVnU=", - version = "v1.7.1", - ) - go_repository( - name = "com_google_cloud_go_ids", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/ids", - sum = "h1:fodnCDtOXuMmS8LTC2y3h8t24U8F3eKWfhi+3LY6Qf0=", - version = "v1.3.0", - ) - go_repository( - name = "com_google_cloud_go_iot", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/iot", - sum = "h1:39W5BFSarRNZfVG0eXI5LYux+OVQT8GkgpHCnrZL2vM=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_kms", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/kms", - sum = "h1:7hm1bRqGCA1GBRQUrp831TwJ9TWhP+tvLuP497CQS2g=", - version = "v1.10.1", -@@ -1347,18 +1428,21 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_language", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/language", - sum = "h1:7Ulo2mDk9huBoBi8zCE3ONOoBrL6UXfAI71CLQ9GEIM=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_lifesciences", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/lifesciences", - sum = "h1:uWrMjWTsGjLZpCTWEAzYvyXj+7fhiZST45u9AgasasI=", - version = "v0.8.0", - ) - go_repository( - name = "com_google_cloud_go_logging", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/logging", - sum = "h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5I=", - version = "v1.7.0", -@@ -1366,18 +1450,21 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_longrunning", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/longrunning", - sum = "h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=", - version = "v0.4.1", - ) - go_repository( - name = "com_google_cloud_go_managedidentities", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/managedidentities", - sum = "h1:ZRQ4k21/jAhrHBVKl/AY7SjgzeJwG1iZa+mJ82P+VNg=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_maps", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/maps", - sum = "h1:mv9YaczD4oZBZkM5XJl6fXQ984IkJNHPwkc8MUsdkBo=", - version = "v0.7.0", -@@ -1385,24 +1472,28 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_mediatranslation", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/mediatranslation", - sum = "h1:anPxH+/WWt8Yc3EdoEJhPMBRF7EhIdz426A+tuoA0OU=", - version = "v0.7.0", - ) - go_repository( - name = "com_google_cloud_go_memcache", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/memcache", - sum = "h1:8/VEmWCpnETCrBwS3z4MhT+tIdKgR1Z4Tr2tvYH32rg=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_metastore", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/metastore", - sum = "h1:QCFhZVe2289KDBQ7WxaHV2rAmPrmRAdLC6gbjUd3HPo=", - version = "v1.10.0", - ) - go_repository( - name = "com_google_cloud_go_monitoring", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/monitoring", - sum = "h1:2qsrgXGVoRXpP7otZ14eE1I568zAa92sJSDPyOJvwjM=", - version = "v1.13.0", -@@ -1410,12 +1501,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_networkconnectivity", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/networkconnectivity", - sum = "h1:ZD6b4Pk1jEtp/cx9nx0ZYcL3BKqDa+KixNDZ6Bjs1B8=", - version = "v1.11.0", - ) - go_repository( - name = "com_google_cloud_go_networkmanagement", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/networkmanagement", - sum = "h1:8KWEUNGcpSX9WwZXq7FtciuNGPdPdPN/ruDm769yAEM=", - version = "v1.6.0", -@@ -1423,30 +1516,35 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_networksecurity", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/networksecurity", - sum = "h1:sOc42Ig1K2LiKlzG71GUVloeSJ0J3mffEBYmvu+P0eo=", - version = "v0.8.0", - ) - go_repository( - name = "com_google_cloud_go_notebooks", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/notebooks", - sum = "h1:Kg2K3K7CbSXYJHZ1aGQpf1xi5x2GUvQWf2sFVuiZh8M=", - version = "v1.8.0", - ) - go_repository( - name = "com_google_cloud_go_optimization", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/optimization", - sum = "h1:dj8O4VOJRB4CUwZXdmwNViH1OtI0WtWL867/lnYH248=", - version = "v1.3.1", - ) - go_repository( - name = "com_google_cloud_go_orchestration", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/orchestration", - sum = "h1:Vw+CEXo8M/FZ1rb4EjcLv0gJqqw89b7+g+C/EmniTb8=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_orgpolicy", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/orgpolicy", - sum = "h1:XDriMWug7sd0kYT1QKofRpRHzjad0bK8Q8uA9q+XrU4=", - version = "v1.10.0", -@@ -1454,24 +1552,28 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_osconfig", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/osconfig", - sum = "h1:PkSQx4OHit5xz2bNyr11KGcaFccL5oqglFPdTboyqwQ=", - version = "v1.11.0", - ) - go_repository( - name = "com_google_cloud_go_oslogin", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/oslogin", - sum = "h1:whP7vhpmc+ufZa90eVpkfbgzJRK/Xomjz+XCD4aGwWw=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_phishingprotection", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/phishingprotection", - sum = "h1:l6tDkT7qAEV49MNEJkEJTB6vOO/onbSOcNtAT09HPuA=", - version = "v0.7.0", - ) - go_repository( - name = "com_google_cloud_go_policytroubleshooter", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/policytroubleshooter", - sum = "h1:yKAGC4p9O61ttZUswaq9GAn1SZnEzTd0vUYXD7ZBT7Y=", - version = "v1.6.0", -@@ -1479,6 +1581,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_privatecatalog", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/privatecatalog", - sum = "h1:EPEJ1DpEGXLDnmc7mnCAqFmkwUJbIsaLAiLHVOkkwtc=", - version = "v0.8.0", -@@ -1486,12 +1589,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_pubsub", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/pubsub", - sum = "h1:vCge8m7aUKBJYOgrZp7EsNDf6QMd2CAlXZqWTn3yq6s=", - version = "v1.30.0", - ) - go_repository( - name = "com_google_cloud_go_pubsublite", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/pubsublite", - sum = "h1:cb9fsrtpINtETHiJ3ECeaVzrfIVhcGjhhJEjybHXHao=", - version = "v1.7.0", -@@ -1499,36 +1604,42 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_recaptchaenterprise_v2", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/recaptchaenterprise/v2", - sum = "h1:6iOCujSNJ0YS7oNymI64hXsjGq60T4FK1zdLugxbzvU=", - version = "v2.7.0", - ) - go_repository( - name = "com_google_cloud_go_recommendationengine", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/recommendationengine", - sum = "h1:VibRFCwWXrFebEWKHfZAt2kta6pS7Tlimsnms0fjv7k=", - version = "v0.7.0", - ) - go_repository( - name = "com_google_cloud_go_recommender", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/recommender", - sum = "h1:ZnFRY5R6zOVk2IDS1Jbv5Bw+DExCI5rFumsTnMXiu/A=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_redis", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/redis", - sum = "h1:JoAd3SkeDt3rLFAAxEvw6wV4t+8y4ZzfZcZmddqphQ8=", - version = "v1.11.0", - ) - go_repository( - name = "com_google_cloud_go_resourcemanager", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/resourcemanager", - sum = "h1:NRM0p+RJkaQF9Ee9JMnUV9BQ2QBIOq/v8M+Pbv/wmCs=", - version = "v1.7.0", - ) - go_repository( - name = "com_google_cloud_go_resourcesettings", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/resourcesettings", - sum = "h1:8Dua37kQt27CCWHm4h/Q1XqCF6ByD7Ouu49xg95qJzI=", - version = "v1.5.0", -@@ -1536,12 +1647,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_retail", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/retail", - sum = "h1:1Dda2OpFNzIb4qWgFZjYlpP7sxX3aLeypKG6A3H4Yys=", - version = "v1.12.0", - ) - go_repository( - name = "com_google_cloud_go_run", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/run", - sum = "h1:ydJQo+k+MShYnBfhaRHSZYeD/SQKZzZLAROyfpeD9zw=", - version = "v0.9.0", -@@ -1549,12 +1662,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_scheduler", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/scheduler", - sum = "h1:NpQAHtx3sulByTLe2dMwWmah8PWgeoieFPpJpArwFV0=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_secretmanager", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/secretmanager", - sum = "h1:pu03bha7ukxF8otyPKTFdDz+rr9sE3YauS5PliDXK60=", - version = "v1.10.0", -@@ -1562,12 +1677,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_security", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/security", - sum = "h1:PYvDxopRQBfYAXKAuDpFCKBvDOWPWzp9k/H5nB3ud3o=", - version = "v1.13.0", - ) - go_repository( - name = "com_google_cloud_go_securitycenter", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/securitycenter", - sum = "h1:AF3c2s3awNTMoBtMX3oCUoOMmGlYxGOeuXSYHNBkf14=", - version = "v1.19.0", -@@ -1581,6 +1698,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_servicedirectory", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/servicedirectory", - sum = "h1:SJwk0XX2e26o25ObYUORXx6torSFiYgsGkWSkZgkoSU=", - version = "v1.9.0", -@@ -1599,12 +1717,14 @@ def go_repositories(): - ) - go_repository( - name = "com_google_cloud_go_shell", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/shell", - sum = "h1:wT0Uw7ib7+AgZST9eCDygwTJn4+bHMDtZo5fh7kGWDU=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_spanner", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/spanner", - sum = "h1:7VdjZ8zj4sHbDw55atp5dfY6kn1j9sam9DRNpPQhqR4=", - version = "v1.45.0", -@@ -1612,6 +1732,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_speech", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/speech", - sum = "h1:JEVoWGNnTF128kNty7T4aG4eqv2z86yiMJPT9Zjp+iw=", - version = "v1.15.0", -@@ -1625,6 +1746,7 @@ def go_repositories(): - ) - go_repository( - name = "com_google_cloud_go_storagetransfer", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/storagetransfer", - sum = "h1:5T+PM+3ECU3EY2y9Brv0Sf3oka8pKmsCfpQ07+91G9o=", - version = "v1.8.0", -@@ -1632,36 +1754,42 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_talent", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/talent", - sum = "h1:nI9sVZPjMKiO2q3Uu0KhTDVov3Xrlpt63fghP9XjyEM=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_texttospeech", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/texttospeech", - sum = "h1:H4g1ULStsbVtalbZGktyzXzw6jP26RjVGYx9RaYjBzc=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_tpu", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/tpu", - sum = "h1:/34T6CbSi+kTv5E19Q9zbU/ix8IviInZpzwz3rsFE+A=", - version = "v1.5.0", - ) - go_repository( - name = "com_google_cloud_go_trace", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/trace", - sum = "h1:olxC0QHC59zgJVALtgqfD9tGk0lfeCP5/AGXL3Px/no=", - version = "v1.9.0", - ) - go_repository( - name = "com_google_cloud_go_translate", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/translate", - sum = "h1:GvLP4oQ4uPdChBmBaUSa/SaZxCdyWELtlAaKzpHsXdA=", - version = "v1.7.0", - ) - go_repository( - name = "com_google_cloud_go_video", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/video", - sum = "h1:upIbnGI0ZgACm58HPjAeBMleW3sl5cT84AbYQ8PWOgM=", - version = "v1.15.0", -@@ -1669,24 +1797,28 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_videointelligence", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/videointelligence", - sum = "h1:Uh5BdoET8XXqXX2uXIahGb+wTKbLkGH7s4GXR58RrG8=", - version = "v1.10.0", - ) - go_repository( - name = "com_google_cloud_go_vision_v2", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/vision/v2", - sum = "h1:8C8RXUJoflCI4yVdqhTy9tRyygSHmp60aP363z23HKg=", - version = "v2.7.0", - ) - go_repository( - name = "com_google_cloud_go_vmmigration", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/vmmigration", - sum = "h1:Azs5WKtfOC8pxvkyrDvt7J0/4DYBch0cVbuFfCCFt5k=", - version = "v1.6.0", - ) - go_repository( - name = "com_google_cloud_go_vmwareengine", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/vmwareengine", - sum = "h1:b0NBu7S294l0gmtrT0nOJneMYgZapr5x9tVWvgDoVEM=", - version = "v0.3.0", -@@ -1694,6 +1826,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_vpcaccess", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/vpcaccess", - sum = "h1:FOe6CuiQD3BhHJWt7E8QlbBcaIzVRddupwJlp7eqmn4=", - version = "v1.6.0", -@@ -1701,12 +1834,14 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_webrisk", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/webrisk", - sum = "h1:IY+L2+UwxcVm2zayMAtBhZleecdIFLiC+QJMzgb0kT0=", - version = "v1.8.0", - ) - go_repository( - name = "com_google_cloud_go_websecurityscanner", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/websecurityscanner", - sum = "h1:AHC1xmaNMOZtNqxI9Rmm87IJEyPaRkOxeI0gpAacXGk=", - version = "v1.5.0", -@@ -1714,6 +1849,7 @@ def go_repositories(): - - go_repository( - name = "com_google_cloud_go_workflows", -+ build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/workflows", - sum = "h1:FfGp9w0cYnaKZJhUOMqCOJCYT/WlvYBfTQhFWV3sRKI=", - version = "v1.10.0", -@@ -1734,6 +1870,7 @@ def go_repositories(): - - go_repository( - name = "in_gopkg_check_v1", -+ build_file_proto_mode = "disable_global", - importpath = "gopkg.in/check.v1", - sum = "h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=", - version = "v1.0.0-20201130134442-10cb98267c6c", -@@ -1766,6 +1903,7 @@ def go_repositories(): - ) - go_repository( - name = "in_gopkg_yaml_v3", -+ build_file_proto_mode = "disable_global", - importpath = "gopkg.in/yaml.v3", - sum = "h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=", - version = "v3.0.1", -@@ -1816,24 +1954,28 @@ def go_repositories(): - ) - go_repository( - name = "org_golang_google_appengine", -+ build_file_proto_mode = "disable_global", - importpath = "google.golang.org/appengine", - sum = "h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=", - version = "v1.6.7", - ) - go_repository( - name = "org_golang_google_genproto", -+ build_file_proto_mode = "disable_global", - importpath = "google.golang.org/genproto", - sum = "h1:Ao9GzfUMPH3zjVfzXG5rlWlk+Q8MXWKwWpwVQE1MXfw=", - version = "v0.0.0-20230526203410-71b5a4ffd15e", - ) - go_repository( - name = "org_golang_google_genproto_googleapis_api", -+ build_file_proto_mode = "disable_global", - importpath = "google.golang.org/genproto/googleapis/api", - sum = "h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM=", - version = "v0.0.0-20230530153820-e85fd2cbaebc", - ) - go_repository( - name = "org_golang_google_genproto_googleapis_rpc", -+ build_file_proto_mode = "disable_global", - importpath = "google.golang.org/genproto/googleapis/rpc", - sum = "h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=", - version = "v0.0.0-20230530153820-e85fd2cbaebc", -@@ -1841,6 +1983,7 @@ def go_repositories(): - - go_repository( - name = "org_golang_google_grpc", -+ build_file_proto_mode = "disable_global", - importpath = "google.golang.org/grpc", - sum = "h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=", - version = "v1.55.0", -@@ -1854,12 +1997,14 @@ def go_repositories(): - ) - go_repository( - name = "org_golang_google_protobuf", -+ build_file_proto_mode = "disable_global", - importpath = "google.golang.org/protobuf", - sum = "h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=", - version = "v1.30.0", - ) - go_repository( - name = "org_golang_x_crypto", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/crypto", - sum = "h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=", - version = "v0.0.0-20190308221718-c2843e01d9a2", -@@ -1892,18 +2037,21 @@ def go_repositories(): - ) - go_repository( - name = "org_golang_x_mod", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/mod", - sum = "h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=", - version = "v0.8.0", - ) - go_repository( - name = "org_golang_x_net", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/net", - sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=", - version = "v0.10.0", - ) - go_repository( - name = "org_golang_x_oauth2", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/oauth2", - sum = "h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=", - version = "v0.8.0", -@@ -1916,12 +2064,14 @@ def go_repositories(): - ) - go_repository( - name = "org_golang_x_sys", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/sys", - sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=", - version = "v0.8.0", - ) - go_repository( - name = "org_golang_x_term", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/term", - sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=", - version = "v0.8.0", -@@ -1929,6 +2079,7 @@ def go_repositories(): - - go_repository( - name = "org_golang_x_text", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/text", - sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=", - version = "v0.9.0", -@@ -1942,6 +2093,7 @@ def go_repositories(): - ) - go_repository( - name = "org_golang_x_tools", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/tools", - sum = "h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=", - version = "v0.6.0", -@@ -1949,6 +2101,7 @@ def go_repositories(): - - go_repository( - name = "org_golang_x_xerrors", -+ build_file_proto_mode = "disable_global", - importpath = "golang.org/x/xerrors", - sum = "h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=", - version = "v0.0.0-20191204190536-9bdfabe68543", -diff --git a/runtime/BUILD.bazel b/runtime/BUILD.bazel -index a8789f1..c3c37af 100644 ---- a/runtime/BUILD.bazel -+++ b/runtime/BUILD.bazel -@@ -1,7 +1,5 @@ - load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - --package(default_visibility = ["//visibility:public"]) -- - go_library( - name = "runtime", - srcs = [ -@@ -23,6 +21,7 @@ go_library( - "query.go", - ], - importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/runtime", -+ visibility = ["//visibility:public"], - deps = [ - "//internal/httprule", - "//utilities", -@@ -44,9 +43,14 @@ go_library( - ], - ) - -+alias( -+ name = "go_default_library", -+ actual = ":runtime", -+ visibility = ["//visibility:public"], -+) -+ - go_test( - name = "runtime_test", -- size = "small", - srcs = [ - "context_test.go", - "convert_test.go", -@@ -89,9 +93,3 @@ go_test( - "@org_golang_google_protobuf//types/known/wrapperspb", - ], - ) -- --alias( -- name = "go_default_library", -- actual = ":runtime", -- visibility = ["//visibility:public"], --) -diff --git a/runtime/internal/examplepb/BUILD.bazel b/runtime/internal/examplepb/BUILD.bazel -index cfed28f..794faad 100644 ---- a/runtime/internal/examplepb/BUILD.bazel -+++ b/runtime/internal/examplepb/BUILD.bazel -@@ -2,10 +2,6 @@ load("@rules_proto//proto:defs.bzl", "proto_library") - load("@io_bazel_rules_go//go:def.bzl", "go_library") - load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") - --# gazelle:exclude non_standard_names_grpc.pb.go -- --package(default_visibility = ["//visibility:public"]) -- - proto_library( - name = "examplepb_proto", - srcs = [ -@@ -14,6 +10,7 @@ proto_library( - "proto2.proto", - "proto3.proto", - ], -+ visibility = ["//runtime:__subpackages__"], - deps = [ - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:duration_proto", -@@ -34,6 +31,7 @@ go_proto_library( - ], - importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/runtime/internal/examplepb", - proto = ":examplepb_proto", -+ visibility = ["//runtime:__subpackages__"], - deps = ["@go_googleapis//google/api:annotations_go_proto"], - ) - -@@ -41,6 +39,7 @@ go_library( - name = "examplepb", - embed = [":examplepb_go_proto"], - importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/runtime/internal/examplepb", -+ visibility = ["//runtime:__subpackages__"], - ) - - alias( diff --git a/tools/release/README.md b/tools/release/README.md index 51a0ef9b86399..d36a307b76d29 100644 --- a/tools/release/README.md +++ b/tools/release/README.md @@ -194,5 +194,5 @@ new schemas to the bucket to ensure that the next release from `main`, i.e 5.3.X > How do I see which schemas where used to build the _migrator_ container. -`tar tf $(bazel cquery //cmd/migrator:tar_schema_descriptions --output=files)` will show the content the container layer used +`bazel build //cmd/migrator:tar_schema_descriptions && tar tf $(bazel cquery //cmd/migrator:tar_schema_descriptions --output=files)` will show the content the container layer used to inject the schemas in the final _migrator_ container image. diff --git a/tools/release/schema_deps.bzl b/tools/release/schema_deps.bzl index 6881188c63fb9..bdacb9492981c 100644 --- a/tools/release/schema_deps.bzl +++ b/tools/release/schema_deps.bzl @@ -8,6 +8,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") def schema_deps(): http_file( name = "schemas_archive", - urls = ["https://storage.googleapis.com/schemas-migrations/dist/schemas-v5.2.1.tar.gz"], - sha256 = "3ec54f2d132ba5fc4f084f3bc76650f1c759ab32b5b73aba2ac9df91098ffeaf", + urls = ["https://storage.googleapis.com/schemas-migrations/dist/schemas-v5.2.3.tar.gz"], + sha256 = "c5aec72d528c0b3803070ccba58049c42f9b2618c9dba367dffe106d30f8f6fe", ) diff --git a/ui/assets/BUILD.bazel b/ui/assets/BUILD.bazel index daae8cfe34c04..6f41251ff1c88 100644 --- a/ui/assets/BUILD.bazel +++ b/ui/assets/BUILD.bazel @@ -1,6 +1,4 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") -load("@bazel_skylib//rules:common_settings.bzl", "string_flag") -load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") go_library( name = "assets", diff --git a/vitest.shared.ts b/vitest.shared.ts index d993ef5eac88d..7d0bc69fac600 100644 --- a/vitest.shared.ts +++ b/vitest.shared.ts @@ -17,7 +17,7 @@ export const defaultProjectConfig: UserWorkspaceConfig = { test: { testTimeout: 10000, hookTimeout: 1000, - experimentalVmThreads: true, + pool: 'vmThreads', include: [`**/*.test.${TS_EXT}?(x)`], exclude: [ '**/integration-test', @@ -34,7 +34,8 @@ export const defaultProjectConfig: UserWorkspaceConfig = { ], css: { modules: { classNameStrategy: 'non-scoped' } }, hideSkippedTests: true, - globalSetup: [path.join(__dirname, `client/testing/src/globalTestSetup.${TS_EXT}`)], + setupFiles: [path.join(process.cwd(), `client/testing/src/perTestSetup.${TS_EXT}`)], + globalSetup: [path.join(process.cwd(), `client/testing/src/globalTestSetup.${TS_EXT}`)], }, plugins: BAZEL ? [ @@ -61,8 +62,12 @@ const userConfig: UserConfig = { test: { cache: BAZEL ? false : undefined, // don't cache in Bazel - minThreads: 1, // otherwise it's slow when there are many CPU cores - maxThreads: 16, + poolOptions: { + vmThreads: { + minThreads: 1, // Otherwise it's slow when there are many CPU cores + maxThreads: 8, // Warning: setting this value to 16 leads to "Error: Failed to terminate worker" + }, + }, teardownTimeout: 1000, // For compatibility with Jest's defaults; can be changed to the Vitest defaults. @@ -86,6 +91,11 @@ export function defineProjectWithDefaults(dir: string, config: UserWorkspaceConf config.test.name = name } if (!config.test.root) { + // Reorient the dir around process.cwd() if we're running in Bazel and we got a __dirname-relative path. + // https://medium.com/@Jakeherringbone/running-tools-under-bazel-8aa416e7090c + if (BAZEL && dir.startsWith(__dirname)) { + dir = path.join(process.cwd(), dir.slice(__dirname.length)) + } config.test.root = dir } diff --git a/vitest.workspace.ts b/vitest.workspace.ts index 38bd39beb1dae..733c5ee5a7e06 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -1,18 +1,16 @@ -import { readFileSync, existsSync } from 'fs' +import { readFileSync } from 'fs' import path from 'path' -import glob from 'glob' import { load } from 'js-yaml' -import { defineWorkspace } from 'vitest/config' interface PnpmWorkspaceFile { packages: string[] } -const workspaceFile = load(readFileSync(path.join(__dirname, 'pnpm-workspace.yaml'), 'utf8')) as PnpmWorkspaceFile -workspaceFile.packages.push('client/web/dev') // is a tsconfig project but not a pnpm workspace package -const projectRoots = workspaceFile.packages - .flatMap(p => glob.sync(`${p}/`, { cwd: __dirname })) - .map(p => p.replace(/\/$/, '')) - .filter(dir => existsSync(path.join(dir, 'vitest.config.ts'))) -export default defineWorkspace(projectRoots) +function fromPnpmWorkspaceFile(filePath: string): string[] { + return (load(readFileSync(filePath, 'utf8')) as PnpmWorkspaceFile).packages.map(p => `${p}/vitest.config.ts`, { + cwd: __dirname, + }) +} + +export default fromPnpmWorkspaceFile(path.join(__dirname, 'pnpm-workspace.yaml')) diff --git a/wolfi-packages/p4cli.yaml b/wolfi-packages/p4cli.yaml index ebbc71cfe51ae..dc305051701e9 100644 --- a/wolfi-packages/p4cli.yaml +++ b/wolfi-packages/p4cli.yaml @@ -1,7 +1,7 @@ package: name: p4cli - version: 22.2 - epoch: 2 + version: 23.1 + epoch: 0 description: "Command line interface for Perforce" target-architecture: - x86_64 @@ -26,8 +26,8 @@ pipeline: - uses: fetch with: uri: https://cdist2.perforce.com/perforce/r${{package.version}}/bin.linux26x86_64/p4 - # Hash occasionally changes, available at https://filehost.perforce.com/perforce/r22.2/bin.linux26x86_64/SHA256SUMS (check version) - expected-sha256: 3dfa10fb0cca6e305037e1ec69df7f32cb4a04844bc8e0d662ebc562b470cf8b + # Hash occasionally changes, available at https://filehost.perforce.com/perforce/r23.1/bin.linux26x86_64/SHA256SUMS (check version) + expected-sha256: d63f0e38c6c6bce469ce584d64792ea06112ba7dfbe8bcdffd216c5b710421e8 extract: false - runs: | chmod +x p4