fix: Use aws.ToString(output.NextToken) when checking tokens (#9750)

hermanschaaf · web-flow · commit 767049489fff · 2023-04-06T13:44:23.000+01:00
This is a defensive change to ensure that we exit the loop regardless of
whether the AWS SDK returns an empty string or a nil value for
`NextToken`.
diff --git a/plugins/source/aws/resources/services/appstream/application_fleet_associations.go b/plugins/source/aws/resources/services/appstream/application_fleet_associations.go
@@ -3,6 +3,7 @@ package appstream
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/appstream"
 	"github.com/aws/aws-sdk-go-v2/service/appstream/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -55,7 +56,7 @@ func fetchAppstreamApplicationFleetAssociations(ctx context.Context, meta schema
 			return err
 		}
 		res <- response.ApplicationFleetAssociations
-		if response.NextToken == nil {
+		if aws.ToString(response.NextToken) == "" {
 			break
 		}
 		input.NextToken = response.NextToken
diff --git a/plugins/source/aws/resources/services/appstream/applications.go b/plugins/source/aws/resources/services/appstream/applications.go
@@ -3,6 +3,7 @@ package appstream
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/appstream"
 	"github.com/aws/aws-sdk-go-v2/service/appstream/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -46,7 +47,7 @@ func fetchAppstreamApplications(ctx context.Context, meta schema.ClientMeta, par
 			return err
 		}
 		res <- response.Applications
-		if response.NextToken == nil {
+		if aws.ToString(response.NextToken) == "" {
 			break
 		}
 		input.NextToken = response.NextToken
diff --git a/plugins/source/aws/resources/services/appstream/stack_entitlements.go b/plugins/source/aws/resources/services/appstream/stack_entitlements.go
@@ -3,6 +3,7 @@ package appstream
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/appstream"
 	"github.com/aws/aws-sdk-go-v2/service/appstream/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -52,7 +53,7 @@ func fetchAppstreamStackEntitlements(ctx context.Context, meta schema.ClientMeta
 			return err
 		}
 		res <- response.Entitlements
-		if response.NextToken == nil {
+		if aws.ToString(response.NextToken) == "" {
 			break
 		}
 		input.NextToken = response.NextToken
diff --git a/plugins/source/aws/resources/services/appstream/stack_user_associations.go b/plugins/source/aws/resources/services/appstream/stack_user_associations.go
@@ -63,7 +63,7 @@ func fetchAppstreamStackUserAssociations(ctx context.Context, meta schema.Client
 			return err
 		}
 		res <- response.UserStackAssociations
-		if response.NextToken == nil {
+		if aws.ToString(response.NextToken) == "" {
 			break
 		}
 		input.NextToken = response.NextToken
diff --git a/plugins/source/aws/resources/services/appstream/stacks.go b/plugins/source/aws/resources/services/appstream/stacks.go
@@ -3,6 +3,7 @@ package appstream
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/appstream"
 	"github.com/aws/aws-sdk-go-v2/service/appstream/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -48,7 +49,7 @@ func fetchAppstreamStacks(ctx context.Context, meta schema.ClientMeta, parent *s
 			return err
 		}
 		res <- response.Stacks
-		if response.NextToken == nil {
+		if aws.ToString(response.NextToken) == "" {
 			break
 		}
 		input.NextToken = response.NextToken
diff --git a/plugins/source/aws/resources/services/appstream/users.go b/plugins/source/aws/resources/services/appstream/users.go
@@ -3,6 +3,7 @@ package appstream
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/appstream"
 	"github.com/aws/aws-sdk-go-v2/service/appstream/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -44,7 +45,7 @@ func fetchAppstreamUsers(ctx context.Context, meta schema.ClientMeta, parent *sc
 			return err
 		}
 		res <- response.Users
-		if response.NextToken == nil {
+		if aws.ToString(response.NextToken) == "" {
 			break
 		}
 		input.NextToken = response.NextToken
diff --git a/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go b/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go
@@ -3,6 +3,7 @@ package config
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/configservice"
 	"github.com/aws/aws-sdk-go-v2/service/configservice/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -66,13 +67,13 @@ func fetchConfigConformancePackRuleCompliances(ctx context.Context, meta schema.
 						Annotation:                 conformancePackComplianceDetail.Annotation,
 					}
 				}
