Skip to content

Commit 031d2c7

Browse files
committed
context fix
1 parent 635f6fb commit 031d2c7

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ func (f *GcpAssetsFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Metada
8989
for asset := range resultsCh {
9090
select {
9191
case <-ctx.Done():
92-
return ctx.Err()
92+
f.log.Debugf("GcpAssetsFetcher.Fetch context done: %v", ctx.Err())
93+
return nil
9394

9495
case f.resourceCh <- fetching.ResourceInfo{
9596
CycleMetadata: cycleMetadata,

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ func (f *GcpLogSinkFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Metad
6565
for asset := range resultsCh {
6666
select {
6767
case <-ctx.Done():
68-
return ctx.Err()
68+
f.log.Debugf("GcpLogSinkFetcher.Fetch context done: %v", ctx.Err())
69+
return nil
6970

7071
case f.resourceCh <- fetching.ResourceInfo{
7172
CycleMetadata: cycleMetadata,

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ func (f *GcpMonitoringFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Me
6060
for asset := range resultsCh {
6161
select {
6262
case <-ctx.Done():
63-
return ctx.Err()
63+
f.log.Debugf("GcpMonitoringFetcher.Fetch context done: %v", ctx.Err())
64+
return nil
6465

6566
case f.resourceCh <- fetching.ResourceInfo{
6667
CycleMetadata: cycleMetadata,

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ func (f *GcpNetworksFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Meta
5959
for asset := range resultsCh {
6060
select {
6161
case <-ctx.Done():
62-
return ctx.Err()
62+
f.log.Debugf("GcpNetworksFetcher.Fetch context done: %v", ctx.Err())
63+
return nil
6364

6465
case f.resourceCh <- fetching.ResourceInfo{
6566
CycleMetadata: cycleMetadata,

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ func (f *GcpPoliciesFetcher) Fetch(ctx context.Context, cycleMetadata cycle.Meta
6060
for asset := range resultsCh {
6161
select {
6262
case <-ctx.Done():
63-
return ctx.Err()
63+
f.log.Debugf("GcpPoliciesFetcher.Fetch context done: %v", ctx.Err())
64+
return nil
6465

6566
case f.resourceCh <- fetching.ResourceInfo{
6667
CycleMetadata: cycleMetadata,

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ func (f *GcpServiceUsageFetcher) Fetch(ctx context.Context, cycleMetadata cycle.
6565
for asset := range resultsCh {
6666
select {
6767
case <-ctx.Done():
68-
return ctx.Err()
68+
f.log.Debugf("GcpServiceUsageFetcher.Fetch context done: %v", ctx.Err())
69+
return nil
6970

7071
case f.resourceCh <- fetching.ResourceInfo{
7172
CycleMetadata: cycleMetadata,

0 commit comments

Comments
 (0)