Revert "Remove the deprecated properties fields in the" (#5909)

* Revert "Remove the deprecated properties fields in the"

This reverts commit 2faa2cd.

Signed-off-by: Jay Mundrawala <jay@mondoo.com>

* Revert "Remove deprecated microsoft.domaindnsrecord.properties"

This reverts commit 66108e9.

---------

Signed-off-by: Jay Mundrawala <jay@mondoo.com>

Author: jaym

providers/ms365/resources/devicemanagement.go

@@ -139,6 +139,7 @@ func (a *mqlMicrosoftDevicemanagement) deviceConfigurations() ([]any, error) {
 	res := []any{}
 	configurations := resp.GetValue()
 	for _, configuration := range configurations {
+		properties := getConfigurationProperties(configuration)
 		mqlResource, err := CreateResource(a.MqlRuntime, "microsoft.devicemanagement.deviceconfiguration",
 			map[string]*llx.RawData{
 				"id":                   llx.StringDataPtr(configuration.GetId()),
@@ -147,6 +148,7 @@ func (a *mqlMicrosoftDevicemanagement) deviceConfigurations() ([]any, error) {
 				"description":          llx.StringDataPtr(configuration.GetDescription()),
 				"displayName":          llx.StringDataPtr(configuration.GetDisplayName()),
 				"version":              llx.IntDataDefault(configuration.GetVersion(), 0),
+				"properties":           llx.DictData(properties),
 			})
 		if err != nil {
 			return nil, err
@@ -217,6 +219,7 @@ func (a *mqlMicrosoftDevicemanagement) deviceCompliancePolicies() ([]any, error)
 		if err != nil {
 			return nil, err
 		}
+		properties := getComplianceProperties(compliancePolicy)
 		mqlResource, err := CreateResource(a.MqlRuntime, "microsoft.devicemanagement.devicecompliancepolicy",
 			map[string]*llx.RawData{
 				"id":                   llx.StringDataPtr(compliancePolicy.GetId()),
@@ -226,6 +229,7 @@ func (a *mqlMicrosoftDevicemanagement) deviceCompliancePolicies() ([]any, error)
 				"lastModifiedDateTime": llx.TimeDataPtr(compliancePolicy.GetLastModifiedDateTime()),
 				"version":              llx.IntDataDefault(compliancePolicy.GetVersion(), 0),
 				"assignments":          llx.ArrayData(assignments, types.Any),
+				"properties":           llx.DictData(properties),
 			})
 		if err != nil {
 			return nil, err

providers/ms365/resources/domains.go

@@ -7,6 +7,7 @@ import (
 	"context"
 
 	"github.com/microsoftgraph/msgraph-sdk-go/domains"
+	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"go.mondoo.com/cnquery/v12/llx"
 	"go.mondoo.com/cnquery/v12/providers/ms365/connection"
 	"go.mondoo.com/cnquery/v12/types"
@@ -79,6 +80,7 @@ func (a *mqlMicrosoftDomain) serviceConfigurationRecords() ([]any, error) {
 	res := []any{}
 	records := resp.GetValue()
 	for _, record := range records {
+		properties := getDomainsDnsRecordProperties(record)
 		mqlResource, err := CreateResource(a.MqlRuntime, "microsoft.domaindnsrecord",
 			map[string]*llx.RawData{
 				"id":               llx.StringDataPtr(record.GetId()),
@@ -87,6 +89,7 @@ func (a *mqlMicrosoftDomain) serviceConfigurationRecords() ([]any, error) {
 				"recordType":       llx.StringDataPtr(record.GetRecordType()),
 				"supportedService": llx.StringDataPtr(record.GetSupportedService()),
 				"ttl":              llx.IntDataDefault(record.GetTtl(), 0),
+				"properties":       llx.DictData(properties),
 			})
 		if err != nil {
 			return nil, err
@@ -96,3 +99,53 @@ func (a *mqlMicrosoftDomain) serviceConfigurationRecords() ([]any, error) {
 
 	return res, nil
 }
+
+func getDomainsDnsRecordProperties(record models.DomainDnsRecordable) map[string]interface{} {
+	props := map[string]interface{}{}
+	if record.GetOdataType() != nil {
+		props["@odata.type"] = *record.GetOdataType()
+	}
+	txtRecord, ok := record.(*models.DomainDnsTxtRecord)
+	if ok {
+		if txtRecord.GetText() != nil {
+			props["text"] = *txtRecord.GetText()
+		}
+	}
+	mxRecord, ok := record.(*models.DomainDnsMxRecord)
+	if ok {
+		if mxRecord.GetMailExchange() != nil {
+			props["mailExchange"] = *mxRecord.GetMailExchange()
+		}
+		if mxRecord.GetPreference() != nil {
+			props["preference"] = *mxRecord.GetPreference()
+		}
+	}
+	cNameRecord, ok := record.(*models.DomainDnsCnameRecord)
+	if ok {
+		if cNameRecord.GetCanonicalName() != nil {
+			props["canonicalName"] = *cNameRecord.GetCanonicalName()
+		}
+	}
+	srvRecord, ok := record.(*models.DomainDnsSrvRecord)
+	if ok {
+		if srvRecord.GetNameTarget() != nil {
+			props["nameTarget"] = *srvRecord.GetNameTarget()
+		}
+		if srvRecord.GetPort() != nil {
+			props["port"] = *srvRecord.GetPort()
+		}
+		if srvRecord.GetPriority() != nil {
+			props["priority"] = *srvRecord.GetPriority()
+		}
+		if srvRecord.GetProtocol() != nil {
+			props["protocol"] = *srvRecord.GetProtocol()
+		}
+		if srvRecord.GetService() != nil {
+			props["service"] = *srvRecord.GetService()
+		}
+		if srvRecord.GetWeight() != nil {
+			props["weight"] = *srvRecord.GetWeight()
+		}
+	}
+	return props
+}

providers/ms365/resources/ms365.lr

@@ -860,6 +860,8 @@ private microsoft.domaindnsrecord @defaults("id label") {
   supportedService string
   // Domain record TTL
   ttl int
+  // Deprecated; kept for backwards compatibility
+  properties dict
 }
 
 // Microsoft Entra ID application registration
@@ -1413,6 +1415,8 @@ private microsoft.devicemanagement.deviceconfiguration @defaults("id displayName
   displayName string
   // Device configuration version
   version int
+  // Deprecated; kept for backwards compatibility
+  properties dict
 }
 
 // Microsoft device compliance policy
@@ -1431,6 +1435,8 @@ private microsoft.devicemanagement.devicecompliancepolicy @defaults("id displayN
   version int
   // Device compliance policy assignments
   assignments []dict
+  // Deprecated; kept for backwards compatibility
+  properties dict
 }
 
 // Microsoft 365 Exchange Online

providers/ms365/resources/ms365.lr.go

@@ -304,6 +304,7 @@ resources:
       displayName: {}
       id: {}
       lastModifiedDateTime: {}
+      properties: {}
       version: {}
     is_private: true
     min_mondoo_version: 9.0.0
@@ -314,6 +315,7 @@ resources:
       displayName: {}
       id: {}
       lastModifiedDateTime: {}
+      properties: {}
       version: {}
     is_private: true
     min_mondoo_version: 9.0.0
@@ -377,6 +379,7 @@ resources:
       id: {}
       isOptional: {}
       label: {}
+      properties: {}
       recordType: {}
       supportedService: {}
       ttl: {}