-				if output.NextToken == nil {
+				if aws.ToString(output.NextToken) == "" {
 					break
 				}
 				detailParams.NextToken = output.NextToken
 			}
 		}
-		if resp.NextToken == nil {
+		if aws.ToString(resp.NextToken) == "" {
 			break
 		}
 		params.NextToken = resp.NextToken
diff --git a/plugins/source/aws/resources/services/config/conformance_packs.go b/plugins/source/aws/resources/services/config/conformance_packs.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/configservice"
 	"github.com/aws/aws-sdk-go-v2/service/configservice/types"
 	"github.com/aws/smithy-go"
@@ -55,7 +56,7 @@ func fetchConfigConformancePacks(ctx context.Context, meta schema.ClientMeta, pa
 			return err
 		}
 		res <- resp.ConformancePackDetails
-		if resp.NextToken == nil {
+		if aws.ToString(resp.NextToken) == "" {
 			break
 		}
 		config.NextToken = resp.NextToken
diff --git a/plugins/source/aws/resources/services/ecs/cluster_container_instances.go b/plugins/source/aws/resources/services/ecs/cluster_container_instances.go
@@ -3,6 +3,7 @@ package ecs
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ecs"
 	"github.com/aws/aws-sdk-go-v2/service/ecs/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -61,7 +62,7 @@ func fetchEcsClusterContainerInstances(ctx context.Context, meta schema.ClientMe
 
 		res <- describeContainerInstances.ContainerInstances
 
-		if listContainerInstances.NextToken == nil {
+		if aws.ToString(listContainerInstances.NextToken) == "" {
 			break
 		}
 		config.NextToken = listContainerInstances.NextToken
diff --git a/plugins/source/aws/resources/services/ecs/cluster_services.go b/plugins/source/aws/resources/services/ecs/cluster_services.go
@@ -3,6 +3,7 @@ package ecs
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ecs"
 	"github.com/aws/aws-sdk-go-v2/service/ecs/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -67,7 +68,7 @@ func fetchEcsClusterServices(ctx context.Context, meta schema.ClientMeta, parent
 
 		res <- describeServicesOutput.Services
 
-		if listServicesOutput.NextToken == nil {
+		if aws.ToString(listServicesOutput.NextToken) == "" {
 			break
 		}
 		config.NextToken = listServicesOutput.NextToken
diff --git a/plugins/source/aws/resources/services/ecs/cluster_tasks.go b/plugins/source/aws/resources/services/ecs/cluster_tasks.go
@@ -71,7 +71,7 @@ func fetchEcsClusterTasks(ctx context.Context, meta schema.ClientMeta, parent *s
 
 		res <- describeTasks.Tasks
 
-		if listTasks.NextToken == nil {
+		if aws.ToString(listTasks.NextToken) == "" {
 			break
 		}
 		config.NextToken = listTasks.NextToken
diff --git a/plugins/source/aws/resources/services/elasticsearch/domains.go b/plugins/source/aws/resources/services/elasticsearch/domains.go
@@ -3,6 +3,7 @@ package elasticsearch
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/elasticsearchservice"
 	"github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -104,7 +105,7 @@ func resolveAuthorizedPrincipals(ctx context.Context, meta schema.ClientMeta, re
 
 		principals = append(principals, out.AuthorizedPrincipalList...)
 
-		if out.NextToken == nil {
+		if aws.ToString(out.NextToken) == "" {
 			break
 		}
 
diff --git a/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go b/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go
@@ -3,6 +3,7 @@ package elasticsearch
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/elasticsearchservice"
 	"github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -49,7 +50,7 @@ func fetchElasticsearchVpcEndpoints(ctx context.Context, meta schema.ClientMeta,
 			vpcEndpointIDs = append(vpcEndpointIDs, *summary.VpcEndpointId)
 		}
 
-		if out.NextToken == nil {
+		if aws.ToString(out.NextToken) == "" {
 			break
 		}
 
diff --git a/plugins/source/aws/resources/services/guardduty/detector_filters.go b/plugins/source/aws/resources/services/guardduty/detector_filters.go
@@ -3,6 +3,7 @@ package guardduty
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/guardduty"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/guardduty/models"
@@ -47,7 +48,7 @@ func fetchDetectorFilters(ctx context.Context, meta schema.ClientMeta, parent *s
 		}
 		res <- output.FilterNames
 
-		if output.NextToken == nil {
+		if aws.ToString(output.NextToken) == "" {
 			return nil
 		}
 		config.NextToken = output.NextToken
diff --git a/plugins/source/aws/resources/services/guardduty/detector_ipsets.go b/plugins/source/aws/resources/services/guardduty/detector_ipsets.go
@@ -3,6 +3,7 @@ package guardduty
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/guardduty"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/guardduty/models"
@@ -47,7 +48,7 @@ func fetchDetectorIPSets(ctx context.Context, meta schema.ClientMeta, parent *sc
 		}
 		res <- output.IpSetIds
 
-		if output.NextToken == nil {
+		if aws.ToString(output.NextToken) == "" {
 			return nil
 		}
 		config.NextToken = output.NextToken
diff --git a/plugins/source/aws/resources/services/guardduty/detector_members.go b/plugins/source/aws/resources/services/guardduty/detector_members.go
@@ -44,7 +44,7 @@ func fetchDetectorMembers(ctx context.Context, meta schema.ClientMeta, parent *s
 			return err
 		}
 		res <- output.Members
-		if output.NextToken == nil {
+		if aws.ToString(output.NextToken) == "" {
 			return nil
 		}
 		config.NextToken = output.NextToken
diff --git a/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go b/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go
@@ -44,7 +44,7 @@ func fetchGuarddutyDetectorPublishingDestinations(ctx context.Context, meta sche
 			return err
 		}
 		res <- output.Destinations
-		if output.NextToken == nil {
+		if aws.ToString(output.NextToken) == "" {
 			return nil
 		}
 		config.NextToken = output.NextToken
diff --git a/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go b/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go
@@ -44,7 +44,7 @@ func fetchDetectorThreatIntelSets(ctx context.Context, meta schema.ClientMeta, p
 			return err
 		}
 		res <- output.ThreatIntelSetIds
-		if output.NextToken == nil {
+		if aws.ToString(output.NextToken) == "" {
 			return nil
 		}
 		config.NextToken = output.NextToken
diff --git a/plugins/source/aws/resources/services/guardduty/detectors.go b/plugins/source/aws/resources/services/guardduty/detectors.go
@@ -3,6 +3,7 @@ package guardduty
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/guardduty"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/guardduty/models"
@@ -62,7 +63,7 @@ func fetchGuarddutyDetectors(ctx context.Context, meta schema.ClientMeta, parent
 		}
 		res <- output.DetectorIds
 
-		if output.NextToken == nil {
+		if aws.ToString(output.NextToken) == "" {
 			return nil
 		}
 		config.NextToken = output.NextToken

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func fetchAppstreamStackUserAssociations(ctx context.Context, meta schema.Client`
`63`	`63`	`return err`
`64`	`64`	`}`
`65`	`65`	`res <- response.UserStackAssociations`
`66`		`- if response.NextToken == nil {`
	`66`	`+ if aws.ToString(response.NextToken) == "" {`
`67`	`67`	`break`
`68`	`68`	`}`
`69`	`69`	`input.NextToken = response.NextToken`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package config`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
	`6`	`+ "github.com/aws/aws-sdk-go-v2/aws"`
`6`	`7`	`"github.com/aws/aws-sdk-go-v2/service/configservice"`
`7`	`8`	`"github.com/aws/aws-sdk-go-v2/service/configservice/types"`
`8`	`9`	`"github.com/cloudquery/cloudquery/plugins/source/aws/client"`
`@@ -66,13 +67,13 @@ func fetchConfigConformancePackRuleCompliances(ctx context.Context, meta schema.`
`66`	`67`	`Annotation: conformancePackComplianceDetail.Annotation,`
`67`	`68`	`}`
`68`	`69`	`}`
`69`		`- if output.NextToken == nil {`
	`70`	`+ if aws.ToString(output.NextToken) == "" {`
`70`	`71`	`break`
`71`	`72`	`}`
`72`	`73`	`detailParams.NextToken = output.NextToken`
`73`	`74`	`}`
`74`	`75`	`}`
`75`		`- if resp.NextToken == nil {`
	`76`	`+ if aws.ToString(resp.NextToken) == "" {`
`76`	`77`	`break`
`77`	`78`	`}`
`78`	`79`	`params.NextToken = resp.NextToken`