chore(code): clean up the code EE-7251 (#11948)

api/http/proxy/manager.go

@@ -1,28 +1,28 @@
 package proxy
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
+	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/dataservices"
 	dockerclient "github.com/portainer/portainer/api/docker/client"
+	"github.com/portainer/portainer/api/http/proxy/factory"
 	"github.com/portainer/portainer/api/http/proxy/factory/kubernetes"
-
-	cmap "github.com/orcaman/concurrent-map"
 	"github.com/portainer/portainer/api/kubernetes/cli"
 
-	portainer "github.com/portainer/portainer/api"
-	"github.com/portainer/portainer/api/http/proxy/factory"
+	cmap "github.com/orcaman/concurrent-map"
 )
 
-type (
-	// Manager represents a service used to manage proxies to environments (endpoints) and extensions.
-	Manager struct {
-		proxyFactory     *factory.ProxyFactory
-		endpointProxies  cmap.ConcurrentMap
-		k8sClientFactory *cli.ClientFactory
-	}
-)
+var ErrProxyFactoryNotInitialized = errors.New("proxy factory not initialized")
+
+// Manager represents a service used to manage proxies to environments (endpoints) and extensions.
+type Manager struct {
+	proxyFactory     *factory.ProxyFactory
+	endpointProxies  cmap.ConcurrentMap
+	k8sClientFactory *cli.ClientFactory
+}
 
 // NewManager initializes a new proxy Service
 func NewManager(kubernetesClientFactory *cli.ClientFactory) *Manager {
@@ -36,11 +36,11 @@ func (manager *Manager) NewProxyFactory(dataStore dataservices.DataStore, signat
 	manager.proxyFactory = factory.NewProxyFactory(dataStore, signatureService, tunnelService, clientFactory, kubernetesClientFactory, kubernetesTokenCacheManager, gitService, snapshotService)
 }
 
-// CreateAndRegisterEndpointProxy creates a new HTTP reverse proxy based on environment(endpoint) properties and and adds it to the registered proxies.
+// CreateAndRegisterEndpointProxy creates a new HTTP reverse proxy based on environment(endpoint) properties and adds it to the registered proxies.
 // It can also be used to create a new HTTP reverse proxy and replace an already registered proxy.
 func (manager *Manager) CreateAndRegisterEndpointProxy(endpoint *portainer.Endpoint) (http.Handler, error) {
 	if manager.proxyFactory == nil {
-		return nil, fmt.Errorf("proxy factory not init")
+		return nil, ErrProxyFactoryNotInitialized
 	}
 
 	proxy, err := manager.proxyFactory.NewEndpointProxy(endpoint)
@@ -49,6 +49,7 @@ func (manager *Manager) CreateAndRegisterEndpointProxy(endpoint *portainer.Endpo
 	}
 
 	manager.endpointProxies.Set(fmt.Sprint(endpoint.ID), proxy)
+
 	return proxy, nil
 }
 
@@ -56,8 +57,9 @@ func (manager *Manager) CreateAndRegisterEndpointProxy(endpoint *portainer.Endpo
 // It can also be used to create a new HTTP reverse proxy and replace an already registered proxy.
 func (manager *Manager) CreateAgentProxyServer(endpoint *portainer.Endpoint) (*factory.ProxyServer, error) {
 	if manager.proxyFactory == nil {
-		return nil, fmt.Errorf("proxy factory not init")
+		return nil, ErrProxyFactoryNotInitialized
 	}
+
 	return manager.proxyFactory.NewAgentProxy(endpoint)
 }
 
@@ -85,7 +87,8 @@ func (manager *Manager) DeleteEndpointProxy(endpointID portainer.EndpointID) {
 // CreateGitlabProxy creates a new HTTP reverse proxy that can be used to send requests to the Gitlab API
 func (manager *Manager) CreateGitlabProxy(url string) (http.Handler, error) {
 	if manager.proxyFactory == nil {
-		return nil, fmt.Errorf("proxy factory not init")
+		return nil, ErrProxyFactoryNotInitialized
 	}
+
 	return manager.proxyFactory.NewGitlabProxy(url)
 }