chore(kotlin): Setup e2e tests for Kotlin (#103)

Author: mattcreaser

.github/workflows/native-sdk-e2e.yml

@@ -24,7 +24,12 @@ jobs:
     name: Detect Changes
     runs-on: ubuntu-latest
     outputs:
-      source-changed: ${{ steps.check.outputs.source-changed }}
+      # Per-platform flags so a change to one language's SDK doesn't fan out to
+      # the others. `any-changed` gates the shared setup/gate jobs.
+      dart-changed: ${{ steps.check.outputs.dart-changed }}
+      swift-changed: ${{ steps.check.outputs.swift-changed }}
+      kotlin-changed: ${{ steps.check.outputs.kotlin-changed }}
+      any-changed: ${{ steps.check.outputs.any-changed }}
     steps:
       - uses: actions/checkout@v5
         with:
@@ -33,18 +38,39 @@ jobs:
       - id: check
         run: |
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "source-changed=true" >> "$GITHUB_OUTPUT"
-          elif git diff --name-only origin/main...HEAD | grep -qE '^(native/(dart|kotlin|swift)|test-apps/native-bindings)/|^\.github/workflows/native-sdk-e2e\.yml$'; then
-            echo "source-changed=true" >> "$GITHUB_OUTPUT"
+            dart=true; swift=true; kotlin=true
           else
-            echo "source-changed=false" >> "$GITHUB_OUTPUT"
+            CHANGED="$(git diff --name-only origin/main...HEAD)"
+            # Shared inputs affect EVERY platform: the test backend that
+            # generates the OpenRPC spec all SDKs are code-genned from, and this
+            # workflow file itself. A change here forces all platforms to run.
+            shared=false
+            if echo "$CHANGED" | grep -qE '^test-apps/native-bindings/|^\.github/workflows/native-sdk-e2e\.yml$'; then
+              shared=true
+            fi
+            # Each platform runs when a shared input changed OR its own SDK dir
+            # changed — so a Dart-only change no longer triggers Kotlin/Swift.
+            dart=$shared; swift=$shared; kotlin=$shared
+            if echo "$CHANGED" | grep -qE '^native/dart/';   then dart=true;   fi
+            if echo "$CHANGED" | grep -qE '^native/swift/';  then swift=true;  fi
+            if echo "$CHANGED" | grep -qE '^native/kotlin/'; then kotlin=true; fi
+          fi
+          any=false
+          if [ "$dart" = true ] || [ "$swift" = true ] || [ "$kotlin" = true ]; then
+            any=true
           fi
+          {
+            echo "dart-changed=$dart"
+            echo "swift-changed=$swift"
+            echo "kotlin-changed=$kotlin"
+            echo "any-changed=$any"
+          } >> "$GITHUB_OUTPUT"
 
   # Shared setup: build monorepo, generate spec, upload artifact
   setup:
     name: Build & Generate Spec
     needs: [detect-changes]
-    if: needs.detect-changes.outputs.source-changed == 'true'
+    if: needs.detect-changes.outputs.any-changed == 'true'
     runs-on: ubuntu-latest
     timeout-minutes: 10
     outputs:
@@ -81,7 +107,7 @@ jobs:
   dart-e2e:
     name: Dart E2E
     needs: [detect-changes, setup]
-    if: needs.detect-changes.outputs.source-changed == 'true'
+    if: needs.detect-changes.outputs.dart-changed == 'true'
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -164,17 +190,74 @@ jobs:
         # BLOCKS_URL is provided via $GITHUB_ENV from the "Pick a free port" step.
         run: dart run bin/e2e_test.dart
 
-  # Kotlin E2E (TODO: add when ready)
-  # kotlin-e2e:
-  #   name: Kotlin E2E
-  #   needs: [detect-changes, setup]
-  #   if: needs.detect-changes.outputs.source-changed == 'true'
-  #   ...
+  kotlin-e2e:
+    name: Kotlin E2E (${{ matrix.label }})
+    needs: [detect-changes, setup]
+    if: needs.detect-changes.outputs.kotlin-changed == 'true'
+    runs-on: ${{ matrix.runs-on }}
+    timeout-minutes: ${{ matrix.timeout }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: JVM
+            runs-on: ubuntu-latest
+            gradle-task: jvmTest
+            timeout: 15
+          - label: iOS
+            runs-on: macos-15
+            gradle-task: iosSimulatorArm64Test
+            timeout: 20
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
+
+      - uses: actions/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - run: npm ci
+      - run: npm run build
+
+      - name: Download spec
+        uses: actions/download-artifact@v4
+        with:
+          name: blocks-spec
+          path: native/kotlin/e2e/
+
+      - name: Run Kotlin codegen
+        working-directory: native/kotlin/e2e
+        run: ./gradlew awsBlocksCodegen
+
+      - name: Start native-bindings server
+        working-directory: test-apps/native-bindings
+        run: |
+          npx tsx aws-blocks/scripts/server.ts &
+          for i in $(seq 1 30); do
+            curl -s -X POST http://localhost:3001/aws-blocks/api \
+              -H "Content-Type: application/json" \
+              -d '{"jsonrpc":"2.0","method":"api.kvGet","params":{"key":"healthcheck"},"id":1}' && break
+            sleep 1
+          done
+
+      - name: Run E2E tests
+        working-directory: native/kotlin/e2e
+        env:
+          BLOCKS_URL: http://localhost:3001/aws-blocks/api
+        run: ./gradlew ${{ matrix.gradle-task }}
 
   swift-e2e:
     name: Swift E2E
     needs: [detect-changes, setup]
-    if: needs.detect-changes.outputs.source-changed == 'true'
+    if: needs.detect-changes.outputs.swift-changed == 'true'
     runs-on: macos-15
     timeout-minutes: 20
     steps:
@@ -265,7 +348,7 @@ jobs:
     name: Dart E2E (sandbox)
     needs: [detect-changes, dart-e2e]
     if: >-
-      needs.detect-changes.outputs.source-changed == 'true' &&
+      needs.detect-changes.outputs.dart-changed == 'true' &&
       (github.event_name == 'workflow_dispatch' ||
        github.event.pull_request.head.repo.full_name == github.repository)
     runs-on: ubuntu-latest
@@ -403,7 +486,7 @@ jobs:
     name: Swift E2E (sandbox)
     needs: [detect-changes, swift-e2e]
     if: >-
-      needs.detect-changes.outputs.source-changed == 'true' &&
+      needs.detect-changes.outputs.swift-changed == 'true' &&
       (github.event_name == 'workflow_dispatch' ||
        github.event.pull_request.head.repo.full_name == github.repository)
     runs-on: macos-15
@@ -497,31 +580,131 @@ jobs:
         working-directory: test-apps/native-bindings
         run: npm run destroy || true
 
+  kotlin-e2e-sandbox:
+    name: Kotlin E2E (${{ matrix.label }}, sandbox)
+    needs: [detect-changes, kotlin-e2e]
+    if: >-
+      needs.detect-changes.outputs.kotlin-changed == 'true' &&
+      (github.event_name == 'workflow_dispatch' ||
+       github.event.pull_request.head.repo.full_name == github.repository)
+    runs-on: ${{ matrix.runs-on }}
+    timeout-minutes: 30
+    environment: publish
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: JVM
+            suffix: jvm
+            runs-on: ubuntu-latest
+            gradle-task: jvmTest
+          - label: iOS
+            suffix: ios
+            runs-on: macos-15
+            gradle-task: iosSimulatorArm64Test
+    env:
+      BLOCKS_STACK_SUFFIX: native-kotlin-${{ matrix.suffix }}-${{ github.event.pull_request.number || github.run_id }}-${{ github.run_attempt }}
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
+
+      - uses: actions/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - run: npm ci
+      - run: npm run build
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v6
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          aws-region: us-east-1
+
+      - name: Deploy sandbox
+        working-directory: test-apps/native-bindings
+        run: npm run deploy
+
+      - name: Resolve BLOCKS_URL
+        id: url
+        working-directory: test-apps/native-bindings
+        run: |
+          URL=$(python3 -c "import json; print(json.load(open('.blocks-sandbox/config.json'))['apiUrl'])")
+          echo "blocks_url=${URL}/aws-blocks/api" >> $GITHUB_OUTPUT
+
+      - name: Warm up sandbox API
+        env:
+          BLOCKS_URL: ${{ steps.url.outputs.blocks_url }}
+        run: |
+          attempts=24
+          delay=2
+          for i in $(seq 1 "$attempts"); do
+            code=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+              -X POST -H 'content-type: application/json' -d '{}' \
+              "$BLOCKS_URL" 2>/dev/null || echo 000)
+            if [ "$code" = "200" ]; then
+              echo "✅ Sandbox API warm after $i attempt(s) (http=200)."
+              exit 0
+            fi
+            echo "⏳ attempt $i/$attempts: API not ready (http=$code); retrying in ${delay}s..."
+            sleep "$delay"
+            if [ "$delay" -lt 10 ]; then delay=$((delay + 2)); fi
+          done
+          echo "❌ Sandbox API did not return HTTP 200 after $attempts attempts."
+          exit 1
+
+      - name: Generate OpenRPC spec
+        working-directory: test-apps/native-bindings
+        run: npm run spec
+
+      - name: Download spec
+        uses: actions/download-artifact@v4
+        with:
+          name: blocks-spec
+          path: native/kotlin/e2e/
+
+      - name: Run Kotlin codegen
+        working-directory: native/kotlin/e2e
+        run: ./gradlew awsBlocksCodegen
+
+      - name: Run Kotlin E2E against sandbox
+        working-directory: native/kotlin/e2e
+        env:
+          BLOCKS_URL: ${{ steps.url.outputs.blocks_url }}
+        run: ./gradlew ${{ matrix.gradle-task }}
+
+      - name: Destroy sandbox
+        if: always()
+        working-directory: test-apps/native-bindings
+        run: npm run destroy || true
+
   # Aggregate gate so this can be a single required status check in branch
   # protection. Always runs (even when the e2e jobs are skipped for unrelated
   # or fork PRs) and only fails if a job that actually ran failed.
   native-sdk-e2e-required:
     name: Native SDK E2E (Required)
     if: always()
-    needs: [detect-changes, setup, dart-e2e, swift-e2e]
+    needs: [detect-changes, setup, dart-e2e, kotlin-e2e, swift-e2e]
     runs-on: ubuntu-latest
     steps:
       - name: Check results
         run: |
-          echo "detect-changes=${{ needs.detect-changes.result }} setup=${{ needs.setup.result }} dart-e2e=${{ needs.dart-e2e.result }} swift-e2e=${{ needs.swift-e2e.result }}"
-          # Required gate = SDK correctness: detect-changes + setup + the local
-          # dart-e2e suite (no AWS). The deploying `dart-e2e-sandbox` job still
-          # runs as a NON-BLOCKING signal — it depends on deployed-backend config
-          # that isn't part of the SDK (real-Cognito email code delivery, which a
-          # dev-only `cognitoGetLastCode` hook can't satisfy; and fresh-deploy
-          # OIDC state). The OIDC relay suite was verified 5/5 against a live
-          # sandbox, so this is environment, not SDK. Re-add `dart-e2e-sandbox`
-          # to this gate once the deployed Cognito sign-in path is testable.
-          # Skipped jobs (no source changes) are treated as passing.
+          echo "detect-changes=${{ needs.detect-changes.result }} setup=${{ needs.setup.result }} dart-e2e=${{ needs.dart-e2e.result }} kotlin-e2e=${{ needs.kotlin-e2e.result }} swift-e2e=${{ needs.swift-e2e.result }}"
+          # Required gate = SDK correctness. Skipped jobs (no source changes)
+          # are treated as passing.
           for result in \
             "${{ needs.detect-changes.result }}" \
             "${{ needs.setup.result }}" \
             "${{ needs.dart-e2e.result }}" \
+            "${{ needs.kotlin-e2e.result }}" \
             "${{ needs.swift-e2e.result }}"; do
             if [ "$result" = "failure" ] || [ "$result" = "cancelled" ]; then
               echo "A required native SDK E2E job failed (or was cancelled)."

native/dart/example/bin/e2e/realtime_test.dart

@@ -23,7 +23,7 @@ void main() async {
   group('Realtime: subscribe and receive');
   final ch = await blocks.api.realtimeGetChannel(channel: 'dart-test');
   final stream = ch.subscribe();
-  final completer = Completer<dynamic>();
+  final completer = Completer<Cursor>();
 
   final sub = stream.listen((msg) {
     if (!completer.isCompleted) completer.complete(msg);
@@ -38,13 +38,10 @@ void main() async {
 
   try {
     final msg = await completer.future.timeout(Duration(seconds: 5));
-    check(msg != null, 'received message via WebSocket');
-    if (msg is Map<String, dynamic>) {
-      check(msg['userId'] == 'dart-sub-test', 'message userId matches');
-      check(msg['x'] == 42, 'message x matches');
-    } else {
-      check(true, 'received message (type: ${msg.runtimeType})');
-    }
+    check(msg.userId == 'dart-sub-test', 'message userId matches');
+    check(msg.x == 42, 'message x matches');
+    check(msg.y == 99, 'message y matches');
+    check(msg.color == '#00ff00', 'message color matches');
   } on TimeoutException {
     check(false, 'WebSocket message received within 5s (timed out)');
   } finally {

native/kotlin/.changeset/brave-geckos-flash.md

@@ -0,0 +1,5 @@
+---
+"aws-blocks-kotlin": patch
+---
+
+Fix handling of keychain in the iOS runtime

native/kotlin/.changeset/fuzzy-tables-sit.md

@@ -0,0 +1,5 @@
+---
+"aws-blocks-kotlin": minor
+---
+
+Bump Kotlin version to 2.2.10

native/kotlin/.changeset/heavy-worlds-give.md

@@ -0,0 +1,5 @@
+---
+"aws-blocks-kotlin": minor
+---
+
+Add ability to clear cookies

native/kotlin/README.md

@@ -1,7 +1,7 @@
 # AWS Blocks Kotlin
 
 [![Maven Central](https://img.shields.io/maven-central/v/com.aws.blocks.kotlin/runtime)](https://central.sonatype.com/search?namespace=com.aws.blocks.kotlin)
-[![Kotlin](https://img.shields.io/badge/kotlin-2.1.21-blue.svg?logo=kotlin)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.2.10-blue.svg?logo=kotlin)](https://kotlinlang.org)
 ![Android](http://img.shields.io/badge/platform-android-6EDB8D.svg?style=flat)
 ![iOS](http://img.shields.io/badge/platform-ios-CDCDCD.svg?style=flat)
 ![Desktop](http://img.shields.io/badge/platform-desktop-DB413D.svg?style=flat)
@@ -106,7 +106,7 @@ See the [`example/android`](example/android) directory for a complete Android ap
 
 ## Requirements
 
-- Kotlin 2.x
+- Kotlin 2.1+
 - JDK 17+
 - Gradle 7.4+
 - Android Gradle Plugin 7.1+ (for Android targets)

native/kotlin/e2e/.gitignore

@@ -0,0 +1,3 @@
+build/
+.gradle/
+blocks.spec.json