fix: paginators not respecting start key (#1101)

smithy-lang · Jun 17, 2024 · e639316 · e639316
1 parent 14c6038
commit e639316
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.changes/15fb7dc6-dee9-4f40-adba-a48183d4f432.json b/.changes/15fb7dc6-dee9-4f40-adba-a48183d4f432.json
@@ -0,0 +1,8 @@
+{
+    "id": "15fb7dc6-dee9-4f40-adba-a48183d4f432",
+    "type": "bugfix",
+    "description": "Fix paginators not respecting start key",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1330"
+    ]
+}
diff --git a/...gen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGenerator.kt b/...gen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGenerator.kt
@@ -143,7 +143,7 @@ class PaginatorGenerator : KotlinIntegration {
                 outputSymbol,
             ) {
                 withBlock("#T {", "}", ExternalTypes.KotlinxCoroutines.FlowGenerator) {
-                    write("var cursor: #F = null", cursorSymbol)
+                    write("var cursor: #F = initialRequest.$markerLiteral", cursorSymbol)
                     write("var hasNextPage: Boolean = true")
                     write("")
                     withBlock("while (hasNextPage) {", "}") {

diff --git a/...src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGeneratorTest.kt b/...src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGeneratorTest.kt
@@ -95,7 +95,7 @@ class PaginatorGeneratorTest {
              */
             public fun TestClient.listFunctionsPaginated(initialRequest: ListFunctionsRequest = ListFunctionsRequest { }): Flow<ListFunctionsResponse> =
                 flow {
-                    var cursor: kotlin.String? = null
+                    var cursor: kotlin.String? = initialRequest.marker
                     var hasNextPage: Boolean = true
             
                     while (hasNextPage) {
@@ -206,7 +206,7 @@ class PaginatorGeneratorTest {
              */
             public fun TestClient.listFunctionsPaginated(initialRequest: ListFunctionsRequest = ListFunctionsRequest { }): Flow<ListFunctionsResponse> =
                 flow {
-                    var cursor: kotlin.String? = null
+                    var cursor: kotlin.String? = initialRequest.marker
                     var hasNextPage: Boolean = true
             
                     while (hasNextPage) {
@@ -343,7 +343,7 @@ class PaginatorGeneratorTest {
              */
             public fun TestClient.listFunctionsPaginated(initialRequest: ListFunctionsRequest = ListFunctionsRequest { }): Flow<ListFunctionsResponse> =
                 flow {
-                    var cursor: kotlin.String? = null
+                    var cursor: kotlin.String? = initialRequest.marker
                     var hasNextPage: Boolean = true
             
                     while (hasNextPage) {
@@ -472,7 +472,7 @@ class PaginatorGeneratorTest {
         val expectedCode = """
             public fun TestClient.listFunctionsPaginated(initialRequest: ListFunctionsRequest = ListFunctionsRequest { }): Flow<ListFunctionsResponse> =
                 flow {
-                    var cursor: kotlin.String? = null
+                    var cursor: kotlin.String? = initialRequest.marker
                     var hasNextPage: Boolean = true
             
                     while (hasNextPage) {
@@ -642,7 +642,7 @@ class PaginatorGeneratorTest {
              */
             public fun TestClient.listFunctionsPaginated(initialRequest: ListFunctionsRequest = ListFunctionsRequest { }): Flow<ListFunctionsResponse> =
                 flow {
-                    var cursor: kotlin.String? = null
+                    var cursor: kotlin.String? = initialRequest.marker
                     var hasNextPage: Boolean = true
             
                     while (hasNextPage) {