feat(ws): Notebooks 2.0 // Backend // add count to workspacekind schema response

Signed-off-by: rafriat <[email protected]>

Author: rafriat

workspaces/backend/internal/models/workspacekinds/funcs.go

@@ -79,7 +79,25 @@ func NewWorkspaceKindModelFromWorkspaceKind(wsk *kubefloworgv1beta1.WorkspaceKin
 				},
 			},
 		},
+		Status: WorkspaceKindStatus{
+			Workspaces: wsk.Status.Workspaces,
+			PodTemplateOptions: PodTemplateOptionsMetrics{
+				ImageConfig: buildStatusConfig(wsk.Status.PodTemplateOptions.ImageConfig),
+				PodConfig:   buildStatusConfig(wsk.Status.PodTemplateOptions.PodConfig),
+			},
+		},
+	}
+}
+
+func buildStatusConfig(config []kubefloworgv1beta1.OptionMetric) []OptionMetric {
+	newConfig := make([]OptionMetric, len(config))
+	for i := range config {
+		newConfig[i] = OptionMetric{
+			Id:         config[i].Id,
+			Workspaces: config[i].Workspaces,
+		}
 	}
+	return newConfig
 }
 
 func buildImageConfigValues(imageConfig kubefloworgv1beta1.ImageConfig) []ImageConfigValue {

workspaces/backend/internal/models/workspacekinds/types.go

@@ -17,15 +17,31 @@ limitations under the License.
 package workspacekinds
 
 type WorkspaceKind struct {
-	Name               string      `json:"name"`
-	DisplayName        string      `json:"displayName"`
-	Description        string      `json:"description"`
-	Deprecated         bool        `json:"deprecated"`
-	DeprecationMessage string      `json:"deprecationMessage"`
-	Hidden             bool        `json:"hidden"`
-	Icon               ImageRef    `json:"icon"`
-	Logo               ImageRef    `json:"logo"`
-	PodTemplate        PodTemplate `json:"podTemplate"`
+	Name               string              `json:"name"`
+	DisplayName        string              `json:"displayName"`
+	Description        string              `json:"description"`
+	Deprecated         bool                `json:"deprecated"`
+	DeprecationMessage string              `json:"deprecationMessage"`
+	Hidden             bool                `json:"hidden"`
+	Icon               ImageRef            `json:"icon"`
+	Logo               ImageRef            `json:"logo"`
+	PodTemplate        PodTemplate         `json:"podTemplate"`
+	Status             WorkspaceKindStatus `json:"status"`
+}
+
+type WorkspaceKindStatus struct {
+	Workspaces         int32                     `json:"workspaces"`
+	PodTemplateOptions PodTemplateOptionsMetrics `json:"podTemplateOptions"`
+}
+
+type PodTemplateOptionsMetrics struct {
+	ImageConfig []OptionMetric `json:"imageConfig"`
+	PodConfig   []OptionMetric `json:"podConfig"`
+}
+
+type OptionMetric struct {
+	Id         string `json:"id"`
+	Workspaces int32  `json:"workspaces"`
 }
 
 type ImageRef struct {

workspaces/backend/openapi/docs.go

@@ -762,6 +762,17 @@ const docTemplate = `{
                 }
             }
         },
+        "workspacekinds.OptionMetric": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "workspaces": {
+                    "type": "integer"
+                }
+            }
+        },
         "workspacekinds.OptionRedirect": {
             "type": "object",
             "properties": {
@@ -855,6 +866,23 @@ const docTemplate = `{
                 }
             }
         },
+        "workspacekinds.PodTemplateOptionsMetrics": {
+            "type": "object",
+            "properties": {
+                "imageConfig": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/workspacekinds.OptionMetric"
+                    }
+                },
+                "podConfig": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/workspacekinds.OptionMetric"
+                    }
+                }
+            }
+        },
         "workspacekinds.PodVolumeMounts": {
             "type": "object",
             "properties": {
@@ -916,6 +944,20 @@ const docTemplate = `{
                 },
                 "podTemplate": {
                     "$ref": "#/definitions/workspacekinds.PodTemplate"
+                },
+                "status": {
+                    "$ref": "#/definitions/workspacekinds.WorkspaceKindStatus"
+                }
+            }
+        },
+        "workspacekinds.WorkspaceKindStatus": {
+            "type": "object",
+            "properties": {
+                "podTemplateOptions": {
+                    "$ref": "#/definitions/workspacekinds.PodTemplateOptionsMetrics"
+                },
+                "workspaces": {
+                    "type": "integer"
                 }
             }
         },

workspaces/backend/openapi/swagger.json

@@ -760,6 +760,17 @@
                 }
             }
         },
+        "workspacekinds.OptionMetric": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "workspaces": {
+                    "type": "integer"
+                }
+            }
+        },
         "workspacekinds.OptionRedirect": {
             "type": "object",
             "properties": {
@@ -853,6 +864,23 @@
                 }
             }
         },
+        "workspacekinds.PodTemplateOptionsMetrics": {
+            "type": "object",
+            "properties": {
+                "imageConfig": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/workspacekinds.OptionMetric"
+                    }
+                },
+                "podConfig": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/workspacekinds.OptionMetric"
+                    }
+                }
+            }
+        },
         "workspacekinds.PodVolumeMounts": {
             "type": "object",
             "properties": {
@@ -914,6 +942,20 @@
                 },
                 "podTemplate": {
                     "$ref": "#/definitions/workspacekinds.PodTemplate"
+                },
+                "status": {
+                    "$ref": "#/definitions/workspacekinds.WorkspaceKindStatus"
+                }
+            }
+        },
+        "workspacekinds.WorkspaceKindStatus": {
+            "type": "object",
+            "properties": {
+                "podTemplateOptions": {
+                    "$ref": "#/definitions/workspacekinds.PodTemplateOptionsMetrics"
+                },
+                "workspaces": {
+                    "type": "integer"
                 }
             }
         },

workspaces/backend/openapi/swagger.yaml

@@ -153,6 +153,13 @@ definitions:
       value:
         type: string
     type: object
+  workspacekinds.OptionMetric:
+    properties:
+      id:
+        type: string
+      workspaces:
+        type: integer
+    type: object
   workspacekinds.OptionRedirect:
     properties:
       message:
@@ -213,6 +220,17 @@ definitions:
       podConfig:
         $ref: '#/definitions/workspacekinds.PodConfig'
     type: object
+  workspacekinds.PodTemplateOptionsMetrics:
+    properties:
+      imageConfig:
+        items:
+          $ref: '#/definitions/workspacekinds.OptionMetric'
+        type: array
+      podConfig:
+        items:
+          $ref: '#/definitions/workspacekinds.OptionMetric'
+        type: array
+    type: object
   workspacekinds.PodVolumeMounts:
     properties:
       home:
@@ -255,6 +273,15 @@ definitions:
         type: string
       podTemplate:
         $ref: '#/definitions/workspacekinds.PodTemplate'
+      status:
+        $ref: '#/definitions/workspacekinds.WorkspaceKindStatus'
+    type: object
+  workspacekinds.WorkspaceKindStatus:
+    properties:
+      podTemplateOptions:
+        $ref: '#/definitions/workspacekinds.PodTemplateOptionsMetrics'
+      workspaces:
+        type: integer
     type: object
   workspaces.Activity:
     properties: