feat(libhttp): import libhttp from CE EE-5475 (#530)

edge/registry/server.go

@@ -10,9 +10,9 @@ import (
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/edge"
 	"github.com/portainer/agent/edge/aws"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 
 	"github.com/gorilla/mux"
 	"github.com/rs/zerolog/log"

go.mod

@@ -24,7 +24,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
 	github.com/pkg/errors v0.9.1
-	github.com/portainer/libhttp v0.0.0-20230615144939-a999f666d9a9
 	github.com/portainer/portainer v0.6.1-0.20230901222702-8cc5e0796c4a
 	github.com/rs/zerolog v1.29.0
 	github.com/stretchr/testify v1.8.2

go.sum

@@ -266,8 +266,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/portainer/libhttp v0.0.0-20230615144939-a999f666d9a9 h1:Jq8g/pDcFL1Z/DnZgn6DyaWu29y9+RiB5aOJ/Xw4960=
-github.com/portainer/libhttp v0.0.0-20230615144939-a999f666d9a9/go.mod h1:H49JLiywwLt2rrJVroafEWy8fIs0i7mThAThK40sbb8=
 github.com/portainer/portainer v0.6.1-0.20230901222702-8cc5e0796c4a h1:Vdq9a9Iivgo8oTXJW4HlNNbDRSaye6USkWvtUfDAcfw=
 github.com/portainer/portainer v0.6.1-0.20230901222702-8cc5e0796c4a/go.mod h1:D4E7gtKZg0hnP2fyAEHxFd97xnXCCp7DswMRQOWSG3Y=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=

http/handler/agent/agent_list.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"net/http"
 
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 func (handler *Handler) agentList(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {

http/handler/agent/handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler is the HTTP handler used to handle agent operations.

http/handler/browse/browse_delete.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/portainer/agent/filesystem"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 // DELETE request on /browse/delete?volumeID=:id&path=:path

http/handler/browse/browse_get.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/portainer/agent/filesystem"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
 )
 
 // GET request on /browse/get?volumeID=:id&path=:path

http/handler/browse/browse_list.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/portainer/agent/filesystem"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 // GET request on /browse/ls?volumeID=:id&path=:path

http/handler/browse/browse_put.go

@@ -5,9 +5,9 @@ import (
 	"net/http"
 
 	"github.com/portainer/agent/filesystem"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 type browsePutPayload struct {

http/handler/browse/browse_rename.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/asaskevich/govalidator"
 	"github.com/portainer/agent/filesystem"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 type browseRenamePayload struct {

http/handler/browse/handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/portainer/agent/http/proxy"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler is the HTTP handler used to handle volume browsing operations.

http/handler/docker/docker_operation.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/http/proxy"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 
 	"github.com/rs/zerolog/log"
 )

http/handler/docker/handler.go

@@ -5,7 +5,7 @@ import (
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/http/proxy"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler represents an HTTP API handler for proxying requests to the Docker API.

http/handler/dockerhub/dockerhub_status.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 const (

http/handler/dockerhub/handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gorilla/mux"
 
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler represents an HTTP API Handler for host specific actions

http/handler/host/handler.go

@@ -8,7 +8,7 @@ import (
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/http/proxy"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler represents an HTTP API Handler for host specific actions

http/handler/host/host_info.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/portainer/agent"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 func (handler *Handler) hostInfo(rw http.ResponseWriter, r *http.Request) *httperror.HandlerError {

http/handler/key/handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/portainer/agent/edge"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler is the HTTP handler used to handle Edge key operations.

http/handler/key/key_create.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"net/http"
 
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 
 	"github.com/rs/zerolog/log"
 )

http/handler/key/key_inspect.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"net/http"
 
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 type keyInspectResponse struct {

http/handler/kubernetes/handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/portainer/agent/exec"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler is the HTTP handler used to handle volume browsing operations.

http/handler/kubernetes/kubernetes_deploy.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/portainer/agent"
 
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 type (

http/handler/kubernetesproxy/handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/portainer/agent/http/proxy"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler represents an HTTP API handler for proxying requests to the Kubernetes API.

http/handler/kubernetesproxy/kubernetes_operation.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/portainer/agent"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 func (handler *Handler) kubernetesOperation(rw http.ResponseWriter, request *http.Request) *httperror.HandlerError {

http/handler/nomadproxy/handler.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/portainer/agent/http/proxy"
 	"github.com/portainer/agent/http/security"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // Handler represents an HTTP API handler for proxying requests to the Nomad API.

http/handler/nomadproxy/nomad_operation.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/portainer/agent"
 
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 func (handler *Handler) nomadOperation(rw http.ResponseWriter, request *http.Request) *httperror.HandlerError {

http/handler/ping/handler.go

@@ -3,8 +3,9 @@ package ping
 import (
 	"net/http"
 
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+
 	"github.com/gorilla/mux"
-	httperror "github.com/portainer/libhttp/error"
 )
 
 // Handler represents an HTTP API Handler executing a ping operation

http/handler/ping/ping.go

@@ -3,8 +3,8 @@ package ping
 import (
 	"net/http"
 
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/response"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/response"
 )
 
 func (h *Handler) ping(rw http.ResponseWriter, request *http.Request) *httperror.HandlerError {

http/handler/websocket/attach.go

@@ -7,14 +7,13 @@ import (
 	"net/http/httputil"
 	"time"
 
-	"github.com/asaskevich/govalidator"
-	"github.com/portainer/libhttp/request"
-
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/http/proxy"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
 
+	"github.com/asaskevich/govalidator"
 	"github.com/gorilla/websocket"
-	httperror "github.com/portainer/libhttp/error"
 )
 
 func (handler *Handler) websocketAttach(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {

http/handler/websocket/exec.go

@@ -9,12 +9,13 @@ import (
 	"net/http/httputil"
 	"time"
 
-	"github.com/asaskevich/govalidator"
-	"github.com/gorilla/websocket"
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/http/proxy"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+
+	"github.com/asaskevich/govalidator"
+	"github.com/gorilla/websocket"
 )
 
 func (handler *Handler) websocketExec(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {

http/handler/websocket/handler.go

@@ -1,12 +1,13 @@
 package websocket
 
 import (
-	"github.com/gorilla/mux"
-	"github.com/gorilla/websocket"
 	"github.com/portainer/agent"
 	"github.com/portainer/agent/http/security"
 	"github.com/portainer/agent/kubernetes"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+
+	"github.com/gorilla/mux"
+	"github.com/gorilla/websocket"
 )
 
 type (

http/handler/websocket/pod.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/portainer/agent"
-	httperror "github.com/portainer/libhttp/error"
-	"github.com/portainer/libhttp/request"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
 
 	"github.com/gorilla/websocket"
 	"github.com/rs/zerolog/log"

http/proxy/agentproxy.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/portainer/agent"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 
 	"github.com/rs/zerolog/log"
 )

http/proxy/local.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 // LocalProxy is a service used to proxy requests to a Unix socket (Linux) or named pipe (Windows).

http/security/notary.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/portainer/agent"
-	httperror "github.com/portainer/libhttp/error"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
 
 type NotaryService struct {

http/server.go

@@ -12,7 +12,7 @@ import (
 	"github.com/portainer/agent/exec"
 	"github.com/portainer/agent/http/handler"
 	"github.com/portainer/agent/kubernetes"
-	httpError "github.com/portainer/libhttp/error"
+	httpError "github.com/portainer/portainer/pkg/libhttp/error"
 
 	"github.com/rs/zerolog/log"
 )