Skip to content

🧹allow users to override the platform id #4954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🧹allow users to override the platform id #4954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/cnquery/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,11 @@ func getCobraScanConfig(cmd *cobra.Command, runtime *providers.Runtime, cliRes *
cliRes.Asset.Name = assetName
}

platformID := viper.GetString("platform-id")
if platformID != "" && cliRes.Asset != nil {
cliRes.Asset.PlatformIds = append(cliRes.Asset.PlatformIds, platformID)
}

traceId := viper.GetString("trace-id")
if traceId != "" && cliRes.Asset != nil {
cliRes.Asset.TraceId = traceId
Expand Down
8 changes: 4 additions & 4 deletions providers/os/connection/docker/container_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func NewDockerEngineContainer(id uint32, conf *inventory.Config, asset *inventor
conn.Metadata.Name = containerid.ShortContainerImageID(ci.ID)
conn.Metadata.Labels = ci.Labels
asset.Name = ci.Name
asset.PlatformIds = []string{containerid.MondooContainerID(ci.ID)}
asset.PlatformIds = append(asset.PlatformIds, containerid.MondooContainerID(ci.ID))
return conn, nil
} else {
log.Debug().Msg("found stopped container " + ci.ID)
Expand All @@ -223,7 +223,7 @@ func NewDockerEngineContainer(id uint32, conf *inventory.Config, asset *inventor
}
// ^^
asset.Name = ci.Name
asset.PlatformIds = []string{containerid.MondooContainerID(ci.ID)}
asset.PlatformIds = append(asset.PlatformIds, containerid.MondooContainerID(ci.ID))
return conn, nil
}
}
Expand Down Expand Up @@ -260,7 +260,7 @@ func NewContainerImageConnection(id uint32, conf *inventory.Config, asset *inven
// The requested image isn't locally available, but we can pull it from a remote registry.
if len(resolvedAssets) > 0 && resolvedAssets[0].Connections[0].Type == shared.Type_RegistryImage.String() {
asset.Name = resolvedAssets[0].Name
asset.PlatformIds = resolvedAssets[0].PlatformIds
asset.PlatformIds = append(asset.PlatformIds, resolvedAssets[0].PlatformIds...)
asset.Labels = resolvedAssets[0].Labels
return container.NewRegistryImage(id, conf, asset)
}
Expand Down Expand Up @@ -294,7 +294,7 @@ func NewContainerImageConnection(id uint32, conf *inventory.Config, asset *inven

identifier := containerid.MondooContainerImageID(labelImageId)

asset.PlatformIds = []string{identifier}
asset.PlatformIds = append(asset.PlatformIds, identifier)
asset.Name = ii.Name
asset.Labels = ii.Labels

Expand Down
14 changes: 8 additions & 6 deletions providers/os/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba

asset := req.Asset
conf := asset.Connections[0]
log.Debug().Str("asset-name", asset.Name).Strs("platform-ids", asset.PlatformIds).Msg("pre-detection platform-ids")

runtime, err := s.AddRuntime(conf, func(connId uint32) (*plugin.Runtime, error) {
var conn shared.Connection
Expand All @@ -371,7 +372,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
if asset.Name == "" {
asset.Name = fingerprint.Name
}
asset.PlatformIds = fingerprint.PlatformIDs
asset.PlatformIds = append(asset.PlatformIds, fingerprint.PlatformIDs...)
asset.IdDetector = fingerprint.ActiveIdDetectors
asset.Platform = p
appendRelatedAssetsFromFingerprint(fingerprint, asset)
Expand All @@ -389,7 +390,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
if asset.Name == "" && conn.Asset().Connections[0].Runtime != "vagrant" {
asset.Name = fingerprint.Name
}
asset.PlatformIds = fingerprint.PlatformIDs
asset.PlatformIds = append(asset.PlatformIds, fingerprint.PlatformIDs...)
asset.IdDetector = fingerprint.ActiveIdDetectors
asset.Platform = p
appendRelatedAssetsFromFingerprint(fingerprint, asset)
Expand All @@ -404,7 +405,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
fingerprint, p, err := id.IdentifyPlatform(conn, req, asset.Platform, asset.IdDetector)
if err == nil {
asset.Name = fingerprint.Name
asset.PlatformIds = fingerprint.PlatformIDs
asset.PlatformIds = append(asset.PlatformIds, fingerprint.PlatformIDs...)
asset.IdDetector = fingerprint.ActiveIdDetectors
asset.Platform = p
appendRelatedAssetsFromFingerprint(fingerprint, asset)
Expand All @@ -419,7 +420,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
fingerprint, p, err := id.IdentifyPlatform(conn, req, asset.Platform, asset.IdDetector)
if err == nil {
asset.Name = fingerprint.Name
asset.PlatformIds = fingerprint.PlatformIDs
asset.PlatformIds = append(asset.PlatformIds, fingerprint.PlatformIDs...)
asset.IdDetector = fingerprint.ActiveIdDetectors
asset.Platform = p
appendRelatedAssetsFromFingerprint(fingerprint, asset)
Expand All @@ -434,7 +435,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
fingerprint, p, err := id.IdentifyPlatform(conn, req, asset.Platform, asset.IdDetector)
if err == nil {
asset.Name = fingerprint.Name
asset.PlatformIds = fingerprint.PlatformIDs
asset.PlatformIds = append(asset.PlatformIds, fingerprint.PlatformIDs...)
asset.IdDetector = fingerprint.ActiveIdDetectors
asset.Platform = p
appendRelatedAssetsFromFingerprint(fingerprint, asset)
Expand Down Expand Up @@ -486,7 +487,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
fingerprint, p, err := id.IdentifyPlatform(conn, req, asset.Platform, asset.IdDetector)
if err == nil {
asset.Name = fingerprint.Name
asset.PlatformIds = fingerprint.PlatformIDs
asset.PlatformIds = append(asset.PlatformIds, fingerprint.PlatformIDs...)
asset.IdDetector = fingerprint.ActiveIdDetectors
asset.Platform = p
}
Expand All @@ -507,6 +508,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
return nil, err
}

log.Debug().Str("asset-name", asset.Name).Strs("platform-ids", asset.PlatformIds).Msg("used platform-ids")
var upstream *upstream.UpstreamClient
if req.Upstream != nil && !req.Upstream.Incognito {
upstream, err = req.Upstream.InitClient(context.Background())
Expand Down
Loading