Support Exec column for generic resource apis (#153)

tamalsaha · web-flow · commit 92e6a750a2d0 · 2022-07-26T12:04:45.000-07:00
Signed-off-by: Tamal Saha &lt;tamal@appscode.com&gt;
diff --git a/artifacts/resourcequeries/render-response.yaml b/artifacts/resourcequeries/render-response.yaml
@@ -184,7 +184,6 @@ response:
             textAlign: center
             type: string
           - exec:
-              alias: ""
               command:
               - bash
               - -c
@@ -203,12 +202,12 @@ response:
             - data: mg-alert-0
               link: /${username}/${clustername}/core/v1/pods/mg-alert-0?namespace=demo
             - data: '-'
-            - data: 143m / 700m
-            - data: 522Mi / 2Gi
+            - data: 125m / 700m
+            - data: 552Mi / 2Gi
             - data: 4Gi / 10Gi
             - color: success is-light
               data: Running
-            - data: 31d
+            - data: 32d
               sort: 1656073686
             - data: http://grafana.bb.test:3005/d/uqpE2Cynk/kubedb-mongodb-pod?from=now-3h&orgId=1&refresh=30s&to=now&var-db=mg-alert&var-namespace=demo&var-pod=mg-alert-0
             - data: mg-alert-0
@@ -284,7 +283,7 @@ response:
             - data: mg-alert-auth
             - data: mongodb-backup-5.0.3
             - data: mongodb-restore-5.0.3
-            - data: 60d
+            - data: 61d
               sort: 1653560482
             namespace: demo
       insight:
@@ -346,12 +345,12 @@ response:
           metadata: {}
           rows:
           - cells:
-            - data: 1487
-            - data: 1272080
-            - data: 837373
-            - data: 496
+            - data: 1510
+            - data: 1314928
+            - data: 837350
+            - data: 503
             - data: 5
-            - data: 1061972
+            - data: 1062431
             - data: 6
             - data: 172032
             - data: <unknown>
@@ -394,7 +393,8 @@ response:
         - name: Monitoring
           priority: 3
           type: string
-        - name: Exec
+        - exec: {}
+          name: Exec
           priority: 4
           type: object
         metadata: {}
diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	kmodules.xyz/client-go v0.24.5
 	kmodules.xyz/custom-resources v0.24.0
 	kmodules.xyz/monitoring-agent-api v0.24.0
-	kmodules.xyz/resource-metadata v0.12.4-0.20220725191232-73f401ba5161
+	kmodules.xyz/resource-metadata v0.12.4-0.20220726185618-99fbbaaa8ba5
 	kmodules.xyz/resource-metrics v0.10.1
 	kmodules.xyz/sets v0.24.0
 	kubepack.dev/kubepack v0.4.1-0.20220604085220-0b1719a66516
diff --git a/go.sum b/go.sum
@@ -1792,8 +1792,8 @@ kmodules.xyz/monitoring-agent-api v0.24.0 h1:CPFvzDppUKckMBLwaMnZbpYCuP7+NhcS4t7
 kmodules.xyz/monitoring-agent-api v0.24.0/go.mod h1:lu1TmXRMx9IcjMpY8s5nc4HNOhOix5/z9caEnbL8JxA=
 kmodules.xyz/offshoot-api v0.24.1 h1:8KCVNkLwdebzWmHcTdZPTQGxqI92bqA+vrmz65ueULY=
 kmodules.xyz/offshoot-api v0.24.1/go.mod h1:fYu0051hoJXXs70OjmIE+Q5smOgmzvYFhRJXCiFShaY=
-kmodules.xyz/resource-metadata v0.12.4-0.20220725191232-73f401ba5161 h1:TmWxIDLDAoSEWlJ6w5eCtTZj3oozJAn+SHaZZGMtPbQ=
-kmodules.xyz/resource-metadata v0.12.4-0.20220725191232-73f401ba5161/go.mod h1:i9+cwehXHOAD/UG/WDlVcnNqKJEd1BzCjvNzy0tc/4Y=
+kmodules.xyz/resource-metadata v0.12.4-0.20220726185618-99fbbaaa8ba5 h1:XWnXF2X56e3pn8vJ1KwZQqogqGsY/C/i0tIvDCRxMUU=
+kmodules.xyz/resource-metadata v0.12.4-0.20220726185618-99fbbaaa8ba5/go.mod h1:i9+cwehXHOAD/UG/WDlVcnNqKJEd1BzCjvNzy0tc/4Y=
 kmodules.xyz/resource-metrics v0.10.1 h1:q1dhk0eYxkZqd1peRy9wHGd8tOktBBH3kzgeTVaNBiY=
 kmodules.xyz/resource-metrics v0.10.1/go.mod h1:YK0hjiLq6oBaGROmLSVcVDbmEgSxT1vpt8BCZZ+9teY=
 kmodules.xyz/sets v0.24.0 h1:GbltLEPVnURjcmWyf8eFstgJBpm9o151wsrABkByGrc=
diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go
diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourcedescriptor_types.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourcedescriptor_types.go
@@ -307,11 +307,14 @@ type DashboardResult struct {
 
 // cell.Data == name of resource
 type ExecResult struct {
-	Alias    string `json:"alias"`
-	Resource string `json:"resource"` // pods or services
-	// Namespace string   `json:"namespace"`
-	Container string   `json:"container"`
-	Command   []string `json:"command"`
+	// +optional
+	Alias string `json:"alias,omitempty"`
+	// +optional
+	Resource string `json:"resource,omitempty"` // pods or services
+	// +optional
+	Container string `json:"container,omitempty"`
+	// +optional
+	Command []string `json:"command,omitempty"`
 	// +optional
 	Help string `json:"help,omitempty"`
 }
diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/table_helpers.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/table_helpers.go
@@ -73,9 +73,12 @@ func Convert_ResourceColumnDefinition_To_ResourceColumn(def ResourceColumnDefini
 		}
 	}
 	if def.Exec != nil {
-		rs := "pods"
-		if def.Exec.ServiceNameTemplate != "" {
-			rs = "services"
+		var rs string
+		if len(def.Exec.Command) > 0 {
+			rs = "pods"
+			if def.Exec.ServiceNameTemplate != "" {
+				rs = "services"
+			}
 		}
 		col.Exec = &ExecResult{
 			Alias:     def.Exec.Alias,
diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/core.k8s.appscode.com/v1alpha1/kubedb/genericresourceservices.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/core.k8s.appscode.com/v1alpha1/kubedb/genericresourceservices.yaml
@@ -74,7 +74,8 @@ spec:
     pathTemplate: '{{ .spec.facilities.monitoring.usage }}'
     priority: 3
     type: string
-  - name: Exec
+  - exec: {}
+    name: Exec
     pathTemplate: '{{ .spec.facilities.exec | toRawJson }}'
     priority: 4
     type: object
diff --git a/vendor/kmodules.xyz/resource-metadata/pkg/tableconvertor/tableconvertor.go b/vendor/kmodules.xyz/resource-metadata/pkg/tableconvertor/tableconvertor.go
@@ -26,6 +26,7 @@ import (
 	"sync"
 	"text/template"
 
+	meta_util "kmodules.xyz/client-go/meta"
 	"kmodules.xyz/resource-metadata/apis/meta/v1alpha1"
 	"kmodules.xyz/resource-metadata/apis/shared"
 	"kmodules.xyz/resource-metadata/pkg/tableconvertor/lib"
@@ -248,25 +249,53 @@ func (c *convertor) rowFn(obj interface{}) ([]v1alpha1.TableCell, error) {
 				}
 			}
 		} else if col.Exec != nil {
-			if col.Exec.ServiceNameTemplate == "" {
-				if v, err := renderTemplate(data, columnOptions{
-					Name:     col.Name,
-					Type:     col.Type,
-					Template: col.PathTemplate,
-				}, buf); err != nil {
-					return nil, err
+			if col.Type == "string" {
+				if col.Exec.ServiceNameTemplate == "" {
+					if v, err := renderTemplate(data, columnOptions{
+						Name:     col.Name,
+						Type:     col.Type,
+						Template: col.PathTemplate,
+					}, buf); err != nil {
+						return nil, err
+					} else {
+						cell.Data = v
+					}
 				} else {
-					cell.Data = v
+					if v, err := renderTemplate(data, columnOptions{
+						Name:     col.Name,
+						Type:     "string",
+						Template: col.Exec.ServiceNameTemplate,
+					}, buf); err != nil {
+						return nil, err
+					} else {
+						cell.Data = v
+					}
 				}
 			} else {
 				if v, err := renderTemplate(data, columnOptions{
 					Name:     col.Name,
-					Type:     "string",
-					Template: col.Exec.ServiceNameTemplate,
+					Type:     col.Type,
+					Template: col.PathTemplate,
 				}, buf); err != nil {
 					return nil, err
 				} else {
-					cell.Data = v
+					if col.Exec.Alias != "" {
+						var execs []v1alpha1.ResourceExec
+						err = meta_util.DecodeObject(v, &execs)
+						if err != nil {
+							return nil, errors.Wrapf(err, "failed to decode cell value for col %s", col.Name)
+						}
+						result := make([]v1alpha1.ResourceExec, 0, len(execs))
+						for _, exec := range execs {
+							if exec.Alias == col.Exec.Alias {
+								result = append(result, exec)
+								break
+							}
+						}
+						cell.Data = result
+					} else {
+						cell.Data = v
+					}
 				}
 			}
 		} else {
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1900,7 +1900,7 @@ kmodules.xyz/monitoring-agent-api/client
 # kmodules.xyz/offshoot-api v0.24.1
 ## explicit; go 1.18
 kmodules.xyz/offshoot-api/api/v1
-# kmodules.xyz/resource-metadata v0.12.4-0.20220725191232-73f401ba5161
+# kmodules.xyz/resource-metadata v0.12.4-0.20220726185618-99fbbaaa8ba5
 ## explicit; go 1.18
 kmodules.xyz/resource-metadata/apis/core/install
 kmodules.xyz/resource-metadata/apis/core/v1alpha1

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,12 @@ func Convert_ResourceColumnDefinition_To_ResourceColumn(def ResourceColumnDefini`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`if def.Exec != nil {`
`76`		`- rs := "pods"`
`77`		`- if def.Exec.ServiceNameTemplate != "" {`
`78`		`- rs = "services"`
	`76`	`+ var rs string`
	`77`	`+ if len(def.Exec.Command) > 0 {`
	`78`	`+ rs = "pods"`
	`79`	`+ if def.Exec.ServiceNameTemplate != "" {`
	`80`	`+ rs = "services"`
	`81`	`+ }`
`79`	`82`	`}`
`80`	`83`	`col.Exec = &ExecResult{`
`81`	`84`	`Alias: def.Exec.Alias,`