fixes

Author: orouz

internal/resources/fetching/fetchers/gcp/assets_fetcher.go

@@ -86,24 +86,22 @@ func (f *GcpAssetsFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Metada
 	resultsCh := make(chan *inventory.ExtendedGcpAsset)
 	go f.provider.ListAssetTypes(ctx, lo.Keys(reversedGcpAssetTypes), resultsCh)
 
-	for {
+	for asset := range resultsCh {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
-		case asset, ok := <-resultsCh:
-			if !ok {
-				return nil
-			}
-			f.resourceCh <- fetching.ResourceInfo{
-				CycleMetadata: cycleMetadata,
-				Resource: &GcpAsset{
-					Type:          reversedGcpAssetTypes[asset.AssetType],
-					SubType:       getGcpSubType(asset.AssetType),
-					ExtendedAsset: asset,
-				},
-			}
+
+		case f.resourceCh <- fetching.ResourceInfo{
+			CycleMetadata: cycleMetadata,
+			Resource: &GcpAsset{
+				Type:          reversedGcpAssetTypes[asset.AssetType],
+				SubType:       getGcpSubType(asset.AssetType),
+				ExtendedAsset: asset,
+			},
+		}:
 		}
 	}
+	return nil
 }
 
 func (f *GcpAssetsFetcher) Stop() {

internal/resources/fetching/fetchers/gcp/log_sink_fetcher.go

@@ -62,25 +62,22 @@ func (f *GcpLogSinkFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Metad
 	resultsCh := make(chan *inventory.ProjectAssets)
 	go f.provider.ListProjectAssets(ctx, []string{inventory.LogSinkAssetType}, resultsCh)
 
-	for {
+	for asset := range resultsCh {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
-		case asset, ok := <-resultsCh:
-			if !ok {
-				return nil
-			}
-
-			f.resourceCh <- fetching.ResourceInfo{
-				CycleMetadata: cycleMetadata,
-				Resource: &GcpLoggingAsset{
-					Type:    fetching.LoggingIdentity,
-					subType: fetching.GcpLoggingType,
-					Asset:   &LoggingAsset{asset.CloudAccount, asset.Assets},
-				},
-			}
+
+		case f.resourceCh <- fetching.ResourceInfo{
+			CycleMetadata: cycleMetadata,
+			Resource: &GcpLoggingAsset{
+				Type:    fetching.LoggingIdentity,
+				subType: fetching.GcpLoggingType,
+				Asset:   &LoggingAsset{asset.CloudAccount, asset.Assets},
+			},
+		}:
 		}
 	}
+	return nil
 }
 
 func (f *GcpLogSinkFetcher) Stop() {

internal/resources/fetching/fetchers/gcp/monitoring_fetcher.go

@@ -57,24 +57,22 @@ func (f *GcpMonitoringFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Me
 	resultsCh := make(chan *inventory.MonitoringAsset)
 	go f.provider.ListMonitoringAssets(ctx, resultsCh)
 
-	for {
+	for asset := range resultsCh {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
-		case asset, ok := <-resultsCh:
-			if !ok {
-				return nil
-			}
-			f.resourceCh <- fetching.ResourceInfo{
-				CycleMetadata: cycleMetadata,
-				Resource: &GcpMonitoringAsset{
-					Type:    fetching.MonitoringIdentity,
-					subType: fetching.GcpMonitoringType,
-					Asset:   asset,
-				},
-			}
+
+		case f.resourceCh <- fetching.ResourceInfo{
+			CycleMetadata: cycleMetadata,
+			Resource: &GcpMonitoringAsset{
+				Type:    fetching.MonitoringIdentity,
+				subType: fetching.GcpMonitoringType,
+				Asset:   asset,
+			},
+		}:
 		}
 	}
+	return nil
 }
 
 func (f *GcpMonitoringFetcher) Stop() {

internal/resources/fetching/fetchers/gcp/networks_fetcher.go

@@ -56,24 +56,22 @@ func (f *GcpNetworksFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Meta
 	resultsCh := make(chan *inventory.ExtendedGcpAsset)
 	go f.provider.ListNetworkAssets(ctx, resultsCh)
 
-	for {
+	for asset := range resultsCh {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
-		case asset, ok := <-resultsCh:
-			if !ok {
-				return nil
-			}
-			f.resourceCh <- fetching.ResourceInfo{
-				CycleMetadata: cycleMetadata,
-				Resource: &GcpNetworksAsset{
-					Type:         fetching.CloudCompute,
-					subType:      "gcp-compute-network",
-					NetworkAsset: asset,
-				},
-			}
+
+		case f.resourceCh <- fetching.ResourceInfo{
+			CycleMetadata: cycleMetadata,
+			Resource: &GcpNetworksAsset{
+				Type:         fetching.CloudCompute,
+				subType:      "gcp-compute-network",
+				NetworkAsset: asset,
+			},
+		}:
 		}
 	}
+	return nil
 }
 
 func (f *GcpNetworksFetcher) Stop() {

internal/resources/fetching/fetchers/gcp/policies_fetcher.go

@@ -57,25 +57,22 @@ func (f *GcpPoliciesFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Meta
 	resultsCh := make(chan *inventory.ProjectPoliciesAsset)
 	go f.provider.ListProjectsAncestorsPolicies(ctx, resultsCh)
 
-	for {
+	for asset := range resultsCh {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
-		case asset, ok := <-resultsCh:
-			if !ok {
-				return nil
-			}
-
-			f.resourceCh <- fetching.ResourceInfo{
-				CycleMetadata: cycleMetadata,
-				Resource: &GcpPoliciesAsset{
-					Type:    fetching.ProjectManagement,
-					subType: fetching.GcpPolicies,
-					Asset:   asset,
-				},
-			}
+
+		case f.resourceCh <- fetching.ResourceInfo{
+			CycleMetadata: cycleMetadata,
+			Resource: &GcpPoliciesAsset{
+				Type:    fetching.ProjectManagement,
+				subType: fetching.GcpPolicies,
+				Asset:   asset,
+			},
+		}:
 		}
 	}
+	return nil
 }
 
 func (f *GcpPoliciesFetcher) Stop() {

internal/resources/fetching/fetchers/gcp/service_usage_fetcher.go

@@ -62,25 +62,22 @@ func (f *GcpServiceUsageFetcher) Fetch(ctx context.Context, cycleMetadata cycle.
 	resultsCh := make(chan *inventory.ProjectAssets)
 	go f.provider.ListProjectAssets(ctx, []string{inventory.ServiceUsageAssetType}, resultsCh)
 
-	for {
+	for asset := range resultsCh {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
-		case asset, ok := <-resultsCh:
-			if !ok {
-				return nil
-			}
-
-			f.resourceCh <- fetching.ResourceInfo{
-				CycleMetadata: cycleMetadata,
-				Resource: &GcpServiceUsageAsset{
-					Type:    fetching.MonitoringIdentity,
-					subType: fetching.GcpServiceUsage,
-					Asset:   &ServiceUsageAsset{asset.CloudAccount, asset.Assets},
-				},
-			}
+
+		case f.resourceCh <- fetching.ResourceInfo{
+			CycleMetadata: cycleMetadata,
+			Resource: &GcpServiceUsageAsset{
+				Type:    fetching.MonitoringIdentity,
+				subType: fetching.GcpServiceUsage,
+				Asset:   &ServiceUsageAsset{asset.CloudAccount, asset.Assets},
+			},
+		}:
 		}
 	}
+	return nil
 }
 
 func (f *GcpServiceUsageFetcher) Stop() {

internal/resources/providers/gcplib/inventory/provider.go

@@ -162,7 +162,6 @@ func (p *Provider) ListMonitoringAssets(ctx context.Context, out chan<- *Monitor
 		go func() {
 			defer wg.Done()
 			logAssets = collect(logsAssetCh)
-
 		}()
 		go func() {
 			defer wg.Done()