chore(version): Bump version

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM public.ecr.aws/ubuntu/ubuntu:latest
 
 ## Dockerfile for local development of Amplify Flutter packages on Linux
 

.github/ISSUE_TEMPLATE/BUG-REPORT.yaml

@@ -79,15 +79,15 @@ body:
     attributes:
       label: "Flutter Version"
       description: "Please share which version of Flutter you're using (found using `flutter --version`)."
-      placeholder: "3.19.3"
+      placeholder: "3.24.0"
     validations:
       required: true
   - type: input
     id: amplify-version
     attributes:
       label: Amplify Flutter Version
       description: "The version of the Amplify Flutter libraries you're currently using."
-      placeholder: "1.7.0"
+      placeholder: "2.4.0"
     validations:
       required: true
   - type: dropdown
@@ -97,8 +97,9 @@ body:
       description: "How do you currently deploy your backend?"
       multiple: false
       options:
-        - Amplify CLI
-        - Amplify CLI + Custom Pipeline
+        - Amplify Gen 2
+        - Amplify CLI (Gen 1)
+        - Amplify CLI (Gen 1) + Custom Pipeline
         - AWS CDK
         - Custom Pipeline
     validations:

.github/workflows/issue_closed.yml

@@ -0,0 +1,32 @@
+name: Issue Closed
+
+on:
+  issues:
+    types: [closed]
+
+permissions:
+  issues: write
+
+jobs:
+  cleanup-labels:
+    runs-on: ubuntu-latest
+    if: ${{ (contains(github.event.issue.labels.*.name, 'pending-community-response') || contains(github.event.issue.labels.*.name, 'pending-maintainer-response') || contains(github.event.issue.labels.*.name, 'pending-close-response-required') || contains(github.event.issue.labels.*.name, 'pending-release')|| contains(github.event.issue.labels.*.name, 'pending-triage')) }}
+    steps:
+      - name: remove unnecessary labels after closing
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          REPOSITORY_NAME: ${{ github.event.repository.full_name }}
+        run: |
+          gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-close-response-required" --remove-label "pending-community-response" --remove-label "pending-maintainer-response" --remove-label "pending-release" --remove-label "pending-triage"
+
+  comment-visibility-warning:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: aws-actions/closed-issue-message@36b7048ea77bb834d16e7a7c5b5471ac767a4ca1 # v1
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          message: |
+            This issue is now closed. Comments on closed issues are hard for our team to see. 
+            If you need more assistance, please open a new issue that references this one.

.github/workflows/issue_comment.yml

@@ -0,0 +1,31 @@
+name: Issue Comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  adjust-labels:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      ISSUE_NUMBER: ${{ github.event.issue.number }}
+      REPOSITORY_NAME: ${{ github.event.repository.full_name }}
+    steps:
+      - name: remove pending-community-response when new comment received
+        if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) && !github.event.issue.pull_request }}
+        shell: bash
+        run: |
+          gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-community-response"
+      - name: add pending-maintainer-response when new community comment received
+        if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
+        shell: bash
+        run: |
+          gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --add-label "pending-maintainer-response"
+      - name: remove pending-maintainer-response when new owner/member comment received
+        if: ${{ contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
+        shell: bash
+        run: |
+          gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-maintainer-response"

.github/workflows/issue_labeled.yml

@@ -0,0 +1,20 @@
+name: Issue Labeled
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  remove-pending-triage-label:
+    runs-on: ubuntu-latest
+    if: ${{ contains(fromJSON('["question", "bug", "feature-request"]'), github.event.label.name) }}
+    permissions:
+      issues: write
+    steps:
+      - name: Remove the pending-triage label
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          REPOSITORY_NAME: ${{ github.event.repository.full_name }}
+        run: |
+          gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-triage"

.github/workflows/issue_opened.yml

@@ -0,0 +1,39 @@
+name: Issue Opened
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  add-issue-opened-labels:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      ISSUE_NUMBER: ${{ github.event.issue.number }}
+      REPOSITORY_NAME: ${{ github.event.repository.full_name }}
+    steps:
+      - name: Add the pending-triage label
+        shell: bash
+        run: |
+          gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --add-label "pending-triage"
+      - name: Add the pending-maintainer-response label
+        if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.issue.author_association) }}
+        shell: bash
+        run: |
+          gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --add-label "pending-maintainer-response"
+
+  maintainer-opened:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    if: ${{ contains(fromJSON('["MEMBER", "OWNER"]'), github.event.issue.author_association) }}
+    steps:
+      - name: Post comment if maintainer opened.
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          REPOSITORY_NAME: ${{ github.event.repository.full_name }}
+        run: |
+          gh issue comment $ISSUE_NUMBER --repo $REPOSITORY_NAME -b "This issue was opened by a maintainer of this repository; updates will be posted here. If you are also experiencing this issue, please comment here with any relevant information so that we're aware and can prioritize accordingly."

