fixup s3 mock paginator example

aws · Dec 11, 2019 · 46d8b3f · 46d8b3f
1 parent cfc4d85
commit 46d8b3f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/example/service/s3/mockPaginator/mockPaginator.go b/example/service/s3/mockPaginator/mockPaginator.go
@@ -5,6 +5,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"log"
 	"os"
 
 	"github.com/aws/aws-sdk-go-v2/aws/external"
@@ -24,12 +25,15 @@ func main() {
 
 	bucket := os.Args[1]
 	svc := s3.New(cfg)
-	keys := getKeys(svc, bucket)
+	keys, err := getKeys(svc, bucket)
+	if err != nil {
+		log.Fatalf("failed to get keys, %v", err)
+	}
 
 	fmt.Printf("keys for bucket %q,\n%v\n", bucket, keys)
 }
 
-func getKeys(svc s3iface.ClientAPI, bucket string) []string {
+func getKeys(svc s3iface.ClientAPI, bucket string) ([]string, error) {
 	req := svc.ListObjectsRequest(&s3.ListObjectsInput{
 		Bucket: &bucket,
 	})
@@ -41,5 +45,9 @@ func getKeys(svc s3iface.ClientAPI, bucket string) []string {
 			keys = append(keys, *obj.Key)
 		}
 	}
-	return keys
+	if err := p.Err(); err != nil {
+		return nil, err
+	}
+
+	return keys, nil
 }
diff --git a/example/service/s3/mockPaginator/mockPaginator_test.go b/example/service/s3/mockPaginator/mockPaginator_test.go
@@ -72,10 +72,16 @@ func TestListObjectsPagination(t *testing.T) {
 		},
 	}
 
-	svc.Client = s3.New(defaults.Config())
+	cfg := defaults.Config()
+	cfg.Region = "us-west-2"
+
+	svc.Client = s3.New(cfg)
 	svc.objects = objects
 
-	keys := getKeys(svc, "foo")
+	keys, err := getKeys(svc, "foo")
+	if err != nil {
+		t.Fatalf("expect no error, got %v", err)
+	}
 	expected := []string{"1", "2", "3"}
 
 	if e, a := 3, len(keys); e != a {