pending scan bypass

Author: prkhrkat

image-scanner/config.md

@@ -1,9 +1,10 @@
-# IMAGESCANER CONFIGMAP 
+# IMAGESCANER CONFIGMAP
 
 
 | Variable Name       | Value                                  | Description                   |
 |---------------------|----------------------------------------|-------------------------------|
 | CLAIR_ADDR          | clair-dcd.devtroncd:6060               | For connecting to Clair if it's enabled |
+| ENABLE_PROGRESSING_SCAN_CHECK | "true"                                | Flag to enable/disable checking for progressing scans at startup (set to "false" to improve startup performance) |
 | CLIENT_ID           | client-2                               | Client ID                        |
 | NATS_SERVER_HOST    | nats://devtron-nats.devtroncd:4222    | For connecting to NATS         |
 | PG_LOG_QUERY        | "false"                                | PostgreSQL Query Logging (false to disable) |

image-scanner/env_gen.md

@@ -9,6 +9,7 @@
  | CONSUMER_CONFIG_JSON | string | |  |  | false |
  | DEFAULT_LOG_TIME_LIMIT | int64 |1 |  |  | false |
  | ENABLE_STATSVIZ | bool |false |  |  | false |
+ | ENABLE_PROGRESSING_SCAN_CHECK | bool |true | Flag to enable/disable checking for progressing scans at startup | false | false |
  | IMAGE_SCAN_ASYNC_TIMEOUT | int |3 |  |  | false |
  | IMAGE_SCAN_TIMEOUT | int |10 |  |  | false |
  | IMAGE_SCAN_TRY_COUNT | int |1 |  |  | false |

image-scanner/pkg/security/ImageScanService.go

@@ -111,7 +111,13 @@ func NewImageScanServiceImpl(logger *zap.SugaredLogger, scanHistoryRepository re
 		RegistryIndexMappingRepository:            registryIndexMappingRepository,
 		CliCommandEnv:                             os.Environ(),
 	}
-	imageScanService.HandleProgressingScans()
+	// Only check for progressing scans if the flag is enabled
+	if imageScanConfig.EnableProgressingScanCheck {
+		logger.Infow("checking for progressing scans at startup")
+		imageScanService.HandleProgressingScans()
+	} else {
+		logger.Infow("skipping progressing scans check at startup as it is disabled")
+	}
 	return imageScanService
 }
 
@@ -125,10 +131,11 @@ func GetImageScannerConfig() (*ImageScanConfig, error) {
 }
 
 type ImageScanConfig struct {
-	ScannerType           string `env:"SCANNER_TYPE" envDefault:""`
-	ScanTryCount          int    `env:"IMAGE_SCAN_TRY_COUNT" envDefault:"1"`
-	ScanImageTimeout      int    `env:"IMAGE_SCAN_TIMEOUT" envDefault:"10"`      // Time is considered in minutes
-	ScanImageAsyncTimeout int    `env:"IMAGE_SCAN_ASYNC_TIMEOUT" envDefault:"3"` // Time is considered in minutes
+	ScannerType                string `env:"SCANNER_TYPE" envDefault:""`
+	ScanTryCount               int    `env:"IMAGE_SCAN_TRY_COUNT" envDefault:"1"`
+	ScanImageTimeout           int    `env:"IMAGE_SCAN_TIMEOUT" envDefault:"10"`              // Time is considered in minutes
+	ScanImageAsyncTimeout      int    `env:"IMAGE_SCAN_ASYNC_TIMEOUT" envDefault:"3"`         // Time is considered in minutes
+	EnableProgressingScanCheck bool   `env:"ENABLE_PROGRESSING_SCAN_CHECK" envDefault:"true"` // Flag to enable/disable checking for progressing scans at startup
 }
 
 func (impl *ImageScanServiceImpl) GetImageToBeScannedAndFetchCliEnv(scanEvent *bean2.ImageScanEvent) (string, error) {