✨ add more asset info to mondoo provider

providers/mondoo/provider/provider.go

@@ -157,7 +157,7 @@ func (s *Service) initResources(runtime *plugin.Runtime) error {
 	conn := runtime.Connection.(*connection.Connection)
 	var err error
 
-	_, err = resources.CreateResource(runtime, "mondoo.agent", map[string]*llx.RawData{
+	_, err = resources.CreateResource(runtime, "mondoo.client", map[string]*llx.RawData{
 		"mrn": llx.StringData(conn.Upstream.Creds.Mrn),
 	})
 	if err != nil {

providers/mondoo/resources/mondoo.go

@@ -5,10 +5,12 @@ package resources
 
 import (
 	"context"
+	"time"
 
 	"go.mondoo.com/cnquery/v11/explorer/resources"
 	"go.mondoo.com/cnquery/v11/llx"
 	"go.mondoo.com/cnquery/v11/providers/mondoo/connection"
+	"go.mondoo.com/cnquery/v11/types"
 	"go.mondoo.com/cnquery/v11/utils/multierr"
 	"go.mondoo.com/mondoo-go"
 )
@@ -26,6 +28,11 @@ func (m *mqlMondooSpace) assets() ([]any, error) {
 					State     string
 					Name      string
 					AssetType string `graphql:"asset_type"`
+					CreatedAt *string
+					UpdatedAt *string
+					// Annotations map[string]string
+					Annotations []keyValue
+					Labels      []keyValue
 				}
 			}
 		} `graphql:"assets(spaceMrn: $spaceMrn)"`
@@ -43,9 +50,13 @@ func (m *mqlMondooSpace) assets() ([]any, error) {
 	for i := range q.Assets.Edges {
 		e := q.Assets.Edges[i]
 		raw, err := CreateResource(m.MqlRuntime, "mondoo.asset", map[string]*llx.RawData{
-			"name":     llx.StringData(e.Node.Name),
-			"mrn":      llx.StringData(e.Node.Mrn),
-			"platform": llx.StringData(e.Node.AssetType),
+			"name":        llx.StringData(e.Node.Name),
+			"mrn":         llx.StringData(e.Node.Mrn),
+			"platform":    llx.StringData(e.Node.AssetType),
+			"annotations": llx.MapData(keyvals2map(e.Node.Annotations), types.Map(types.String, types.String)),
+			"labels":      llx.MapData(keyvals2map(e.Node.Labels), types.Map(types.String, types.String)),
+			"createdAt":   llx.TimeDataPtr(string2time(e.Node.CreatedAt)),
+			"updatedAt":   llx.TimeDataPtr(string2time(e.Node.UpdatedAt)),
 		})
 		if err != nil {
 			return nil, err
@@ -56,6 +67,38 @@ func (m *mqlMondooSpace) assets() ([]any, error) {
 	return res, nil
 }
 
+type keyValue struct {
+	Key   string
+	Value *string
+}
+
+func keyvals2map(keyvals []keyValue) map[string]any {
+	if len(keyvals) == 0 {
+		return nil
+	}
+	res := make(map[string]any, len(keyvals))
+	for i := range keyvals {
+		cur := keyvals[i]
+		if cur.Value == nil {
+			res[cur.Key] = ""
+		} else {
+			res[cur.Key] = *cur.Value
+		}
+	}
+	return res
+}
+
+func string2time(s *string) *time.Time {
+	if s == nil {
+		return nil
+	}
+	res, err := time.Parse(time.RFC3339, *s)
+	if err != nil {
+		return nil
+	}
+	return &res
+}
+
 func (m *mqlMondooAsset) id() (string, error) {
 	return m.Mrn.Data, nil
 }

providers/mondoo/resources/mondoo.lr

@@ -8,7 +8,7 @@ option provider = "go.mondoo.com/cnquery/v11/providers/mondoo"
 option go_package = "go.mondoo.com/cnquery/v11/providers/mondoo/resources"
 
 // Mondoo Client
-mondoo.agent @defaults("mrn") {
+mondoo.client @defaults("mrn") {
   // Client identifier
   mrn string
 }
@@ -31,6 +31,14 @@ private mondoo.asset @defaults("name platform") {
   mrn string
   // Platform name
   platform string
+  // Annotations associated with this asset
+  annotations map[string]string
+  // Labels associated with this asset
+  labels map[string]string
+  // Time this asset was created
+  createdAt time
+  // Time this asset was last updated
+  updatedAt time
   // Asset resources
   resources() []mondoo.resource
 }

providers/mondoo/resources/mondoo.lr.manifest.yaml

@@ -11,12 +11,20 @@ resources:
     min_mondoo_version: 9.0.0
   mondoo.asset:
     fields:
+      annotations: {}
+      createdAt: {}
+      labels: {}
       mrn: {}
       name: {}
       platform: {}
       resources: {}
+      updatedAt: {}
     is_private: true
     min_mondoo_version: 9.0.0
+  mondoo.client:
+    fields:
+      mrn: {}
+    min_mondoo_version: 9.0.0
   mondoo.resource:
     fields:
       id: {}