From 3ed92e5feeb4f2fe74f5de9bfe112270fe50865d Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 23 Jan 2022 09:17:31 +0200 Subject: [PATCH] fix(docker): delete docker resources [EE-2411] (#6414) fixes [EE-2411] ignore resource control object not found when deleting a docker resource --- api/http/proxy/factory/docker/transport.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/http/proxy/factory/docker/transport.go b/api/http/proxy/factory/docker/transport.go index cf3221bdf..d705d01ff 100644 --- a/api/http/proxy/factory/docker/transport.go +++ b/api/http/proxy/factory/docker/transport.go @@ -16,6 +16,7 @@ import ( portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/dataservices" + dataerrors "github.com/portainer/portainer/api/dataservices/errors" "github.com/portainer/portainer/api/docker" "github.com/portainer/portainer/api/http/proxy/factory/utils" "github.com/portainer/portainer/api/http/security" @@ -601,6 +602,10 @@ func (transport *Transport) executeGenericResourceDeletionOperation(request *htt if response.StatusCode == http.StatusNoContent || response.StatusCode == http.StatusOK { resourceControl, err := transport.dataStore.ResourceControl().ResourceControlByResourceIDAndType(resourceIdentifierAttribute, resourceType) if err != nil { + if err == dataerrors.ErrObjectNotFound { + return response, nil + } + return response, err }