github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(api/snapshot): convert error message only on matching env types (#7661)

pull/7715/head
LP B 2022-09-22 00:34:14 +02:00 committed by GitHub
parent 8ef584e41c
commit 6063f368ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/http/handler/endpoints/endpoint_create.go
View File

@ -495,7 +495,8 @@ func (handler *Handler) createTLSSecuredEndpoint(payload *endpointCreatePayload,
func (handler *Handler) snapshotAndPersistEndpoint(endpoint *portainer.Endpoint) *httperror.HandlerError { func (handler *Handler) snapshotAndPersistEndpoint(endpoint *portainer.Endpoint) *httperror.HandlerError {
err := handler.SnapshotService.SnapshotEndpoint(endpoint) err := handler.SnapshotService.SnapshotEndpoint(endpoint)
if err != nil { if err != nil {
if strings.Contains(err.Error(), "Invalid request signature") || strings.Contains(err.Error(), "unknown") { if (endpoint.Type == portainer.AgentOnDockerEnvironment && strings.Contains(err.Error(), "Invalid request signature")) ||
(endpoint.Type == portainer.AgentOnKubernetesEnvironment && strings.Contains(err.Error(), "unknown")) {
err = errors.New("agent already paired with another Portainer instance") err = errors.New("agent already paired with another Portainer instance")
} }
return httperror.InternalServerError("Unable to initiate communications with environment", err) return httperror.InternalServerError("Unable to initiate communications with environment", err)