fix: make container deletion more robust

Use the `IsErrNotFound` function exported from the Docker client library
to detect HTTP 404 errors returned by the Docker API more reliably.

This improves compatibility with Podman's implementation of the Docker
API, because Podman uses a different capitalization for the error
message that is returned when a container has already been deleted,
causing the existing code to fail to recognize this condition.

Author: Decaf Code

internal/provider/helpers.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/docker/docker/client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -134,3 +135,11 @@ func containsIgnorableErrorMessage(errorMsg string, ignorableErrorMessages ...st
 
 	return false
 }
+
+func alreadyDeleted(err error) bool {
+	if strings.Contains(err.Error(), "is already in progress") {
+		return true
+	}
+
+	return client.IsErrNotFound(err)
+}

internal/provider/resource_docker_container_funcs.go

@@ -886,7 +886,7 @@ func resourceDockerContainerDelete(ctx context.Context, d *schema.ResourceData,
 
 	log.Printf("[INFO] Removing Container '%s'", d.Id())
 	if err := client.ContainerRemove(ctx, d.Id(), removeOpts); err != nil {
-		if !containsIgnorableErrorMessage(err.Error(), "No such container", "is already in progress") {
+		if !alreadyDeleted(err) {
 			return diag.Errorf("Error deleting container %s: %s", d.Id(), err)
 		}
 	}
@@ -902,7 +902,7 @@ func resourceDockerContainerDelete(ctx context.Context, d *schema.ResourceData,
 	case waitOk := <-waitOkC:
 		log.Printf("[INFO] Container exited with code [%v]: '%s'", waitOk.StatusCode, d.Id())
 	case err := <-errorC:
-		if !containsIgnorableErrorMessage(err.Error(), "No such container", "is already in progress") {
+		if !alreadyDeleted(err) {
 			return diag.Errorf("Error waiting for container removal '%s': %s", d.Id(), err)
 		}
 		log.Printf("[INFO] Waiting for Container '%s' errord: '%s'", d.Id(), err.Error())