opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 09:52:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

E2C: Change permissions for navigating to Cloud Migration (#84594)

Browse Source 
* allow org admins / settings writers to access e2c

* test for org admin specifically
This commit is contained in:
Josh Hunt
2024-03-15 17:22:39 +00:00
committed by GitHub
parent 97f37b2e6f
commit 08f4aeded1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/navtree/navtreeimpl/admin.go
View File

@ -7,6 +7,7 @@ import (
"github.com/grafana/grafana/pkg/services/correlations" "github.com/grafana/grafana/pkg/services/correlations"
"github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/navtree" "github.com/grafana/grafana/pkg/services/navtree"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol" "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
"github.com/grafana/grafana/pkg/services/serviceaccounts" "github.com/grafana/grafana/pkg/services/serviceaccounts"
) )
@ -135,7 +136,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
configNodes = append(configNodes, storage) configNodes = append(configNodes, storage)
} }
if s.features.IsEnabled(ctx, featuremgmt.FlagOnPremToCloudMigrations) && c.SignedInUser.IsGrafanaAdmin { if s.features.IsEnabled(ctx, featuremgmt.FlagOnPremToCloudMigrations) && c.SignedInUser.HasRole(org.RoleAdmin) {
migrateToCloud := &navtree.NavLink{ migrateToCloud := &navtree.NavLink{
Text: "Migrate to Grafana Cloud", Text: "Migrate to Grafana Cloud",
Id: "migrate-to-cloud", Id: "migrate-to-cloud",

2
public/app/routes/routes.tsx
View File

@ -364,7 +364,7 @@ export function getAppRoutes(): RouteDescriptor[] {
}, },
config.featureToggles.onPremToCloudMigrations && { config.featureToggles.onPremToCloudMigrations && {
path: '/admin/migrate-to-cloud', path: '/admin/migrate-to-cloud',
roles: () => ['ServerAdmin'], roles: () => ['Admin'],
component: SafeDynamicImport( component: SafeDynamicImport(
() => import(/* webpackChunkName: "MigrateToCloud" */ 'app/features/admin/migrate-to-cloud/MigrateToCloud') () => import(/* webpackChunkName: "MigrateToCloud" */ 'app/features/admin/migrate-to-cloud/MigrateToCloud')
), ),