updated deploygrid version

Author: btomasini

api/e2e/testdata/config-default.yaml

@@ -2,6 +2,10 @@
 logging:
   devMode: true
 clusters:
+  environments:
+    - Dev
+    - QA
+    - Stage
   clusters:
     - name: kind-ops-cluster-1
       address: https://127.0.0.1:6443

api/kind/applications.yaml

@@ -11,7 +11,7 @@ kind: Application
 metadata:
   name: dev-app-a
   namespace: argocd
-  labels:
+  annotations:
     deploygrid/name: app-a
     deploygrid/environment: Dev
     deploygrid/group: Apps
@@ -30,7 +30,7 @@ kind: Application
 metadata:
   name: dev-app-b
   namespace: argocd
-  labels:
+  annotations:
     deploygrid/name: app-b
     deploygrid/environment: Dev
     deploygrid/group: Apps
@@ -49,7 +49,7 @@ kind: Application
 metadata:
   name: qa-app-a
   namespace: argocd
-  labels:
+  annotations:
     deploygrid/name: app-a
     deploygrid/environment: QA
     deploygrid/group: Apps
@@ -68,7 +68,7 @@ kind: Application
 metadata:
   name: qa-app-b
   namespace: argocd
-  labels:
+  annotations:
     deploygrid/name: app-b
     deploygrid/environment: QA
     deploygrid/group: Apps
@@ -87,7 +87,7 @@ kind: Application
 metadata:
   name: stage-app-a
   namespace: argocd
-  labels:
+  annotations:
     deploygrid/name: app-a
     deploygrid/environment: Stage
     deploygrid/group: Apps
@@ -106,7 +106,7 @@ kind: Application
 metadata:
   name: stage-app-b
   namespace: argocd
-  labels:
+  annotations:
     deploygrid/name: app-b
     deploygrid/environment: Stage
     deploygrid/group: Apps

api/pkg/config/types.go

@@ -14,7 +14,8 @@ type ClusterConfig struct {
 }
 
 type ClustersConfig struct {
-	Clusters []ClusterConfig `mapstructure:"clusters"`
+	Clusters     []ClusterConfig `mapstructure:"clusters"`
+	Environments []string        `mapstructure:"environments"`
 }
 
 type SwaggerConfig struct {

api/pkg/repository/k8s/resources.go

@@ -37,8 +37,9 @@ func NewApplicationRepository(client dynamic.Interface) repository.ResourceRepos
 			simpleName := app.Spec.Source.Chart
 
 			return &repository.Resource{
-				Name:   ApplicationName(app.Name),
-				Labels: app.Labels,
+				Name:        ApplicationName(app.Name),
+				Labels:      app.Labels,
+				Annotations: app.Annotations,
 				Components: []repository.Component{
 					{
 						Name:        ApplicationName(app.Name),
@@ -110,10 +111,11 @@ func NewDeploymentRepository(client dynamic.Interface) repository.ResourceReposi
 			}
 
 			return &repository.Resource{
-				Name:       DeploymentName(dep.Namespace, dep.Name),
-				Labels:     dep.Labels,
-				Parent:     parent,
-				Components: comps,
+				Name:        DeploymentName(dep.Namespace, dep.Name),
+				Labels:      dep.Labels,
+				Annotations: dep.Annotations,
+				Parent:      parent,
+				Components:  comps,
 			}, nil
 		},
 	})

api/pkg/repository/types.go

