chore: release

.codebuild/e2e_workflow.yml

@@ -13,13 +13,13 @@ batch:
     - identifier: build_windows
       buildspec: .codebuild/build_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
     - identifier: test_windows
       buildspec: .codebuild/test_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
       depend-on:
@@ -92,7 +92,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: src/__tests__/graphql-generator-gen2.test.ts
           CLI_REGION: us-east-1
@@ -194,7 +194,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/add-codegen-ios.test.ts|src/__tests__/configure-codegen-android.test.ts|src/__tests__/configure-codegen-js.test.ts|src/__tests__/graphql-codegen-android.test.ts
@@ -208,7 +208,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/graphql-codegen-js.test.ts|src/__tests__/remove-codegen-android.test.ts|src/__tests__/remove-codegen-ios.test.ts|src/__tests__/add-codegen-android.test.ts
@@ -222,7 +222,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/configure-codegen-ios.test.ts|src/__tests__/datastore-modelgen-android.test.ts|src/__tests__/datastore-modelgen-js.test.ts|src/__tests__/feature-flags.test.ts
@@ -236,7 +236,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/graphql-codegen-ios.test.ts|src/__tests__/add-codegen-js.test.ts|src/__tests__/datastore-modelgen-ios.test.ts|src/__tests__/remove-codegen-js.test.ts
@@ -250,7 +250,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/datastore-modelgen-flutter.test.ts|src/__tests__/env-codegen.test.ts|src/__tests__/model-introspection-codegen.test.ts|src/__tests__/pull-codegen.test.ts
@@ -264,7 +264,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/push-codegen-ios.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/graphql-documents-generator.test.ts|src/__tests__/push-codegen-js.test.ts
@@ -278,7 +278,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/build-app-ts.test.ts|src/__tests__/graphql-generator-app.test.ts|src/__tests__/push-codegen-admin-modelgen.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts
@@ -293,7 +293,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: >-
             src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts|src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts

.codebuild/e2e_workflow_base.yml

@@ -13,13 +13,13 @@ batch:
     - identifier: build_windows
       buildspec: .codebuild/build_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
     - identifier: test_windows
       buildspec: .codebuild/test_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
       depend-on:
@@ -92,7 +92,7 @@ batch:
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         variables:
           TEST_SUITE: src/__tests__/graphql-generator-gen2.test.ts
           CLI_REGION: us-east-1

.codebuild/pr_workflow.yml

@@ -11,13 +11,13 @@ batch:
     - identifier: build_windows
       buildspec: .codebuild/build_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
     - identifier: test_windows
       buildspec: .codebuild/test_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
       depend-on:

.codebuild/release_workflow.yml

@@ -11,13 +11,13 @@ batch:
     - identifier: build_windows
       buildspec: .codebuild/build_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
     - identifier: test_windows
       buildspec: .codebuild/test_windows.yml
       env:
-        type: WINDOWS_SERVER_2019_CONTAINER
+        type: WINDOWS_SERVER_2022_CONTAINER
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
       depend-on:

.codebuild/run_android_modelgen_e2e_test.yml

@@ -13,6 +13,8 @@ phases:
     commands:
       # Corretto PGP Key has expired. Fetch the renewed key. https://github.com/corretto/corretto-21/issues/83
       - sudo apt-key del A122542AB04F24E3 && sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A122542AB04F24E3
+      # Debian Yarn GPG has expired. Fetch the renewed key. https://github.com/yarnpkg/yarn/issues/9218
+      - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
       - sudo apt update
       - yes | sudo apt install android-sdk
       - export ANDROID_HOME=/usr/lib/android-sdk

.codebuild/scripts/e2e_test_windows.sh

@@ -3,6 +3,11 @@
 # set exit on error to true
 set -e
 
+# Ensure HOME is set for Windows environments
+if [ -z  "$HOME" ]; then 
+  export HOME="${USERPROFILE:-$CODEBUILD_SRC_DIR/..}"
+fi
+
 source ./shared-scripts.sh && _setupE2ETestsWindows
 codebuild-breakpoint
 source ./shared-scripts.sh && _runE2ETestsWindows

