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

api/http/proxy/factory/azure/containergroup.go

@@ -23,7 +23,7 @@ func (transport *Transport) proxyContainerGroupRequest(request *http.Request) (*
 }
 
 func (transport *Transport) proxyContainerGroupPutRequest(request *http.Request) (*http.Response, error) {
-	//add a lock before processing existense check
+	//add a lock before processing existence check
 	transport.mutex.Lock()
 	defer transport.mutex.Unlock()
 

api/http/proxy/factory/docker/portainer.go

@@ -24,7 +24,6 @@ func (transport *Transport) applyPortainerContainers(resources []interface{}) ([
 			continue
 		}
 		responseObject, _ = transport.applyPortainerContainer(responseObject)
-
 		decoratedResourceData = append(decoratedResourceData, responseObject)
 	}
 	return decoratedResourceData, nil

api/http/proxy/factory/kubernetes/edge_transport.go

@@ -18,6 +18,8 @@ type edgeTransport struct {
 // NewAgentTransport returns a new transport that can be used to send signed requests to a Portainer Edge agent
 func NewEdgeTransport(dataStore dataservices.DataStore, signatureService portainer.DigitalSignatureService, reverseTunnelService portainer.ReverseTunnelService, endpoint *portainer.Endpoint, tokenManager *tokenManager, k8sClientFactory *cli.ClientFactory) *edgeTransport {
 	transport := &edgeTransport{
+		reverseTunnelService: reverseTunnelService,
+		signatureService:     signatureService,
 		baseTransport: newBaseTransport(
 			&http.Transport{},
 			tokenManager,
@@ -25,8 +27,6 @@ func NewEdgeTransport(dataStore dataservices.DataStore, signatureService portain
 			k8sClientFactory,
 			dataStore,
 		),
-		reverseTunnelService: reverseTunnelService,
-		signatureService:     signatureService,
 	}
 
 	return transport

api/http/proxy/factory/kubernetes/refresh_registry.go

@@ -1,8 +1,9 @@
 package kubernetes
 
 import (
-	"github.com/portainer/portainer/api/internal/registryutils"
 	"net/http"
+
+	"github.com/portainer/portainer/api/internal/registryutils"
 )
 
 func (transport *baseTransport) refreshRegistry(request *http.Request, namespace string) (err error) {

api/http/proxy/factory/kubernetes/token_cache.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/orcaman/concurrent-map"
+	cmap "github.com/orcaman/concurrent-map"
 )
 
 type (

api/http/proxy/factory/kubernetes/transport.go

@@ -3,7 +3,6 @@ package kubernetes
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -17,6 +16,7 @@ import (
 	"github.com/portainer/portainer/api/http/security"
 	"github.com/portainer/portainer/api/kubernetes/cli"
 
+	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 )
 

api/http/proxy/factory/utils/json.go

@@ -87,7 +87,7 @@ func marshal(contentType string, data interface{}) ([]byte, error) {
 }
 
 func unmarshal(contentType string, body []byte, returnBody interface{}) error {
-	// Note: contentType can look look like: "application/json" or "application/json; charset=utf-8"
+	// Note: contentType can look like: "application/json" or "application/json; charset=utf-8"
 	mediaType, _, err := mime.ParseMediaType(contentType)
 	if err != nil {
 		return err

api/http/proxy/factory/utils/response.go

@@ -2,12 +2,12 @@ package utils
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strconv"
 
+	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 )
 
@@ -18,7 +18,10 @@ func GetResponseAsJSONObject(response *http.Response) (map[string]interface{}, e
 		return nil, err
 	}
 
-	responseObject := responseData.(map[string]interface{})
+	responseObject, ok := responseData.(map[string]interface{})
+	if !ok {
+		return nil, nil
+	}
 	return responseObject, nil
 }
 
@@ -28,6 +31,9 @@ func GetResponseAsJSONArray(response *http.Response) ([]interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
+	if responseData == nil {
+		return nil, nil
+	}
 
 	switch responseObject := responseData.(type) {
 	case []interface{}:

api/http/proxy/manager.go

@@ -16,7 +16,7 @@ import (
 )
 
 type (
-	// Manager represents a service used to manage proxies to environments (endpoints).
+	// Manager represents a service used to manage proxies to environments (endpoints) and extensions.
 	Manager struct {
 		proxyFactory     *factory.ProxyFactory
 		endpointProxies  cmap.ConcurrentMap