From a3021b1a99a567d0de4a9ec106b01200441c85c1 Mon Sep 17 00:00:00 2001
From: Bartek Tofel <bartek.tofel@smartcontract.com>
Date: Wed, 8 Jan 2025 15:07:58 +0100
Subject: [PATCH 1/2] do not change container name on startup retry, delete old
 container instead (#1540)

---
 lib/docker/docker.go | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/lib/docker/docker.go b/lib/docker/docker.go
index bc728deaa..019c2a975 100644
--- a/lib/docker/docker.go
+++ b/lib/docker/docker.go
@@ -1,10 +1,13 @@
 package docker
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
+	"github.com/docker/docker/api/types/container"
 	"github.com/google/uuid"
+	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	tc "github.com/testcontainers/testcontainers-go"
 
@@ -58,8 +61,13 @@ var NaiveRetrier = func(l zerolog.Logger, startErr error, req tc.GenericContaine
 		Str("Retrier", "NaiveRetrier").
 		Msgf("Attempting to start %s container", req.Name)
 
-	oldName := req.Name
-	req.Name = req.Name + "-naive-retry"
+	req.Reuse = false // We need to force a new container to be created
+
+	removeErr := removeContainer(req)
+	if removeErr != nil {
+		l.Error().Err(removeErr).Msgf("Failed to remove %s container to initiate restart", req.Name)
+		return nil, removeErr
+	}
 
 	ct, err := tc.GenericContainer(testcontext.Get(nil), req)
 	if err == nil {
@@ -78,8 +86,6 @@ var NaiveRetrier = func(l zerolog.Logger, startErr error, req tc.GenericContaine
 		}
 	}
 
-	req.Name = oldName
-
 	l.Debug().
 		Str("Original start error", startErr.Error()).
 		Str("Current start error", err.Error()).
@@ -94,9 +100,8 @@ var LinuxPlatformImageRetrier = func(l zerolog.Logger, startErr error, req tc.Ge
 	if startErr == nil {
 		return nil, startErr
 	}
+
 	req.Reuse = false // We need to force a new container to be created
-	oldName := req.Name
-	req.Name = req.Name + "-linux-retry"
 
 	// a bit lame, but that's the lame error we get in case there's no specific image for our platform :facepalm:
 	if !strings.Contains(startErr.Error(), "No such image") {
@@ -115,6 +120,12 @@ var LinuxPlatformImageRetrier = func(l zerolog.Logger, startErr error, req tc.Ge
 	originalPlatform := req.ImagePlatform
 	req.ImagePlatform = "linux/x86_64"
 
+	removeErr := removeContainer(req)
+	if removeErr != nil {
+		l.Error().Err(removeErr).Msgf("Failed to remove %s container to initiate restart", req.Name)
+		return nil, removeErr
+	}
+
 	ct, err := tc.GenericContainer(testcontext.Get(nil), req)
 	if err == nil {
 		l.Debug().
@@ -124,7 +135,6 @@ var LinuxPlatformImageRetrier = func(l zerolog.Logger, startErr error, req tc.Ge
 	}
 
 	req.ImagePlatform = originalPlatform
-	req.Name = oldName
 
 	if ct != nil {
 		err := ct.Terminate(testcontext.Get(nil))
@@ -171,3 +181,18 @@ func StartContainerWithRetry(l zerolog.Logger, req tc.GenericContainerRequest, r
 
 	return nil, err
 }
+
+func removeContainer(req tc.GenericContainerRequest) error {
+	provider, providerErr := tc.NewDockerProvider()
+	if providerErr != nil {
+		return errors.Wrapf(providerErr, "failed to create Docker provider")
+	}
+
+	removeErr := provider.Client().ContainerRemove(context.Background(), req.Name, container.RemoveOptions{Force: true})
+	if removeErr != nil && strings.Contains(strings.ToLower(removeErr.Error()), "no such container") {
+		// container doesn't exist, nothing to remove
+		return nil
+	}
+
+	return removeErr
+}

From 1374a36145d43716857465ab9abb98251768b5ad Mon Sep 17 00:00:00 2001
From: Bartek Tofel <bartek.tofel@smartcontract.com>
Date: Wed, 8 Jan 2025 15:13:13 +0100
Subject: [PATCH 2/2] make sure go.mods are tidy (#1541)

---
 .github/workflows/lint.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 829fa2793..c282001da 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -21,6 +21,26 @@ jobs:
       - name: Run pre-commit checks
         run: |
           nix develop -c sh -c "pre-commit run --hook-stage pre-commit --show-diff-on-failure --color=always"
+
+  clean-go-mods:
+    name: Clean go mods
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.23.3
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23.3'
+      - name: Install gomods
+        run: go install github.com/jmank88/gomods@v0.1.4
+      - name: Check out code
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: Run gomods tidy
+        run: gomods tidy
+      - name: Ensure clean after tidy
+        run: |
+          git add --all
+          git diff --minimal --cached --exit-code
+
   tools:
     name: Get tool-versions
     runs-on: ubuntu-latest