fix get_bucket() if there are more than 1000 entries (closes #414)

s-u · s-u · commit 3e635ab42856 · 2025-08-18T15:02:26.000+12:00
diff --git a/NEWS.md b/NEWS.md
@@ -26,6 +26,10 @@
 
 * Adapt to `DisplayName` being removed from the AWS API (#437)
 
+* `get_bucket` fetched incorrect list (repeating the first
+  chunk) if multiple fetches were required and the response included
+  the `NextMarker` entry (#414)
+
 
 # aws.s3 0.3.21
 
diff --git a/R/get_bucket.R b/R/get_bucket.R
@@ -53,7 +53,7 @@ get_bucket <- function(bucket,
                 prefix = prefix,
                 delimiter = delimiter,
                 "max-keys" = as.integer(pmin(max - as.integer(r[["MaxKeys"]]), 1000)),
-                marker = tail(r, 1)[["Contents"]][["Key"]]
+                marker = if (!is.null(r[["NextMarker"]])) r[["NextMarker"]] else tail(r[names(r) == "Contents"], 1)[["Contents"]][["Key"]]
             )
             extra <- s3HTTP(verb = "GET", bucket = bucket, query = query, parse_response = parse_response, ...)
             new_r <- c(r, tail(extra, -5))

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ get_bucket <- function(bucket,`
`53`	`53`	`prefix = prefix,`
`54`	`54`	`delimiter = delimiter,`
`55`	`55`	`"max-keys" = as.integer(pmin(max - as.integer(r[["MaxKeys"]]), 1000)),`
`56`		`- marker = tail(r, 1)[["Contents"]][["Key"]]`
	`56`	`+ marker = if (!is.null(r[["NextMarker"]])) r[["NextMarker"]] else tail(r[names(r) == "Contents"], 1)[["Contents"]][["Key"]]`
`57`	`57`	`)`
`58`	`58`	`extra <- s3HTTP(verb = "GET", bucket = bucket, query = query, parse_response = parse_response, ...)`
`59`	`59`	`new_r <- c(r, tail(extra, -5))`