Show server side columns

pkg/server/store/proxy/client.go

@@ -1,66 +0,0 @@
-package proxy
-
-import (
-	"fmt"
-
-	"github.com/rancher/steve/pkg/attributes"
-	"github.com/rancher/steve/pkg/schemaserver/httperror"
-	"github.com/rancher/steve/pkg/schemaserver/types"
-	"github.com/rancher/wrangler/pkg/schemas/validation"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/client-go/dynamic"
-	"k8s.io/client-go/rest"
-)
-
-type ClientFactory struct {
-	cfg         rest.Config
-	client      dynamic.Interface
-	impersonate bool
-	idToGVR     map[string]schema.GroupVersionResource
-}
-
-func NewClientFactory(cfg *rest.Config, impersonate bool) *ClientFactory {
-	return &ClientFactory{
-		impersonate: impersonate,
-		cfg:         *cfg,
-		idToGVR:     map[string]schema.GroupVersionResource{},
-	}
-}
-
-func (p *ClientFactory) Client(ctx *types.APIRequest, schema *types.APISchema) (dynamic.ResourceInterface, error) {
-	gvr := attributes.GVR(schema)
-	if gvr.Resource == "" {
-		return nil, httperror.NewAPIError(validation.NotFound, "Failed to find gvr for "+schema.ID)
-	}
-
-	user, ok := request.UserFrom(ctx.Request.Context())
-	if !ok {
-		return nil, fmt.Errorf("failed to find user context for client")
-	}
-
-	client, err := p.getClient(user)
-	if err != nil {
-		return nil, err
-	}
-
-	return client.Resource(gvr), nil
-}
-
-func (p *ClientFactory) getClient(user user.Info) (dynamic.Interface, error) {
-	if p.impersonate {
-		return p.client, nil
-	}
-
-	if user.GetName() == "" {
-		return nil, fmt.Errorf("failed to determine current user")
-	}
-
-	newCfg := p.cfg
-	newCfg.Impersonate.UserName = user.GetName()
-	newCfg.Impersonate.Groups = user.GetGroups()
-	newCfg.Impersonate.Extra = user.GetExtra()
-
-	return dynamic.NewForConfig(&newCfg)
-}

pkg/server/store/proxy/proxy_store.go

@@ -96,7 +96,9 @@ func (s *Store) byID(apiOp *types.APIRequest, schema *types.APISchema, id string
 		return nil, err
 	}
 
-	return k8sClient.Get(id, opts)
+	obj, err := k8sClient.Get(id, opts)
+	rowToObject(obj)
+	return obj, err
 }
 
 func moveFromUnderscore(obj map[string]interface{}) map[string]interface{} {
@@ -130,6 +132,51 @@ func moveToUnderscore(obj *unstructured.Unstructured) *unstructured.Unstructured
 	return obj
 }
 
+func rowToObject(obj *unstructured.Unstructured) {
+	if obj.Object["kind"] != "Table" ||
+		obj.Object["apiVersion"] != "meta.k8s.io/v1" {
+		return
+	}
+
+	items := tableToObjects(obj.Object)
+	if len(items) == 1 {
+		obj.Object = items[0].Object
+	}
+}
+
+func tableToList(obj *unstructured.UnstructuredList) {
+	if obj.Object["kind"] != "Table" ||
+		obj.Object["apiVersion"] != "meta.k8s.io/v1" {
+		return
+	}
+
+	obj.Items = tableToObjects(obj.Object)
+}
+
+func tableToObjects(obj map[string]interface{}) []unstructured.Unstructured {
+	var result []unstructured.Unstructured
+
+	rows, _ := obj["rows"].([]interface{})
+	for _, row := range rows {
+		m, ok := row.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		cells := m["cells"]
+		object, ok := m["object"].(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		data.PutValue(object, cells, "metadata", "fields")
+		result = append(result, unstructured.Unstructured{
+			Object: object,
+		})
+	}
+
+	return result
+}
+
 func (s *Store) List(apiOp *types.APIRequest, schema *types.APISchema) (types.APIObjectList, error) {
 	k8sClient, err := s.clientGetter.Client(apiOp, schema, apiOp.Namespace)
 	if err != nil {
@@ -146,6 +193,8 @@ func (s *Store) List(apiOp *types.APIRequest, schema *types.APISchema) (types.AP
 		return types.APIObjectList{}, err
 	}
 
+	tableToList(resultList)
+
 	result := types.APIObjectList{
 		Revision: resultList.GetResourceVersion(),
 		Continue: resultList.GetContinue(),
@@ -230,6 +279,10 @@ func (s *Store) toAPIEvent(apiOp *types.APIRequest, schema *types.APISchema, et
 		name = types.CreateAPIEvent
 	}
 
+	if unstr, ok := obj.(*unstructured.Unstructured); ok {
+		rowToObject(unstr)
+	}
+
 	event := types.APIEvent{
 		Name:   name,
 		Object: toAPI(schema, obj),