diff --git a/.github/actions/install-cli/action.yml b/.github/actions/install-cli/action.yml new file mode 100644 index 00000000000..1058a41bccd --- /dev/null +++ b/.github/actions/install-cli/action.yml @@ -0,0 +1,26 @@ +name: Install Amplify CLI +description: Installs Amplify CLI +inputs: + cli-version: + description: a version of Amplify CLI + required: true +runs: + using: 'composite' + steps: + - name: Install CLI + shell: bash + if: runner.os != 'Windows' + run: | + npm install -g @aws-amplify/cli@${{ inputs.cli-version }} + AMPLIFY_PATH=$(which amplify) + echo "AMPLIFY_PATH=$AMPLIFY_PATH" + echo "AMPLIFY_PATH=$AMPLIFY_PATH" >> $GITHUB_ENV + + - name: Install CLI Windows + shell: powershell + if: runner.os == 'Windows' + run: | + npm install -g @aws-amplify/cli@${{ inputs.cli-version }} + $AMPLIFY_PATH=(Get-Command amplify).Path + echo "AMPLIFY_PATH=$AMPLIFY_PATH" + "AMPLIFY_PATH=$AMPLIFY_PATH" >> $env:GITHUB_ENV diff --git a/.github/actions/run-smoke-tests-windows/README.md b/.github/actions/run-smoke-tests-windows/README.md new file mode 100644 index 00000000000..f8b99d44a78 --- /dev/null +++ b/.github/actions/run-smoke-tests-windows/README.md @@ -0,0 +1,2 @@ +The Run Smoke Tests contains lightweight version of smoke tests for Windows. +GitHub Action's Windows workers are small and using our E2E testing framework for smoke testing overwhelms them. diff --git a/.github/actions/run-smoke-tests-windows/action.yml b/.github/actions/run-smoke-tests-windows/action.yml new file mode 100644 index 00000000000..0eeaa9fcaad --- /dev/null +++ b/.github/actions/run-smoke-tests-windows/action.yml @@ -0,0 +1,53 @@ +name: Run Smoke Tests +description: Executes Smoke Tests +inputs: + role-to-assume: + description: an IAM role to use in tests + required: true + region: + description: an AWS region to run in + required: false + default: us-west-2 +runs: + using: 'composite' + steps: + - name: Verify Amplify Path + shell: bash + run: | + if [[ -z "$AMPLIFY_PATH" ]]; then + echo "AMPLIFY_PATH must be defined" + exit 1 + fi + echo "AMPLIFY_PATH=$AMPLIFY_PATH" + $AMPLIFY_PATH version + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1 + with: + role-to-assume: ${{ inputs.role-to-assume }} + aws-region: ${{ inputs.region }} + + - name: Install AWS CLI + shell: powershell + run: | + msiexec.exe /i https://awscli.amazonaws.com/AWSCLIV2.msi /qn + aws --version + + - name: Configure Profile + shell: bash + run: | + aws configure set region ${{ inputs.region }} --profile default + aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default + aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default + aws configure set aws_session_token $AWS_SESSION_TOKEN --profile default + + - name: Run Smoke Tests + shell: bash + run: .github/actions/run-smoke-tests-windows/windows-smoke-tests.sh + + - name: Cleanup + shell: bash + if: always() + run: | + cd $AMPLIFY_PROJ_DIR + $AMPLIFY_PATH delete --force diff --git a/.github/actions/run-smoke-tests-windows/add_api_request.json b/.github/actions/run-smoke-tests-windows/add_api_request.json new file mode 100644 index 00000000000..31bd0c3dd0f --- /dev/null +++ b/.github/actions/run-smoke-tests-windows/add_api_request.json @@ -0,0 +1,9 @@ +{ + "version": 1, + "serviceConfiguration": { + "serviceName": "AppSync", + "apiName": "myApiName", + "transformSchema": "type Todo @model { id: ID! content: String}", + "defaultAuthType": { "mode": "API_KEY" } + } +} diff --git a/.github/actions/run-smoke-tests-windows/add_auth_request.json b/.github/actions/run-smoke-tests-windows/add_auth_request.json new file mode 100644 index 00000000000..847d7da074d --- /dev/null +++ b/.github/actions/run-smoke-tests-windows/add_auth_request.json @@ -0,0 +1,9 @@ +{ + "version": 2, + "resourceName": "myAuthResource", + "serviceConfiguration": { + "serviceName": "Cognito", + "includeIdentityPool": false, + "userPoolConfiguration": { "requiredSignupAttributes": ["EMAIL", "PHONE_NUMBER"], "signinMethod": "USERNAME" } + } +} diff --git a/.github/actions/run-smoke-tests-windows/windows-smoke-tests.sh b/.github/actions/run-smoke-tests-windows/windows-smoke-tests.sh new file mode 100755 index 00000000000..00ca2eca044 --- /dev/null +++ b/.github/actions/run-smoke-tests-windows/windows-smoke-tests.sh @@ -0,0 +1,41 @@ +#!/bin/bash -e + +$AMPLIFY_PATH version + +random_guid=$(powershell -Command "[guid]::NewGuid().ToString()") +random_guid=${random_guid//-/} +random_guid=${random_guid:0:6} +projDir="smoke-test-${random_guid}" +echo "AMPLIFY_PROJ_DIR=$projDir" >> $GITHUB_ENV + +# Read headless requests content. This must be done before we change directory to $projDir. +THIS_SCRIPT_PATH=$(dirname "${BASH_SOURCE[0]}") +ADD_AUTH_REQUEST=$(cat $THIS_SCRIPT_PATH/add_auth_request.json) +ADD_AUTH_REQUEST=${ADD_AUTH_REQUEST//[$'\r\n']} +ADD_API_REQUEST=$(cat $THIS_SCRIPT_PATH/add_api_request.json) +ADD_API_REQUEST=${ADD_API_REQUEST//[$'\r\n']} + +mkdir $projDir +cd $projDir + +$AMPLIFY_PATH init --yes + +$AMPLIFY_PATH status + +echo $ADD_AUTH_REQUEST +$AMPLIFY_PATH add auth --headless <<< $ADD_AUTH_REQUEST + +$AMPLIFY_PATH status + +$AMPLIFY_PATH push --yes + +$AMPLIFY_PATH status + +echo $ADD_API_REQUEST +$AMPLIFY_PATH add api --headless <<< $ADD_API_REQUEST + +$AMPLIFY_PATH status + +$AMPLIFY_PATH push --yes + +$AMPLIFY_PATH status diff --git a/.github/actions/run-smoke-tests/action.yml b/.github/actions/run-smoke-tests/action.yml new file mode 100644 index 00000000000..f86126c1d3f --- /dev/null +++ b/.github/actions/run-smoke-tests/action.yml @@ -0,0 +1,66 @@ +name: Run Smoke Tests +description: Executes Smoke Tests +inputs: + role-to-assume: + description: an IAM role to use in tests + required: true + region: + description: an AWS region to run in + required: false + default: us-west-2 +runs: + using: 'composite' + steps: + - name: Verify Amplify Path + shell: bash + run: | + if [[ -z "$AMPLIFY_PATH" ]]; then + echo "AMPLIFY_PATH must be defined" + exit 1 + fi + echo "AMPLIFY_PATH=$AMPLIFY_PATH" + $AMPLIFY_PATH version + + - name: Install Dependencies + shell: bash + run: yarn install --immutable + + - name: Build + shell: bash + run: yarn build-tests + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1 + with: + role-to-assume: ${{ inputs.role-to-assume }} + aws-region: ${{ inputs.region }} + + # For iOS tests + - name: Setup Ruby + uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0 + if: runner.os == 'macOS' + with: + ruby-version: '3.2.1' + + # For iOS tests + - name: Set Default Xcode Version + if: runner.os == 'macOS' + shell: bash + run: | + sudo xcode-select -s "/Applications/Xcode_14.1.app" + xcodebuild -version + + - name: Run Smoke Tests + shell: bash + run: yarn smoketest -- --forceExit --no-cache --maxWorkers=2 + env: + CLI_REGION: ${{ inputs.region }} + CI: true + CIRCLECI: true + + - name: Upload Report + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2 + if: always() + with: + name: test report + path: packages/amplify-e2e-tests/amplify-e2e-reports diff --git a/.github/workflows/smoke-tests-canaries.yml b/.github/workflows/smoke-tests-canaries.yml new file mode 100644 index 00000000000..c701bff8bc1 --- /dev/null +++ b/.github/workflows/smoke-tests-canaries.yml @@ -0,0 +1,17 @@ +name: Smoke Tests - Canaries + +# This is required by aws-actions/configure-aws-credentials +permissions: + id-token: write + contents: read + +on: + schedule: + - cron: '0 16 * * *' # Everyday 16:00 UTC + +jobs: + call-smoke-tests: + uses: ./.github/workflows/smoke-tests.yml + secrets: inherit + with: + versions: '["rc", "latest"]' diff --git a/.github/workflows/smoke-tests-manual.yml b/.github/workflows/smoke-tests-manual.yml new file mode 100644 index 00000000000..0280df3e6d9 --- /dev/null +++ b/.github/workflows/smoke-tests-manual.yml @@ -0,0 +1,27 @@ +name: Smoke Tests - Manual Run + +# This is required by aws-actions/configure-aws-credentials +permissions: + id-token: write + contents: read + +on: + workflow_dispatch: + inputs: + os: + required: false + type: string + default: '["macos-latest-xl", "ubuntu-latest", "windows-latest"]' + versions: + required: false + type: string + default: '["rc", "latest"]' + +jobs: + call-smoke-tests: + if: github.event_name == 'workflow_dispatch' + uses: ./.github/workflows/smoke-tests.yml + secrets: inherit + with: + os: ${{ github.event.inputs.os }} + versions: ${{ github.event.inputs.versions }} diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml new file mode 100644 index 00000000000..835311caa49 --- /dev/null +++ b/.github/workflows/smoke-tests.yml @@ -0,0 +1,53 @@ +name: Smoke Tests + +# This is required by aws-actions/configure-aws-credentials +permissions: + id-token: write + contents: read + +on: + workflow_call: + inputs: + os: + required: false + type: string + default: '["macos-latest-xl", "ubuntu-latest", "windows-latest"]' + versions: + required: false + type: string + default: '["rc", "latest"]' + +env: + NODE_OPTIONS: --max-old-space-size=8096 + +jobs: + run-smoke-tests: + strategy: + fail-fast: false + matrix: + os: ${{ fromJson(inputs.os) }} + cli-version: ${{ fromJson(inputs.versions) }} + name: Smoke Tests ${{ matrix.os }} ${{ matrix.cli-version }} + runs-on: ${{ matrix.os }} + steps: + - name: Checkout Code + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + with: + persist-credentials: false + + - name: Install Amplify CLI + uses: ./.github/actions/install-cli + with: + cli-version: ${{ matrix.cli-version }} + + - name: Run Smoke Tests Unix + if: runner.os != 'Windows' + uses: ./.github/actions/run-smoke-tests + with: + role-to-assume: ${{ secrets.SMOKE_TESTS_ROLE_ARN }} + + - name: Run Smoke Tests Windows + if: runner.os == 'Windows' + uses: ./.github/actions/run-smoke-tests-windows + with: + role-to-assume: ${{ secrets.SMOKE_TESTS_ROLE_ARN }} diff --git a/.prettierignore b/.prettierignore index cc8897b7e66..743cc738d61 100644 --- a/.prettierignore +++ b/.prettierignore @@ -14,6 +14,7 @@ packages/amplify-cli-core/src/__tests__/testFiles/packageManager-npm/package-loc packages/amplify-cli-core/src/__tests__/testFiles/testProject-initialize-json-error/amplify/cli.json packages/amplify-e2e-core/dist/index.html packages/amplify-e2e-tests/amplify-e2e-reports +packages/amplify-e2e-tests/resources/example-ios-app packages/amplify-environment-parameters/src/schemas/BackendParameters.schema.json packages/amplify-nodejs-function-runtime-provider/src/__tests__/utils/handlerWithSyntaxError.js packages/amplify-velocity-template/src/parse/velocity.yy diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml index 67803e22cd4..924f8e8aa82 100644 --- a/codebuild_specs/e2e_workflow_generated.yml +++ b/codebuild_specs/e2e_workflow_generated.yml @@ -145,7 +145,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/diagnose.test.ts|src/__tests__/hooks-a.test.ts|src/__tests__/mock-api.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_analytics_kinesis_analytics_pinpoint_flutter_analytics_pinpoint_js @@ -153,7 +153,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/analytics-kinesis.test.ts|src/__tests__/analytics-pinpoint-flutter.test.ts|src/__tests__/analytics-pinpoint-js.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_auth_2a_auth_2b_auth_2d @@ -161,7 +161,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_2a.test.ts|src/__tests__/auth_2b.test.ts|src/__tests__/auth_2d.test.ts - CLI_REGION: us-east-2 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_auth_2f_notifications_lifecycle_notifications_analytics_compatibility_in_app_1 @@ -169,7 +169,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_2f.test.ts|src/__tests__/notifications-lifecycle.test.ts|src/__tests__/notifications-analytics-compatibility-in-app-1.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_notifications_analytics_compatibility_sms_2_analytics_2_global_sandbox_c @@ -185,7 +185,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/hooks-b.test.ts|src/__tests__/notifications-analytics-compatibility-sms-1.test.ts|src/__tests__/plugin.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_studio_modelgen_custom_transformers_notifications_in_app_messaging_env_1 @@ -193,7 +193,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/studio-modelgen.test.ts|src/__tests__/graphql-v2/custom-transformers.test.ts|src/__tests__/notifications-in-app-messaging-env-1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_notifications_sms_pull_pull_auth_10 @@ -201,7 +201,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/notifications-sms-pull.test.ts|src/__tests__/pull.test.ts|src/__tests__/auth_10.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-east-1 depend-on: - upb - identifier: l_container_hosting_init_b_notifications_apns @@ -209,7 +209,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/container-hosting.test.ts|src/__tests__/init_b.test.ts|src/__tests__/notifications-apns.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_notifications_fcm_notifications_in_app_messaging_env_2_with_babel_config @@ -225,7 +225,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/amplify-configure.test.ts|src/__tests__/env-2.test.ts|src/__tests__/init_d.test.ts - CLI_REGION: us-east-2 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_init_f_auth_5d_configure_project @@ -233,7 +233,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/init_f.test.ts|src/__tests__/auth_5d.test.ts|src/__tests__/configure-project.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_git_clone_attach_init_c_layer_4 @@ -241,7 +241,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/git-clone-attach.test.ts|src/__tests__/init_c.test.ts|src/__tests__/layer-4.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_function_2c_function_3b_function_4 @@ -249,7 +249,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/function_2c.test.ts|src/__tests__/function_3b.test.ts|src/__tests__/function_4.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_interactions_schema_model_a_tags @@ -265,7 +265,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_1a.test.ts|src/__tests__/auth-trigger.test.ts|src/__tests__/custom_policies_function.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_function_6_storage_2_export @@ -273,7 +273,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/function_6.test.ts|src/__tests__/storage-2.test.ts|src/__tests__/export.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_iam_permissions_boundary_node_function_notifications_sms @@ -281,7 +281,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/iam-permissions-boundary.test.ts|src/__tests__/migration/node.function.test.ts|src/__tests__/notifications-sms.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_schema_auth_4b_schema_model_e_schema_versioned @@ -289,7 +289,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-4b.test.ts|src/__tests__/schema-model-e.test.ts|src/__tests__/schema-versioned.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_auth_1c_auth_5e_auth_8b @@ -297,7 +297,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_1c.test.ts|src/__tests__/auth_5e.test.ts|src/__tests__/auth_8b.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_geo_add_b_s3_sse_schema_auth_4a @@ -305,7 +305,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/geo-add-b.test.ts|src/__tests__/s3-sse.test.ts|src/__tests__/schema-auth-4a.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_schema_model_b_schema_model_d_auth_5f @@ -329,7 +329,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-6a.test.ts|src/__tests__/schema-data-access-patterns.test.ts|src/__tests__/schema-model-c.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_schema_predictions_model_migration_auth_3c @@ -337,7 +337,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-predictions.test.ts|src/__tests__/transformer-migrations/model-migration.test.ts|src/__tests__/auth_3c.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_auth_4c_auth_5a_auth_5c @@ -345,7 +345,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_4c.test.ts|src/__tests__/auth_5a.test.ts|src/__tests__/auth_5c.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_env_1_geo_add_a_init_a @@ -353,7 +353,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/env-1.test.ts|src/__tests__/geo-add-a.test.ts|src/__tests__/init_a.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_schema_auth_4c_schema_auth_5c_auth_5b @@ -361,7 +361,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-4c.test.ts|src/__tests__/schema-auth-5c.test.ts|src/__tests__/auth_5b.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_auth_9_custom_resources_env_5 @@ -369,7 +369,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_9.test.ts|src/__tests__/custom_resources.test.ts|src/__tests__/env-5.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_function_10_function_9c_function_permissions @@ -377,7 +377,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/function_10.test.ts|src/__tests__/function_9c.test.ts|src/__tests__/function-permissions.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_geo_import_1a_geo_import_2_global_sandbox_b @@ -393,7 +393,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-5d.test.ts|src/__tests__/schema-auth-6b.test.ts|src/__tests__/schema-auth-8c.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_auth_3a_auth_3b_auth_4a @@ -409,7 +409,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_7a.test.ts|src/__tests__/auth_8c.test.ts|src/__tests__/feature-flags.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_geo_import_1b_global_sandbox_a_init_e @@ -425,7 +425,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/notifications-analytics-compatibility-in-app-2.test.ts|src/__tests__/schema-auth-11-c.test.ts|src/__tests__/schema-auth-2b.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_schema_auth_6c_schema_auth_6d_schema_auth_7c @@ -433,7 +433,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-6c.test.ts|src/__tests__/schema-auth-6d.test.ts|src/__tests__/schema-auth-7c.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_schema_auth_8a_function_migration_api_10 @@ -441,7 +441,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-8a.test.ts|src/__tests__/transformer-migrations/function-migration.test.ts|src/__tests__/api_10.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_api_7_export_pull_a_function_9a @@ -449,7 +449,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/api_7.test.ts|src/__tests__/export-pull-a.test.ts|src/__tests__/function_9a.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_geo_headless_api_key_migration5_schema_auth_1a @@ -457,7 +457,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/geo-headless.test.ts|src/__tests__/migration/api.key.migration5.test.ts|src/__tests__/schema-auth-1a.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_schema_auth_5b_schema_auth_8b_schema_auth_9_a @@ -465,7 +465,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-5b.test.ts|src/__tests__/schema-auth-8b.test.ts|src/__tests__/schema-auth-9-a.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_schema_auth_9_c_storage_3_auth_11 @@ -473,7 +473,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-9-c.test.ts|src/__tests__/storage-3.test.ts|src/__tests__/auth_11.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_auth_1b_delete_geo_add_c @@ -481,7 +481,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_1b.test.ts|src/__tests__/delete.test.ts|src/__tests__/geo-add-c.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: us-east-1 depend-on: - upb - identifier: l_geo_add_d_geo_import_3_hosting @@ -489,7 +489,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/geo-add-d.test.ts|src/__tests__/geo-import-3.test.ts|src/__tests__/hosting.test.ts - CLI_REGION: us-east-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_layer_3_api_connection_migration_api_key_migration3 @@ -497,7 +497,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/layer-3.test.ts|src/__tests__/migration/api.connection.migration.test.ts|src/__tests__/migration/api.key.migration3.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_predictions_schema_auth_11_b_schema_auth_1b @@ -505,7 +505,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/predictions.test.ts|src/__tests__/schema-auth-11-b.test.ts|src/__tests__/schema-auth-1b.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_schema_auth_2a_schema_auth_7a_schema_auth_7b @@ -513,7 +513,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-2a.test.ts|src/__tests__/schema-auth-7a.test.ts|src/__tests__/schema-auth-7b.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: us-east-1 depend-on: - upb - identifier: l_schema_auth_9_b_schema_iterative_rollback_1_predictions_migration @@ -521,7 +521,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-9-b.test.ts|src/__tests__/schema-iterative-rollback-1.test.ts|src/__tests__/transformer-migrations/predictions-migration.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_api_6a_auth_7b_export_pull_b @@ -529,7 +529,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/api_6a.test.ts|src/__tests__/auth_7b.test.ts|src/__tests__/export-pull-b.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_function_3a_init_special_case_http_migration @@ -537,7 +537,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/function_3a.test.ts|src/__tests__/init-special-case.test.ts|src/__tests__/transformer-migrations/http-migration.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_schema_auth_12_schema_auth_3_schema_function_2 @@ -545,7 +545,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-12.test.ts|src/__tests__/schema-auth-3.test.ts|src/__tests__/schema-function-2.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_auth_4b_auth_8a_export_pull_d @@ -553,7 +553,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_4b.test.ts|src/__tests__/auth_8a.test.ts|src/__tests__/export-pull-d.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_schema_auth_5a_schema_iterative_rollback_2_schema_iterative_update_3 @@ -561,7 +561,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/schema-auth-5a.test.ts|src/__tests__/schema-iterative-rollback-2.test.ts|src/__tests__/schema-iterative-update-3.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_auth_migration_amplify_remove_api_2a @@ -569,7 +569,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/transformer-migrations/auth-migration.test.ts|src/__tests__/amplify-remove.test.ts|src/__tests__/api_2a.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_api_2b_api_6c_api_9a @@ -577,7 +577,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/api_2b.test.ts|src/__tests__/api_6c.test.ts|src/__tests__/api_9a.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_auth_12_auth_2g_auth_2h @@ -585,7 +585,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_12.test.ts|src/__tests__/auth_2g.test.ts|src/__tests__/auth_2h.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_auth_5g_hosted_ui_user_groups_s3_access @@ -593,7 +593,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/auth_5g.test.ts|src/__tests__/auth/hosted-ui.test.ts|src/__tests__/auth/user-groups-s3-access.test.ts - CLI_REGION: us-east-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_user_groups_build_function_custom_resource_with_storage @@ -617,7 +617,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/function_13.test.ts|src/__tests__/function_14.test.ts|src/__tests__/function_15.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_function_2d_general_config_headless_init_help @@ -625,7 +625,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/function_2d.test.ts|src/__tests__/general-config/general-config-headless-init.test.ts|src/__tests__/help.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_hooks_c_init_force_push_interactions_1 @@ -649,7 +649,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/notifications-sms-update.test.ts|src/__tests__/opensearch-simulator/opensearch-simulator.test.ts|src/__tests__/parameter-store-1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_parameter_store_2_android_analytics_pinpoint_config_android_notifications_pinpoint_config @@ -657,7 +657,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/parameter-store-2.test.ts|src/__tests__/pinpoint/android-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/android-notifications-pinpoint-config.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_flutter_analytics_pinpoint_config_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config @@ -665,7 +665,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/pinpoint/flutter-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/flutter-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/ios-analytics-pinpoint-config.test.ts - CLI_REGION: us-east-2 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_ios_notifications_pinpoint_config_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config @@ -673,7 +673,7 @@ batch: env: variables: TEST_SUITE: src/__tests__/pinpoint/ios-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/javascript-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/javascript-notifications-pinpoint-config.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_pr_previews_multi_env_1_pull_2_push @@ -681,135 +681,135 @@ batch: env: variables: TEST_SUITE: src/__tests__/pr-previews-multi-env-1.test.ts|src/__tests__/pull-2.test.ts|src/__tests__/push.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: eu-central-1 depend-on: - upb - - identifier: l_smoketest_S3server_api_8 + - identifier: l_smoketest_ios_smoketest_S3server buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/smoketest.test.ts|src/__tests__/storage-simulator/S3server.test.ts|src/__tests__/api_8.test.ts - CLI_REGION: us-east-1 + TEST_SUITE: src/__tests__/smoke-tests/smoketest-ios.test.ts|src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/storage-simulator/S3server.test.ts + CLI_REGION: us-east-2 depend-on: - upb - - identifier: l_function_8_schema_iterative_update_locking_api_lambda_auth_2 + - identifier: l_api_8_function_8_schema_iterative_update_locking buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/function_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts - CLI_REGION: ap-southeast-2 + TEST_SUITE: src/__tests__/api_8.test.ts|src/__tests__/function_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts + CLI_REGION: eu-west-2 depend-on: - upb - - identifier: l_layer_2_schema_auth_13_function_5 + - identifier: l_api_lambda_auth_2_layer_2_schema_auth_13 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/layer-2.test.ts|src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts - CLI_REGION: us-west-2 + TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_2.test.ts|src/__tests__/layer-2.test.ts|src/__tests__/schema-auth-13.test.ts + CLI_REGION: eu-central-1 depend-on: - upb - - identifier: l_schema_iterative_update_1_auth_6_function_2a + - identifier: l_function_5_schema_iterative_update_1_auth_6 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts - CLI_REGION: ap-southeast-1 + TEST_SUITE: src/__tests__/function_5.test.ts|src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts + CLI_REGION: ap-southeast-2 depend-on: - upb - - identifier: l_schema_connection_2_schema_function_1_api_9b + - identifier: l_function_2a_schema_connection_2_schema_function_1 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts - CLI_REGION: us-east-2 + TEST_SUITE: src/__tests__/function_2a.test.ts|src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts + CLI_REGION: eu-central-1 depend-on: - upb - - identifier: l_custom_policies_container_function_9b_schema_iterative_update_2 + - identifier: l_api_9b_custom_policies_container_function_9b buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts - CLI_REGION: us-east-1 + TEST_SUITE: src/__tests__/api_9b.test.ts|src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts + CLI_REGION: ap-southeast-1 depend-on: - upb - - identifier: l_storage_1a_storage_1b_function_11 + - identifier: l_schema_iterative_update_2_storage_1a_storage_1b buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts - CLI_REGION: us-east-2 + TEST_SUITE: src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts + CLI_REGION: ap-southeast-1 depend-on: - upb - - identifier: l_function_2b_function_7_api_connection_migration2 + - identifier: l_function_11_function_2b_function_7 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/function_2b.test.ts|src/__tests__/function_7.test.ts|src/__tests__/migration/api.connection.migration2.test.ts + TEST_SUITE: src/__tests__/function_11.test.ts|src/__tests__/function_2b.test.ts|src/__tests__/function_7.test.ts CLI_REGION: us-east-1 depend-on: - upb - - identifier: l_api_4_containers_api_secrets_storage_4 + - identifier: l_api_connection_migration2_api_4_containers_api_secrets buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts + TEST_SUITE: src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts CLI_REGION: us-west-2 depend-on: - upb - - identifier: l_schema_auth_10_geo_multi_env_searchable_datastore + - identifier: l_storage_4_schema_auth_10_geo_multi_env buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts - CLI_REGION: us-east-2 + TEST_SUITE: src/__tests__/storage-4.test.ts|src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts + CLI_REGION: us-west-2 depend-on: - upb - - identifier: l_resolvers_schema_key_api_5 + - identifier: l_searchable_datastore_resolvers_schema_key buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts + TEST_SUITE: src/__tests__/graphql-v2/searchable-datastore.test.ts|src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts CLI_REGION: us-east-1 depend-on: - upb - - identifier: l_apigw_api_lambda_auth_1_api_key_migration2 + - identifier: l_api_5_apigw_api_lambda_auth_1 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts - CLI_REGION: eu-west-2 + TEST_SUITE: src/__tests__/api_5.test.ts|src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts + CLI_REGION: us-east-1 depend-on: - upb - - identifier: l_schema_searchable_api_key_migration1_schema_auth_14 + - identifier: l_api_key_migration2_schema_searchable_api_key_migration1 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts - CLI_REGION: eu-west-2 + TEST_SUITE: src/__tests__/migration/api.key.migration2.test.ts|src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts + CLI_REGION: ap-northeast-1 depend-on: - upb - - identifier: l_api_3_api_6b_api_1 + - identifier: l_schema_auth_14_api_3_api_6b buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts - CLI_REGION: ap-southeast-2 + TEST_SUITE: src/__tests__/schema-auth-14.test.ts|src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts + CLI_REGION: us-east-2 depend-on: - upb - - identifier: l_layer_1_api_key_migration4_schema_iterative_update_4 + - identifier: l_api_1_layer_1_api_key_migration4 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts + TEST_SUITE: src/__tests__/api_1.test.ts|src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts CLI_REGION: ap-southeast-1 depend-on: - upb - - identifier: l_function_1_storage_5 + - identifier: l_schema_iterative_update_4_function_1_storage_5 buildspec: codebuild_specs/run_e2e_tests_linux.yml env: variables: - TEST_SUITE: src/__tests__/function_1.test.ts|src/__tests__/storage-5.test.ts - CLI_REGION: eu-west-2 + TEST_SUITE: src/__tests__/schema-iterative-update-4.test.ts|src/__tests__/function_1.test.ts|src/__tests__/storage-5.test.ts + CLI_REGION: us-east-1 depend-on: - upb - identifier: l_datastore_modelgen @@ -818,7 +818,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/datastore-modelgen.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-southeast-1 DISABLE_COVERAGE: 1 depend-on: - upb @@ -828,7 +828,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/amplify-app.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-1 DISABLE_COVERAGE: 1 depend-on: - upb @@ -838,7 +838,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/auth_2c.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-east-1 depend-on: - upb - identifier: l_auth_2e @@ -847,7 +847,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/auth_2e.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_uibuilder @@ -856,7 +856,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/uibuilder.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_geo_remove_3 @@ -865,7 +865,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/geo-remove-3.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_geo_add_f @@ -874,7 +874,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/geo-add-f.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_geo_add_e @@ -883,7 +883,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/geo-add-e.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_import_dynamodb_2c @@ -892,7 +892,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_dynamodb_2c.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_env_3 @@ -901,7 +901,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/env-3.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_geo_remove_2 @@ -910,7 +910,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/geo-remove-2.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_notifications_in_app_messaging @@ -919,7 +919,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/notifications-in-app-messaging.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_import_auth_2a @@ -928,7 +928,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_auth_2a.test.ts - CLI_REGION: us-west-2 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_import_auth_1a @@ -937,7 +937,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_auth_1a.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_import_auth_2b @@ -946,7 +946,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_auth_2b.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_import_s3_2a @@ -955,7 +955,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_s3_2a.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_import_s3_2c @@ -973,7 +973,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_auth_1b.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_schema_auth_11_a @@ -991,7 +991,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/geo-update-1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_geo_update_2 @@ -1000,7 +1000,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/geo-update-2.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_import_s3_3 @@ -1009,7 +1009,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_s3_3.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_import_dynamodb_2b @@ -1018,7 +1018,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_dynamodb_2b.test.ts - CLI_REGION: us-east-2 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_hostingPROD @@ -1045,7 +1045,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/containers-api-1.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_schema_auth_15 @@ -1054,7 +1054,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/schema-auth-15.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_schema_connection_1 @@ -1063,7 +1063,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/schema-connection-1.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: us-east-1 depend-on: - upb - identifier: l_import_auth_3 @@ -1072,7 +1072,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_auth_3.test.ts - CLI_REGION: us-east-1 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_import_dynamodb_2a @@ -1081,7 +1081,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_dynamodb_2a.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_containers_api_2 @@ -1090,7 +1090,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/containers-api-2.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_import_s3_1 @@ -1099,7 +1099,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_s3_1.test.ts - CLI_REGION: us-east-2 + CLI_REGION: ap-southeast-1 USE_PARENT_ACCOUNT: 1 depend-on: - upb @@ -1109,7 +1109,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/transformer-migrations/searchable-migration.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: eu-central-1 USE_PARENT_ACCOUNT: 1 depend-on: - upb @@ -1119,7 +1119,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/geo-remove-1.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_import_dynamodb_1 @@ -1128,7 +1128,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/import_dynamodb_1.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: ap-northeast-1 USE_PARENT_ACCOUNT: 1 depend-on: - upb @@ -1150,7 +1150,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_2a.test.ts|src/__tests__/auth_2b.test.ts|src/__tests__/auth_2d.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-southeast-1 depend-on: - build_windows - upb @@ -1161,7 +1161,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_2f.test.ts|src/__tests__/notifications-lifecycle.test.ts|src/__tests__/notifications-analytics-compatibility-in-app-1.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1172,7 +1172,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/notifications-analytics-compatibility-sms-2.test.ts|src/__tests__/analytics-2.test.ts|src/__tests__/global_sandbox-c.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-east-1 depend-on: - build_windows - upb @@ -1183,7 +1183,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/hooks-b.test.ts|src/__tests__/notifications-analytics-compatibility-sms-1.test.ts|src/__tests__/plugin.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1194,7 +1194,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/studio-modelgen.test.ts|src/__tests__/graphql-v2/custom-transformers.test.ts|src/__tests__/notifications-in-app-messaging-env-1.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1205,7 +1205,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/notifications-sms-pull.test.ts|src/__tests__/auth_10.test.ts|src/__tests__/container-hosting.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-central-1 depend-on: - build_windows - upb @@ -1216,7 +1216,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/init_b.test.ts|src/__tests__/notifications-apns.test.ts|src/__tests__/notifications-fcm.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1227,7 +1227,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/notifications-in-app-messaging-env-2.test.ts|src/__tests__/with-babel-config.test.ts|src/__tests__/amplify-configure.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1238,7 +1238,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/init_d.test.ts|src/__tests__/init_f.test.ts|src/__tests__/auth_5d.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: us-east-2 depend-on: - build_windows - upb @@ -1249,7 +1249,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/configure-project.test.ts|src/__tests__/init_c.test.ts|src/__tests__/layer-4.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1271,7 +1271,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/tags.test.ts|src/__tests__/auth_1a.test.ts|src/__tests__/auth-trigger.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 depend-on: - build_windows - upb @@ -1282,7 +1282,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/custom_policies_function.test.ts|src/__tests__/storage-2.test.ts|src/__tests__/iam-permissions-boundary.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-southeast-1 depend-on: - build_windows - upb @@ -1293,7 +1293,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/migration/node.function.test.ts|src/__tests__/notifications-sms.test.ts|src/__tests__/schema-auth-4b.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1315,7 +1315,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_5e.test.ts|src/__tests__/auth_8b.test.ts|src/__tests__/geo-add-b.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1326,7 +1326,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/s3-sse.test.ts|src/__tests__/schema-auth-4a.test.ts|src/__tests__/schema-model-b.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -1337,7 +1337,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-model-d.test.ts|src/__tests__/auth_5f.test.ts|src/__tests__/env-4.test.ts - CLI_REGION: us-east-2 + CLI_REGION: eu-central-1 depend-on: - build_windows - upb @@ -1348,7 +1348,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/frontend_config_drift.test.ts|src/__tests__/schema-auth-4d.test.ts|src/__tests__/schema-auth-6a.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: eu-central-1 depend-on: - build_windows - upb @@ -1359,7 +1359,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-data-access-patterns.test.ts|src/__tests__/schema-model-c.test.ts|src/__tests__/schema-predictions.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1370,7 +1370,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/transformer-migrations/model-migration.test.ts|src/__tests__/auth_3c.test.ts|src/__tests__/auth_4c.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 depend-on: - build_windows - upb @@ -1381,7 +1381,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_5a.test.ts|src/__tests__/auth_5c.test.ts|src/__tests__/env-1.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1392,7 +1392,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/geo-add-a.test.ts|src/__tests__/init_a.test.ts|src/__tests__/schema-auth-4c.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1414,7 +1414,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/env-5.test.ts|src/__tests__/function_10.test.ts|src/__tests__/function_9c.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -1425,7 +1425,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/function-permissions.test.ts|src/__tests__/geo-import-1a.test.ts|src/__tests__/geo-import-2.test.ts - CLI_REGION: us-east-2 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1436,7 +1436,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/global_sandbox-b.test.ts|src/__tests__/schema-auth-5d.test.ts|src/__tests__/schema-auth-6b.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1447,7 +1447,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-8c.test.ts|src/__tests__/auth_3a.test.ts|src/__tests__/auth_3b.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1458,7 +1458,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_4a.test.ts|src/__tests__/auth_7a.test.ts|src/__tests__/auth_8c.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-southeast-1 depend-on: - build_windows - upb @@ -1469,7 +1469,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/feature-flags.test.ts|src/__tests__/geo-import-1b.test.ts|src/__tests__/global_sandbox-a.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-east-2 depend-on: - build_windows - upb @@ -1480,7 +1480,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/init_e.test.ts|src/__tests__/notifications-analytics-compatibility-in-app-2.test.ts|src/__tests__/schema-auth-11-c.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 depend-on: - build_windows - upb @@ -1491,7 +1491,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-2b.test.ts|src/__tests__/schema-auth-6c.test.ts|src/__tests__/schema-auth-6d.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1502,7 +1502,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-7c.test.ts|src/__tests__/schema-auth-8a.test.ts|src/__tests__/transformer-migrations/function-migration.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -1513,7 +1513,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/api_10.test.ts|src/__tests__/api_7.test.ts|src/__tests__/export-pull-a.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1524,7 +1524,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/function_9a.test.ts|src/__tests__/geo-headless.test.ts|src/__tests__/migration/api.key.migration5.test.ts - CLI_REGION: us-west-2 + CLI_REGION: us-east-2 depend-on: - build_windows - upb @@ -1535,7 +1535,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-1a.test.ts|src/__tests__/schema-auth-5b.test.ts|src/__tests__/schema-auth-8b.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-east-1 depend-on: - build_windows - upb @@ -1546,7 +1546,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-9-a.test.ts|src/__tests__/schema-auth-9-c.test.ts|src/__tests__/storage-3.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -1579,7 +1579,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/hosting.test.ts|src/__tests__/layer-3.test.ts|src/__tests__/migration/api.connection.migration.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1601,7 +1601,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-1b.test.ts|src/__tests__/schema-auth-2a.test.ts|src/__tests__/schema-auth-7a.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1612,7 +1612,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-7b.test.ts|src/__tests__/schema-auth-9-b.test.ts|src/__tests__/transformer-migrations/predictions-migration.test.ts - CLI_REGION: us-east-2 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1623,7 +1623,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/api_6a.test.ts|src/__tests__/auth_7b.test.ts|src/__tests__/export-pull-b.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 depend-on: - build_windows - upb @@ -1634,7 +1634,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/init-special-case.test.ts|src/__tests__/transformer-migrations/http-migration.test.ts|src/__tests__/schema-auth-12.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1645,7 +1645,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-3.test.ts|src/__tests__/schema-function-2.test.ts|src/__tests__/auth_4b.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-east-1 depend-on: - build_windows - upb @@ -1656,7 +1656,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_8a.test.ts|src/__tests__/export-pull-d.test.ts|src/__tests__/schema-auth-5a.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: us-east-2 depend-on: - build_windows - upb @@ -1678,7 +1678,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/api_2a.test.ts|src/__tests__/api_2b.test.ts|src/__tests__/api_6c.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -1689,7 +1689,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/api_9a.test.ts|src/__tests__/auth_2h.test.ts|src/__tests__/auth_5g.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1700,7 +1700,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth/hosted-ui.test.ts|src/__tests__/auth/user-groups-s3-access.test.ts|src/__tests__/auth/user-groups.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: us-east-1 depend-on: - build_windows - upb @@ -1722,7 +1722,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts|src/__tests__/function_14.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1733,7 +1733,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/function_2d.test.ts|src/__tests__/general-config/general-config-headless-init.test.ts|src/__tests__/help.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -1755,7 +1755,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/minify-cloudformation.test.ts|src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-southeast-2 depend-on: - build_windows - upb @@ -1766,161 +1766,172 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/parameter-store-1.test.ts|src/__tests__/parameter-store-2.test.ts|src/__tests__/push.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-east-1 depend-on: - build_windows - upb - - identifier: w_api_8_schema_iterative_update_locking_api_lambda_auth_2 + - identifier: w_smoketest_ios_smoketest_api_8 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/api_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts - CLI_REGION: eu-west-2 + TEST_SUITE: src/__tests__/smoke-tests/smoketest-ios.test.ts|src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/api_8.test.ts + CLI_REGION: eu-central-1 depend-on: - build_windows - upb - - identifier: w_schema_auth_13_function_5_schema_iterative_update_1 + - identifier: w_schema_iterative_update_locking_api_lambda_auth_2_schema_auth_13 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts|src/__tests__/schema-iterative-update-1.test.ts - CLI_REGION: us-east-1 + TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts|src/__tests__/schema-auth-13.test.ts + CLI_REGION: eu-central-1 depend-on: - build_windows - upb - - identifier: w_auth_6_function_2a_schema_connection_2 + - identifier: w_function_5_schema_iterative_update_1_auth_6 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts|src/__tests__/schema-connection-2.test.ts - CLI_REGION: ap-southeast-2 + TEST_SUITE: src/__tests__/function_5.test.ts|src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts + CLI_REGION: eu-west-2 depend-on: - build_windows - upb - - identifier: w_schema_function_1_api_9b_custom_policies_container + - identifier: w_function_2a_schema_connection_2_schema_function_1 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts|src/__tests__/custom_policies_container.test.ts - CLI_REGION: us-east-1 + TEST_SUITE: src/__tests__/function_2a.test.ts|src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts + CLI_REGION: eu-central-1 depend-on: - build_windows - upb - - identifier: w_function_9b_schema_iterative_update_2_storage_1a + - identifier: w_api_9b_custom_policies_container_function_9b buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/storage-1a.test.ts + TEST_SUITE: src/__tests__/api_9b.test.ts|src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts CLI_REGION: us-east-1 depend-on: - build_windows - upb - - identifier: w_storage_1b_function_11_function_2b + - identifier: w_schema_iterative_update_2_storage_1a_storage_1b buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts|src/__tests__/function_2b.test.ts - CLI_REGION: eu-central-1 + TEST_SUITE: src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts + CLI_REGION: eu-west-2 depend-on: - build_windows - upb - - identifier: w_api_connection_migration2_api_4_containers_api_secrets + - identifier: w_function_11_function_2b_api_connection_migration2 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts - CLI_REGION: ap-northeast-1 + TEST_SUITE: src/__tests__/function_11.test.ts|src/__tests__/function_2b.test.ts|src/__tests__/migration/api.connection.migration2.test.ts + CLI_REGION: us-east-2 depend-on: - build_windows - upb - - identifier: w_storage_4_schema_auth_10_geo_multi_env + - identifier: w_api_4_containers_api_secrets_storage_4 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/storage-4.test.ts|src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts - CLI_REGION: eu-west-2 + TEST_SUITE: src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts + CLI_REGION: eu-central-1 depend-on: - build_windows - upb - - identifier: w_searchable_datastore_resolvers_schema_key + - identifier: w_schema_auth_10_geo_multi_env_searchable_datastore buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/graphql-v2/searchable-datastore.test.ts|src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts - CLI_REGION: eu-central-1 + TEST_SUITE: src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts + CLI_REGION: us-west-2 depend-on: - build_windows - upb - - identifier: w_api_5_apigw_api_lambda_auth_1 + - identifier: w_resolvers_schema_key_api_5 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/api_5.test.ts|src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts - CLI_REGION: ap-southeast-1 + TEST_SUITE: src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts + CLI_REGION: us-east-1 depend-on: - build_windows - upb - - identifier: w_api_key_migration2_schema_searchable_api_key_migration1 + - identifier: w_apigw_api_lambda_auth_1_api_key_migration2 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/migration/api.key.migration2.test.ts|src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts - CLI_REGION: ap-southeast-2 + TEST_SUITE: src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts + CLI_REGION: us-west-2 depend-on: - build_windows - upb - - identifier: w_schema_auth_14_api_3_api_6b + - identifier: w_schema_searchable_api_key_migration1_schema_auth_14 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/schema-auth-14.test.ts|src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts - CLI_REGION: us-east-2 + TEST_SUITE: src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts + CLI_REGION: eu-west-2 depend-on: - build_windows - upb - - identifier: w_api_1_layer_1_api_key_migration4 + - identifier: w_api_3_api_6b_api_1 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/api_1.test.ts|src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts - CLI_REGION: us-east-1 + TEST_SUITE: src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb - - identifier: w_schema_iterative_update_4_function_1 + - identifier: w_layer_1_api_key_migration4_schema_iterative_update_4 buildspec: codebuild_specs/run_e2e_tests_windows.yml env: type: WINDOWS_SERVER_2019_CONTAINER image: $WINDOWS_IMAGE_2019 variables: - TEST_SUITE: src/__tests__/schema-iterative-update-4.test.ts|src/__tests__/function_1.test.ts - CLI_REGION: ap-northeast-1 + TEST_SUITE: src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts + CLI_REGION: ap-southeast-2 + depend-on: + - build_windows + - upb + - identifier: w_function_1 + buildspec: codebuild_specs/run_e2e_tests_windows.yml + env: + type: WINDOWS_SERVER_2019_CONTAINER + image: $WINDOWS_IMAGE_2019 + variables: + TEST_SUITE: src/__tests__/function_1.test.ts + CLI_REGION: us-east-2 depend-on: - build_windows - upb @@ -1931,7 +1942,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_2c.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1942,7 +1953,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/auth_2e.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -1953,7 +1964,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/env-3.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -1975,7 +1986,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-auth-11-a.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-east-1 depend-on: - build_windows - upb @@ -1986,7 +1997,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/import_s3_3.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: eu-west-2 depend-on: - build_windows - upb @@ -1997,7 +2008,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/hostingPROD.test.ts - CLI_REGION: us-east-1 + CLI_REGION: ap-northeast-1 depend-on: - build_windows - upb @@ -2008,7 +2019,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/containers-api-1.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -2030,7 +2041,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/schema-connection-1.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-west-2 depend-on: - build_windows - upb @@ -2041,7 +2052,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/containers-api-2.test.ts - CLI_REGION: us-west-2 + CLI_REGION: us-east-2 depend-on: - build_windows - upb @@ -2052,7 +2063,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/import_s3_1.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: ap-southeast-1 USE_PARENT_ACCOUNT: 1 depend-on: - build_windows @@ -2064,7 +2075,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/transformer-migrations/searchable-migration.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-east-2 USE_PARENT_ACCOUNT: 1 depend-on: - build_windows @@ -2076,7 +2087,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/geo-remove-1.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: us-east-1 depend-on: - build_windows - upb @@ -2087,7 +2098,7 @@ batch: image: $WINDOWS_IMAGE_2019 variables: TEST_SUITE: src/__tests__/import_dynamodb_1.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 USE_PARENT_ACCOUNT: 1 depend-on: - build_windows @@ -2098,7 +2109,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration-4.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_api_key_migration_v8 @@ -2116,7 +2127,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_api_key_migration_2_v8 @@ -2134,7 +2145,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration-2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_function_migration_update_v8 @@ -2143,7 +2154,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/update_tests/function_migration_update.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_notifications_migration_3_v8 @@ -2152,7 +2163,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration-3.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_scaffold_v10 @@ -2161,7 +2172,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/scaffold.test.ts - CLI_REGION: us-east-1 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_api_graphql_v2_migration_v10 @@ -2170,7 +2181,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/api-graphql-v2.migration.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_api_rest_basic_migration_v10 @@ -2179,7 +2190,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/api-rest-basic.migration.test.ts - CLI_REGION: us-east-1 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_api_rest_lambda_migration_v10 @@ -2188,7 +2199,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/api-rest-lambda.migration.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_api_rest_serverless_migration_v10 @@ -2197,7 +2208,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/api-rest-serverless.migration.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: eu-west-2 depend-on: - upb - identifier: l_auth_add_all_migration_v10 @@ -2206,7 +2217,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/auth-add-all.migration.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_auth_override_migration_v10 @@ -2215,7 +2226,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/auth-override.migration.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-west-2 depend-on: - upb - identifier: l_custom_stack_migration_v10 @@ -2224,7 +2235,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/custom-stack.migration.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-southeast-2 depend-on: - upb - identifier: l_geo_migration_v10 @@ -2242,7 +2253,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v10/git-clone-migration-tests.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 depend-on: - upb - identifier: l_pinpoint_region_migration_v10 @@ -2278,7 +2289,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v12/auth-hosted-ui-lambda-migration.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: l_auth_lambda_callout_migration_rollback_v12 @@ -2287,7 +2298,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v12/auth-lambda-callout-migration-rollback.test.ts - CLI_REGION: us-west-2 + CLI_REGION: ap-northeast-1 depend-on: - upb - identifier: l_auth_lambda_callout_migration_v12 @@ -2305,7 +2316,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v12/auth-oauth-lambda-migration.test.ts - CLI_REGION: us-east-1 + CLI_REGION: us-east-2 depend-on: - upb - identifier: l_auth_migration_v12 @@ -2314,7 +2325,7 @@ batch: variables: compute-type: BUILD_GENERAL1_SMALL TEST_SUITE: src/__tests__/migration_tests_v12/auth.migration.test.ts - CLI_REGION: us-east-2 + CLI_REGION: eu-central-1 depend-on: - upb - identifier: aggregate_e2e_reports diff --git a/codebuild_specs/wait_for_ids.json b/codebuild_specs/wait_for_ids.json index 5f399ac6313..e964411e562 100644 --- a/codebuild_specs/wait_for_ids.json +++ b/codebuild_specs/wait_for_ids.json @@ -2,18 +2,22 @@ "l_amplify_app", "l_amplify_configure_env_2_init_d", "l_analytics_kinesis_analytics_pinpoint_flutter_analytics_pinpoint_js", + "l_api_1_layer_1_api_key_migration4", "l_api_2b_api_6c_api_9a", - "l_api_3_api_6b_api_1", - "l_api_4_containers_api_secrets_storage_4", + "l_api_5_apigw_api_lambda_auth_1", "l_api_6a_auth_7b_export_pull_b", "l_api_7_export_pull_a_function_9a", + "l_api_8_function_8_schema_iterative_update_locking", + "l_api_9b_custom_policies_container_function_9b", + "l_api_connection_migration2_api_4_containers_api_secrets", "l_api_graphql_v2_migration_v10", + "l_api_key_migration2_schema_searchable_api_key_migration1", "l_api_key_migration_2_v8", "l_api_key_migration_v8", + "l_api_lambda_auth_2_layer_2_schema_auth_13", "l_api_rest_basic_migration_v10", "l_api_rest_lambda_migration_v10", "l_api_rest_serverless_migration_v10", - "l_apigw_api_lambda_auth_1_api_key_migration2", "l_auth_12_auth_2g_auth_2h", "l_auth_1a_auth_trigger_custom_policies_function", "l_auth_1b_delete_geo_add_c", @@ -40,7 +44,6 @@ "l_container_hosting_init_b_notifications_apns", "l_containers_api_1", "l_containers_api_2", - "l_custom_policies_container_function_9b_schema_iterative_update_2", "l_custom_stack_migration_v10", "l_datastore_modelgen", "l_diagnose_hooks_a_mock_api", @@ -50,14 +53,14 @@ "l_env_4_frontend_config_drift_schema_auth_4d", "l_flutter_analytics_pinpoint_config_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config", "l_function_10_function_9c_function_permissions", + "l_function_11_function_2b_function_7", "l_function_13_function_14_function_15", - "l_function_1_storage_5", - "l_function_2b_function_7_api_connection_migration2", + "l_function_2a_schema_connection_2_schema_function_1", "l_function_2c_function_3b_function_4", "l_function_2d_general_config_headless_init_help", "l_function_3a_init_special_case_http_migration", + "l_function_5_schema_iterative_update_1_auth_6", "l_function_6_storage_2_export", - "l_function_8_schema_iterative_update_locking_api_lambda_auth_2", "l_function_migration_update_v8", "l_geo_add_b_s3_sse_schema_auth_4a", "l_geo_add_d_geo_import_3_hosting", @@ -96,8 +99,6 @@ "l_interactions_2_minify_cloudformation_notifications_multi_env", "l_interactions_schema_model_a_tags", "l_ios_notifications_pinpoint_config_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config", - "l_layer_1_api_key_migration4_schema_iterative_update_4", - "l_layer_2_schema_auth_13_function_5", "l_layer_3_api_connection_migration_api_key_migration3", "l_notifications_analytics_compatibility_in_app_2_schema_auth_11_c_schema_auth_2b", "l_notifications_analytics_compatibility_sms_2_analytics_2_global_sandbox_c", @@ -113,11 +114,10 @@ "l_pinpoint_region_migration_v10", "l_pr_previews_multi_env_1_pull_2_push", "l_predictions_schema_auth_11_b_schema_auth_1b", - "l_resolvers_schema_key_api_5", "l_scaffold_v10", - "l_schema_auth_10_geo_multi_env_searchable_datastore", "l_schema_auth_11_a", "l_schema_auth_12_schema_auth_3_schema_function_2", + "l_schema_auth_14_api_3_api_6b", "l_schema_auth_15", "l_schema_auth_2a_schema_auth_7a_schema_auth_7b", "l_schema_auth_4b_schema_model_e_schema_versioned", @@ -131,29 +131,28 @@ "l_schema_auth_9_b_schema_iterative_rollback_1_predictions_migration", "l_schema_auth_9_c_storage_3_auth_11", "l_schema_connection_1", - "l_schema_connection_2_schema_function_1_api_9b", - "l_schema_iterative_update_1_auth_6_function_2a", + "l_schema_iterative_update_2_storage_1a_storage_1b", + "l_schema_iterative_update_4_function_1_storage_5", "l_schema_model_b_schema_model_d_auth_5f", "l_schema_predictions_model_migration_auth_3c", - "l_schema_searchable_api_key_migration1_schema_auth_14", + "l_searchable_datastore_resolvers_schema_key", "l_searchable_migration", - "l_smoketest_S3server_api_8", - "l_storage_1a_storage_1b_function_11", + "l_smoketest_ios_smoketest_S3server", + "l_storage_4_schema_auth_10_geo_multi_env", "l_storage_migration_v10", "l_studio_modelgen_custom_transformers_notifications_in_app_messaging_env_1", "l_uibuilder", "l_user_groups_build_function_custom_resource_with_storage", "w_analytics_kinesis_analytics_pinpoint_flutter_analytics_pinpoint_js", "w_api_10_api_7_export_pull_a", - "w_api_1_layer_1_api_key_migration4", "w_api_2a_api_2b_api_6c", - "w_api_5_apigw_api_lambda_auth_1", + "w_api_3_api_6b_api_1", + "w_api_4_containers_api_secrets_storage_4", "w_api_6a_auth_7b_export_pull_b", - "w_api_8_schema_iterative_update_locking_api_lambda_auth_2", "w_api_9a_auth_2h_auth_5g", - "w_api_connection_migration2_api_4_containers_api_secrets", - "w_api_key_migration2_schema_searchable_api_key_migration1", + "w_api_9b_custom_policies_container_function_9b", "w_api_key_migration3_predictions_schema_auth_11_b", + "w_apigw_api_lambda_auth_1_api_key_migration2", "w_auth_11_auth_1b_delete", "w_auth_2a_auth_2b_auth_2d", "w_auth_2c", @@ -162,7 +161,6 @@ "w_auth_4a_auth_7a_auth_8c", "w_auth_5a_auth_5c_env_1", "w_auth_5e_auth_8b_geo_add_b", - "w_auth_6_function_2a_schema_connection_2", "w_auth_8a_export_pull_d_schema_auth_5a", "w_build_function_dynamodb_simulator_export_pull_c", "w_configure_project_init_c_layer_4", @@ -173,11 +171,14 @@ "w_env_5_function_10_function_9c", "w_feature_flags_geo_import_1b_global_sandbox_a", "w_frontend_config_drift_schema_auth_4d_schema_auth_6a", + "w_function_1", + "w_function_11_function_2b_api_connection_migration2", "w_function_12_function_13_function_14", + "w_function_2a_schema_connection_2_schema_function_1", "w_function_2c_interactions_schema_model_a", "w_function_2d_general_config_headless_init_help", + "w_function_5_schema_iterative_update_1_auth_6", "w_function_9a_geo_headless_api_key_migration5", - "w_function_9b_schema_iterative_update_2_storage_1a", "w_function_permissions_geo_import_1a_geo_import_2", "w_geo_add_a_init_a_schema_auth_4c", "w_geo_add_c_geo_add_d_geo_import_3", @@ -195,6 +196,7 @@ "w_init_e_notifications_analytics_compatibility_in_app_2_schema_auth_11_c", "w_init_force_push_interactions_1_interactions_2", "w_init_special_case_http_migration_schema_auth_12", + "w_layer_1_api_key_migration4_schema_iterative_update_4", "w_minify_cloudformation_notifications_multi_env_notifications_sms_update", "w_model_migration_auth_3c_auth_4c", "w_node_function_notifications_sms_schema_auth_4b", @@ -203,10 +205,10 @@ "w_notifications_in_app_messaging_env_2_with_babel_config_amplify_configure", "w_notifications_sms_pull_auth_10_container_hosting", "w_parameter_store_1_parameter_store_2_push", + "w_resolvers_schema_key_api_5", "w_s3_sse_schema_auth_4a_schema_model_b", + "w_schema_auth_10_geo_multi_env_searchable_datastore", "w_schema_auth_11_a", - "w_schema_auth_13_function_5_schema_iterative_update_1", - "w_schema_auth_14_api_3_api_6b", "w_schema_auth_15", "w_schema_auth_1a_schema_auth_5b_schema_auth_8b", "w_schema_auth_1b_schema_auth_2a_schema_auth_7a", @@ -219,15 +221,14 @@ "w_schema_auth_9_a_schema_auth_9_c_storage_3", "w_schema_connection_1", "w_schema_data_access_patterns_schema_model_c_schema_predictions", - "w_schema_function_1_api_9b_custom_policies_container", + "w_schema_iterative_update_2_storage_1a_storage_1b", "w_schema_iterative_update_3_auth_migration_amplify_remove", - "w_schema_iterative_update_4_function_1", + "w_schema_iterative_update_locking_api_lambda_auth_2_schema_auth_13", "w_schema_model_d_auth_5f_env_4", "w_schema_model_e_schema_versioned_auth_1c", - "w_searchable_datastore_resolvers_schema_key", + "w_schema_searchable_api_key_migration1_schema_auth_14", "w_searchable_migration", - "w_storage_1b_function_11_function_2b", - "w_storage_4_schema_auth_10_geo_multi_env", + "w_smoketest_ios_smoketest_api_8", "w_studio_modelgen_custom_transformers_notifications_in_app_messaging_env_1", "w_tags_auth_1a_auth_trigger" ] diff --git a/package.json b/package.json index 097213e7571..cbc56a08001 100644 --- a/package.json +++ b/package.json @@ -59,9 +59,7 @@ "rm-dev-link": "rimraf -f \".bin/amplify-dev\"", "setup-dev-win": "yarn build && yarn link-win && yarn link-aa-win", "setup-dev": "yarn build && yarn rm-dev-link && yarn link-dev && yarn rm-aa-dev-link && yarn link-aa-dev", - "smoketest": "lerna run smoketest --output-style=stream-without-prefixes", - "smoketest@latest": "CLI_VERSION=latest lerna run smoketest --output-style=stream-without-prefixes", - "smoketest@rc": "CLI_VERSION=rc lerna run smoketest --output-style=stream-without-prefixes", + "smoketest": "lerna run smoketest", "split-e2e-tests-codebuild-single": "yarn ts-node ./scripts/generate_single_test_buildspec_codebuild.ts", "split-e2e-tests-codebuild": "yarn ts-node ./scripts/split-e2e-tests-codebuild.ts", "split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .circleci/config.yml", diff --git a/packages/amplify-e2e-core/src/categories/codegen.ts b/packages/amplify-e2e-core/src/categories/codegen.ts index 63d7ce42302..42af1c9ac10 100644 --- a/packages/amplify-e2e-core/src/categories/codegen.ts +++ b/packages/amplify-e2e-core/src/categories/codegen.ts @@ -1,5 +1,14 @@ import { getCLIPath, nspawn as spawn } from '..'; -export const generateModels = async (cwd: string): Promise => { - await spawn(getCLIPath(), ['codegen', 'models'], { cwd, stripColors: true }).runAsync(); +export const generateModels = ( + cwd: string, + settings?: { + expectXcode?: boolean; + }, +): Promise => { + const chain = spawn(getCLIPath(), ['codegen', 'models'], { cwd, stripColors: true }); + if (settings?.expectXcode) { + chain.wait('Updating Xcode project').wait('Successfully added models').wait('Amplify setup completed successfully.'); + } + return chain.runAsync(); }; diff --git a/packages/amplify-e2e-core/src/init/initProjectHelper.ts b/packages/amplify-e2e-core/src/init/initProjectHelper.ts index e3b8f79a16c..3d8d7f63093 100644 --- a/packages/amplify-e2e-core/src/init/initProjectHelper.ts +++ b/packages/amplify-e2e-core/src/init/initProjectHelper.ts @@ -200,6 +200,36 @@ export function initIosProjectWithProfile(cwd: string, settings: Record { + return spawn(getCLIPath(), ['init'], { + cwd, + stripColors: true, + }) + .wait('Enter a name for the project') + .sendCarriageReturn() + .wait('Initialize the project with the above configuration?') + .sendConfirmNo() + .wait('Enter a name for the environment') + .sendLine(defaultSettings.envName) + .wait('Choose your default editor:') + .sendKeyDown(2) + .sendCarriageReturn() + .wait("Choose the type of app that you're building") + .sendLine('ios') + .wait('Select the authentication method you want to use:') + .sendCarriageReturn() + .wait('Please choose the profile you want to use') + .sendLine(defaultSettings.profileName) + .wait(/Help improve Amplify CLI by sharing non( |-)sensitive( | project )configurations on failures/) + .sendYes() + .wait('Updating Xcode project:') + .wait('Amplify project found.') + .wait('Amplify config files found.') + .wait('Successfully updated project') + .wait('Amplify setup completed successfully.') + .runAsync(); +} + export function initFlutterProjectWithProfile(cwd: string, settings: Record): Promise { const s = { ...defaultSettings, ...settings }; diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json index ced7dcde65d..1c23dbe1599 100644 --- a/packages/amplify-e2e-tests/package.json +++ b/packages/amplify-e2e-tests/package.json @@ -22,7 +22,7 @@ "build-tests": "tsc --build tsconfig.tests.json", "setup-profile": "ts-node ./src/configure_tests.ts", "clean-e2e-resources": "ts-node ./src/cleanup-e2e-resources.ts", - "smoketest": "jest --runInBand --testPathPattern='smoketest' --config=jest.config.js" + "smoketest": "yarn e2e --testPathPattern='src/__tests__/smoke-tests/.*.test.ts'" }, "dependencies": { "@aws-amplify/amplify-category-auth": "3.6.0", diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/.gitignore b/packages/amplify-e2e-tests/resources/example-ios-app/.gitignore new file mode 100644 index 00000000000..875d04b5e66 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/.gitignore @@ -0,0 +1,22 @@ + + +#amplify-do-not-edit-begin +amplify/\#current-cloud-backend +amplify/.config/local-* +amplify/logs +amplify/mock-data +amplify/backend/amplify-meta.json +amplify/backend/.temp +build/ +dist/ +node_modules/ +aws-exports.js +awsconfiguration.json +amplifyconfiguration.json +amplifyconfiguration.dart +amplify-build-config.json +amplify-gradle-config.json +amplifytools.xcconfig +.secret-* +**.sample +#amplify-do-not-edit-end diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/Gemfile b/packages/amplify-e2e-tests/resources/example-ios-app/Gemfile new file mode 100644 index 00000000000..adc90d98cfc --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" \ No newline at end of file diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/Gemfile.lock b/packages/amplify-e2e-tests/resources/example-ios-app/Gemfile.lock new file mode 100644 index 00000000000..f9a653355b9 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/Gemfile.lock @@ -0,0 +1,221 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.5) + rexml + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.2.0) + aws-partitions (1.575.0) + aws-sdk-core (3.130.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.525.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.6) + emoji_regex (3.2.3) + excon (0.92.2) + faraday (1.10.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.2.6) + fastlane (2.205.1) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.18.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-core (0.4.2) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.10.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-playcustomapp_v1 (0.7.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-storage_v1 (0.13.0) + google-apis-core (>= 0.4, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.2.0) + google-cloud-storage (1.36.1) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.1) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.1.2) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.4) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.1) + json (2.6.1) + jwt (2.3.0) + memoist (0.16.2) + mini_magick (4.11.0) + mini_mime (1.1.2) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) + plist (3.6.0) + public_suffix (4.0.7) + rake (13.0.6) + representable (3.1.1) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.3) + signet (0.16.1) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.1) + unicode-display_width (1.8.0) + webrick (1.7.0) + word_wrap (1.0.0) + xcodeproj (1.21.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + arm64-darwin-21 + universal-darwin-20 + x86_64-darwin-19 + x86_64-darwin-21 + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.3.11 diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp.xcodeproj/project.pbxproj b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp.xcodeproj/project.pbxproj new file mode 100644 index 00000000000..8a538c9f561 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp.xcodeproj/project.pbxproj @@ -0,0 +1,525 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 52; + objects = { + +/* Begin PBXBuildFile section */ + 3A136F0C28060295006292EF /* MyAmplifyAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A136F0B28060295006292EF /* MyAmplifyAppApp.swift */; }; + 3A136F0E28060295006292EF /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A136F0D28060295006292EF /* ContentView.swift */; }; + 3A136F102806029E006292EF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A136F0F2806029E006292EF /* Assets.xcassets */; }; + 3A136F132806029E006292EF /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A136F122806029E006292EF /* Preview Assets.xcassets */; }; + 3A136F292806029F006292EF /* MyAmplifyAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A136F282806029F006292EF /* MyAmplifyAppUITests.swift */; }; + 4989DDE421F56C7AC37A85ED /* awsconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = FC37E5EADB1509B0750F39D1 /* awsconfiguration.json */; }; + 5A4FCDB558061CA7A37B9D2A /* amplifyconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = 50B98813260A5C7896822AB0 /* amplifyconfiguration.json */; }; + B41EF4282906F5C100DD6BD9 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = B41EF4272906F5C100DD6BD9 /* AWSAPIPlugin */; }; + B41EF42A2906F5C100DD6BD9 /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = B41EF4292906F5C100DD6BD9 /* AWSDataStorePlugin */; }; + B41EF42C2906F5C100DD6BD9 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = B41EF42B2906F5C100DD6BD9 /* Amplify */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 3A136F252806029F006292EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3A136F0028060295006292EF /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3A136F0728060295006292EF; + remoteInfo = MyAmplifyApp; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 3A136F0828060295006292EF /* MyAmplifyApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MyAmplifyApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 3A136F0B28060295006292EF /* MyAmplifyAppApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyAmplifyAppApp.swift; sourceTree = ""; }; + 3A136F0D28060295006292EF /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 3A136F0F2806029E006292EF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 3A136F122806029E006292EF /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + 3A136F142806029E006292EF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3A136F242806029F006292EF /* MyAmplifyAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MyAmplifyAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3A136F282806029F006292EF /* MyAmplifyAppUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyAmplifyAppUITests.swift; sourceTree = ""; }; + 3A136F2A2806029F006292EF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 50B98813260A5C7896822AB0 /* amplifyconfiguration.json */ = {isa = PBXFileReference; explicitFileType = text.json; path = amplifyconfiguration.json; sourceTree = ""; }; + FC37E5EADB1509B0750F39D1 /* awsconfiguration.json */ = {isa = PBXFileReference; explicitFileType = text.json; path = awsconfiguration.json; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 3A136F0528060295006292EF /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + B41EF42A2906F5C100DD6BD9 /* AWSDataStorePlugin in Frameworks */, + B41EF42C2906F5C100DD6BD9 /* Amplify in Frameworks */, + B41EF4282906F5C100DD6BD9 /* AWSAPIPlugin in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3A136F212806029F006292EF /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 245B8BF34E95491633D60348 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + 3A136EFF28060295006292EF = { + isa = PBXGroup; + children = ( + 3A136F0A28060295006292EF /* MyAmplifyApp */, + 3A136F272806029F006292EF /* MyAmplifyAppUITests */, + 3A136F0928060295006292EF /* Products */, + 245B8BF34E95491633D60348 /* Frameworks */, + E4AB4B612BABDF42DE9A1972 /* AmplifyConfig */, + ); + sourceTree = ""; + }; + 3A136F0928060295006292EF /* Products */ = { + isa = PBXGroup; + children = ( + 3A136F0828060295006292EF /* MyAmplifyApp.app */, + 3A136F242806029F006292EF /* MyAmplifyAppUITests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 3A136F0A28060295006292EF /* MyAmplifyApp */ = { + isa = PBXGroup; + children = ( + 3A136F0B28060295006292EF /* MyAmplifyAppApp.swift */, + 3A136F0D28060295006292EF /* ContentView.swift */, + 3A136F0F2806029E006292EF /* Assets.xcassets */, + 3A136F142806029E006292EF /* Info.plist */, + 3A136F112806029E006292EF /* Preview Content */, + ); + path = MyAmplifyApp; + sourceTree = ""; + }; + 3A136F112806029E006292EF /* Preview Content */ = { + isa = PBXGroup; + children = ( + 3A136F122806029E006292EF /* Preview Assets.xcassets */, + ); + path = "Preview Content"; + sourceTree = ""; + }; + 3A136F272806029F006292EF /* MyAmplifyAppUITests */ = { + isa = PBXGroup; + children = ( + 3A136F282806029F006292EF /* MyAmplifyAppUITests.swift */, + 3A136F2A2806029F006292EF /* Info.plist */, + ); + path = MyAmplifyAppUITests; + sourceTree = ""; + }; + E4AB4B612BABDF42DE9A1972 /* AmplifyConfig */ = { + isa = PBXGroup; + children = ( + FC37E5EADB1509B0750F39D1 /* awsconfiguration.json */, + 50B98813260A5C7896822AB0 /* amplifyconfiguration.json */, + ); + name = AmplifyConfig; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 3A136F0728060295006292EF /* MyAmplifyApp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3A136F2D2806029F006292EF /* Build configuration list for PBXNativeTarget "MyAmplifyApp" */; + buildPhases = ( + 3A136F0428060295006292EF /* Sources */, + 3A136F0528060295006292EF /* Frameworks */, + 3A136F0628060295006292EF /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MyAmplifyApp; + packageProductDependencies = ( + B41EF4272906F5C100DD6BD9 /* AWSAPIPlugin */, + B41EF4292906F5C100DD6BD9 /* AWSDataStorePlugin */, + B41EF42B2906F5C100DD6BD9 /* Amplify */, + ); + productName = MyAmplifyApp; + productReference = 3A136F0828060295006292EF /* MyAmplifyApp.app */; + productType = "com.apple.product-type.application"; + }; + 3A136F232806029F006292EF /* MyAmplifyAppUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3A136F332806029F006292EF /* Build configuration list for PBXNativeTarget "MyAmplifyAppUITests" */; + buildPhases = ( + 3A136F202806029F006292EF /* Sources */, + 3A136F212806029F006292EF /* Frameworks */, + 3A136F222806029F006292EF /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 3A136F262806029F006292EF /* PBXTargetDependency */, + ); + name = MyAmplifyAppUITests; + productName = MyAmplifyAppUITests; + productReference = 3A136F242806029F006292EF /* MyAmplifyAppUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 3A136F0028060295006292EF /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1240; + LastUpgradeCheck = 1240; + TargetAttributes = { + 3A136F0728060295006292EF = { + CreatedOnToolsVersion = 12.4; + }; + 3A136F232806029F006292EF = { + CreatedOnToolsVersion = 12.4; + TestTargetID = 3A136F0728060295006292EF; + }; + }; + }; + buildConfigurationList = 3A136F0328060295006292EF /* Build configuration list for PBXProject "MyAmplifyApp" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 3A136EFF28060295006292EF; + packageReferences = ( + B41EF4262906F5C100DD6BD9 /* XCRemoteSwiftPackageReference "amplify-swift" */, + ); + productRefGroup = 3A136F0928060295006292EF /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 3A136F0728060295006292EF /* MyAmplifyApp */, + 3A136F232806029F006292EF /* MyAmplifyAppUITests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 3A136F0628060295006292EF /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3A136F132806029E006292EF /* Preview Assets.xcassets in Resources */, + 3A136F102806029E006292EF /* Assets.xcassets in Resources */, + 4989DDE421F56C7AC37A85ED /* awsconfiguration.json in Resources */, + 5A4FCDB558061CA7A37B9D2A /* amplifyconfiguration.json in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3A136F222806029F006292EF /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 3A136F0428060295006292EF /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3A136F0E28060295006292EF /* ContentView.swift in Sources */, + 3A136F0C28060295006292EF /* MyAmplifyAppApp.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3A136F202806029F006292EF /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3A136F292806029F006292EF /* MyAmplifyAppUITests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 3A136F262806029F006292EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3A136F0728060295006292EF /* MyAmplifyApp */; + targetProxy = 3A136F252806029F006292EF /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 3A136F2B2806029F006292EF /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 3A136F2C2806029F006292EF /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 3A136F2E2806029F006292EF /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"MyAmplifyApp/Preview Content\""; + ENABLE_PREVIEWS = YES; + INFOPLIST_FILE = MyAmplifyApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = my.org.MyAmplifyApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 3A136F2F2806029F006292EF /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"MyAmplifyApp/Preview Content\""; + ENABLE_PREVIEWS = YES; + INFOPLIST_FILE = MyAmplifyApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = my.org.MyAmplifyApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 3A136F342806029F006292EF /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = MyAmplifyAppUITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = my.org.MyAmplifyAppUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = MyAmplifyApp; + }; + name = Debug; + }; + 3A136F352806029F006292EF /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = MyAmplifyAppUITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = my.org.MyAmplifyAppUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = MyAmplifyApp; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 3A136F0328060295006292EF /* Build configuration list for PBXProject "MyAmplifyApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3A136F2B2806029F006292EF /* Debug */, + 3A136F2C2806029F006292EF /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3A136F2D2806029F006292EF /* Build configuration list for PBXNativeTarget "MyAmplifyApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3A136F2E2806029F006292EF /* Debug */, + 3A136F2F2806029F006292EF /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3A136F332806029F006292EF /* Build configuration list for PBXNativeTarget "MyAmplifyAppUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3A136F342806029F006292EF /* Debug */, + 3A136F352806029F006292EF /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + B41EF4262906F5C100DD6BD9 /* XCRemoteSwiftPackageReference "amplify-swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/aws-amplify/amplify-swift"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + B41EF4272906F5C100DD6BD9 /* AWSAPIPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = B41EF4262906F5C100DD6BD9 /* XCRemoteSwiftPackageReference "amplify-swift" */; + productName = AWSAPIPlugin; + }; + B41EF4292906F5C100DD6BD9 /* AWSDataStorePlugin */ = { + isa = XCSwiftPackageProductDependency; + package = B41EF4262906F5C100DD6BD9 /* XCRemoteSwiftPackageReference "amplify-swift" */; + productName = AWSDataStorePlugin; + }; + B41EF42B2906F5C100DD6BD9 /* Amplify */ = { + isa = XCSwiftPackageProductDependency; + package = B41EF4262906F5C100DD6BD9 /* XCRemoteSwiftPackageReference "amplify-swift" */; + productName = Amplify; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = 3A136F0028060295006292EF /* Project object */; +} diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/AccentColor.colorset/Contents.json b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 00000000000..eb878970081 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000000..9221b9bb1a3 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/Contents.json b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/Contents.json new file mode 100644 index 00000000000..73c00596a7f --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/ContentView.swift b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/ContentView.swift new file mode 100644 index 00000000000..ba4724b6ac6 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/ContentView.swift @@ -0,0 +1,21 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import SwiftUI + +struct ContentView: View { + var body: some View { + Text("Hello, world!") + .padding() + } +} + +struct ContentView_Previews: PreviewProvider { + static var previews: some View { + ContentView() + } +} diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Info.plist b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Info.plist new file mode 100644 index 00000000000..efc211a0c1b --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Info.plist @@ -0,0 +1,50 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + + UIApplicationSupportsIndirectInputEvents + + UILaunchScreen + + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/MyAmplifyAppApp.swift b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/MyAmplifyAppApp.swift new file mode 100644 index 00000000000..68eddea3b88 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/MyAmplifyAppApp.swift @@ -0,0 +1,33 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import SwiftUI +import Amplify + + +@main +struct MyAmplifyAppApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } + + // add a default initializer and configure Amplify + init() { + configureAmplify() + } +} +func configureAmplify() { + do { + try Amplify.configure() + print("Initialized Amplify") + } catch { + // simplified error handling for the tutorial + print("Could not initialize Amplify: \(error)") + } +} diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Preview Content/Preview Assets.xcassets/Contents.json b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 00000000000..73c00596a7f --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyApp/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyAppUITests/Info.plist b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyAppUITests/Info.plist new file mode 100644 index 00000000000..64d65ca4957 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyAppUITests/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyAppUITests/MyAmplifyAppUITests.swift b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyAppUITests/MyAmplifyAppUITests.swift new file mode 100644 index 00000000000..1271490b8b5 --- /dev/null +++ b/packages/amplify-e2e-tests/resources/example-ios-app/MyAmplifyAppUITests/MyAmplifyAppUITests.swift @@ -0,0 +1,33 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import XCTest + +class MyAmplifyAppUITests: XCTestCase { + + override func setUpWithError() throws { + // Put setup code here. This method is called before the invocation of each test method in the class. + + // In UI tests it is usually best to stop immediately when a failure occurs. + continueAfterFailure = false + + // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. + } + + override func tearDownWithError() throws { + // Put teardown code here. This method is called after the invocation of each test method in the class. + } + + func testExample() throws { + // UI tests must launch the application that they test. + let app = XCUIApplication() + app.launch() + + // Use recording to get started writing UI tests. + // Use XCTAssert and related functions to verify your tests produce the correct results. + } +} diff --git a/packages/amplify-e2e-tests/src/__tests__/smoke-tests/smoketest-ios.test.ts b/packages/amplify-e2e-tests/src/__tests__/smoke-tests/smoketest-ios.test.ts new file mode 100644 index 00000000000..ed927df7b43 --- /dev/null +++ b/packages/amplify-e2e-tests/src/__tests__/smoke-tests/smoketest-ios.test.ts @@ -0,0 +1,56 @@ +import { + addApi, + createNewProjectDir, + deleteProject, + deleteProjectDir, + generateModels, + initIosProjectWithXcode, + nspawn as spawn, +} from '@aws-amplify/amplify-e2e-core'; +import * as fs from 'fs/promises'; +import * as path from 'path'; + +describe('Smoke Test - iOS', () => { + if (process.platform == 'darwin') { + let projRoot: string; + const exampleIOSAppPath = path.resolve(__dirname, '..', '..', '..', 'resources', 'example-ios-app'); + beforeEach(async () => { + projRoot = await createNewProjectDir('ios-app'); + }); + + afterEach(async () => { + await deleteProject(projRoot); + deleteProjectDir(projRoot); + }); + + it('Creates Amplify iOS App', async () => { + await fs.cp(exampleIOSAppPath, projRoot, { + recursive: true, + }); + + await initIosProjectWithXcode(projRoot); + await addApi(projRoot); + await generateModels(projRoot, { expectXcode: true }); + await rubyBundleInstall(projRoot); + await buildAndTestExampleIosApp(projRoot); + }); + } else { + it('dummy test', () => {}); + } +}); + +function rubyBundleInstall(cwd: string) { + return spawn('bundle', ['install'], { + cwd, + }) + .wait('Bundle complete') + .runAsync(); +} + +function buildAndTestExampleIosApp(cwd: string) { + return spawn('bundle', ['exec', 'fastlane', 'scan', '--device', 'iPhone 13 Pro', '--deployment_target_version', '16.1'], { + cwd, + }) + .wait(/Test.*Succeeded/) + .runAsync(); +} diff --git a/packages/amplify-e2e-tests/src/__tests__/smoketest.test.ts b/packages/amplify-e2e-tests/src/__tests__/smoke-tests/smoketest.test.ts similarity index 85% rename from packages/amplify-e2e-tests/src/__tests__/smoketest.test.ts rename to packages/amplify-e2e-tests/src/__tests__/smoke-tests/smoketest.test.ts index 694ee460626..ebdb6b6758a 100644 --- a/packages/amplify-e2e-tests/src/__tests__/smoketest.test.ts +++ b/packages/amplify-e2e-tests/src/__tests__/smoke-tests/smoketest.test.ts @@ -2,37 +2,11 @@ import execa from 'execa'; import * as path from 'path'; import * as fs from 'fs-extra'; import * as os from 'os'; -import * as pty from 'node-pty'; import { getCLIPath, initJSProjectWithProfile, nspawn as spawn } from '@aws-amplify/amplify-e2e-core'; jest.retryTimes(0); -export const NPM = { - install(pkgName: string, isGlobal: boolean = false): Promise { - return new Promise((resolve) => { - const args = ['install']; - if (isGlobal) { - args.push('-g'); - } - args.push(pkgName); - execa.sync('npm', args, { stdio: 'inherit' }); - resolve(); - }); - }, - uninstall(pkgName: string, isGlobal: boolean = false): Promise { - return new Promise((resolve) => { - const args = ['uninstall', pkgName]; - if (isGlobal) { - args.push('-g'); - } - execa.sync('npm', args, { stdio: 'inherit' }); - resolve(); - }); - }, -}; - export type SmoketestArgs = { projectDirectory: string; - cliVersion: string; destructive: boolean; }; @@ -46,10 +20,9 @@ function defaultProjectDirectoryName(): string { } function getArgs(): SmoketestArgs { - const { DESTRUCTIVE = 'false', CLI_VERSION = 'latest', PROJECT_DIRECTORY = defaultProjectDirectoryName() } = process.env; + const { DESTRUCTIVE = 'false', PROJECT_DIRECTORY = defaultProjectDirectoryName() } = process.env; return { projectDirectory: PROJECT_DIRECTORY, - cliVersion: CLI_VERSION, destructive: DESTRUCTIVE.toLowerCase() === 'true', }; } @@ -69,14 +42,17 @@ export function removeProjectDirectory(projectDirectory: string) { fs.removeSync(projectDirectory); } -export type Evaluatable = { - evaluate(data: string, ptyProcess: pty.IPty): Promise; -}; export class Amplify { private executionArgs: { cwd: string; encoding: 'utf8' }; constructor(projectDirectory: string) { this.executionArgs = { cwd: projectDirectory, encoding: 'utf8' }; } + version = async () => { + const cliPath = getCLIPath(); + const versionResult = await execa(cliPath, ['version']); + const version = versionResult.stdout; + writeBanner(`CLI version is ${version}`); + }; init = async (cwd: string) => { return initJSProjectWithProfile(cwd, {}); }; @@ -172,7 +148,6 @@ export class Amplify { .sendLine('n') .wait('Do you want to add another path?') .sendNo() - .runAsync(); }; status = () => { @@ -224,11 +199,11 @@ function writeBanner(text: string) { process.stdout.write('\n'); } -describe('Release Smoke Tests', () => { - const createCommands = (amplify: Amplify, cliVersion: string, directory: string): Command[] => [ +describe('Smoke Tests', () => { + const createCommands = (amplify: Amplify, directory: string): Command[] => [ { - description: `Install @aws-amplify/cli@${cliVersion}`, - run: () => NPM.install(`@aws-amplify/cli@${cliVersion}`, true), + description: 'Amplify CLI version', + run: () => amplify.version(), }, { description: 'Create an Amplify project', @@ -287,7 +262,7 @@ describe('Release Smoke Tests', () => { run: () => amplify.delete(), }, ]; - test('An amplify project can be created without error', async () => { + it('An amplify project can be created without error', async () => { const args = getArgs(); const amplify = new Amplify(args.projectDirectory); @@ -298,7 +273,7 @@ describe('Release Smoke Tests', () => { } assertEmpty(args.projectDirectory); - const commands = createCommands(amplify, args.cliVersion, args.projectDirectory); + const commands = createCommands(amplify, args.projectDirectory); for (const command of commands) { writeBanner(command.description); await command.run();