.codebuild/scripts/local_publish_helpers.sh

@@ -48,11 +48,19 @@ function unsetSudoNpmRegistryUrl {
 }
 
 function changeNpmGlobalPath {
-    mkdir -p ~/.npm-global
-    if [ -z $SKIP_SET_NPM_PREFIX ]; then
-        npm config set prefix '~/.npm-global'
+    if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then
+        mkdir -p "$USERPROFILE/.npm-global"
+        if [ -z $SKIP_SET_NPM_PREFIX ]; then
+            npm config set prefix "$USERPROFILE/.npm-global"
+        fi
+        export PATH="$USERPROFILE/.npm-global/bin:$PATH"
+    else
+        mkdir -p ~/.npm-global
+        if [ -z $SKIP_SET_NPM_PREFIX ]; then
+            npm config set prefix '~/.npm-global'
+        fi
+        export PATH=~/.npm-global/bin:$PATH
     fi
-    export PATH=~/.npm-global/bin:$PATH
 }
 
 function changeSudoNpmGlobalPath {

.codebuild/scripts/run-ios-modelgen-e2e-test.sh

@@ -52,7 +52,7 @@ main() {
     latest_run_id=$(get_latest_run_id)
     echo "Latest run ID: $latest_run_id"
     run_status=$(get_run_status "$latest_run_id")
-    timeout=$((SECONDS + 1500))  # 1500 seconds = 25 minutes
+    timeout=$((SECONDS + 4800))  # 4800 seconds = 1 hour and 20 minutes
 
     # Continuously check for status until completion
     while [[ "$run_status" != "completed"  && "$SECONDS" -lt "$timeout" ]]; do

.github/workflows/build-swift-modelgen.yml

@@ -13,7 +13,7 @@ env:
 jobs:
   Build-Swift-Modelgen:
     name: Build
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     permissions:
       actions: read
       contents: read
@@ -22,6 +22,9 @@ jobs:
       fail-fast: true
 
     steps:
+      - name: Set Xcode version
+        run: sudo xcode-select --switch "/Applications/Xcode_16.1.0.app"
+
       - name: Mask S3 URL
         run: echo "::add-mask::$MODELS_S3_URL"
 

.github/workflows/closed-issue-message.yml

@@ -2,6 +2,10 @@ name: Closed Issue Message
 on:
   issues:
     types: [closed]
+
+permissions:
+  issues: write
+
 jobs:
   auto_comment:
     runs-on: ubuntu-latest

package.json

@@ -39,6 +39,7 @@
     "trigger-deprecate-release": "source ./scripts/cloud-release.sh && deprecateRelease",
     "view-test-artifact": "./scripts/view-test-artifacts.sh",
     "cleanup-stale-resources": "source ./scripts/cloud-utils.sh && cleanupStaleResources",
+    "cloud-pr": "./scripts/cloud-pr.sh",
     "cloud-e2e": "source scripts/cloud-utils.sh && cloudE2E",
     "cloud-e2e-beta": "source scripts/cloud-utils.sh && cloudE2EBeta",
     "split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .codebuild/e2e_workflow.yml",
@@ -70,13 +71,14 @@
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "lerna": "^5.1.6"
+    "lerna": "^5.1.6",
+    "tar": "^7.5.8"
   },
   "workspaces": [
     "packages/*"
   ],
   "devDependencies": {
-    "@aws-amplify/amplify-cli-core": "^4.4.0",
+    "@aws-amplify/amplify-cli-core": "^4.4.1",
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/config-lerna-scopes": "^17.0.2",
@@ -89,7 +91,10 @@
     "@typescript-eslint/eslint-plugin": "^4.0.0",
     "@typescript-eslint/parser": "^4.0.0",
     "amplify-headless-interface": "^1.13.1",
-    "aws-sdk": "2.1414.0",
+    "@aws-sdk/client-codebuild": "^3.996.0",
+    "@aws-sdk/client-s3": "^3.996.0",
+    "@aws-sdk/credential-providers": "^3.996.0",
+    "@smithy/types": "^4.13.0",
     "cli-progress": "3.12.0",
     "cmd-shim": "^3.0.3",
     "codecov": "^3.7.0",
@@ -126,19 +131,30 @@
   "resolutions": {
     "**/@aws-amplify/amplify-codegen-e2e-tests/**/cookie": "^0.7.0",
     "**/@aws-amplify/amplify-codegen-e2e-tests/**/fast-xml-parser": "^4.4.1",
+    "**/@aws-sdk/xml-builder/**/fast-xml-parser": "5.3.8",
+    "@smithy/config-resolver": "^4.4.0",
     "@octokit/plugin-paginate-rest": "^9.2.2",
     "@octokit/request": "^8.4.1",
     "@octokit/request-error": "^5.1.1",
-    "axios": "^1.7.4",
+    "aws-cdk-lib": "^2.189.1",
+    "axios": "^1.16.0",
     "cross-fetch": "^2.2.6",
+    "form-data": "^4.0.4",
     "glob-parent": "^6.0.2",
     "graphql": "15.8.0",
+    "handlebars": ">=4.7.9",
+    "**/codecov/**/js-yaml": "^3.14.2",
+    "**/nx/**/js-yaml": "^4.1.1",
+    "immutable": "^4.3.8",
     "lodash": "^4.17.21",
     "minimist": "^1.2.6",
     "node-fetch": "^2.6.7",
     "parse-url": "^8.1.0",
+    "tar": "^7.5.8",
     "xml2js": "0.5.0",
-    "aws-cdk-lib": "^2.187.0"
+    "tmp": "^0.2.4",
+    "minimatch": "^3.1.3",
+    "http-proxy-agent": "^7.0.0"
   },
   "config": {
     "commitizen": {

packages/amplify-codegen-e2e-core/package.json

@@ -22,7 +22,19 @@
     "clean": "rimraf ./lib"
   },
   "dependencies": {
-    "aws-sdk": "^2.1465.0",
+    "@aws-sdk/client-amplifybackend": "^3.990.0",
+    "@aws-sdk/client-appsync": "^3.996.0",
+    "@aws-sdk/client-cloudformation": "^3.996.0",
+    "@aws-sdk/client-cloudwatch-events": "^3.996.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.996.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.996.0",
+    "@aws-sdk/client-dynamodb": "^3.996.0",
+    "@aws-sdk/client-kinesis": "^3.996.0",
+    "@aws-sdk/client-lambda": "^3.996.0",
+    "@aws-sdk/client-lex-model-building-service": "^3.996.0",
+    "@aws-sdk/client-pinpoint": "^3.996.0",
+    "@aws-sdk/client-rekognition": "^3.996.0",
+    "@aws-sdk/client-s3": "^3.996.0",
     "chalk": "^3.0.0",
     "dotenv": "^8.6.0",
     "execa": "^4.1.0",
@@ -32,18 +44,18 @@
     "jest-circus": "^27.5.1",
     "jest-environment-node": "^26.6.2",
     "lodash": "^4.17.19",
-    "node-pty": "1.0.0",
+    "node-pty": "1.1.0",
     "retimer": "2.0.0",
     "rimraf": "^3.0.0",
     "strip-ansi": "^6.0.0",
     "throat": "^5.0.0",
-    "uuid": "7.0.1"
+    "uuid": "9.0.1"
   },
   "devDependencies": {
     "@types/ini": "^1.3.31"
   },
   "peerDependencies": {
-    "@aws-amplify/amplify-cli-core": "^4.4.0",
+    "@aws-amplify/amplify-cli-core": "^4.4.1",
     "amplify-headless-interface": "^1.13.1",
     "graphql-transformer-core": "^8.0.0"
   }