Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

site-config: Remove deprecated experimentalFeatures.bitbucketServerFastperm #50707

Merged
merged 3 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ All notable changes to Sourcegraph are documented in this file.
### Removed

- User tags are removed in favor of the newer feature flags functionality. [#49318](https://github.com/sourcegraph/sourcegraph/pull/49318)
- Previously deprecated site config `experimentalFeatures.bitbucketServerFastPerm` has been removed. [#50707](https://github.com/sourcegraph/sourcegraph/pull/50707)

## 5.0.1

Expand Down
1 change: 0 additions & 1 deletion enterprise/internal/authz/bitbucketserver/BUILD.bazel

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions enterprise/internal/authz/bitbucketserver/authz.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
atypes "github.com/sourcegraph/sourcegraph/enterprise/internal/authz/types"
"github.com/sourcegraph/sourcegraph/enterprise/internal/licensing"
"github.com/sourcegraph/sourcegraph/internal/authz"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
"github.com/sourcegraph/sourcegraph/internal/extsvc/bitbucketserver"
"github.com/sourcegraph/sourcegraph/internal/types"
Expand All @@ -27,7 +26,7 @@ func NewAuthzProviders(
initResults := &atypes.ProviderInitResult{}
// Authorization (i.e., permissions) providers
for _, c := range conns {
pluginPerm := conf.BitbucketServerPluginPerm() || (c.Plugin != nil && c.Plugin.Permissions == "enabled")
pluginPerm := c.Plugin != nil && c.Plugin.Permissions == "enabled"
p, err := newAuthzProvider(c, pluginPerm)
if err != nil {
initResults.InvalidConnections = append(initResults.InvalidConnections, extsvc.TypeBitbucketServer)
Expand Down
5 changes: 0 additions & 5 deletions internal/conf/computed.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,6 @@ func SearchSymbolsParallelism() int {
return val
}

func BitbucketServerPluginPerm() bool {
val := ExperimentalFeatures().BitbucketServerFastPerm
return val == "enabled"
}

func EventLoggingEnabled() bool {
val := ExperimentalFeatures().EventLogging
if val == "" {
Expand Down
3 changes: 0 additions & 3 deletions schema/schema.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions schema/site.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,6 @@
"enum": ["enabled", "disabled"],
"default": "enabled"
},
"bitbucketServerFastPerm": {
"description": "DEPRECATED: Configure in Bitbucket Server config.",
"type": "string",
"enum": ["enabled", "disabled"],
"default": "disabled"
},
"perforce": {
"description": "Allow adding Perforce code host connections",
"type": "string",
Expand Down