Merge branch '280-destroy-clone' into 'master'

fix: destroy a clone even if the clone container does not exist (#280)

Closes #280

See merge request postgres-ai/database-lab!328

Author: agneum

go.sum

@@ -671,6 +671,7 @@ github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

pkg/services/provision/databases/postgres/postgres.go

@@ -124,7 +124,14 @@ func Stop(r runners.Runner, p *resources.Pool, name string) error {
 	log.Dbg("Stopping Postgres container...")
 
 	if _, err := docker.RemoveContainer(r, name); err != nil {
-		return errors.Wrap(err, "failed to remove container")
+		const errorPrefix = "Error: No such container:"
+
+		if e, ok := err.(runners.RunnerError); ok && !strings.HasPrefix(e.Stderr, errorPrefix) {
+			return errors.Wrap(err, "failed to remove container")
+		}
+
+		log.Msg("docker container was not found, ignore", err)
+
 	}
 
 	if _, err := r.Run("rm -rf " + p.SocketCloneDir(name) + "/*"); err != nil {

pkg/services/provision/databases/postgres/postgres_test.go

@@ -0,0 +1,74 @@
+package postgres
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+
+	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
+	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
+)
+
+type MockRunner struct {
+	mock.Mock
+	output string
+	err    error
+}
+
+func (m *MockRunner) Run(cmd string, _ ...bool) (string, error) {
+	m.Called(cmd)
+
+	err := m.err
+	if m.err != nil {
+		err = runners.NewRunnerError(cmd, m.err.Error(), m.err)
+	}
+
+	return m.output, err
+}
+
+func TestRemoveContainers(t *testing.T) {
+	p := &resources.Pool{}
+	testCases := []struct {
+		output string
+		err    error
+	}{
+		{
+			output: "",
+			err:    nil,
+		},
+		{
+			err:    runners.RunnerError{Msg: "test fail"},
+			output: "Unknown error",
+		},
+		{
+			err:    nil,
+			output: "Error: No such container:",
+		},
+	}
+
+	for _, tc := range testCases {
+		runner := &MockRunner{
+			output: tc.output,
+			err:    tc.err,
+		}
+		runner.On("Run",
+			mock.MatchedBy(
+				func(cmd string) bool {
+					return strings.HasPrefix(cmd, "docker container rm --force --volumes ")
+				})).
+			Return("", tc.err).
+			On("Run",
+				mock.MatchedBy(
+					func(cmd string) bool {
+						return strings.HasPrefix(cmd, "rm -rf ")
+					})).
+			Return("", nil)
+
+		err := Stop(runner, p, "test_clone")
+
+		assert.Equal(t, tc.err, errors.Cause(err))
+	}
+}