From 60b4d4f6364f51a38cc82ef6fa602eafe6eaf891 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Thu, 24 Sep 2020 07:27:11 +0200 Subject: [PATCH] Fix role provisioning --- provision/system/provision.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/provision/system/provision.go b/provision/system/provision.go index 2676ee38a..3e43a99ce 100644 --- a/provision/system/provision.go +++ b/provision/system/provision.go @@ -50,13 +50,12 @@ func Provision(ctx context.Context, log *zap.Logger, s store.Storer) (err error) if hasRoles, err = checkRoles(ctx, s); err != nil { return err } else if !hasRoles { - rs := service.DefaultRole.With(ctx) rr := types.RoleSet{ - &types.Role{ID: 0, Name: "Administrators", Handle: "admins"}, - &types.Role{ID: 0, Name: "Everyone", Handle: "everyone"}, + &types.Role{ID: rbac.AdminsRoleID, Name: "Administrators", Handle: "admins"}, + &types.Role{ID: rbac.EveryoneRoleID, Name: "Everyone", Handle: "everyone"}, } - if err = rr.Walk(func(r *types.Role) error { _, err := rs.Create(r); return err }); err != nil { + if err = rr.Walk(func(r *types.Role) error { return store.CreateRole(ctx, s, r) }); err != nil { return err } }