Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Backport 50668 to 5.0#50720

Merged
coury-clark merged 2 commits into
5.0from
backport-50668-to-5.0
Apr 17, 2023
Merged

Backport 50668 to 5.0#50720
coury-clark merged 2 commits into
5.0from
backport-50668-to-5.0

Conversation

@eseliger

Copy link
Copy Markdown
Member

This backports both

to 5.0. The former is cherry picked to reduce merge conflicts and make potential future cherry picks a bit easier.
I also had to backport adding a bazelignore entry for client/cody because I couldn't update the build files on this branch anymore. There seems to have been a few misses in buildfile updates so this PR is unfortunately quite noisy.

Test plan

CI and code review.

Rok Novosel and others added 2 commits April 17, 2023 15:09
## Test plan

<!-- All pull requests REQUIRE a test plan:
https://docs.sourcegraph.com/dev/background-information/testing_principles
-->
* Non-dotcom instances should work as before
* If `cody-experimental` feature flag is not created, dotcom users will
not be able to use completions endpoint and embeddings GQL API
* If `cody-experimental` feature flag override is created for a user,
that user should have access to completions and embeddings on dot com
* Unauthorized users should not have access to either

(cherry picked from commit 3c90dda)
…mental" feature flag (#50668)

Addresses https://github.com/sourcegraph/sourcegraph/issues/50632

To enable this, the Sourcegraph site admin must do the following:
1. Set `"codyRestrictUsersFeatureFlag": true` in site config under
`"experimentalFeatures"`.
2. Create a feature flag called `cody-experimental` through
https://$SOURCEGRAPH_HOST/site-admin/feature-flags
3. Set the default value of the feature flag to `false` and then add
overrides to `true` for specific users, as we do on sourcegraph.com

(cherry picked from commit 0b460b4)
@cla-bot cla-bot Bot added the cla-signed label Apr 17, 2023
@eseliger eseliger marked this pull request as ready for review April 17, 2023 14:01
@eseliger eseliger requested a review from a team April 17, 2023 14:01
@sourcegraph-bot

Copy link
Copy Markdown
Contributor

Codenotify: Notifying subscribers in CODENOTIFY files for diff 7754870...e1e0634.

Notify File(s)
@Strum355 enterprise/internal/codeintel/autoindexing/internal/background/BUILD.bazel
enterprise/internal/codeintel/ranking/internal/background/BUILD.bazel
enterprise/internal/codeintel/uploads/transport/graphql/BUILD.bazel
@efritz enterprise/cmd/executor/internal/command/BUILD.bazel
enterprise/cmd/worker/internal/permissions/BUILD.bazel
enterprise/internal/codeintel/autoindexing/internal/background/BUILD.bazel
enterprise/internal/codeintel/ranking/internal/background/BUILD.bazel
enterprise/internal/codeintel/uploads/transport/graphql/BUILD.bazel
internal/codeintel/dependencies/internal/store/BUILD.bazel
@indradhanush internal/gitserver/BUILD.bazel
internal/repos/BUILD.bazel
@keegancsmith cmd/symbols/internal/api/BUILD.bazel
internal/symbols/BUILD.bazel
@mrnugget internal/codeintel/dependencies/internal/store/BUILD.bazel
@sashaostrikov internal/gitserver/BUILD.bazel
internal/repos/BUILD.bazel
@sourcegraph/code-insights-backend enterprise/internal/insights/scheduler/BUILD.bazel
@unknwon enterprise/cmd/frontend/internal/authz/resolvers/BUILD.bazel
enterprise/internal/authz/azuredevops/BUILD.bazel
internal/authz/BUILD.bazel

@sourcegraph-bot

Copy link
Copy Markdown
Contributor

Codenotify: Notifying subscribers in OWNERS files for diff 7754870...e1e0634.

Notify File(s)
@sourcegraph/code-exploration-devs client/wildcard/BUILD.bazel
@vovakulikov client/wildcard/BUILD.bazel

@coury-clark coury-clark merged commit 0643d56 into 5.0 Apr 17, 2023
@coury-clark coury-clark deleted the backport-50668-to-5.0 branch April 17, 2023 17:44
@amenne

amenne commented Apr 18, 2023

Copy link
Copy Markdown
Contributor

@eseliger just want to confirm this will be available in 5.0.2? Looking at this for a customer to help throttle user onboarding (FYI @dhdiemer)

@eseliger

Copy link
Copy Markdown
Member Author

Yes it will!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants