Expose installationID and serverURL to deep link and API contexts

Signed-off-by: Atif Ali <[email protected]>

Author: aali309

server/application/application.go

@@ -1317,6 +1317,7 @@ func (s *Server) validateAndNormalizeApp(ctx context.Context, app *v1alpha1.Appl
 		return status.Errorf(codes.InvalidArgument, "application spec for %s is invalid: %s", app.Name, argo.FormatAppConditions(conditions))
 	}
 
+	app.Spec = *argo.NormalizeApplicationSpec(&app.Spec)
 	return nil
 }
 
@@ -2164,8 +2165,19 @@ func (s *Server) ListLinks(ctx context.Context, req *application.ListAppLinksReq
 		return nil, err
 	}
 
+	// Create deep links object with managed-by URL
 	deepLinksObject := deeplinks.CreateDeepLinksObject(nil, obj, clstObj, nil)
 
+	// If no managed-by URL is set, use the current instance's URL
+	if deepLinksObject[deeplinks.ManagedByURLKey] == nil {
+		settings, err := s.settingsMgr.GetSettings()
+		if err != nil {
+			log.Warnf("Failed to get settings: %v", err)
+		} else if settings.URL != "" {
+			deepLinksObject[deeplinks.ManagedByURLKey] = settings.URL
+		}
+	}
+
 	finalList, errorList := deeplinks.EvaluateDeepLinksResponse(deepLinksObject, obj.GetName(), deepLinks)
 	if len(errorList) > 0 {
 		log.Errorf("errorList while evaluating application deep links, %v", strings.Join(errorList, ", "))

server/cluster/cluster.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/argoproj/gitops-engine/pkg/utils/kube"
@@ -15,30 +16,39 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/argoproj/argo-cd/v3/common"
+	"github.com/argoproj/argo-cd/v3/pkg/apiclient/application"
 	"github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
 	appv1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	servercache "github.com/argoproj/argo-cd/v3/server/cache"
+	"github.com/argoproj/argo-cd/v3/server/deeplinks"
 	"github.com/argoproj/argo-cd/v3/util/argo"
 	"github.com/argoproj/argo-cd/v3/util/clusterauth"
 	"github.com/argoproj/argo-cd/v3/util/db"
 	"github.com/argoproj/argo-cd/v3/util/rbac"
+	"github.com/argoproj/argo-cd/v3/util/settings"
+)
+
+const (
+	ClusterDeepLinks = "cluster.deepLinks"
 )
 
 // Server provides a Cluster service
 type Server struct {
-	db      db.ArgoDB
-	enf     *rbac.Enforcer
-	cache   *servercache.Cache
-	kubectl kube.Kubectl
+	db          db.ArgoDB
+	enf         *rbac.Enforcer
+	cache       *servercache.Cache
+	kubectl     kube.Kubectl
+	settingsMgr *settings.SettingsManager
 }
 
 // NewServer returns a new instance of the Cluster service
-func NewServer(db db.ArgoDB, enf *rbac.Enforcer, cache *servercache.Cache, kubectl kube.Kubectl) *Server {
+func NewServer(db db.ArgoDB, enf *rbac.Enforcer, cache *servercache.Cache, kubectl kube.Kubectl, settingsMgr *settings.SettingsManager) *Server {
 	return &Server{
-		db:      db,
-		enf:     enf,
-		cache:   cache,
-		kubectl: kubectl,
+		db:          db,
+		enf:         enf,
+		cache:       cache,
+		kubectl:     kubectl,
+		settingsMgr: settingsMgr,
 	}
 }
 
@@ -506,3 +516,31 @@ func (s *Server) InvalidateCache(ctx context.Context, q *cluster.ClusterQuery) (
 	}
 	return s.toAPIResponse(cls), nil
 }
+
+func (s *Server) ListLinks(ctx context.Context, req *cluster.ListClusterLinksRequest) (*application.LinksResponse, error) {
+	clst, err := s.getClusterAndVerifyAccess(ctx, &cluster.ClusterQuery{
+		Name:   req.GetName(),
+		Server: req.GetServer(),
+	}, rbac.ActionGet)
+	if err != nil {
+		return nil, err
+	}
+
+	obj, err := kube.ToUnstructured(clst)
+	if err != nil {
+		return nil, fmt.Errorf("error getting cluster: %w", err)
+	}
+
+	deepLinks, err := s.settingsMgr.GetDeepLinks(ClusterDeepLinks)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read cluster deep links from configmap: %w", err)
+	}
+
+	deeplinksObj := deeplinks.CreateDeepLinksObject(nil, nil, nil, obj)
+	finalList, errorList := deeplinks.EvaluateDeepLinksResponse(deeplinksObj, obj.GetName(), deepLinks)
+	if len(errorList) > 0 {
+		log.Errorf("errorList while evaluating cluster deep links, %v", strings.Join(errorList, ", "))
+	}
+
+	return finalList, nil
+}

