Skip to content

Add data release to cleaner #3

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
pablomendezroyo merged 1 commit into from
May 26, 2025
Merged

Add data release to cleaner #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 21 additions & 13 deletions internal/adapters/composite/cleaner/cleaner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,32 @@ import (
"clients-test/internal/adapters/apis/dappmanager"
"clients-test/internal/adapters/apis/docker"
"clients-test/internal/adapters/apis/execution"
"clients-test/internal/adapters/apis/tropidatooor"
"clients-test/internal/adapters/system/mount"
"clients-test/internal/application/domain"
"context"
"fmt"
)

type CleanerAdapter struct {
Dappmanager *dappmanager.DappManagerAdapter
Execution *execution.ExecutionAdapter
Brain *brain.BrainAdapter
Beaconchain *beaconchain.BeaconchainAdapter
Docker *docker.DockerAdapter
Mount *mount.MountAdapter
Dappmanager *dappmanager.DappManagerAdapter
Execution *execution.ExecutionAdapter
Brain *brain.BrainAdapter
Beaconchain *beaconchain.BeaconchainAdapter
Docker *docker.DockerAdapter
Mount *mount.MountAdapter
Tropidatooor *tropidatooor.TropidatooorAdapter
}

func NewCleanerAdapter(dappmanager *dappmanager.DappManagerAdapter, execution *execution.ExecutionAdapter, brain *brain.BrainAdapter, beaconchain *beaconchain.BeaconchainAdapter, docker *docker.DockerAdapter, mount *mount.MountAdapter) *CleanerAdapter {
func NewCleanerAdapter(dappmanager *dappmanager.DappManagerAdapter, execution *execution.ExecutionAdapter, brain *brain.BrainAdapter, beaconchain *beaconchain.BeaconchainAdapter, docker *docker.DockerAdapter, mount *mount.MountAdapter, tropidatooor *tropidatooor.TropidatooorAdapter) *CleanerAdapter {
return &CleanerAdapter{
Dappmanager: dappmanager,
Execution: execution,
Brain: brain,
Beaconchain: beaconchain,
Docker: docker,
Mount: mount,
Dappmanager: dappmanager,
Execution: execution,
Brain: brain,
Beaconchain: beaconchain,
Docker: docker,
Mount: mount,
Tropidatooor: tropidatooor,
}
}

Expand All @@ -42,6 +45,11 @@ func (e *CleanerAdapter) CleanEnvironment(ctx context.Context, stakerConfig doma
}
}

err = e.Tropidatooor.DataRelease(ctx, mountConfig.Id)
if err != nil {
fmt.Printf("failed to release data for uniqueId %s: %v\n", mountConfig.Id, err)
}

// Remove non-core packages. Web3signer volume is not removed to persist the keys
err = e.Dappmanager.RemoveNonCorePackages(ctx)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/composite/composite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func NewCompositeAdapter(
) *CompositeAdapter {
ensurer := ensurer.NewEnsurerAdapter(dappManagerAdapter, brainAdapter, tropidatooorAdapter, dockerAdapter, mountAdapter, beaconchainAdapter, executionAdapter, ipfsAdapter)
executor := executor.NewExecutorAdapter(executionAdapter, brainAdapter, beaconchainAdapter)
cleaner := cleaner.NewCleanerAdapter(dappManagerAdapter, executionAdapter, brainAdapter, beaconchainAdapter, dockerAdapter, mountAdapter)
cleaner := cleaner.NewCleanerAdapter(dappManagerAdapter, executionAdapter, brainAdapter, beaconchainAdapter, dockerAdapter, mountAdapter, tropidatooorAdapter)
return &CompositeAdapter{ensurer, executor, cleaner}
}

Expand Down