review

api/openapi.yaml

@@ -1416,6 +1416,7 @@ components:
         name:
           type: string
         zones:
+          example: 'us-central1-a'
           type: array
           items:
             type: string

runtime_scan/pkg/orchestrator/scanconfigwatcher/watcher.go

@@ -168,7 +168,6 @@ func (w *Watcher) reconcileUnscheduled(ctx context.Context, scanConfig *models.S
 }
 
 func (w *Watcher) reconcileDue(ctx context.Context, scanConfig *models.ScanConfig, schedule *ScanConfigSchedule) error {
-	// TODO createScanIfNotExist
 	if err := w.createScan(ctx, scanConfig); err != nil {
 		return fmt.Errorf("failed to reconcile new Scan for ScanConfig. ScanConfigID=%s: %w", *scanConfig.Id, err)
 	}
@@ -199,7 +198,6 @@ func (w *Watcher) createScan(ctx context.Context, scanConfig *models.ScanConfig)
 		Count:  utils.PointerTo(true),
 	})
 	if err != nil || scans == nil {
-		// TODO not found error is also an error here?
 		return fmt.Errorf("failed to fetch scans for ScanConfig. ScanConfigID=%s: %w", *scanConfig.Id, err)
 	}
 

runtime_scan/pkg/provider/aws/client.go

@@ -790,7 +790,7 @@ func (c *Client) RemoveTargetScan(ctx context.Context, config *provider.ScanJobC
 func (c *Client) GetInstances(ctx context.Context, filters []ec2types.Filter, excludeTags []models.Tag, regionID string) ([]Instance, error) {
 	ret := make([]Instance, 0)
 
-	out, err := c.ec2Client.DescribeInstances(ctx, &ec2.DescribeInstancesInput {
+	out, err := c.ec2Client.DescribeInstances(ctx, &ec2.DescribeInstancesInput{
 		Filters:    filters,
 		MaxResults: utils.PointerTo[int32](maxResults), // TODO what will be a good number?
 	}, func(options *ec2.Options) {

runtime_scan/pkg/provider/gcp/client.go

@@ -23,13 +23,12 @@ import (
 
 	compute "cloud.google.com/go/compute/apiv1"
 	"cloud.google.com/go/compute/apiv1/computepb"
-	//	"github.com/google/martian/log"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/api/iterator"
 
 	"github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
-	log2 "github.com/openclarity/vmclarity/shared/pkg/log"
+	"github.com/openclarity/vmclarity/shared/pkg/log"
 	"github.com/openclarity/vmclarity/shared/pkg/utils"
 )
 
@@ -96,8 +95,8 @@ func (c *Client) RunTargetScan(ctx context.Context, config *provider.ScanJobConf
 		return provider.FatalErrorf("unable to get vminfo from target: %w", err)
 	}
 
-	logger := log2.GetLoggerFromContextOrDefault(ctx).WithFields(logrus.Fields{
-		"scanResultID":   config.ScanResultID,
+	logger := log.GetLoggerFromContextOrDefault(ctx).WithFields(logrus.Fields{
+		"ScanResultID":   config.ScanResultID,
 		"TargetLocation": vminfo.Location,
 		"InstanceID":     vminfo.InstanceID,
 		"ScannerZone":    c.gcpConfig.ScannerZone,
@@ -161,7 +160,7 @@ func (c *Client) RunTargetScan(ctx context.Context, config *provider.ScanJobConf
 }
 
 func (c *Client) RemoveTargetScan(ctx context.Context, config *provider.ScanJobConfig) error {
-	logger := log2.GetLoggerFromContextOrDefault(ctx).WithFields(logrus.Fields{
+	logger := log.GetLoggerFromContextOrDefault(ctx).WithFields(logrus.Fields{
 		"scanResultID": config.ScanResultID,
 		"ScannerZone":  c.gcpConfig.ScannerZone,
 		"Provider":     string(c.Kind()),
@@ -379,18 +378,7 @@ func hasIncludeTags(vm *computepb.Instance, tags *[]models.Tag) bool {
 		return false
 	}
 
-	instanceTags := convertTagsToMap(vm.Tags)
-
-	for _, tag := range *tags {
-		val, ok := instanceTags[tag.Key]
-		if !ok {
-			return false
-		}
-		if !(strings.Compare(val, tag.Value) == 0) {
-			return false
-		}
-	}
-	return true
+	return hasTags(vm.Tags, tags)
 }
 
 // AND logic - if tags = {tag1:val1, tag2:val2},
@@ -406,9 +394,13 @@ func hasExcludeTags(vm *computepb.Instance, tags *[]models.Tag) bool {
 		return false
 	}
 
-	instanceTags := convertTagsToMap(vm.Tags)
+	return hasTags(vm.Tags, tags)
+}
+
+func hasTags(vmTags *computepb.Tags, modelsTags *[]models.Tag) bool {
+	instanceTags := convertTagsToMap(vmTags)
 
-	for _, tag := range *tags {
+	for _, tag := range *modelsTags {
 		val, ok := instanceTags[tag.Key]
 		if !ok {
 			return false
@@ -490,12 +482,7 @@ func (c *Client) getVMInfoFromVirtualMachine(vm *computepb.Instance) (models.Tar
 func convertTags(tags *computepb.Tags) *[]models.Tag {
 	ret := make([]models.Tag, 0, len(tags.Items))
 	for _, item := range tags.Items {
-		spl := strings.Split(item, "=")
-		var key, val string
-		key = spl[0]
-		if len(spl) > 1 {
-			val = spl[1]
-		}
+		key, val := getKeyValue(item)
 		ret = append(ret, models.Tag{
 			Key:   key,
 			Value: val,
@@ -507,13 +494,17 @@ func convertTags(tags *computepb.Tags) *[]models.Tag {
 func convertTagsToMap(tags *computepb.Tags) map[string]string {
 	ret := make(map[string]string, len(tags.Items))
 	for _, item := range tags.Items {
-		spl := strings.Split(item, "=")
-		var key, val string
-		key = spl[0]
-		if len(spl) > 1 {
-			val = spl[1]
-		}
+		key, val := getKeyValue(item)
 		ret[key] = val
 	}
 	return ret
 }
+
+func getKeyValue(str string) (key, value string) {
+	spl := strings.Split(str, "=")
+	key = spl[0]
+	if len(spl) > 1 {
+		value = spl[1]
+	}
+	return
+}