From fac411f06ffeee86ebb47603ac97b943a9a2a257 Mon Sep 17 00:00:00 2001
From: Victoria Jeffrey <vj@mondoo.com>
Date: Sun, 27 Aug 2023 09:12:05 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20gcp=20log=20errs=20on=20individu?=
 =?UTF-8?q?al=20service=20assets=20discovery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 motor/discovery/gcp/mql_assets.go | 40 ++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/motor/discovery/gcp/mql_assets.go b/motor/discovery/gcp/mql_assets.go
index 7b7b99baa4..c5c0a3f01b 100644
--- a/motor/discovery/gcp/mql_assets.go
+++ b/motor/discovery/gcp/mql_assets.go
@@ -93,58 +93,66 @@ func GatherAssets(ctx context.Context, tc *providers.Config, project string, cre
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryInstances) {
 		instances, err := computeInstances(m, project, tc, sfn)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover compute instances")
+		} else {
+			assets = append(assets, instances...)
 		}
-		assets = append(assets, instances...)
 	}
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryComputeImages) {
 		images, err := computeImages(m, project, tc)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover compute images")
+		} else {
+			assets = append(assets, images...)
 		}
-		assets = append(assets, images...)
 	}
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryComputeNetworks) {
 		networks, err := computeNetworks(m, project, tc)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover compute networks")
+		} else {
+			assets = append(assets, networks...)
 		}
-		assets = append(assets, networks...)
 	}
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryComputeSubnetworks) {
 		subnetworks, err := computeSubnetworks(m, project, tc)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover compute subnetworks")
+		} else {
+			assets = append(assets, subnetworks...)
 		}
-		assets = append(assets, subnetworks...)
 	}
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryComputeFirewalls) {
 		firewalls, err := computeFirewalls(m, project, tc)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover compute firewalls")
+		} else {
+			assets = append(assets, firewalls...)
 		}
-		assets = append(assets, firewalls...)
 	}
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryGkeClusters) {
 		clusters, err := gkeClusters(m, project, tc)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover gke clusters")
+		} else {
+			assets = append(assets, clusters...)
 		}
-		assets = append(assets, clusters...)
 	}
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryStorageBuckets) {
 		buckets, err := storageBuckets(m, project, tc)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover storage buckets")
+		} else {
+			assets = append(assets, buckets...)
 		}
-		assets = append(assets, buckets...)
 	}
 	if tc.IncludesOneOfDiscoveryTarget(common.DiscoveryAll, DiscoveryBigQueryDatasets) {
 		datasets, err := bigQueryDatasets(m, project, tc)
 		if err != nil {
-			return nil, err
+			log.Error().Err(err).Msg("cannot discover bigquery datasets")
+		} else {
+			assets = append(assets, datasets...)
 		}
-		assets = append(assets, datasets...)
 	}
 
 	return assets, nil