fix delayed discovery scans

Signed-off-by: Ivan Milchev <[email protected]>
mondoohq · Mar 5, 2024 · 034c94c · 034c94c
1 parent 1e7e7a0
commit 034c94c
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 1 deletion.
diff --git a/explorer/scan/local_scanner.go b/explorer/scan/local_scanner.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"slices"
 	"strings"
 	sync "sync"
 	"time"
@@ -181,6 +182,7 @@ func CreateProgressBar(discoveredAssets *DiscoveredAssets, disableProgressBar bo
 			asset := discoveredAssets.Assets[i].Asset
 			// this shouldn't happen, but might
 			// it normally indicates a bug in the provider
+			slices.Sort(asset.PlatformIds)
 			if presentAsset, present := progressBarElements[asset.PlatformIds[0]]; present {
 				return nil, fmt.Errorf("asset %s and %s have the same platform id %s", presentAsset, asset.Name, asset.PlatformIds[0])
 			}
@@ -358,7 +360,8 @@ func (s *LocalScanner) distributeJob(job *Job, ctx context.Context, upstream *up
 							continue
 						}
 
-						// platformMrn := asset.PlatformIds[0]
+						asset = runtime.Provider.Connection.Asset
+						slices.Sort(asset.PlatformIds)
 						details := resp.Details[asset.PlatformIds[0]]
 						asset.Mrn = details.AssetMrn
 						asset.Url = details.Url

diff --git a/providers/os/connection/docker/container_connection.go b/providers/os/connection/docker/container_connection.go
@@ -119,6 +119,10 @@ func (c *ContainerConnection) Asset() *inventory.Asset {
 	return c.asset
 }
 
+func (p *ContainerConnection) UpdateAsset(asset *inventory.Asset) {
+	p.asset = asset
+}
+
 func (c *ContainerConnection) ContainerId() string {
 	return c.container
 }

diff --git a/providers/os/connection/fs/filesystem.go b/providers/os/connection/fs/filesystem.go
@@ -116,3 +116,7 @@ func (c *FileSystemConnection) Type() shared.ConnectionType {
 func (c *FileSystemConnection) Asset() *inventory.Asset {
 	return c.asset
 }
+
+func (p *FileSystemConnection) UpdateAsset(asset *inventory.Asset) {
+	p.asset = asset
+}
diff --git a/providers/os/connection/local/local.go b/providers/os/connection/local/local.go
@@ -60,6 +60,10 @@ func (p *LocalConnection) Asset() *inventory.Asset {
 	return p.asset
 }
 
+func (p *LocalConnection) UpdateAsset(asset *inventory.Asset) {
+	p.asset = asset
+}
+
 func (p *LocalConnection) Capabilities() shared.Capabilities {
 	return shared.Capability_File | shared.Capability_RunCommand
 }

diff --git a/providers/os/connection/mock/mock.go b/providers/os/connection/mock/mock.go
@@ -123,6 +123,10 @@ func (c *Connection) Asset() *inventory.Asset {
 	return c.asset
 }
 
+func (p *Connection) UpdateAsset(asset *inventory.Asset) {
+	p.asset = asset
+}
+
 func (c *Connection) Capabilities() shared.Capabilities {
 	return shared.Capability_File | shared.Capability_RunCommand
 }

diff --git a/providers/os/connection/shared/shared.go b/providers/os/connection/shared/shared.go
@@ -51,6 +51,7 @@ type Connection interface {
 	Name() string
 	Type() ConnectionType
 	Asset() *inventory.Asset
+	UpdateAsset(asset *inventory.Asset)
 	Capabilities() Capabilities
 }
 

diff --git a/providers/os/connection/ssh/ssh.go b/providers/os/connection/ssh/ssh.go
@@ -131,6 +131,10 @@ func (p *Connection) Asset() *inventory.Asset {
 	return p.asset
 }
 
+func (p *Connection) UpdateAsset(asset *inventory.Asset) {
+	p.asset = asset
+}
+
 func (p *Connection) Capabilities() shared.Capabilities {
 	return shared.Capability_File | shared.Capability_RunCommand
 }

diff --git a/providers/os/connection/tar/connection.go b/providers/os/connection/tar/connection.go
@@ -61,6 +61,10 @@ func (p *Connection) Asset() *inventory.Asset {
 	return p.asset
 }
 
+func (p *Connection) UpdateAsset(asset *inventory.Asset) {
+	p.asset = asset
+}
+
 func (p *Connection) Conf() *inventory.Config {
 	return p.conf
 }

diff --git a/providers/os/connection/winrm/winrm.go b/providers/os/connection/winrm/winrm.go
@@ -109,6 +109,10 @@ func (p *Connection) Asset() *inventory.Asset {
 	return p.asset
 }
 
+func (p *Connection) UpdateAsset(asset *inventory.Asset) {
+	p.asset = asset
+}
+
 func (p *Connection) Capabilities() shared.Capabilities {
 	return shared.Capability_File | shared.Capability_RunCommand
 }

diff --git a/providers/os/provider/detector.go b/providers/os/provider/detector.go
@@ -115,6 +115,12 @@ func (s *Service) detect(asset *inventory.Asset, conn shared.Connection) error {
 	// First sort the platform IDs and then call Compact, because Compact removes only consecutive duplicates
 	slices.Sort(asset.PlatformIds)
 	asset.PlatformIds = slices.Compact(asset.PlatformIds)
+
+	// If the asset connection had the SkipDiscovery flag and the current asset doesn't, we just performed
+	// discovery for the asset and we need to update it.
+	if conn.Asset().Connections[0].SkipDiscovery && !asset.Connections[0].SkipDiscovery {
+		conn.UpdateAsset(asset)
+	}
 	return nil
 }