SkipDiscovery -> DelayDiscovery

Signed-off-by: Ivan Milchev <[email protected]>

explorer/scan/local_scanner.go

@@ -271,7 +271,7 @@ func (s *LocalScanner) distributeJob(job *Job, ctx context.Context, upstream *up
 			assetsToSync := make([]*inventory.Asset, 0, len(batch))
 			for i := range batch {
 				// If discovery has been skipped, then we don't sync that asset just yet. We will do that during the scan
-				if batch[i].Asset.Connections[0].SkipDiscovery {
+				if batch[i].Asset.Connections[0].DelayDiscovery {
 					continue
 				}
 				assetsToSync = append(assetsToSync, batch[i].Asset)
@@ -341,8 +341,8 @@ func (s *LocalScanner) distributeJob(job *Job, ctx context.Context, upstream *up
 				default:
 				}
 
-				if asset.Connections[0].SkipDiscovery {
-					asset.Connections[0].SkipDiscovery = false
+				if asset.Connections[0].DelayDiscovery {
+					asset.Connections[0].DelayDiscovery = false
 					if err := runtime.Connect(&plugin.ConnectReq{Asset: asset}); err != nil {
 						log.Error().Err(err).Str("asset", asset.Name).Msg("failed to connect to asset")
 						reporter.AddScanError(asset, err)

providers-sdk/v1/inventory/inventory.proto

@@ -197,8 +197,9 @@ message Config {
   // connection
   string platform_id = 26;
   repeated string capabilities = 29;
-  // Determines whether to skip discovery during the connection phase
-  bool skip_discovery = 31;
+  // Determines whether to delay discovery during the connection phase. Discovery
+  // will only happen if this is false
+  bool delay_discovery = 31;
 }
 
 message Sudo {

providers/os/connection/container/image_connection.go

@@ -25,7 +25,7 @@ func NewImageConnection(id uint32, conf *inventory.Config, asset *inventory.Asse
 	// FIXME: DEPRECATED, remove in v12.0 vv
 	// The SkipDiscovery flag should always be set from v12
 	if conf.Options == nil || conf.Options[plugin.DISABLE_DELAYED_DISCOVERY_OPTION] == "" {
-		conf.SkipDiscovery = true // Skip discovery, to make sure we don't directly download the image
+		conf.DelayDiscovery = true // Delay discovery, to make sure we don't directly download the image
 	}
 	// ^^
 	f, err := tar.RandomFile()

providers/os/connection/docker/container_connection.go

@@ -219,7 +219,7 @@ func NewDockerEngineContainer(id uint32, conf *inventory.Config, asset *inventor
 		// FIXME: DEPRECATED, remove in v12.0 vv
 		// The SkipDiscovery flag should always be set from v12
 		if conf.Options == nil || conf.Options[plugin.DISABLE_DELAYED_DISCOVERY_OPTION] == "" {
-			conf.SkipDiscovery = true // Skip discovery, to make sure we don't directly download the image
+			conf.DelayDiscovery = true // Delay discovery, to make sure we don't directly download the image
 		}
 		// ^^
 		asset.Name = ci.Name
@@ -304,7 +304,7 @@ func NewContainerImageConnection(id uint32, conf *inventory.Config, asset *inven
 	// FIXME: DEPRECATED, remove in v12.0 vv
 	// The SkipDiscovery flag should always be set from v12
 	if conf.Options == nil || conf.Options[plugin.DISABLE_DELAYED_DISCOVERY_OPTION] == "" {
-		conf.SkipDiscovery = true // Skip discovery, to make sure we don't directly download the image
+		conf.DelayDiscovery = true // Delay discovery, to make sure we don't directly download the image
 	}
 	// ^^
 

providers/os/provider/detector.go

@@ -116,9 +116,9 @@ func (s *Service) detect(asset *inventory.Asset, conn shared.Connection) error {
 	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
+	// If the asset connection had the DelayDiscovery 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 {
+	if conn.Asset().Connections[0].DelayDiscovery && !asset.Connections[0].DelayDiscovery {
 		conn.UpdateAsset(asset)
 	}
 	return nil

providers/os/provider/provider.go

@@ -224,7 +224,7 @@ func (s *Service) Connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 	}
 
 	// We only need to run the detection step when we don't have any asset information yet.
-	if !req.Asset.Connections[0].SkipDiscovery && (req.Asset.Platform == nil || req.Asset.Platform.Name == "") {
+	if !req.Asset.Connections[0].DelayDiscovery && (req.Asset.Platform == nil || req.Asset.Platform.Name == "") {
 		if err := s.detect(req.Asset, conn); err != nil {
 			return nil, err
 		}