server/cluster/cluster.proto

@@ -26,6 +26,11 @@ message ClusterQuery {
 
 message ClusterResponse {}
 
+message ListClusterLinksRequest {
+	string name = 1;
+	string server = 2;
+}
+
 message ClusterCreateRequest {
 	github.zerozr99.workers.dev.argoproj.argo_cd.v3.pkg.apis.application.v1alpha1.Cluster cluster = 1;
 	bool upsert = 2;
@@ -80,5 +85,9 @@ service ClusterService {
 	rpc InvalidateCache(ClusterQuery) returns (github.com.argoproj.argo_cd.v3.pkg.apis.application.v1alpha1.Cluster) {
 		option (google.api.http).post = "/api/v1/clusters/{id.value}/invalidate-cache";
 	}
-	
+
+	// ListLinks returns list of links for a cluster
+	rpc ListLinks(ListClusterLinksRequest) returns (github.com.argoproj.argo_cd.v3.pkg.apiclient.application.LinksResponse) {
+		option (google.api.http).get = "/api/v1/clusters/{name}/links";
+	}
 }

server/deeplinks/deeplinks.go

@@ -31,6 +31,7 @@ const (
 	AppDeepLinkShortKey = "app"
 	ClusterDeepLinkKey  = "cluster"
 	ProjectDeepLinkKey  = "project"
+	ManagedByURLKey     = "managedByURL"
 )
 
 type ClusterLinksData struct {
@@ -70,6 +71,17 @@ func CreateDeepLinksObject(resourceObj *unstructured.Unstructured, app *unstruct
 	if app != nil {
 		deeplinkObj[AppDeepLinkKey] = app.Object
 		deeplinkObj[AppDeepLinkShortKey] = app.Object
+
+		// Add managed-by URL if present in annotations
+		if app.Object["metadata"] != nil {
+			if metadata, ok := app.Object["metadata"].(map[string]interface{}); ok {
+				if annotations, ok := metadata["annotations"].(map[string]interface{}); ok {
+					if managedByURL, ok := annotations["argocd.argoproj.io/managed-by-url"].(string); ok {
+						deeplinkObj[ManagedByURLKey] = managedByURL
+					}
+				}
+			}
+		}
 	}
 	if cluster != nil {
 		deeplinkObj[ClusterDeepLinkKey] = cluster.Object

server/project/project.go

@@ -563,3 +563,15 @@ func (s *Server) NormalizeProjs() error {
 	}
 	return nil
 }
+
+func (s *Server) getProjectEnforceRBAC(ctx context.Context, action string, name string) (*v1alpha1.AppProject, error) {
+	if err := s.enf.EnforceErr(ctx.Value("claims"), rbac.ResourceProjects, action, name); err != nil {
+		return nil, err
+	}
+	proj, err := s.appclientset.ArgoprojV1alpha1().AppProjects(s.ns).Get(ctx, name, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+	proj.NormalizeJWTTokens()
+	return proj, nil
+}

server/server.go

@@ -1009,7 +1009,7 @@ type ArgoCDServiceSet struct {
 
 func newArgoCDServiceSet(a *ArgoCDServer) *ArgoCDServiceSet {
 	kubectl := kubeutil.NewKubectl()
-	clusterService := cluster.NewServer(a.db, a.enf, a.Cache, kubectl)
+	clusterService := cluster.NewServer(a.db, a.enf, a.Cache, kubectl, a.settingsMgr)
 	repoService := repository.NewServer(a.RepoClientset, a.db, a.enf, a.Cache, a.appLister, a.projInformer, a.Namespace, a.settingsMgr, a.HydratorEnabled)
 	repoCredsService := repocreds.NewServer(a.RepoClientset, a.db, a.enf, a.settingsMgr)
 	var loginRateLimiter func() (utilio.Closer, error)