DS proxy: Remove ft datasourceProxyDisableRBAC and logic (#101239)
delete ft datasourceproxy
This commit is contained in:
@@ -172,7 +172,6 @@ export interface FeatureToggles {
|
||||
newDashboardSharingComponent?: boolean;
|
||||
alertingListViewV2?: boolean;
|
||||
dashboardRestore?: boolean;
|
||||
datasourceProxyDisableRBAC?: boolean;
|
||||
alertingDisableSendAlertsExternal?: boolean;
|
||||
preserveDashboardStateWhenNavigating?: boolean;
|
||||
alertingCentralAlertHistory?: boolean;
|
||||
|
||||
@@ -306,16 +306,8 @@ func (proxy *DataSourceProxy) validateRequest() error {
|
||||
continue
|
||||
}
|
||||
|
||||
if proxy.features.IsEnabled(proxy.ctx.Req.Context(), featuremgmt.FlagDatasourceProxyDisableRBAC) {
|
||||
// TODO(aarongodin): following logic can be removed with FlagDatasourceProxyDisableRBAC as it is covered by
|
||||
// proxy.hasAccessToRoute(..)
|
||||
if route.ReqRole.IsValid() && !proxy.ctx.HasUserRole(route.ReqRole) {
|
||||
return errors.New("plugin proxy route access denied")
|
||||
}
|
||||
} else {
|
||||
if !proxy.hasAccessToRoute(route) {
|
||||
return errors.New("plugin proxy route access denied")
|
||||
}
|
||||
if !proxy.hasAccessToRoute(route) {
|
||||
return errors.New("plugin proxy route access denied")
|
||||
}
|
||||
|
||||
proxy.matchedRoute = route
|
||||
|
||||
@@ -1170,14 +1170,6 @@ var (
|
||||
HideFromAdminPage: true,
|
||||
Expression: "false", // enabled by default
|
||||
},
|
||||
{
|
||||
Name: "datasourceProxyDisableRBAC",
|
||||
Description: "Disables applying a plugin route's ReqAction field to authorization",
|
||||
Stage: FeatureStageGeneralAvailability,
|
||||
Owner: identityAccessTeam,
|
||||
HideFromDocs: true,
|
||||
Expression: "false",
|
||||
},
|
||||
{
|
||||
Name: "alertingDisableSendAlertsExternal",
|
||||
Description: "Disables the ability to send alerts to an external Alertmanager datasource.",
|
||||
|
||||
@@ -153,7 +153,6 @@ logsExploreTableDefaultVisualization,experimental,@grafana/observability-logs,fa
|
||||
newDashboardSharingComponent,GA,@grafana/sharing-squad,false,false,true
|
||||
alertingListViewV2,experimental,@grafana/alerting-squad,false,false,true
|
||||
dashboardRestore,experimental,@grafana/search-and-storage,false,false,false
|
||||
datasourceProxyDisableRBAC,GA,@grafana/identity-access-team,false,false,false
|
||||
alertingDisableSendAlertsExternal,experimental,@grafana/alerting-squad,false,false,false
|
||||
preserveDashboardStateWhenNavigating,experimental,@grafana/dashboards-squad,false,false,false
|
||||
alertingCentralAlertHistory,experimental,@grafana/alerting-squad,false,false,true
|
||||
|
||||
|
@@ -623,10 +623,6 @@ const (
|
||||
// Enables deleted dashboard restore feature
|
||||
FlagDashboardRestore = "dashboardRestore"
|
||||
|
||||
// FlagDatasourceProxyDisableRBAC
|
||||
// Disables applying a plugin route's ReqAction field to authorization
|
||||
FlagDatasourceProxyDisableRBAC = "datasourceProxyDisableRBAC"
|
||||
|
||||
// FlagAlertingDisableSendAlertsExternal
|
||||
// Disables the ability to send alerts to an external Alertmanager datasource.
|
||||
FlagAlertingDisableSendAlertsExternal = "alertingDisableSendAlertsExternal"
|
||||
|
||||
@@ -1277,6 +1277,7 @@
|
||||
"name": "datasourceProxyDisableRBAC",
|
||||
"resourceVersion": "1720021873452",
|
||||
"creationTimestamp": "2024-05-21T13:05:16Z",
|
||||
"deletionTimestamp": "2025-02-24T17:23:43Z",
|
||||
"annotations": {
|
||||
"grafana.app/updatedTimestamp": "2024-07-03 15:51:13.452477 +0000 UTC"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user