small changes

openclarity · Nov 13, 2022 · 1812b5a · 1812b5a
1 parent 7c07e9e
commit 1812b5a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/runtime_scan/pkg/provider/aws/client.go b/runtime_scan/pkg/provider/aws/client.go
@@ -440,7 +440,7 @@ func (c *Client) ListAllRegions() ([]types.Region, error) {
 	}
 	for _, region := range out.Regions {
 		ret = append(ret, types.Region{
-			ID:    *region.RegionName,
+			ID: *region.RegionName,
 		})
 	}
 	return ret, nil

diff --git a/runtime_scan/pkg/scanner/job_managment.go b/runtime_scan/pkg/scanner/job_managment.go
@@ -47,7 +47,7 @@ func (s *Scanner) jobBatchManagement(scanDone chan struct{}) {
 		go s.worker(q, i, done, s.killSignal)
 	}
 
-	// wait until scan of all images is done - non blocking. once all done, notify on fullScanDone chan
+	// wait until scan of all instances is done - non blocking. once all done, notify on fullScanDone chan
 	go func() {
 		for c := 0; c < len(instanceIDToScanData); c++ {
 			select {
@@ -113,7 +113,7 @@ func (s *Scanner) worker(queue chan *scanData, workNumber int, done, ks chan boo
 			select {
 			case done <- true:
 			case <-ks:
-				log.WithFields(s.logFields).Infof("Image scan was canceled. imageID=%v", data.instance.ID)
+				log.WithFields(s.logFields).Infof("Instance scan was canceled. instanceID=%v", data.instance.ID)
 			}
 		case <-ks:
 			log.WithFields(s.logFields).Debugf("worker #%v halted", workNumber)

diff --git a/runtime_scan/pkg/scanner/scanner.go b/runtime_scan/pkg/scanner/scanner.go
@@ -82,11 +82,11 @@ func CreateScanner(config *_config.Config, providerClient provider.Client) *Scan
 // initScan Calculate properties of scan targets
 // nolint:cyclop
 func (s *Scanner) initScan() error {
-	imageIDToScanData := make(map[string]*scanData)
+	instanceIDToScanData := make(map[string]*scanData)
 
 	// Populate the instance to scanData map
 	for _, instance := range s.scanConfig.Instances {
-		imageIDToScanData[instance.ID] = &scanData{
+		instanceIDToScanData[instance.ID] = &scanData{
 			instance:              instance,
 			scanUUID:              uuid.NewV4().String(),
 			vulnerabilitiesResult: vulnerabilitiesScanResult{},
@@ -98,10 +98,10 @@ func (s *Scanner) initScan() error {
 		}
 	}
 
-	s.instanceIDToScanData = imageIDToScanData
-	s.progress.InstancesToScan = uint32(len(imageIDToScanData))
+	s.instanceIDToScanData = instanceIDToScanData
+	s.progress.InstancesToScan = uint32(len(instanceIDToScanData))
 
-	log.WithFields(s.logFields).Infof("Total %d unique images to scan", s.progress.InstancesToScan)
+	log.WithFields(s.logFields).Infof("Total %d unique instances to scan", s.progress.InstancesToScan)
 
 	return nil
 }