Skip to content

Athena Migration Script: Add additional migration options #28560

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

Merged
logand22 merged 4 commits into from
Jul 3, 2023
Merged

Athena Migration Script: Add additional migration options #28560

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3edb4aa
Add additional function
logand22 Jun 30, 2023
e435ebf
Update examples/dynamoathenamigration/migration.go
logand22 Jul 3, 2023
79b8f42
Merge branch 'master' into logan/athena-migration-updates
logand22 Jul 3, 2023
03eb0cd
Merge branch 'master' into logan/athena-migration-updates
logand22 Jul 3, 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
23 changes: 16 additions & 7 deletions examples/dynamoathenamigration/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,7 @@ type eventsEmitter interface {
EmitAuditEvent(ctx context.Context, in apievents.AuditEvent) error
}

func newMigrateTask(ctx context.Context, cfg Config) (*task, error) {
awsCfg, err := config.LoadDefaultConfig(ctx)
if err != nil {
return nil, trace.Wrap(err)
}

func newMigrateTask(ctx context.Context, cfg Config, awsCfg aws.Config) (*task, error) {
s3Client := s3.NewFromConfig(awsCfg)
return &task{
Config: cfg,
Expand Down Expand Up @@ -179,7 +174,21 @@ func Migrate(ctx context.Context, cfg Config) error {
return trace.Wrap(err)
}

t, err := newMigrateTask(ctx, cfg)
awsCfg, err := config.LoadDefaultConfig(ctx)
if err != nil {
return trace.Wrap(err)
}

return trace.Wrap(MigrateWithAWS(ctx, cfg, awsCfg))
}

// MigrateWithAWS executed dynamodb -> athena migration. Provide your own awsCfg
func MigrateWithAWS(ctx context.Context, cfg Config, awsCfg aws.Config) error {
if err := cfg.CheckAndSetDefaults(); err != nil {
return trace.Wrap(err)
}

t, err := newMigrateTask(ctx, cfg, awsCfg)
if err != nil {
return trace.Wrap(err)
}
Expand Down