fix: add data to k8_secret and k8_configmap

Author: Arta Asadi

cloudql/kubernetes/table_kubernetes_config_map.go

@@ -23,6 +23,12 @@ func tableKubernetesConfigMap(ctx context.Context) *plugin.Table {
 				Description: "If set to true, ensures that data stored in the ConfigMap cannot be updated (only object metadata can be modified). If not set to true, the field can be modified at any time. Defaulted to nil.",
 				Transform:   transform.FromField("Description.ConfigMap.Immutable"),
 			},
+			{
+				Name:        "data",
+				Type:        proto.ColumnType_JSON,
+				Description: "configmap data",
+				Transform:   transform.FromField("Description.ConfigMap.Data"),
+			},
 			//// Steampipe Standard Columns
 			{
 				Name:        "title",

cloudql/kubernetes/table_kubernetes_job.go

@@ -13,7 +13,7 @@ func tableKubernetesJob(ctx context.Context) *plugin.Table {
 		Name:        "k8_job",
 		Description: "A Job creates one or more Pods and will continue to retry execution of the Pods until a specified number of them successfully terminate.",
 		List: &plugin.ListConfig{
-			Hydrate: opengovernance.ListKubernetesIngress,
+			Hydrate: opengovernance.ListKubernetesJob,
 		},
 		Columns: commonColumns([]*plugin.Column{
 			{

cloudql/kubernetes/table_kubernetes_node.go

@@ -198,19 +198,31 @@ func transformNodeCpuAndMemoryUnit(_ context.Context, d *transform.TransformData
 	switch param {
 	case "Capacity.CPU":
 		if v, ok := node.Status.Capacity["cpu"]; ok {
-			return v, nil
+			if vv, k := v.AsInt64(); k {
+				return vv, nil
+			}
+			return nil, nil
 		}
 	case "Capacity.Memory":
 		if v, ok := node.Status.Capacity["memory"]; ok {
-			return v, nil
+			if vv, k := v.AsInt64(); k {
+				return vv, nil
+			}
+			return nil, nil
 		}
 	case "Allocatable.CPU":
 		if v, ok := node.Status.Allocatable["cpu"]; ok {
-			return v, nil
+			if vv, k := v.AsInt64(); k {
+				return vv, nil
+			}
+			return nil, nil
 		}
 	case "Allocatable.Memory":
 		if v, ok := node.Status.Allocatable["memory"]; ok {
-			return v, nil
+			if vv, k := v.AsInt64(); k {
+				return vv, nil
+			}
+			return nil, nil
 		}
 	}
 
@@ -224,19 +236,19 @@ func transformNodeCpuAndMemory(_ context.Context, d *transform.TransformData) (a
 	switch param {
 	case "Capacity.CPU":
 		if v, ok := node.Status.Capacity["cpu"]; ok {
-			return v, nil
+			return v.String(), nil
 		}
 	case "Capacity.Memory":
 		if v, ok := node.Status.Capacity["memory"]; ok {
-			return v, nil
+			return v.String(), nil
 		}
 	case "Allocatable.CPU":
 		if v, ok := node.Status.Allocatable["cpu"]; ok {
-			return v, nil
+			return v.String(), nil
 		}
 	case "Allocatable.Memory":
 		if v, ok := node.Status.Allocatable["memory"]; ok {
-			return v, nil
+			return v.String(), nil
 		}
 	}
 

cloudql/kubernetes/table_kubernetes_secret.go

@@ -28,6 +28,18 @@ func tableKubernetesSecret(ctx context.Context) *plugin.Table {
 				Description: "Type of the secret data.",
 				Transform:   transform.FromField("Description.Secret.Type"),
 			},
+			{
+				Name:        "data",
+				Type:        proto.ColumnType_JSON,
+				Description: "Type of the secret data.",
+				Transform:   transform.FromField("Description.Secret.Data"),
+			},
+			{
+				Name:        "string_data",
+				Type:        proto.ColumnType_JSON,
+				Description: "Type of the secret data.",
+				Transform:   transform.FromField("Description.Secret.StringData"),
+			},
 
 			//// Steampipe Standard Columns
 			{

discovery/describers/kubernetes.go

@@ -121,11 +121,7 @@ func KubernetesConfigMap(ctx context.Context, client model.Client, extra string,
 	for _, configMap := range configMaps.Items {
 		var resource models.Resource
 
-		// Do not include the data in the configmap
-		configMap.Data = nil
 		configMap.BinaryData = nil
-		// We don't need to include the managed fields in the description, also it causes issues in elastic search mapping generation
-		configMap.ManagedFields = nil
 		resource = models.Resource{
 			ID:   fmt.Sprintf("configmap/%s/%s", configMap.Namespace, configMap.Name),
 			Name: fmt.Sprintf("%s/%s", configMap.Namespace, configMap.Name),
@@ -136,7 +132,6 @@ func KubernetesConfigMap(ctx context.Context, client model.Client, extra string,
 					ObjectMeta: helpers.ConvertObjectMeta(&configMap.ObjectMeta),
 					Immutable:  configMap.Immutable,
 					Data:       configMap.Data,
-					BinaryData: configMap.BinaryData,
 				},
 			},
 		}
@@ -1038,11 +1033,6 @@ func KubernetesSecret(ctx context.Context, client model.Client, extra string, st
 
 	for _, secret := range secrets.Items {
 		var resource models.Resource
-		// Do not include the data in the secret
-		secret.Data = nil
-		secret.StringData = nil
-		// We don't need to include the managed fields in the description, also it causes issues in elastic search mapping generation
-		secret.ManagedFields = nil
 		resource = models.Resource{
 			ID:   fmt.Sprintf("secret/%s/%s", secret.Namespace, secret.Name),
 			Name: fmt.Sprintf("%s/%s", secret.Namespace, secret.Name),

discovery/pkg/es/resources_clients.go

@@ -724,6 +724,7 @@ func (p KubernetesConfigMapPaginator) NextPage(ctx context.Context) ([]Kubernete
 }
 
 var listKubernetesConfigMapFilters = map[string]string{
+	"data":      "Description.ConfigMap.Data",
 	"immutable": "Description.ConfigMap.Immutable",
 	"title":     "Description.ConfigMap.Name",
 }
@@ -789,6 +790,7 @@ func ListKubernetesConfigMap(ctx context.Context, d *plugin.QueryData, _ *plugin
 }
 
 var getKubernetesConfigMapFilters = map[string]string{
+	"data":      "Description.ConfigMap.Data",
 	"immutable": "Description.ConfigMap.Immutable",
 	"title":     "Description.ConfigMap.Name",
 }
@@ -6434,9 +6436,11 @@ func (p KubernetesSecretPaginator) NextPage(ctx context.Context) ([]KubernetesSe
 }
 
 var listKubernetesSecretFilters = map[string]string{
-	"immutable": "Description.Secret.Immutable",
-	"title":     "Description.Secret.Name",
-	"type":      "Description.Secret.Type",
+	"data":        "Description.Secret.Data",
+	"immutable":   "Description.Secret.Immutable",
+	"string_data": "Description.Secret.StringData",
+	"title":       "Description.Secret.Name",
+	"type":        "Description.Secret.Type",
 }
 
 func ListKubernetesSecret(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -6500,9 +6504,11 @@ func ListKubernetesSecret(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy
 }
 
 var getKubernetesSecretFilters = map[string]string{
-	"immutable": "Description.Secret.Immutable",
-	"title":     "Description.Secret.Name",
-	"type":      "Description.Secret.Type",
+	"data":        "Description.Secret.Data",
+	"immutable":   "Description.Secret.Immutable",
+	"string_data": "Description.Secret.StringData",
+	"title":       "Description.Secret.Name",
+	"type":        "Description.Secret.Type",
 }
 
 func GetKubernetesSecret(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {

discovery/provider/helpers/config_map.go

@@ -10,7 +10,6 @@ type ConfigMap struct {
 	ObjectMeta // Assumes ObjectMeta in model_helpers.go
 	Immutable  *bool
 	Data       map[string]string
-	BinaryData map[string][]byte
 }
 
 // ConvertConfigMap creates a helper ConfigMap from a corev1 ConfigMap
@@ -20,6 +19,5 @@ func ConvertConfigMap(cm *corev1.ConfigMap) ConfigMap {
 		ObjectMeta: ConvertObjectMeta(&cm.ObjectMeta), // Assumes ConvertObjectMeta in model_helpers.go
 		Immutable:  cm.Immutable,
 		Data:       cm.Data,
-		BinaryData: cm.BinaryData,
 	}
 }