From 555163b602bcc54a95229b0947851a07d95c6543 Mon Sep 17 00:00:00 2001 From: Ansgar Schulte <1299623+ansgarschulte@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:37:36 +0100 Subject: [PATCH 1/3] feat: add execution id to container id --- exthost/action_fill_disk.go | 1 + exthost/action_network.go | 1 + exthost/action_stress.go | 1 + go.mod | 2 +- go.sum | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/exthost/action_fill_disk.go b/exthost/action_fill_disk.go index e01a881d..c7d2fe1c 100644 --- a/exthost/action_fill_disk.go +++ b/exthost/action_fill_disk.go @@ -195,6 +195,7 @@ func (a *fillDiskAction) Prepare(ctx context.Context, state *FillDiskActionState state.Sidecar = diskfill.SidecarOpts{ TargetProcess: initProcess, IdSuffix: "host", + ExecutionId: request.ExecutionId, } state.FillDiskOpts = opts state.ExecutionId = request.ExecutionId diff --git a/exthost/action_network.go b/exthost/action_network.go index e9791213..56d70892 100644 --- a/exthost/action_network.go +++ b/exthost/action_network.go @@ -102,6 +102,7 @@ func (a *networkAction) Prepare(ctx context.Context, state *NetworkActionState, state.Sidecar = network.SidecarOpts{ TargetProcess: initProcess, IdSuffix: "host", + ExecutionId: request.ExecutionId, } opts, messages, err := a.optsProvider(ctx, state.Sidecar, request) diff --git a/exthost/action_stress.go b/exthost/action_stress.go index f125aa66..e8f5ed29 100644 --- a/exthost/action_stress.go +++ b/exthost/action_stress.go @@ -101,6 +101,7 @@ func (a *stressAction) Prepare(ctx context.Context, state *StressActionState, re state.Sidecar = stress.SidecarOpts{ TargetProcess: initProcess, IdSuffix: "host", + ExecutionId: request.ExecutionId, } state.ExecutionId = request.ExecutionId if !extutil.ToBool(request.Config["failOnOomKill"]) { diff --git a/go.mod b/go.mod index 7f3362b3..5c3c22d9 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.33.0 github.com/steadybit/action-kit/go/action_kit_api/v2 v2.9.6 - github.com/steadybit/action-kit/go/action_kit_commons v1.2.14 + github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116132539-7257dc01be86 github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14 github.com/steadybit/action-kit/go/action_kit_test v1.3.2 github.com/steadybit/discovery-kit/go/discovery_kit_api v1.6.0 diff --git a/go.sum b/go.sum index 3215e7c1..4758d36b 100644 --- a/go.sum +++ b/go.sum @@ -144,6 +144,7 @@ github.com/steadybit/action-kit/go/action_kit_api/v2 v2.9.6 h1:Qci7Numf66mjCIRo7 github.com/steadybit/action-kit/go/action_kit_api/v2 v2.9.6/go.mod h1:ycF2RLgRsB8I/jD52aE+dKZKVru1GIEtmkcRcIR3vXk= github.com/steadybit/action-kit/go/action_kit_commons v1.2.14 h1:9sGm4L8cVeXUMRp4gBWW93LMsEBJQw42mlyJLzj8Cdw= github.com/steadybit/action-kit/go/action_kit_commons v1.2.14/go.mod h1:Fyz7eekZhKf3j9br2aoT77kx292bpXdWzJ/m+dGwqDM= +github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116132539-7257dc01be86/go.mod h1:GFLcaf/WluBIqnq+iSCEGkEqxnfB9h1I16IBR1T7kNQ= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14 h1:x94RX+vh9Iyc0tS6BhiSpvknj+xE36AV0Nc3D5Yuub0= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14/go.mod h1:Tp/klK5b7k+BCvb3JTSDZSNcnpFBaHauhndzOarnMW4= github.com/steadybit/action-kit/go/action_kit_test v1.3.2 h1:DFDznoWEbTGv+fiGYiRaq7tq5es9VTScjrWusRAbS08= From 23fc7178da95c1b833ed2c5e03a8e7ea51da9ce4 Mon Sep 17 00:00:00 2001 From: Ansgar Schulte <1299623+ansgarschulte@users.noreply.github.com> Date: Thu, 16 Jan 2025 16:19:31 +0100 Subject: [PATCH 2/3] fix: go.sum --- go.sum | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 4758d36b..9d5966cb 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,7 @@ 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.9.6 h1:Qci7Numf66mjCIRo7KDwHUimIxUZzq+GBfyv/1f/QCU= github.com/steadybit/action-kit/go/action_kit_api/v2 v2.9.6/go.mod h1:ycF2RLgRsB8I/jD52aE+dKZKVru1GIEtmkcRcIR3vXk= -github.com/steadybit/action-kit/go/action_kit_commons v1.2.14 h1:9sGm4L8cVeXUMRp4gBWW93LMsEBJQw42mlyJLzj8Cdw= -github.com/steadybit/action-kit/go/action_kit_commons v1.2.14/go.mod h1:Fyz7eekZhKf3j9br2aoT77kx292bpXdWzJ/m+dGwqDM= +github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116132539-7257dc01be86 h1:2/9lvWSFcN4aUZSYnPGx+6bk0/kEYIvGyLeW/m1euNs= github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116132539-7257dc01be86/go.mod h1:GFLcaf/WluBIqnq+iSCEGkEqxnfB9h1I16IBR1T7kNQ= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14 h1:x94RX+vh9Iyc0tS6BhiSpvknj+xE36AV0Nc3D5Yuub0= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14/go.mod h1:Tp/klK5b7k+BCvb3JTSDZSNcnpFBaHauhndzOarnMW4= From d859fc632002b74bc6eeafd21063c5120ca8a759 Mon Sep 17 00:00:00 2001 From: Ansgar Schulte <1299623+ansgarschulte@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:12:15 +0100 Subject: [PATCH 3/3] feat: add execution id to container id (shorter) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5c3c22d9..4e8b3d23 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.33.0 github.com/steadybit/action-kit/go/action_kit_api/v2 v2.9.6 - github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116132539-7257dc01be86 + github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116161007-c7e02610cc20 github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14 github.com/steadybit/action-kit/go/action_kit_test v1.3.2 github.com/steadybit/discovery-kit/go/discovery_kit_api v1.6.0 diff --git a/go.sum b/go.sum index 9d5966cb..b7735c73 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,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.9.6 h1:Qci7Numf66mjCIRo7KDwHUimIxUZzq+GBfyv/1f/QCU= github.com/steadybit/action-kit/go/action_kit_api/v2 v2.9.6/go.mod h1:ycF2RLgRsB8I/jD52aE+dKZKVru1GIEtmkcRcIR3vXk= -github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116132539-7257dc01be86 h1:2/9lvWSFcN4aUZSYnPGx+6bk0/kEYIvGyLeW/m1euNs= -github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116132539-7257dc01be86/go.mod h1:GFLcaf/WluBIqnq+iSCEGkEqxnfB9h1I16IBR1T7kNQ= +github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116161007-c7e02610cc20 h1:gIdaKjImy2KwRbjrGlOLCQQbtDQvMPfXnt+0D6M9DfY= +github.com/steadybit/action-kit/go/action_kit_commons v1.2.17-0.20250116161007-c7e02610cc20/go.mod h1:GFLcaf/WluBIqnq+iSCEGkEqxnfB9h1I16IBR1T7kNQ= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14 h1:x94RX+vh9Iyc0tS6BhiSpvknj+xE36AV0Nc3D5Yuub0= github.com/steadybit/action-kit/go/action_kit_sdk v1.1.14/go.mod h1:Tp/klK5b7k+BCvb3JTSDZSNcnpFBaHauhndzOarnMW4= github.com/steadybit/action-kit/go/action_kit_test v1.3.2 h1:DFDznoWEbTGv+fiGYiRaq7tq5es9VTScjrWusRAbS08=