fix: [CDS-42790]: add scoping to cluster list (#37238)

* add MR link

* Merge branch 'develop' of https://github.com/harness/harness-core into develop

* Merge branch 'develop' of https://github.com/harness/harness-core into develop

* Merge branch 'develop' of https://github.com/harness/harness-core into develop

* Merge branch 'develop' of https://github.com/harness/harness-core into develop

* Merge branch 'develop' of https://github.com/harness/harness-core into develop

* Merge branch 'develop' of https://github.com/harness/harness-core into develop

* Merge branch 'develop' of https://github.com/harness/harness-core into develop

* add deleteSourceBranch by default false

* Merge branch 'develop' of https://github.com/harness/harness-core into feat_CDS-40391_deleteSourceBranch

* Merge branch 'develop' of https://github.com/harness/harness-core into feat_CDS-40391_deleteSourceBranch

* first commit

* clean code

* fmt

* rm unused imports

* fix project

* handle nil pointer

Author: Gabriel

120-ng-manager/src/main/java/io/harness/ng/gitops/resource/ClusterResource.java

@@ -281,6 +281,7 @@ public class ClusterResource {
     checkForAccessOrThrow(
         accountId, orgIdentifier, projectIdentifier, envIdentifier, ENVIRONMENT_VIEW_PERMISSION, "list");
 
+    // NG Clusters
     Page<Cluster> entities = clusterService.list(
         page, size, accountId, orgIdentifier, projectIdentifier, envIdentifier, searchTerm, identifiers, sort);
 
@@ -294,7 +295,9 @@ public class ClusterResource {
     Map<String, ClusterFromGitops> allClusters =
         Stream.of(accountLevelClusters.getContent(), projectLevelClusters.getContent())
             .flatMap(List::stream)
-            .collect(Collectors.toMap(e -> e.getIdentifier(), Function.identity(), (c1, c2) -> c1));
+            .collect(Collectors.toMap(e
+                -> e.getScopeLevel().toString().toLowerCase() + "." + e.getIdentifier(),
+                Function.identity(), (c1, c2) -> c1));
     return ResponseDTO.newResponse(getNGPageResponse(entities.map(e -> ClusterEntityMapper.writeDTO(e, allClusters))));
   }
 

127-cd-nextgen-entities/src/main/java/io/harness/cdng/gitops/beans/ClusterResponse.java

@@ -33,6 +33,7 @@ public class ClusterResponse {
   @EntityIdentifier @Schema(description = "identifier of the gitops cluster") String clusterRef;
   @Schema(description = "organization identifier of the cluster") String orgIdentifier;
   @Schema(description = "project identifier of the cluster") String projectIdentifier;
+  @Schema(description = "account identifier of the cluster") String accountIdentifier;
   @Schema(description = "environment identifier of the cluster") @NotEmpty String envRef;
   @Schema(description = "time at which the cluster was linked") Long linkedAt;
   @Schema(description = "scope at which the cluster exists in harness gitops, project vs org vs account")

127-cd-nextgen-entities/src/main/java/io/harness/cdng/gitops/mappers/ClusterEntityMapper.java

@@ -81,17 +81,44 @@ public ClusterResponse writeDTO(Cluster cluster) {
   }
 
   public ClusterResponse writeDTO(Cluster cluster, Map<String, ClusterFromGitops> clusterFromGitops) {
-    final ScopeAndRef scopeFromClusterRef = getScopeFromClusterRef(cluster.getClusterRef());
+    String clusterRef = cluster.getClusterRef().toLowerCase();
+    ClusterFromGitops gitOpsCluster = clusterFromGitops.getOrDefault(clusterRef, ClusterFromGitops.builder().build());
+    final ScopeAndRef scopeFromClusterRef = getScopeFromClusterRef(clusterRef);
 
-    return ClusterResponse.builder()
-        .name(clusterFromGitops.get(cluster.getClusterRef()).getName())
-        .orgIdentifier(cluster.getOrgIdentifier())
-        .projectIdentifier(cluster.getProjectIdentifier())
-        .clusterRef(scopeFromClusterRef.getOriginalRef())
-        .scope(scopeFromClusterRef.getScope())
-        .envRef(cluster.getEnvRef())
-        .linkedAt(cluster.getCreatedAt())
-        .build();
+    switch (scopeFromClusterRef.getScope()) {
+      case PROJECT:
+        return ClusterResponse.builder()
+            .name(
+                clusterFromGitops.getOrDefault("project." + clusterRef, ClusterFromGitops.builder().build()).getName())
+            .orgIdentifier(cluster.getOrgIdentifier())
+            .projectIdentifier(cluster.getProjectIdentifier())
+            .clusterRef(scopeFromClusterRef.getOriginalRef())
+            .scope(scopeFromClusterRef.getScope())
+            .envRef(cluster.getEnvRef())
+            .linkedAt(cluster.getCreatedAt())
+            .build();
+      case ACCOUNT:
+        return ClusterResponse.builder()
+            .name(gitOpsCluster.getName())
+            .clusterRef(scopeFromClusterRef.getOriginalRef())
+            .accountIdentifier(cluster.getAccountId())
+            .scope(scopeFromClusterRef.getScope())
+            .envRef(cluster.getEnvRef())
+            .linkedAt(cluster.getCreatedAt())
+            .build();
+      case ORGANIZATION:
+        return ClusterResponse.builder()
+            .name(gitOpsCluster.getName())
+            .orgIdentifier(cluster.getOrgIdentifier())
+            .accountIdentifier(cluster.getAccountId())
+            .clusterRef(scopeFromClusterRef.getOriginalRef())
+            .scope(scopeFromClusterRef.getScope())
+            .envRef(cluster.getEnvRef())
+            .linkedAt(cluster.getCreatedAt())
+            .build();
+      default:
+        throw new InvalidRequestException("Invalid cluster reference %s:" + clusterRef);
+    }
   }
 
   public ClusterFromGitops writeDTO(ScopeLevel scopeLevel, io.harness.gitops.models.Cluster cluster) {