diff --git a/pkg/provision/migrations_202103_apps.go b/pkg/provision/migrations_202103_apps.go index ec86959c3..964cf4ef0 100644 --- a/pkg/provision/migrations_202103_apps.go +++ b/pkg/provision/migrations_202103_apps.go @@ -7,7 +7,7 @@ import ( "time" ) -func apps(ctx context.Context, s store.Storer) error { +func migrateApplications(ctx context.Context, s store.Storer) error { rd := releaseDate(2021, time.March) set, _, err := store.SearchApplications(ctx, s, types.ApplicationFilter{}) diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go index 1b883f306..47e0ccf41 100644 --- a/pkg/provision/provision.go +++ b/pkg/provision/provision.go @@ -17,11 +17,8 @@ import ( func Run(ctx context.Context, log *zap.Logger, s store.Storer, provisionOpt options.ProvisionOpt, authOpt options.AuthOpt) error { ffn := []func() error{ - // Old relics - func() error { return roles(ctx, s) }, - // Migrations: - func() error { return apps(ctx, s) }, + func() error { return migrateApplications(ctx, s) }, func() error { return migrateEmailTemplates(ctx, log, s) }, // Config (full & partial) diff --git a/pkg/provision/roles.go b/pkg/provision/roles.go deleted file mode 100644 index 7646a5fa9..000000000 --- a/pkg/provision/roles.go +++ /dev/null @@ -1,32 +0,0 @@ -package provision - -import ( - "context" - "time" - - "github.com/cortezaproject/corteza-server/pkg/rbac" - "github.com/cortezaproject/corteza-server/store" - "github.com/cortezaproject/corteza-server/system/types" -) - -func roles(ctx context.Context, s store.Storer) error { - if set, _, err := store.SearchRoles(ctx, s, types.RoleFilter{}); err != nil { - return err - } else if len(set) > 0 { - return nil - } - - now := time.Now().Round(time.Second) - - rr := types.RoleSet{ - &types.Role{ID: rbac.AdminsRoleID, Name: "Administrators", Handle: "admins"}, - &types.Role{ID: rbac.EveryoneRoleID, Name: "Everyone", Handle: "everyone"}, - } - - err := rr.Walk(func(r *types.Role) error { - r.CreatedAt = now - return store.CreateRole(ctx, s, r) - }) - - return err -}