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

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"
 )