diff --git a/exthost/action_fill_disk.go b/exthost/action_fill_disk.go index d96f4b2..328c530 100644 --- a/exthost/action_fill_disk.go +++ b/exthost/action_fill_disk.go @@ -16,7 +16,6 @@ import ( "github.com/steadybit/extension-kit/extutil" "golang.org/x/sync/syncmap" "runtime/trace" - "strings" ) var ID = fmt.Sprintf("%s.fill_disk", BaseActionID) @@ -221,17 +220,6 @@ func (a *fillDiskAction) Start(ctx context.Context, state *FillDiskActionState) a.diskfills.Store(state.ExecutionId, diskFill) - if !diskFill.HasSomethingToDo() { - return &action_kit_api.StartResult{ - Messages: extutil.Ptr([]action_kit_api.Message{ - { - Level: extutil.Ptr(action_kit_api.Warn), - Message: "Nothing to do for host fill disk", - }, - }), - }, nil - } - if err := diskFill.Start(); err != nil { return nil, extension_kit.ToError("Failed to fill disk on host", err) } @@ -240,7 +228,7 @@ func (a *fillDiskAction) Start(ctx context.Context, state *FillDiskActionState) Messages: extutil.Ptr([]action_kit_api.Message{ { Level: extutil.Ptr(action_kit_api.Info), - Message: fmt.Sprintf("Starting fill disk on host with args %s", strings.Join(diskFill.Args(), " ")), + Message: "Starting fill disk on host", //TODO Re-add args to message }, }), }, nil @@ -254,8 +242,7 @@ func (a *fillDiskAction) Stop(ctx context.Context, state *FillDiskActionState) ( messages := make([]action_kit_api.Message, 0) - copiedOpts := state.FillDiskOpts - stopped := a.stopFillDiskContainer(ctx, state.ExecutionId, a.runc, state.Sidecar, copiedOpts) + stopped := a.stopFillDiskContainer(state.ExecutionId) if stopped { messages = append(messages, action_kit_api.Message{ Level: extutil.Ptr(action_kit_api.Info), @@ -276,11 +263,11 @@ func (a *fillDiskAction) fillDiskExited(executionId uuid.UUID) (bool, error) { return s.(*diskfill.DiskFill).Exited() } -func (a *fillDiskAction) stopFillDiskContainer(ctx context.Context, executionId uuid.UUID, r runc.Runc, sidecar diskfill.SidecarOpts, opts diskfill.Opts) bool { +func (a *fillDiskAction) stopFillDiskContainer(executionId uuid.UUID) bool { s, ok := a.diskfills.LoadAndDelete(executionId) if !ok { return false } - err := s.(*diskfill.DiskFill).Stop(ctx, r, sidecar, opts) + err := s.(*diskfill.DiskFill).Stop() return err == nil } diff --git a/go.mod b/go.mod index f6391ec..a7a6402 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.31.0 github.com/steadybit/action-kit/go/action_kit_api/v2 v2.8.0 - github.com/steadybit/action-kit/go/action_kit_commons v1.0.10-0.20231202225014-8f2ed6c83f45 + github.com/steadybit/action-kit/go/action_kit_commons v1.0.10-0.20231202233143-67615a1a893e github.com/steadybit/action-kit/go/action_kit_sdk v1.1.8 github.com/steadybit/action-kit/go/action_kit_test v1.2.7-0.20231201163618-36a5c38d9077 github.com/steadybit/discovery-kit/go/discovery_kit_api v1.5.0 diff --git a/go.sum b/go.sum index 135e550..cbbe5a3 100644 --- a/go.sum +++ b/go.sum @@ -268,8 +268,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/steadybit/action-kit/go/action_kit_api/v2 v2.8.0 h1:mo+wf8we5LVnxgUuJvvN/DDVA42uZt6RLKCBJtkWL/4= github.com/steadybit/action-kit/go/action_kit_api/v2 v2.8.0/go.mod h1:q9fyUhgf3LnhMRCzZ9tBjj8w2le5SUJi0vHw6A3PIKw= -github.com/steadybit/action-kit/go/action_kit_commons v1.0.10-0.20231202225014-8f2ed6c83f45 h1:l6k6f19I9aHnEaw+5iOoYRXNxOYEsjmBTOhtTo3arp4= -github.com/steadybit/action-kit/go/action_kit_commons v1.0.10-0.20231202225014-8f2ed6c83f45/go.mod h1:oIJXLzgQTPaG4CA6/KSagU43uqhz/EUnNfxLhNLl/94= +github.com/steadybit/action-kit/go/action_kit_commons v1.0.10-0.20231202233143-67615a1a893e h1:VP1KpNSfdYoL8HB8LZkNQxC7+QkAWbX3Jo+nqzMt/80= +github.com/steadybit/action-kit/go/action_kit_commons v1.0.10-0.20231202233143-67615a1a893e/go.mod h1:oIJXLzgQTPaG4CA6/KSagU43uqhz/EUnNfxLhNLl/94= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.8 h1:kcpEVZw0iv5bIE7GNmjC54XRKxUlwPkDsvfMGeudIrQ= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.8/go.mod h1:h2E1gRdpIhWvfQy5XsRIfQi3AujlpdcXxt3tNU9829U= github.com/steadybit/action-kit/go/action_kit_test v1.2.7-0.20231201163618-36a5c38d9077 h1:t3ICl0+woASuMjhkmbUpYg7eTD1piB8vVRDpOeyeIoI=