✨ asset kinds inside inventory package

Signed-off-by: Salim Afiune Maya <[email protected]>

providers-sdk/v1/inventory/asset_kinds.go

@@ -0,0 +1,11 @@
+// Copyright (c) Mondoo, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package inventory
+
+// Use this file to define kinds of assets that are used widely.
+
+const (
+	AssetKindCloudVM   = "virtualmachine"
+	AssetKindBaremetal = "baremetal"
+)

providers/aws/connection/platform.go

@@ -5,7 +5,6 @@ package connection
 
 import (
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
-	"go.mondoo.com/cnquery/v11/providers/os/id/clouddetect"
 )
 
 func (a *AwsConnection) PlatformInfo() *inventory.Platform {
@@ -39,7 +38,7 @@ func getPlatformKind(platformName string) string {
 		// "aws-ecs-container",
 		"aws-ec2-instance",
 		"aws-ssm-instance":
-		return clouddetect.AssetKind
+		return inventory.AssetKindCloudVM
 	case "aws":
 		return "api"
 	default:

providers/aws/resources/discovery_conversion.go

@@ -19,7 +19,6 @@ import (
 	"go.mondoo.com/cnquery/v11/providers/aws/connection/awsec2ebsconn"
 	awsec2ebstypes "go.mondoo.com/cnquery/v11/providers/aws/connection/awsec2ebsconn/types"
 	"go.mondoo.com/cnquery/v11/providers/os/id/awsec2"
-	"go.mondoo.com/cnquery/v11/providers/os/id/clouddetect"
 	"go.mondoo.com/cnquery/v11/providers/os/id/containerid"
 	"go.mondoo.com/cnquery/v11/providers/os/id/ids"
 )
@@ -286,7 +285,7 @@ func addConnectionInfoToEc2Asset(instance *mqlAwsEc2Instance, accountId string,
 	asset.PlatformIds = []string{awsec2.MondooInstanceID(accountId, instance.Region.Data, instance.InstanceId.Data)}
 	asset.IdDetector = []string{ids.IdDetector_Hostname, ids.IdDetector_CloudDetect, ids.IdDetector_SshHostkey}
 	asset.Platform = &inventory.Platform{
-		Kind:    clouddetect.AssetKind,
+		Kind:    inventory.AssetKindCloudVM,
 		Runtime: "aws-ec2-instance",
 		Family:  getPlatformFamily(instance.PlatformDetails.Data),
 	}
@@ -433,7 +432,7 @@ func addConnectionInfoToSSMAsset(instance *mqlAwsSsmInstance, accountId string,
 	asset.Options = conn.ConnectionOptions()
 	asset.PlatformIds = []string{awsec2.MondooInstanceID(accountId, instance.Region.Data, instance.InstanceId.Data)}
 	asset.Platform = &inventory.Platform{
-		Kind:    clouddetect.AssetKind,
+		Kind:    inventory.AssetKindCloudVM,
 		Runtime: "aws-ssm-instance",
 		Family:  getPlatformFamily(instance.PlatformName.Data),
 	}

providers/builtin_dev.go

@@ -10,11 +10,21 @@ import (
 	_ "embed"
 	// osconf "go.mondoo.com/cnquery/v11/providers/os/config"
 	// os "go.mondoo.com/cnquery/v11/providers/os/provider"
+	awsconf "go.mondoo.com/cnquery/v11/providers/aws/config"
+	aws "go.mondoo.com/cnquery/v11/providers/aws/provider"
+	osconf "go.mondoo.com/cnquery/v11/providers/os/config"
+	os "go.mondoo.com/cnquery/v11/providers/os/provider"
 )
 
 // //go:embed os/resources/os.resources.json
 // var osInfo []byte
 
+//go:embed os.resources.json
+var osInfo []byte
+
+//go:embed aws.resources.json
+var awsInfo []byte
+
 func init() {
 	// builtinProviders[osconf.Config.ID] = &builtinProvider{
 	// 	Runtime: &RunningProvider{
@@ -27,4 +37,26 @@ func init() {
 	// 	Config: &osconf.Config,
 	// }
 
+	builtinProviders[osconf.Config.ID] = &builtinProvider{
+		Runtime: &RunningProvider{
+			Name:     osconf.Config.Name,
+			ID:       osconf.Config.ID,
+			Plugin:   os.Init(),
+			Schema:   MustLoadSchema("os", osInfo),
+			isClosed: false,
+		},
+		Config: &osconf.Config,
+	}
+
+	builtinProviders[awsconf.Config.ID] = &builtinProvider{
+		Runtime: &RunningProvider{
+			Name:     awsconf.Config.Name,
+			ID:       awsconf.Config.ID,
+			Plugin:   aws.Init(),
+			Schema:   MustLoadSchema("aws", awsInfo),
+			isClosed: false,
+		},
+		Config: &awsconf.Config,
+	}
+
 }

providers/os/id/clouddetect/clouddetect.go

@@ -29,25 +29,26 @@ var detectors = []detectorFunc{
 	gcp.Detect,
 }
 
-const AssetKind = "virtualmachine"
-
 type detectResult struct {
 	platformId         string
 	platformName       string
 	relatedPlatformIds []string
 }
 
+// PlatformInfo contains platform information gathered from one of our cloud detectors.
 type PlatformInfo struct {
 	ID                 string
 	Name               string
 	Kind               string
 	RelatedPlatformIDs []string
 }
 
-func Detect(conn shared.Connection, p *inventory.Platform) PlatformInfo {
+// Detect tried to detect if we are running on a cloud asset, and if so, it returns
+// the platform information, otherwise it returns a `nil` pointer.
+func Detect(conn shared.Connection, p *inventory.Platform) *PlatformInfo {
 	mgr, err := smbios.ResolveManager(conn, p)
 	if err != nil {
-		return PlatformInfo{"", "", "", nil}
+		return nil
 	}
 
 	wg := sync.WaitGroup{}
@@ -82,11 +83,11 @@ func Detect(conn shared.Connection, p *inventory.Platform) PlatformInfo {
 	}
 
 	if len(platformIds) == 0 {
-		return PlatformInfo{"", "", "", nil}
+		return nil
 	} else if len(platformIds) > 1 {
 		log.Error().Strs("detected", platformIds).Msg("multiple cloud platform ids detected")
-		return PlatformInfo{"", "", "", nil}
+		return nil
 	}
 
-	return PlatformInfo{platformIds[0], name, AssetKind, relatedPlatformIds}
+	return &PlatformInfo{platformIds[0], name, inventory.AssetKindCloudVM, relatedPlatformIds}
 }

providers/os/id/platform.go

@@ -203,7 +203,7 @@ func gatherPlatformInfo(conn shared.Connection, pf *inventory.Platform, idDetect
 		return &platformInfo{}, nil
 	case idDetector == ids.IdDetector_CloudDetect:
 		cloudPlatformInfo := clouddetect.Detect(conn, pf)
-		if cloudPlatformInfo.ID != "" {
+		if cloudPlatformInfo != nil {
 			return &platformInfo{
 				IDs:                []string{cloudPlatformInfo.ID},
 				Name:               cloudPlatformInfo.Name,

providers/os/provider/detector.go

@@ -75,7 +75,7 @@ func (s *Service) detect(asset *inventory.Asset, conn shared.Connection) error {
 	if hasDetector(detectors, ids.IdDetector_CloudDetect) {
 		log.Debug().Msg("run cloud platform detector")
 		cloudPlatformInfo := clouddetect.Detect(conn, asset.Platform)
-		if cloudPlatformInfo.ID != "" {
+		if cloudPlatformInfo != nil {
 			log.Debug().Interface("info", cloudPlatformInfo).Msg("cloud platform detected")
 			asset.PlatformIds = append(asset.PlatformIds, cloudPlatformInfo.ID)
 			if cloudPlatformInfo.Name != "" {