@@ -25,10 +25,11 @@ type ClusterLocation struct {
 }
 
 type Resource struct {
-	Name       string
-	Parent     string
-	Labels     map[string]string
-	Components []Component
+	Name        string
+	Parent      string
+	Labels      map[string]string
+	Annotations map[string]string
+	Components  []Component
 }
 
 type ResourceStore interface {

api/pkg/service/constants.go

@@ -1,8 +1,8 @@
 package service
 
 const (
-	LabelDeployGridGroup       = "deploygrid/group"
-	LabelDeployGridName        = "deploygrid/name"
-	LabelDeployGridEnvironment = "deploygrid/environment"
-	GroupNoGroup               = "Default Group"
+	AnnotationDeployGridGroup       = "deploygrid/group"
+	AnnotationDeployGridName        = "deploygrid/name"
+	AnnotationDeployGridEnvironment = "deploygrid/environment"
+	GroupNoGroup                    = "Default Group"
 )

api/pkg/service/grid.go

@@ -20,11 +20,12 @@ type resourcesOrError struct {
 }
 
 type gridService struct {
-	clusters   map[string]resourcesOrError
-	accessor   repository.ClusterAwareAccessor[*repository.Resources]
-	stores     map[string]stores
-	lock       sync.RWMutex
-	addressMap map[string]string
+	clusters     map[string]resourcesOrError
+	accessor     repository.ClusterAwareAccessor[*repository.Resources]
+	stores       map[string]stores
+	lock         sync.RWMutex
+	addressMap   map[string]string
+	environments []string
 }
 
 func (g *gridService) updateClusters(ctx context.Context) {
@@ -95,6 +96,7 @@ type gridRow struct {
 	level int
 	group string
 	cells map[string]*gridCell
+	name  string
 }
 
 func (g *gridRow) expand() []*deploygrid.Component {
@@ -106,9 +108,8 @@ func (g *gridRow) expand() []*deploygrid.Component {
 	}
 
 	type withParent struct {
-		parentPath  string
-		currentPath string
-		node        *[]*deploygrid.Component
+		parentPath string
+		node       *[]*deploygrid.Component
 	}
 
 	pathMap := map[string]bool{}
@@ -148,9 +149,8 @@ func (g *gridRow) expand() []*deploygrid.Component {
 	var res []*deploygrid.Component
 
 	cur := &withParent{
-		parentPath:  "",
-		currentPath: "",
-		node:        &res,
+		parentPath: "",
+		node:       &res,
 	}
 	st.Push(cur)
 
@@ -179,43 +179,82 @@ func (g *gridRow) expand() []*deploygrid.Component {
 		}
 
 		*cur.node = append(*cur.node, comp)
+		st.Push(cur)
 		cur = &withParent{
-			parentPath:  cur.currentPath,
-			currentPath: path,
-			node:        &comp.Children,
+			parentPath: path,
+			node:       &comp.Children,
 		}
 		st.Push(cur)
 	}
 
 	return res
 }
 
-func newGridRow(group string) *gridRow {
+func newGridRow(group string, name string) *gridRow {
 	return &gridRow{
+		name:  name,
 		group: group,
 		cells: map[string]*gridCell{},
 	}
 }
 
-func buildGrid(grid *deploygrid.Grid, rows map[string]*gridRow) {
+func buildGrid(grid *deploygrid.Grid, rows map[string]*gridRow, columns []string) {
 
 	envs := map[string]bool{}
-	var comps []*deploygrid.Component
+
+	var sorted []*gridRow
 
 	for _, rv := range rows {
+		sorted = append(sorted, rv)
+	}
+
+	slices.SortFunc(sorted, func(a, b *gridRow) int {
+		return strings.Compare(a.name, b.name)
+	})
+
+	grouped := map[string]*deploygrid.Component{}
+
+	for _, rv := range sorted {
 		for ck, _ := range rv.cells {
 			envs[ck] = true
 		}
-		comps = append(comps, rv.expand()...)
+
+		groupName := rv.group
+		if groupName == "" {
+			groupName = "Default"
+		}
+		comps := rv.expand()
+
+		if grp, ok := grouped[groupName]; ok {
+			grp.Children = append(grp.Children, comps...)
+		} else {
+			grp = &deploygrid.Component{
+				Name:          groupName,
+				ComponentType: "Group",
+				Children:      comps,
+			}
+			grouped[groupName] = grp
+		}
+
 	}
 
-	grid.Components = comps
-	for k, _ := range envs {
+	for _, c := range columns {
 		grid.Environments = append(grid.Environments, &deploygrid.Environment{
-			Name: k,
+			Name: c,
 		})
 	}
 
+	var comps []*deploygrid.Component
+
+	for _, v := range grouped {
+		comps = append(comps, v)
+	}
+
+	slices.SortFunc(comps, func(a, b *deploygrid.Component) int {
+		return strings.Compare(a.Name, b.Name)
+	})
+
+	grid.Components = comps
 }
 
 func (g *gridService) Init() {
@@ -263,40 +302,41 @@ func (g *gridService) Get(ctx context.Context) (*deploygrid.Grid, error) {
 	// TODO - first encountered group defines the group container - this should change
 	for _, v := range data {
 		for _, e := range v.entries {
-			group := e.Labels[LabelDeployGridGroup]
+			group := e.Annotations[AnnotationDeployGridGroup]
 
 			if group == "" {
 				group = GroupNoGroup
 			}
 
-			name, nameOk := e.Labels[LabelDeployGridName]
-			env, envOk := e.Labels[LabelDeployGridEnvironment]
+			name, nameOk := e.Annotations[AnnotationDeployGridName]
+			envs, envsOk := e.Annotations[AnnotationDeployGridEnvironment]
 
-			if nameOk && envOk && e.Parent == "" {
+			if nameOk && envsOk && e.Parent == "" {
 
 				row, ok := rowMap[name]
 				if !ok {
-					row = newGridRow(group)
+					row = newGridRow(group, name)
 					rowMap[name] = row
 				}
 
-				cell, ok := row.cells[env]
-				if !ok {
-					cell = newGridCell()
-					row.cells[env] = cell
-				}
-
-				err := g.buildNodes(ctx, data, &cell.nodes, &e.Components)
+				for _, env := range strings.Split(envs, ",") {
+					cell, ok := row.cells[env]
+					if !ok {
+						cell = newGridCell()
+						row.cells[env] = cell
+					}
 
-				if err != nil {
-					return nil, err
+					err := g.buildNodes(ctx, data, &cell.nodes, &e.Components)
+					if err != nil {
+						return nil, err
+					}
 				}
 
 			}
 		}
 	}
 
-	buildGrid(res, rowMap)
+	buildGrid(res, rowMap, g.environments)
 
 	return res, nil
 }
@@ -353,9 +393,10 @@ func NewGridService(params GridServiceParams) GridService {
 		}
 	}
 	return &gridService{
-		accessor:   params.Accessor,
-		addressMap: addressMap,
-		clusters:   map[string]resourcesOrError{},
-		stores:     map[string]stores{},
+		accessor:     params.Accessor,
+		addressMap:   addressMap,
+		environments: params.ClustersConfig.Environments,
+		clusters:     map[string]resourcesOrError{},
+		stores:       map[string]stores{},
 	}
 }

ui/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Strata</title>
+    <title>DeployGrid</title>
   </head>
   <body>
     <div id="root"></div>