diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 3c44ec151b9..04d3b87f701 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -168,7 +168,7 @@ require ( github.com/consensys/gnark-crypto v0.20.1 // indirect github.com/containerd/console v1.0.5 // indirect github.com/containerd/containerd/api v1.11.1 // indirect - github.com/containerd/containerd/v2 v2.3.5 // indirect + github.com/containerd/containerd/v2 v2.3.6 // indirect github.com/containerd/continuity v0.5.0 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 2b1cbe117e4..913f3b39798 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -404,8 +404,8 @@ github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/q github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd/api v1.11.1 h1:h8nfoDW9+fNsC/9TwiAHj8B1GzXKtR4eFtkhi/X5RLU= github.com/containerd/containerd/api v1.11.1/go.mod h1:CaQFRu+N1MtbgL6JDOJLUB1hCKESU1lD6MuTJhgtdlw= -github.com/containerd/containerd/v2 v2.3.5 h1:9MYlI81gUcOZ0WsCkSMtvOU7rTR3hqAoa2eCzhoLlkA= -github.com/containerd/containerd/v2 v2.3.5/go.mod h1:RXDyLPaI3zoO7dFdAW9/54W4cix+z3A6larieufC9mg= +github.com/containerd/containerd/v2 v2.3.6 h1:huoqZXaDW1x1kgPvFC4rMwxv92vUJnqgq7I5b1rSddM= +github.com/containerd/containerd/v2 v2.3.6/go.mod h1:qaUSWKk9EchqbudSbhv1MxI8dXKGYHLpZtMQdkEkVZ4= github.com/containerd/continuity v0.5.0 h1:7a85HZpCSs+1Zps0Ee3DPSuAWY+0SJM1JNM51nlEVDg= github.com/containerd/continuity v0.5.0/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= diff --git a/core/services/workflows/artifacts/v2/file_module_store_test.go b/core/services/workflows/artifacts/v2/file_module_store_test.go index 0792fa8ca56..68d102ba2c2 100644 --- a/core/services/workflows/artifacts/v2/file_module_store_test.go +++ b/core/services/workflows/artifacts/v2/file_module_store_test.go @@ -167,6 +167,37 @@ func TestStore_CleanOnStartup(t *testing.T) { assert.Equal(t, []byte("fresh"), got) } +func TestStore_CleanOnStartupRemovesAllContents(t *testing.T) { + t.Parallel() + dir := t.TempDir() + + leftovers := []string{ + filepath.Join(dir, "wf-stale", binaryFileName), + filepath.Join(dir, "wf-stale", engineVersionFileName), + filepath.Join(dir, "wf-stale", binaryFileName+".tmp"), // interrupted atomic write + filepath.Join(dir, "wf-nested", "inner", binaryFileName), + filepath.Join(dir, "orphan.txt"), + filepath.Join(dir, ".hidden"), + } + for _, p := range leftovers { + require.NoError(t, os.MkdirAll(filepath.Dir(p), 0o755)) + require.NoError(t, os.WriteFile(p, []byte("leftover"), 0o600)) + } + require.NoError(t, os.MkdirAll(filepath.Join(dir, "empty-dir"), 0o755)) + + s, err := NewFileModuleStore(dir, true) + require.NoError(t, err) + + entries, err := os.ReadDir(s.CacheDir()) + require.NoError(t, err) + assert.Empty(t, entries, "cache rebuild must leave no leftover files behind") + + for _, p := range leftovers { + _, err := os.Stat(p) + assert.ErrorIs(t, err, os.ErrNotExist) + } +} + func TestStore_ConcurrentAccess(t *testing.T) { t.Parallel() s, err := NewFileModuleStore(t.TempDir(), false) diff --git a/plugins/plugins.public.yaml b/plugins/plugins.public.yaml index 5e342c7215d..2a2fdbaa244 100644 --- a/plugins/plugins.public.yaml +++ b/plugins/plugins.public.yaml @@ -69,7 +69,7 @@ plugins: capability-consensus: - moduleURI: "github.com/smartcontractkit/capabilities/consensus" - gitRef: "fab9af5ab180a205dbfd5d90a1cd837815019159" + gitRef: "2aaae97ddf6900b082391c4756687b7584bfaf8a" installPath: "." capability-httpaction: diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 1346828d714..86b87f7c8eb 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -179,7 +179,7 @@ require ( github.com/consensys/gnark-crypto v0.20.1 // indirect github.com/containerd/console v1.0.5 // indirect github.com/containerd/containerd/api v1.11.1 // indirect - github.com/containerd/containerd/v2 v2.3.5 // indirect + github.com/containerd/containerd/v2 v2.3.6 // indirect github.com/containerd/continuity v0.5.0 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 0bfe752f939..381c70b04cc 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -399,8 +399,8 @@ github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/q github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd/api v1.11.1 h1:h8nfoDW9+fNsC/9TwiAHj8B1GzXKtR4eFtkhi/X5RLU= github.com/containerd/containerd/api v1.11.1/go.mod h1:CaQFRu+N1MtbgL6JDOJLUB1hCKESU1lD6MuTJhgtdlw= -github.com/containerd/containerd/v2 v2.3.5 h1:9MYlI81gUcOZ0WsCkSMtvOU7rTR3hqAoa2eCzhoLlkA= -github.com/containerd/containerd/v2 v2.3.5/go.mod h1:RXDyLPaI3zoO7dFdAW9/54W4cix+z3A6larieufC9mg= +github.com/containerd/containerd/v2 v2.3.6 h1:huoqZXaDW1x1kgPvFC4rMwxv92vUJnqgq7I5b1rSddM= +github.com/containerd/containerd/v2 v2.3.6/go.mod h1:qaUSWKk9EchqbudSbhv1MxI8dXKGYHLpZtMQdkEkVZ4= github.com/containerd/continuity v0.5.0 h1:7a85HZpCSs+1Zps0Ee3DPSuAWY+0SJM1JNM51nlEVDg= github.com/containerd/continuity v0.5.0/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 82f34694426..ff3f84d756a 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -248,7 +248,7 @@ require ( github.com/consensys/gnark-crypto v0.20.1 // indirect github.com/containerd/console v1.0.5 // indirect github.com/containerd/containerd/api v1.11.1 // indirect - github.com/containerd/containerd/v2 v2.3.5 // indirect + github.com/containerd/containerd/v2 v2.3.6 // indirect github.com/containerd/continuity v0.5.0 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index fc68484ffa6..e44e29a7837 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -447,8 +447,8 @@ github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/q github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd/api v1.11.1 h1:h8nfoDW9+fNsC/9TwiAHj8B1GzXKtR4eFtkhi/X5RLU= github.com/containerd/containerd/api v1.11.1/go.mod h1:CaQFRu+N1MtbgL6JDOJLUB1hCKESU1lD6MuTJhgtdlw= -github.com/containerd/containerd/v2 v2.3.5 h1:9MYlI81gUcOZ0WsCkSMtvOU7rTR3hqAoa2eCzhoLlkA= -github.com/containerd/containerd/v2 v2.3.5/go.mod h1:RXDyLPaI3zoO7dFdAW9/54W4cix+z3A6larieufC9mg= +github.com/containerd/containerd/v2 v2.3.6 h1:huoqZXaDW1x1kgPvFC4rMwxv92vUJnqgq7I5b1rSddM= +github.com/containerd/containerd/v2 v2.3.6/go.mod h1:qaUSWKk9EchqbudSbhv1MxI8dXKGYHLpZtMQdkEkVZ4= github.com/containerd/continuity v0.5.0 h1:7a85HZpCSs+1Zps0Ee3DPSuAWY+0SJM1JNM51nlEVDg= github.com/containerd/continuity v0.5.0/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=