infra-gen2/backends/api/api-multi-auth/amplify/data/resource.ts

@@ -151,6 +151,6 @@ export const data = defineData({
   schema,
   authorizationModes: {
     defaultAuthorizationMode: "userPool",
-    apiKeyAuthorizationMode: { expiresInDays: 30 },
+    apiKeyAuthorizationMode: { expiresInDays: 365 },
   },
 });

packages/amplify/amplify_flutter/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.4.1
+
+### Fixes
+- fix(datastore): FlutterSerializedModel.extractJsonValue returns `.some(nil)` instead of `nil` ([#5370](https://github.com/aws-amplify/amplify-flutter/pull/5370))
+- fix(api): web socket error handling ([#5359](https://github.com/aws-amplify/amplify-flutter/pull/5359))
+
+### Chores
+- chore(deps): Amplify Android 2.21.1 ([#5376](https://github.com/aws-amplify/amplify-flutter/pull/5376))
+
 ## 2.4.0
 
 ### Features

packages/amplify/amplify_flutter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_flutter
 description: The top level Flutter package for the AWS Amplify libraries.
-version: 2.4.0
+version: 2.4.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify/amplify_flutter
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -19,9 +19,9 @@ platforms:
   web:
 
 dependencies:
-  amplify_core: ">=2.4.0 <2.5.0"
-  amplify_secure_storage: ">=0.5.5 <0.6.0"
-  aws_common: ">=0.7.2 <0.8.0"
+  amplify_core: ">=2.4.1 <2.5.0"
+  amplify_secure_storage: ">=0.5.7 <0.6.0"
+  aws_common: ">=0.7.3 <0.8.0"
   collection: ^1.15.0
   flutter:
     sdk: flutter

packages/amplify_core/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.1
+
+### Fixes
+- fix(api): web socket error handling ([#5359](https://github.com/aws-amplify/amplify-flutter/pull/5359))
+
 ## 2.4.0
 
 ### Features

packages/amplify_core/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_core
 description: The base package containing common types and utilities that are shared across the Amplify Flutter packages.
-version: 2.4.0
+version: 2.4.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_core
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,8 +10,8 @@ environment:
 
 dependencies:
   async: ^2.10.0
-  aws_common: ">=0.7.2 <0.8.0"
-  aws_signature_v4: ">=0.6.2 <0.7.0"
+  aws_common: ">=0.7.3 <0.8.0"
+  aws_signature_v4: ">=0.6.3 <0.7.0"
   collection: ^1.15.0
   graphs: ^2.1.0
   intl: ">=0.18.0 <1.0.0"

packages/amplify_datastore/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.1
+
+### Fixes
+- fix(datastore): FlutterSerializedModel.extractJsonValue returns `.some(nil)` instead of `nil` ([#5370](https://github.com/aws-amplify/amplify-flutter/pull/5370))
+
 ## 2.4.0
 
 ### Fixes

packages/amplify_datastore/android/build.gradle

@@ -73,10 +73,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.amplifyframework:aws-auth-cognito:2.19.1'
-    implementation "com.amplifyframework:aws-api:2.19.1"
-    implementation "com.amplifyframework:aws-datastore:2.19.1"
-    implementation "com.amplifyframework:aws-api-appsync:2.19.1"
+    implementation 'com.amplifyframework:aws-auth-cognito:2.21.1'
+    implementation "com.amplifyframework:aws-api:2.21.1"
+    implementation "com.amplifyframework:aws-datastore:2.21.1"
+    implementation "com.amplifyframework:aws-api-appsync:2.21.1"
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 

packages/amplify_datastore/example/ios/unit_tests/AmplifySerializedModelUnitTests.swift

@@ -192,4 +192,13 @@ class AmplifySerializedModelUnitTests: XCTestCase {
             }
         }
     }
+
+    func test_extracts_some_nil() throws {
+        let output = try FlutterSerializedModelData.BlogWithNullSerializedModel.jsonValue(for: "post")
+
+        // This ensures if a property has a `null` json value, it gets returned as `.some(nil)`
+        // Per https://github.com/aws-amplify/amplify-swift/blob/cb80b91c38d99932af28df6be07633ee0563be08/Amplify/Categories/DataStore/Model/JSONHelper/JSONValueHolder.swift#L33-L34
+        XCTAssertNotNil(output)
+        XCTAssertNil(output!)
+    }
 }

packages/amplify_datastore/example/ios/unit_tests/resources/FlutterSerializedModelData.swift

@@ -9,6 +9,12 @@ struct FlutterSerializedModelData {
             "id": JSONValue.string("999"),
             "name": JSONValue.string("blog name"),
         ], modelName: "Blog")
+    static var BlogWithNullSerializedModel: FlutterSerializedModel =
+        .init(map: [
+            "id": JSONValue.string("999"),
+            "name": JSONValue.string("blog name"),
+            "post": JSONValue.null,
+        ], modelName: "Blog")
     static var CommentSerializedModel: FlutterSerializedModel =
         .init(map: [
             "id": JSONValue.string("999"),

packages/amplify_datastore/ios/Classes/types/model/FlutterSerializedModel.swift

@@ -97,7 +97,7 @@ public struct FlutterSerializedModel: Model, ModelIdentifiable, JSONValueHolder
         case .string(let deserializedValue):
             return deserializedValue
         case .null:
-            return nil
+            return .some(nil)
         }
     }
 

packages/amplify_datastore/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_datastore
 description: The Amplify Flutter DataStore category plugin, providing a queryable, on-device data store.
-version: 2.4.0
+version: 2.4.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_datastore
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -12,8 +12,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  amplify_datastore_plugin_interface: ">=2.4.0 <2.5.0"
-  amplify_core: ">=2.4.0 <2.5.0"
+  amplify_datastore_plugin_interface: ">=2.4.1 <2.5.0"
+  amplify_core: ">=2.4.1 <2.5.0"
   plugin_platform_interface: ^2.0.0
   meta: ^1.7.0
   collection: ^1.14.13

packages/amplify_datastore_plugin_interface/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.1
+
+- Minor bug fixes and improvements
+
 ## 2.4.0
 
 - Minor bug fixes and improvements

packages/amplify_datastore_plugin_interface/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_datastore_plugin_interface
 description: The platform interface for the DataStore module of Amplify Flutter.
-version: 2.4.0
+version: 2.4.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_datastore_plugin_interface
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,7 +10,7 @@ environment:
   flutter: ">=3.19.0"
 
 dependencies:
-  amplify_core: ">=2.4.0 <2.5.0"
+  amplify_core: ">=2.4.1 <2.5.0"
   collection: ^1.15.0
   flutter:
     sdk: flutter

packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.1
+
+- Minor bug fixes and improvements
+
 ## 2.4.0
 
 ### Chores

packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml

@@ -20,7 +20,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
-  amplify_analytics_pinpoint_dart: ">=0.2.0 <0.3.0"
+  amplify_analytics_pinpoint_dart: ">=0.4.5 <0.5.0"
   amplify_integration_test: any
   amplify_lints:
     path: ../../../amplify_lints