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

api/internal/edge/edgegroup.go

@@ -1,7 +1,8 @@
 package edge
 
 import (
-	"github.com/portainer/portainer/api"
+	portainer "github.com/portainer/portainer/api"
+	"github.com/portainer/portainer/api/internal/endpointutils"
 	"github.com/portainer/portainer/api/internal/tag"
 )
 
@@ -13,7 +14,7 @@ func EdgeGroupRelatedEndpoints(edgeGroup *portainer.EdgeGroup, endpoints []porta
 
 	endpointIDs := []portainer.EndpointID{}
 	for _, endpoint := range endpoints {
-		if endpoint.Type != portainer.EdgeAgentOnDockerEnvironment && endpoint.Type != portainer.EdgeAgentOnKubernetesEnvironment {
+		if !endpointutils.IsEdgeEndpoint(&endpoint) {
 			continue
 		}
 

api/internal/edge/edgestack.go

@@ -2,6 +2,7 @@ package edge
 
 import (
 	"errors"
+
 	"github.com/portainer/portainer/api"
 )
 

api/internal/edge/endpoint.go

@@ -23,5 +23,4 @@ func EndpointRelatedEdgeStacks(endpoint *portainer.Endpoint, endpointGroup *port
 	}
 
 	return relatedEdgeStacks
-
 }

api/internal/registryutils/auth_header.go

@@ -3,6 +3,7 @@ package registryutils
 import (
 	"encoding/base64"
 	"encoding/json"
+
 	portainer "github.com/portainer/portainer/api"
 )
 

api/internal/snapshot/snapshot.go

@@ -213,6 +213,10 @@ func (service *Service) snapshotEndpoints() error {
 			continue
 		}
 
+		if endpoint.URL == "" {
+			continue
+		}
+
 		snapshotError := service.SnapshotEndpoint(&endpoint)
 
 		latestEndpointReference, err := service.dataStore.Endpoint().Endpoint(endpoint.ID)

api/internal/url/url.go

@@ -11,7 +11,6 @@ import (
 // to prevent an error when url has port but no protocol prefix
 // we add `//` prefix if needed
 func ParseURL(endpointURL string) (*url.URL, error) {
-
 	if !strings.HasPrefix(endpointURL, "http") &&
 		!strings.HasPrefix(endpointURL, "tcp") &&
 		!strings.HasPrefix(endpointURL, "//") &&