Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrations: Revert remove ACL migration #5942

Merged
merged 5 commits into from
May 31, 2023
Merged

Migrations: Revert remove ACL migration #5942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
203f3bd
Migrations: Revert remove ACL migration
N-o-Z May 23, 2023
c0e4f8e
Gofmt
N-o-Z May 24, 2023
90b6fec
CR Fixes
N-o-Z May 28, 2023
7233b98
CR Fixes
N-o-Z May 31, 2023
85719c5
CR Fixes 2
N-o-Z May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions cmd/lakefs/cmd/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/treeverse/lakefs/pkg/config"
"github.com/treeverse/lakefs/pkg/kv"
"github.com/treeverse/lakefs/pkg/kv/migrations"
"github.com/treeverse/lakefs/pkg/logging"
)

// migrateCmd represents the migrate command
Expand Down Expand Up @@ -77,6 +78,8 @@ var upCmd = &cobra.Command{
}
defer kvStore.Close()

force, _ := cmd.Flags().GetBool("force")

_, err = kv.ValidateSchemaVersion(ctx, kvStore)
switch {
case err == nil:
Expand All @@ -85,7 +88,7 @@ var upCmd = &cobra.Command{
_, _ = fmt.Fprintf(os.Stderr, "%s\n", err)
os.Exit(1)
case errors.Is(err, kv.ErrMigrationRequired):
err = doMigration(ctx, kvStore, cfg)
err = DoMigration(ctx, kvStore, cfg, force)
if err != nil {
_, _ = fmt.Fprintf(os.Stderr, "Migration failed: %s\n", err)
os.Exit(1)
Expand All @@ -98,7 +101,7 @@ var upCmd = &cobra.Command{
},
}

func doMigration(ctx context.Context, kvStore kv.Store, cfg *config.Config) error {
func DoMigration(ctx context.Context, kvStore kv.Store, cfg *config.Config, force bool) error {
var (
version int
err error
Expand All @@ -109,22 +112,15 @@ func doMigration(ctx context.Context, kvStore kv.Store, cfg *config.Config) erro
return err
}
switch {
case version < kv.ACLNoReposMigrateVersion || version >= kv.NextSchemaVersion:
case version >= kv.NextSchemaVersion || version < kv.ACLMigrateVersion:
return fmt.Errorf("wrong starting version %d: %w", version, kv.ErrMigrationVersion)

case version < kv.ACLNoReposMigrateVersion:
err = migrations.MigrateToACL(ctx, kvStore, cfg, logging.Default(), version, force)
case version < kv.ACLImportMigrateVersion:
// skip migrate to ACL for users with External authorizations
if !cfg.IsAuthUISimplified() {
fmt.Println("skipping ACL migration - external Authorization")
err = kv.SetDBSchemaVersion(ctx, kvStore, kv.ACLImportMigrateVersion)
if err != nil {
return fmt.Errorf("failed to upgrade version, to fix this re-run migration: %w", err)
}
} else {
if err = migrations.MigrateImportPermissions(ctx, kvStore); err != nil {
return err
}
}
err = migrations.MigrateImportPermissions(ctx, kvStore, cfg)
}
if err != nil {
return err
}
}
return nil
Expand Down
110 changes: 110 additions & 0 deletions cmd/lakefs/cmd/migrate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
package cmd_test

import (
"context"
"testing"

"github.com/stretchr/testify/require"
"github.com/treeverse/lakefs/cmd/lakefs/cmd"
"github.com/treeverse/lakefs/pkg/config"
"github.com/treeverse/lakefs/pkg/kv"
"github.com/treeverse/lakefs/pkg/kv/kvtest"
)

func TestDoMigrate(t *testing.T) {
ctx := context.Background()

t.Run("not_initialized", func(t *testing.T) {
kvStore := kvtest.GetStore(ctx, t)
err := cmd.DoMigration(ctx, kvStore, nil, false)
require.ErrorIs(t, err, kv.ErrNotFound)
_, err = kv.GetDBSchemaVersion(ctx, kvStore)
require.ErrorIs(t, err, kv.ErrNotFound)
})

t.Run("not_meets_required_version", func(t *testing.T) {
kvStore := kvtest.GetStore(ctx, t)
require.NoError(t, kv.SetDBSchemaVersion(ctx, kvStore, kv.InitialMigrateVersion))
err := cmd.DoMigration(ctx, kvStore, nil, false)
require.ErrorIs(t, err, kv.ErrMigrationVersion)
version, err := kv.GetDBSchemaVersion(ctx, kvStore)
require.NoError(t, err)
require.Equal(t, kv.InitialMigrateVersion, version)
})

t.Run("from_acl_v1_no_force", func(t *testing.T) {
cfg := config.Config{}
cfg.Auth.UIConfig.RBAC = config.AuthRBACSimplified
kvStore := kvtest.GetStore(ctx, t)
require.NoError(t, kv.SetDBSchemaVersion(ctx, kvStore, kv.ACLMigrateVersion))
err := cmd.DoMigration(ctx, kvStore, &cfg, false)
require.ErrorIs(t, err, kv.ErrMigrationVersion)
version, err := kv.GetDBSchemaVersion(ctx, kvStore)
require.NoError(t, err)
require.Equal(t, kv.ACLMigrateVersion, version)
})

t.Run("from_acl_v1_force", func(t *testing.T) {
cfg := config.Config{}
cfg.Auth.UIConfig.RBAC = config.AuthRBACSimplified
kvStore := kvtest.GetStore(ctx, t)
require.NoError(t, kv.SetDBSchemaVersion(ctx, kvStore, kv.ACLNoReposMigrateVersion))
err := cmd.DoMigration(ctx, kvStore, &cfg, true)
require.NoError(t, err)
version, err := kv.GetDBSchemaVersion(ctx, kvStore)
require.NoError(t, err)
require.True(t, kv.IsLatestSchemaVersion(version))
})

t.Run("from_acl_v2", func(t *testing.T) {
cfg := config.Config{}
cfg.Auth.UIConfig.RBAC = config.AuthRBACSimplified
startVer := kv.ACLNoReposMigrateVersion
for !kv.IsLatestSchemaVersion(startVer) {
kvStore := kvtest.GetStore(ctx, t)
require.NoError(t, kv.SetDBSchemaVersion(ctx, kvStore, uint(startVer)))
err := cmd.DoMigration(ctx, kvStore, &cfg, false)
require.NoError(t, err)
version, err := kv.GetDBSchemaVersion(ctx, kvStore)
require.NoError(t, err)
require.True(t, kv.IsLatestSchemaVersion(version))
startVer += 1
}
})

t.Run("latest_version", func(t *testing.T) {
cfg := config.Config{}
cfg.Auth.UIConfig.RBAC = config.AuthRBACSimplified
kvStore := kvtest.GetStore(ctx, t)
require.NoError(t, kv.SetDBSchemaVersion(ctx, kvStore, kv.NextSchemaVersion-1))
err := cmd.DoMigration(ctx, kvStore, &cfg, false)
require.NoError(t, err)
version, err := kv.GetDBSchemaVersion(ctx, kvStore)
require.NoError(t, err)
require.True(t, kv.IsLatestSchemaVersion(version))
})

t.Run("next_version", func(t *testing.T) {
cfg := config.Config{}
cfg.Auth.UIConfig.RBAC = config.AuthRBACSimplified
kvStore := kvtest.GetStore(ctx, t)
require.NoError(t, kv.SetDBSchemaVersion(ctx, kvStore, kv.NextSchemaVersion))
err := cmd.DoMigration(ctx, kvStore, &cfg, false)
require.ErrorIs(t, err, kv.ErrMigrationVersion)
version, err := kv.GetDBSchemaVersion(ctx, kvStore)
require.NoError(t, err)
require.Equal(t, kv.NextSchemaVersion, version)
})

t.Run("invalid_version", func(t *testing.T) {
cfg := config.Config{}
cfg.Auth.UIConfig.RBAC = config.AuthRBACSimplified
kvStore := kvtest.GetStore(ctx, t)
require.NoError(t, kv.SetDBSchemaVersion(ctx, kvStore, 0))
err := cmd.DoMigration(ctx, kvStore, &cfg, false)
require.ErrorIs(t, err, kv.ErrMigrationVersion)
version, err := kv.GetDBSchemaVersion(ctx, kvStore)
require.NoError(t, err)
require.Equal(t, 0, version)
})
}
19 changes: 19 additions & 0 deletions pkg/auth/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,25 @@ var statementByName = map[string]model.Statement{
},
}

// GetActionsForPolicyType returns the actions for police type typ.
func GetActionsForPolicyType(typ string) ([]string, error) {
statement, ok := statementByName[typ]
if !ok {
return nil, fmt.Errorf("%w: %s", ErrStatementNotFound, typ)
}
actions := make([]string, len(statement.Action))
copy(actions, statement.Action)
return actions, nil
}

func GetActionsForPolicyTypeOrDie(typ string) []string {
ret, err := GetActionsForPolicyType(typ)
if err != nil {
panic(err)
}
return ret
}

// MakeStatementForPolicyType returns statements for policy type typ,
// limited to resources.
func MakeStatementForPolicyType(typ string, resources []string) (model.Statements, error) {
Expand Down
5 changes: 3 additions & 2 deletions pkg/kv/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ func ValidateSchemaVersion(ctx context.Context, store Store) (int, error) {
return kvVersion, fmt.Errorf("incompatible schema version. Latest: %d: %w", NextSchemaVersion-1, ErrMigrationVersion)
case kvVersion < InitialMigrateVersion:
return kvVersion, fmt.Errorf("migration to KV required. Did you migrate using version v0.80.x? https://docs.lakefs.io/reference/upgrade.html#lakefs-0800-or-greater-kv-migration: %w", ErrMigrationVersion)
case kvVersion < ACLNoReposMigrateVersion:
return kvVersion, fmt.Errorf("migration to ACL required. Did you migrate using version v0.99.x? https://docs.lakefs.io/reference/access-control-list.html#migrating-from-the-previous-version-of-acls: %w", ErrMigrationVersion)
case kvVersion < ACLMigrateVersion,
kvVersion < ACLNoReposMigrateVersion:
return kvVersion, fmt.Errorf("migration to ACL required. Please run 'lakefs migrate up': %w", ErrMigrationRequired)
case kvVersion < ACLImportMigrateVersion:
return kvVersion, fmt.Errorf("ACL migration required. Please run 'lakefs migrate up': %w", ErrMigrationRequired)
}
Expand Down
15 changes: 9 additions & 6 deletions pkg/kv/migrations/import_permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@ import (
"fmt"

"github.com/treeverse/lakefs/pkg/auth/model"
"github.com/treeverse/lakefs/pkg/config"
"github.com/treeverse/lakefs/pkg/kv"
"github.com/treeverse/lakefs/pkg/permissions"
"golang.org/x/exp/slices"
"google.golang.org/protobuf/types/known/timestamppb"
)

func MigrateImportPermissions(ctx context.Context, kvStore kv.Store) error {
func MigrateImportPermissions(ctx context.Context, kvStore kv.Store, cfg *config.Config) error {
// skip migrate for users with External authorizations
if !cfg.IsAuthUISimplified() {
fmt.Println("skipping ACL migration - external Authorization")
return updateKVSchemaVersion(ctx, kvStore, kv.ACLImportMigrateVersion)
}

const action = "fs:Import*"
it, err := kv.NewPrimaryIterator(ctx, kvStore, (&model.PolicyData{}).ProtoReflect().Type(), model.PartitionKey, model.PolicyPath(""), kv.IteratorOptionsFrom([]byte("")))
if err != nil {
Expand Down Expand Up @@ -42,9 +49,5 @@ func MigrateImportPermissions(ctx context.Context, kvStore kv.Store) error {
}
}

err = kv.SetDBSchemaVersion(ctx, kvStore, kv.ACLImportMigrateVersion)
if err != nil {
return fmt.Errorf("migration succeeded but failed to upgrade version, to fix this re-run migration: %w", err)
}
return nil
return updateKVSchemaVersion(ctx, kvStore, kv.ACLImportMigrateVersion)
}
Loading