Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

chore(code): reduce divergence with EE EE-4344 (#7748)

Browse source
This commit is contained in:
andres-portainer 2022-09-28 14:56:32 -03:00 • committed by GitHub
parent e9384a6987
commit cb79dc18f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 259 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

5
api/http/handler/websocket/attach.go
View file

@ -6,11 +6,12 @@ import (
"net/http/httputil"
"time"
"github.com/asaskevich/govalidator"
"github.com/gorilla/websocket"
httperror "github.com/portainer/libhttp/error"
"github.com/portainer/libhttp/request"
portainer "github.com/portainer/portainer/api"
"github.com/asaskevich/govalidator"
"github.com/gorilla/websocket"
)
// @summary Attach a websocket

5
api/http/handler/websocket/exec.go
View file

@ -8,11 +8,12 @@ import (
"net/http/httputil"
"time"
"github.com/asaskevich/govalidator"
"github.com/gorilla/websocket"
httperror "github.com/portainer/libhttp/error"
"github.com/portainer/libhttp/request"
portainer "github.com/portainer/portainer/api"
"github.com/asaskevich/govalidator"
"github.com/gorilla/websocket"
)
type execStartOperationPayload struct {

5
api/http/handler/websocket/initdial.go
View file

@ -2,10 +2,11 @@ package websocket
import (
"crypto/tls"
"github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/crypto"
"net"
"net/url"
"github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/crypto"
)
func initDial(endpoint *portainer.Endpoint) (net.Conn, error) {

2
api/http/handler/websocket/pod.go
View file

@ -91,12 +91,14 @@ func (handler *Handler) websocketPodExec(w http.ResponseWriter, r *http.Request)
if err != nil {
return httperror.InternalServerError("Unable to proxy websocket request to agent", err)
}
return nil
} else if endpoint.Type == portainer.EdgeAgentOnKubernetesEnvironment {
err := handler.proxyEdgeAgentWebsocketRequest(w, r, params)
if err != nil {
return httperror.InternalServerError("Unable to proxy websocket request to Edge agent", err)
}
return nil
}

4
api/http/handler/websocket/types.go
View file

@ -1,8 +1,6 @@
package websocket
import (
"github.com/portainer/portainer/api"
)
import "github.com/portainer/portainer/api"
type webSocketRequestParams struct {
ID string