Amend pagination to avoid nil pointer dereference (#19)

ribbybibby · Apr 26, 2021 · bdf0932 · bdf0932
1 parent 44d5e40
commit bdf0932
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/s3_exporter.go b/s3_exporter.go
@@ -92,8 +92,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
 
 	// Continue making requests until we've listed and compared the date of every object
 	startList := time.Now()
-	truncated := true
-	for truncated {
+	for {
 		resp, err := e.svc.ListObjectsV2(query)
 		if err != nil {
 			log.Errorln(err)
@@ -113,8 +112,10 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
 				biggestObjectSize = *item.Size
 			}
 		}
+		if resp.NextContinuationToken == nil {
+			break
+		}
 		query.ContinuationToken = resp.NextContinuationToken
-		truncated = *resp.IsTruncated
 	}
 	listDuration := time.Now().Sub(startList).Seconds()