diff --git a/pkg/api/dashboard_permission.go b/pkg/api/dashboard_permission.go index 7ebb0e37a53..eccae6871b0 100644 --- a/pkg/api/dashboard_permission.go +++ b/pkg/api/dashboard_permission.go @@ -156,7 +156,7 @@ func (hs *HTTPServer) UpdateDashboardPermissions(c *models.ReqContext) response. return dashboardGuardianResponse(err) } - var items []*models.DashboardACL + items := make([]*models.DashboardACL, 0, len(apiCmd.Items)) for _, item := range apiCmd.Items { items = append(items, &models.DashboardACL{ OrgID: c.OrgID, diff --git a/pkg/api/folder_permission.go b/pkg/api/folder_permission.go index 09ccd441e11..c48dda8f108 100644 --- a/pkg/api/folder_permission.go +++ b/pkg/api/folder_permission.go @@ -105,7 +105,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *models.ReqContext) response.Res return apierrors.ToFolderErrorResponse(dashboards.ErrFolderAccessDenied) } - var items []*models.DashboardACL + items := make([]*models.DashboardACL, 0, len(apiCmd.Items)) for _, item := range apiCmd.Items { items = append(items, &models.DashboardACL{ OrgID: c.OrgID, diff --git a/pkg/codegen/jenny_tsveneerindex.go b/pkg/codegen/jenny_tsveneerindex.go index 6052cc94bf5..1d5b11dea2c 100644 --- a/pkg/codegen/jenny_tsveneerindex.go +++ b/pkg/codegen/jenny_tsveneerindex.go @@ -306,7 +306,7 @@ var allowedTSVeneers = map[string]bool{ } func allowedTSVeneersString() string { - var list []string + list := make([]string, 0, len(allowedTSVeneers)) for tgt := range allowedTSVeneers { list = append(list, tgt) } diff --git a/pkg/plugins/pfs/pfs.go b/pkg/plugins/pfs/pfs.go index 04682f07380..3de4651ef8c 100644 --- a/pkg/plugins/pfs/pfs.go +++ b/pkg/plugins/pfs/pfs.go @@ -49,7 +49,7 @@ type slotandname struct { var allslots []slotandname func init() { - var all []string + all := make([]string, 0, len(PermittedCUEImports())) for _, im := range PermittedCUEImports() { all = append(all, fmt.Sprintf("\t%s", im)) } diff --git a/pkg/plugins/storage/fs.go b/pkg/plugins/storage/fs.go index 0660e648159..302305a1196 100644 --- a/pkg/plugins/storage/fs.go +++ b/pkg/plugins/storage/fs.go @@ -55,7 +55,7 @@ func (fs *FS) Add(ctx context.Context, pluginID string, pluginArchive *zip.ReadC fs.log.Successf("Downloaded and extracted %s v%s zip successfully to %s", res.ID, res.Info.Version, pluginDir) - var deps []*Dependency + deps := make([]*Dependency, 0, len(res.Dependencies.Plugins)) for _, plugin := range res.Dependencies.Plugins { deps = append(deps, &Dependency{ ID: plugin.ID, diff --git a/pkg/services/accesscontrol/evaluator.go b/pkg/services/accesscontrol/evaluator.go index 67f43fc0495..fe84337f617 100644 --- a/pkg/services/accesscontrol/evaluator.go +++ b/pkg/services/accesscontrol/evaluator.go @@ -124,7 +124,7 @@ func (a allEvaluator) Evaluate(permissions map[string][]string) bool { } func (a allEvaluator) MutateScopes(ctx context.Context, mutate ScopeAttributeMutator) (Evaluator, error) { - var modified []Evaluator + modified := make([]Evaluator, 0, len(a.allOf)) for _, e := range a.allOf { i, err := e.MutateScopes(ctx, mutate) if err != nil { @@ -174,7 +174,7 @@ func (a anyEvaluator) Evaluate(permissions map[string][]string) bool { } func (a anyEvaluator) MutateScopes(ctx context.Context, mutate ScopeAttributeMutator) (Evaluator, error) { - var modified []Evaluator + modified := make([]Evaluator, 0, len(a.anyOf)) for _, e := range a.anyOf { i, err := e.MutateScopes(ctx, mutate) if err != nil { diff --git a/pkg/services/accesscontrol/resourcepermissions/service.go b/pkg/services/accesscontrol/resourcepermissions/service.go index c0f236c330a..9e57be89ffa 100644 --- a/pkg/services/accesscontrol/resourcepermissions/service.go +++ b/pkg/services/accesscontrol/resourcepermissions/service.go @@ -53,7 +53,7 @@ func New( ac accesscontrol.AccessControl, service accesscontrol.Service, sqlStore db.DB, teamService team.Service, userService user.Service, ) (*Service, error) { - var permissions []string + permissions := make([]string, 0, len(options.PermissionsToActions)) actionSet := make(map[string]struct{}) for permission, actions := range options.PermissionsToActions { permissions = append(permissions, permission) diff --git a/pkg/services/accesscontrol/resourcepermissions/store.go b/pkg/services/accesscontrol/resourcepermissions/store.go index 0b9f6925a61..1ee3bba77ac 100644 --- a/pkg/services/accesscontrol/resourcepermissions/store.go +++ b/pkg/services/accesscontrol/resourcepermissions/store.go @@ -608,7 +608,7 @@ func (s *store) createPermissions(sess *db.Session, roleID int64, resource, reso if len(actions) == 0 { return nil } - var permissions []accesscontrol.Permission + permissions := make([]accesscontrol.Permission, 0, len(actions)) for action := range actions { p := managedPermission(action, resource, resourceID, resourceAttribute) p.RoleID = roleID