From 4d553e5602a84729e517a3716338f2235567ea82 Mon Sep 17 00:00:00 2001 From: Danielle Adams <6271256+danielleadams@users.noreply.github.com> Date: Thu, 14 Oct 2021 16:36:55 -0400 Subject: [PATCH] feat(amplify-provider-awscloudformation): merge user config with transform generated resolvers (#8447) --- .circleci/config.yml | 1028 +++++++++-------- packages/amplify-e2e-core/src/utils/api.ts | 5 + .../src/__tests__/resolvers.test.ts | 47 + .../graphql-transformer/utils.test.ts | 63 + .../transform-graphql-schema.ts | 6 +- .../src/graphql-transformer/utils.ts | 14 + 6 files changed, 711 insertions(+), 452 deletions(-) create mode 100644 packages/amplify-e2e-tests/src/__tests__/resolvers.test.ts create mode 100644 packages/amplify-provider-awscloudformation/src/__tests__/graphql-transformer/utils.test.ts diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e043b9e570..1f5cbb4037d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2245,6 +2245,58 @@ jobs: AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/pull.test.ts CLI_REGION: ap-northeast-1 + resolvers-amplify_e2e_tests: + working_directory: ~/repo + parameters: + os: + type: executor + default: linux + executor: << parameters.os >> + steps: + - attach_workspace: + at: ./ + - restore_cache: + key: >- + amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ + arch }} + - restore_cache: + key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }} + - restore_cache: + key: amplify-pkg-binaries-{{ .Branch }}-{{ .Revision }} + - run: + name: Start verdaccio, install node CLI and amplify-app + command: | + source .circleci/local_publish_helpers.sh + startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml" + setNpmRegistryUrlToLocal + changeNpmGlobalPath + npm install -g @aws-amplify/cli + npm install -g amplify-app + unsetNpmRegistryUrl + - run: + name: Run E2e Tests + command: | + source .circleci/local_publish_helpers.sh + retry runE2eTest + no_output_timeout: 90m + - run: + name: Scan And Cleanup E2E Test Artifacts + command: | + if ! yarn ts-node .circleci/scan_artifacts.ts; then + echo "Cleaning the repository" + git clean -fdx + exit 1 + fi + when: always + - store_test_results: + path: packages/amplify-e2e-tests/ + - store_artifacts: + path: ~/repo/packages/amplify-e2e-tests/amplify-e2e-reports + environment: + AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin + AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify + TEST_SUITE: src/__tests__/resolvers.test.ts + CLI_REGION: ap-southeast-1 s3-sse-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2296,7 +2348,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/s3-sse.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-auth-12-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2348,7 +2400,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-12.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-auth-13-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2400,7 +2452,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-13.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-function-1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2452,7 +2504,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-function-1.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-function-2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2504,7 +2556,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-function-2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 schema-iterative-update-locking-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2556,7 +2608,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 storage-1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2608,7 +2660,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/storage-1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 storage-2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2660,7 +2712,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/storage-2.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 storage-3-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2712,7 +2764,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/storage-3.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 plugin-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2764,7 +2816,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/plugin.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 init-special-case-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2816,7 +2868,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/init-special-case.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 datastore-modelgen-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2868,7 +2920,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/datastore-modelgen.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 amplify-configure-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2920,7 +2972,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/amplify-configure.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 init-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -2972,7 +3024,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/init.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 tags-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3024,7 +3076,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/tags.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 notifications-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3076,7 +3128,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/notifications.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-versioned-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3128,7 +3180,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-versioned.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-data-access-patterns-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3180,7 +3232,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-data-access-patterns.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 interactions-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3284,7 +3336,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-predictions.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 amplify-app-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3336,7 +3388,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/amplify-app.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 hosting-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3388,7 +3440,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/hosting.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 analytics-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3440,7 +3492,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/analytics.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 feature-flags-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3492,7 +3544,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/feature-flags.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-iterative-update-2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3544,7 +3596,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-iterative-update-2.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 containers-api-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3596,7 +3648,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/containers-api.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 predictions-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3648,7 +3700,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/predictions.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 hostingPROD-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3700,7 +3752,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/hostingPROD.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 geo-add-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3752,7 +3804,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/geo-add.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 geo-update-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3804,7 +3856,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/geo-update.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 geo-remove-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3856,7 +3908,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/geo-remove.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-auth-10-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3908,7 +3960,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-10.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-key-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -3960,7 +4012,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-key.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 auth_1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4012,7 +4064,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/auth_1.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 auth_5-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4064,7 +4116,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/auth_5.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 function_3-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4116,7 +4168,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/function_3.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-iterative-update-1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4168,7 +4220,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-auth-3-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4220,7 +4272,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-3.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 delete-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4272,7 +4324,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/delete.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 function_2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4324,7 +4376,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/function_2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 auth_3-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4376,7 +4428,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/auth_3.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 migration-api-key-migration1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4428,7 +4480,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 auth_4-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4480,7 +4532,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/auth_4.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-auth-7-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4532,7 +4584,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-7.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-auth-8-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4584,7 +4636,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-8.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-searchable-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4636,7 +4688,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-searchable.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-auth-4-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4688,7 +4740,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-4.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 api_3-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4740,7 +4792,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/api_3.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 import_auth_1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4792,7 +4844,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/import_auth_1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 import_auth_2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4844,7 +4896,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/import_auth_2.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 import_s3_1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -4896,7 +4948,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/import_s3_1.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 USE_PARENT_ACCOUNT: 1 import_dynamodb_1-amplify_e2e_tests: working_directory: ~/repo @@ -4949,7 +5001,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/import_dynamodb_1.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 USE_PARENT_ACCOUNT: 1 schema-iterative-rollback-1-amplify_e2e_tests: working_directory: ~/repo @@ -5002,7 +5054,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-iterative-rollback-1.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-iterative-rollback-2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5054,7 +5106,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-iterative-rollback-2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 env-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5106,7 +5158,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/env.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 auth_2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5158,7 +5210,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/auth_2.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 USE_PARENT_ACCOUNT: 1 schema-auth-9-amplify_e2e_tests: working_directory: ~/repo @@ -5211,7 +5263,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-9.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-auth-11-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5263,7 +5315,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-11.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 migration-api-key-migration2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5315,7 +5367,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/migration/api.key.migration2.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 USE_PARENT_ACCOUNT: 1 function_1-amplify_e2e_tests: working_directory: ~/repo @@ -5368,7 +5420,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/function_1.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-auth-1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5420,7 +5472,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-1.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 function_4-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5472,7 +5524,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/function_4.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 schema-model-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5524,7 +5576,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-model.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 migration-api-connection-migration-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5576,7 +5628,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/migration/api.connection.migration.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-connection-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5628,7 +5680,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-connection.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-auth-6-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5680,7 +5732,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-6.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-iterative-update-3-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5732,7 +5784,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-iterative-update-3.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-auth-2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5784,7 +5836,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 api_1-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5836,7 +5888,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/api_1.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 USE_PARENT_ACCOUNT: 1 schema-auth-5-amplify_e2e_tests: working_directory: ~/repo @@ -5889,7 +5941,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-auth-5.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 api_2-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -5941,7 +5993,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/api_2.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 USE_PARENT_ACCOUNT: 1 api_5-amplify_e2e_tests: working_directory: ~/repo @@ -5994,7 +6046,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/api_5.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-iterative-update-4-amplify_e2e_tests: working_directory: ~/repo parameters: @@ -6046,7 +6098,7 @@ jobs: AMPLIFY_DIR: /home/circleci/repo/packages/amplify-cli/bin AMPLIFY_PATH: /home/circleci/repo/packages/amplify-cli/bin/amplify TEST_SUITE: src/__tests__/schema-iterative-update-4.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 api_4-amplify_e2e_tests_pkg: parameters: os: @@ -6957,7 +7009,7 @@ jobs: environment: TEST_SUITE: src/__tests__/pull.test.ts CLI_REGION: ap-northeast-1 - s3-sse-amplify_e2e_tests_pkg: + resolvers-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -6990,9 +7042,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/s3-sse.test.ts + TEST_SUITE: src/__tests__/resolvers.test.ts CLI_REGION: ap-southeast-1 - schema-auth-12-amplify_e2e_tests_pkg: + s3-sse-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7025,9 +7077,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/schema-auth-12.test.ts + TEST_SUITE: src/__tests__/s3-sse.test.ts CLI_REGION: ap-southeast-2 - schema-auth-13-amplify_e2e_tests_pkg: + schema-auth-12-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7060,9 +7112,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/schema-auth-13.test.ts + TEST_SUITE: src/__tests__/schema-auth-12.test.ts CLI_REGION: us-east-2 - schema-function-1-amplify_e2e_tests_pkg: + schema-auth-13-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7095,9 +7147,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/schema-function-1.test.ts + TEST_SUITE: src/__tests__/schema-auth-13.test.ts CLI_REGION: us-west-2 - schema-function-2-amplify_e2e_tests_pkg: + schema-function-1-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7130,9 +7182,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/schema-function-2.test.ts + TEST_SUITE: src/__tests__/schema-function-1.test.ts CLI_REGION: eu-west-2 - schema-iterative-update-locking-amplify_e2e_tests_pkg: + schema-function-2-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7165,9 +7217,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts + TEST_SUITE: src/__tests__/schema-function-2.test.ts CLI_REGION: eu-central-1 - storage-1-amplify_e2e_tests_pkg: + schema-iterative-update-locking-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7200,9 +7252,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/storage-1.test.ts + TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts CLI_REGION: ap-northeast-1 - storage-2-amplify_e2e_tests_pkg: + storage-1-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7235,9 +7287,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/storage-2.test.ts + TEST_SUITE: src/__tests__/storage-1.test.ts CLI_REGION: ap-southeast-1 - storage-3-amplify_e2e_tests_pkg: + storage-2-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7270,9 +7322,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/storage-3.test.ts + TEST_SUITE: src/__tests__/storage-2.test.ts CLI_REGION: ap-southeast-2 - plugin-amplify_e2e_tests_pkg: + storage-3-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7305,9 +7357,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/plugin.test.ts + TEST_SUITE: src/__tests__/storage-3.test.ts CLI_REGION: us-east-2 - init-special-case-amplify_e2e_tests_pkg: + plugin-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7340,9 +7392,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/init-special-case.test.ts + TEST_SUITE: src/__tests__/plugin.test.ts CLI_REGION: us-west-2 - datastore-modelgen-amplify_e2e_tests_pkg: + init-special-case-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7375,9 +7427,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/datastore-modelgen.test.ts + TEST_SUITE: src/__tests__/init-special-case.test.ts CLI_REGION: eu-west-2 - amplify-configure-amplify_e2e_tests_pkg: + datastore-modelgen-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7410,9 +7462,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/amplify-configure.test.ts + TEST_SUITE: src/__tests__/datastore-modelgen.test.ts CLI_REGION: eu-central-1 - init-amplify_e2e_tests_pkg: + amplify-configure-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7445,9 +7497,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/init.test.ts + TEST_SUITE: src/__tests__/amplify-configure.test.ts CLI_REGION: ap-northeast-1 - tags-amplify_e2e_tests_pkg: + init-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7480,9 +7532,9 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/tags.test.ts + TEST_SUITE: src/__tests__/init.test.ts CLI_REGION: ap-southeast-1 - notifications-amplify_e2e_tests_pkg: + tags-amplify_e2e_tests_pkg: parameters: os: type: executor @@ -7515,8 +7567,43 @@ jobs: - store_artifacts: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: - TEST_SUITE: src/__tests__/notifications.test.ts + TEST_SUITE: src/__tests__/tags.test.ts CLI_REGION: ap-southeast-2 + notifications-amplify_e2e_tests_pkg: + parameters: + os: + type: executor + default: os.linux + executor: << parameters.os >> + working_directory: ~/repo + steps: + - attach_workspace: + at: ./ + - restore_cache: + key: >- + amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ + arch }} + - restore_cache: + key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }} + - restore_cache: + key: amplify-build-artifact-{{ .Revision }}-{{ arch }} + - restore_cache: + key: amplify-pkg-binaries-{{ .Branch }}-{{ .Revision }} + - install_yarn: + os: << parameters.os >> + - install_packaged_cli: + os: << parameters.os >> + - run_e2e_tests: + os: << parameters.os >> + - scan_e2e_test_artifacts: + os: << parameters.os >> + - store_test_results: + path: packages/amplify-e2e-tests/ + - store_artifacts: + path: packages/amplify-e2e-tests/amplify-e2e-reports + environment: + TEST_SUITE: src/__tests__/notifications.test.ts + CLI_REGION: us-east-2 schema-versioned-amplify_e2e_tests_pkg: parameters: os: @@ -7551,7 +7638,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-versioned.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-data-access-patterns-amplify_e2e_tests_pkg: parameters: os: @@ -7586,7 +7673,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-data-access-patterns.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 interactions-amplify_e2e_tests_pkg: parameters: os: @@ -7656,7 +7743,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-predictions.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 amplify-app-amplify_e2e_tests_pkg: parameters: os: @@ -7691,7 +7778,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/amplify-app.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 hosting-amplify_e2e_tests_pkg: parameters: os: @@ -7726,7 +7813,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/hosting.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 analytics-amplify_e2e_tests_pkg: parameters: os: @@ -7761,7 +7848,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/analytics.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 feature-flags-amplify_e2e_tests_pkg: parameters: os: @@ -7796,7 +7883,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/feature-flags.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-iterative-update-2-amplify_e2e_tests_pkg: parameters: os: @@ -7831,7 +7918,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-iterative-update-2.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 containers-api-amplify_e2e_tests_pkg: parameters: os: @@ -7866,7 +7953,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/containers-api.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 predictions-amplify_e2e_tests_pkg: parameters: os: @@ -7901,7 +7988,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/predictions.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 hostingPROD-amplify_e2e_tests_pkg: parameters: os: @@ -7936,7 +8023,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/hostingPROD.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 geo-add-amplify_e2e_tests_pkg: parameters: os: @@ -7971,7 +8058,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/geo-add.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 geo-update-amplify_e2e_tests_pkg: parameters: os: @@ -8006,7 +8093,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/geo-update.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 geo-remove-amplify_e2e_tests_pkg: parameters: os: @@ -8041,7 +8128,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/geo-remove.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-auth-10-amplify_e2e_tests_pkg: parameters: os: @@ -8076,7 +8163,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-10.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-key-amplify_e2e_tests_pkg: parameters: os: @@ -8111,7 +8198,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-key.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 auth_1-amplify_e2e_tests_pkg: parameters: os: @@ -8146,7 +8233,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/auth_1.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 auth_5-amplify_e2e_tests_pkg: parameters: os: @@ -8181,7 +8268,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/auth_5.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 function_3-amplify_e2e_tests_pkg: parameters: os: @@ -8216,7 +8303,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/function_3.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-iterative-update-1-amplify_e2e_tests_pkg: parameters: os: @@ -8251,7 +8338,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-auth-3-amplify_e2e_tests_pkg: parameters: os: @@ -8286,7 +8373,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-3.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 delete-amplify_e2e_tests_pkg: parameters: os: @@ -8321,7 +8408,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/delete.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 function_2-amplify_e2e_tests_pkg: parameters: os: @@ -8356,7 +8443,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/function_2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 auth_3-amplify_e2e_tests_pkg: parameters: os: @@ -8391,7 +8478,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/auth_3.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 migration-api-key-migration1-amplify_e2e_tests_pkg: parameters: os: @@ -8426,7 +8513,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 auth_4-amplify_e2e_tests_pkg: parameters: os: @@ -8461,7 +8548,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/auth_4.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-auth-7-amplify_e2e_tests_pkg: parameters: os: @@ -8496,7 +8583,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-7.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-auth-8-amplify_e2e_tests_pkg: parameters: os: @@ -8531,7 +8618,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-8.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-searchable-amplify_e2e_tests_pkg: parameters: os: @@ -8566,7 +8653,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-searchable.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-auth-4-amplify_e2e_tests_pkg: parameters: os: @@ -8601,7 +8688,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-4.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 api_3-amplify_e2e_tests_pkg: parameters: os: @@ -8636,7 +8723,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/api_3.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 import_auth_1-amplify_e2e_tests_pkg: parameters: os: @@ -8671,7 +8758,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/import_auth_1.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 import_auth_2-amplify_e2e_tests_pkg: parameters: os: @@ -8706,7 +8793,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/import_auth_2.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 import_s3_1-amplify_e2e_tests_pkg: parameters: os: @@ -8741,7 +8828,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/import_s3_1.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 USE_PARENT_ACCOUNT: 1 import_dynamodb_1-amplify_e2e_tests_pkg: parameters: @@ -8777,7 +8864,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/import_dynamodb_1.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 USE_PARENT_ACCOUNT: 1 schema-iterative-rollback-1-amplify_e2e_tests_pkg: parameters: @@ -8813,7 +8900,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-iterative-rollback-1.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-iterative-rollback-2-amplify_e2e_tests_pkg: parameters: os: @@ -8848,7 +8935,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-iterative-rollback-2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 env-amplify_e2e_tests_pkg: parameters: os: @@ -8883,7 +8970,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/env.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 auth_2-amplify_e2e_tests_pkg: parameters: os: @@ -8918,7 +9005,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/auth_2.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 USE_PARENT_ACCOUNT: 1 schema-auth-9-amplify_e2e_tests_pkg: parameters: @@ -8954,7 +9041,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-9.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-auth-11-amplify_e2e_tests_pkg: parameters: os: @@ -8989,7 +9076,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-11.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 migration-api-key-migration2-amplify_e2e_tests_pkg: parameters: os: @@ -9024,7 +9111,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/migration/api.key.migration2.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 USE_PARENT_ACCOUNT: 1 function_1-amplify_e2e_tests_pkg: parameters: @@ -9060,7 +9147,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/function_1.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-auth-1-amplify_e2e_tests_pkg: parameters: os: @@ -9095,7 +9182,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-1.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 function_4-amplify_e2e_tests_pkg: parameters: os: @@ -9130,7 +9217,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/function_4.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 schema-model-amplify_e2e_tests_pkg: parameters: os: @@ -9165,7 +9252,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-model.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 migration-api-connection-migration-amplify_e2e_tests_pkg: parameters: os: @@ -9200,7 +9287,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/migration/api.connection.migration.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 schema-connection-amplify_e2e_tests_pkg: parameters: os: @@ -9235,7 +9322,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-connection.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-auth-6-amplify_e2e_tests_pkg: parameters: os: @@ -9270,7 +9357,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-6.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 schema-iterative-update-3-amplify_e2e_tests_pkg: parameters: os: @@ -9305,7 +9392,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-iterative-update-3.test.ts - CLI_REGION: us-west-2 + CLI_REGION: eu-west-2 schema-auth-2-amplify_e2e_tests_pkg: parameters: os: @@ -9340,7 +9427,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-2.test.ts - CLI_REGION: eu-west-2 + CLI_REGION: eu-central-1 api_1-amplify_e2e_tests_pkg: parameters: os: @@ -9375,7 +9462,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/api_1.test.ts - CLI_REGION: eu-central-1 + CLI_REGION: ap-northeast-1 USE_PARENT_ACCOUNT: 1 schema-auth-5-amplify_e2e_tests_pkg: parameters: @@ -9411,7 +9498,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-auth-5.test.ts - CLI_REGION: ap-northeast-1 + CLI_REGION: ap-southeast-1 api_2-amplify_e2e_tests_pkg: parameters: os: @@ -9446,7 +9533,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/api_2.test.ts - CLI_REGION: ap-southeast-1 + CLI_REGION: ap-southeast-2 USE_PARENT_ACCOUNT: 1 api_5-amplify_e2e_tests_pkg: parameters: @@ -9482,7 +9569,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/api_5.test.ts - CLI_REGION: ap-southeast-2 + CLI_REGION: us-east-2 schema-iterative-update-4-amplify_e2e_tests_pkg: parameters: os: @@ -9517,7 +9604,7 @@ jobs: path: packages/amplify-e2e-tests/amplify-e2e-reports environment: TEST_SUITE: src/__tests__/schema-iterative-update-4.test.ts - CLI_REGION: us-east-2 + CLI_REGION: us-west-2 AuthV2Transformer-e2e-graphql_e2e_tests: working_directory: ~/repo parameters: @@ -11386,9 +11473,25 @@ workflows: - custom_policies_function-amplify_e2e_tests - hooks-amplify_e2e_tests - layer-3-amplify_e2e_tests + - schema-auth-12-amplify_e2e_tests + - storage-3-amplify_e2e_tests + - notifications-amplify_e2e_tests + - analytics-amplify_e2e_tests + - geo-update-amplify_e2e_tests + - schema-iterative-update-1-amplify_e2e_tests + - schema-auth-7-amplify_e2e_tests + - import_s3_1-amplify_e2e_tests + - schema-auth-11-amplify_e2e_tests + - schema-connection-amplify_e2e_tests + - api_5-amplify_e2e_tests + - auth_6-amplify_e2e_tests + - frontend_config_drift-amplify_e2e_tests + - iam-permissions-boundary-amplify_e2e_tests + - layer-4-amplify_e2e_tests - schema-auth-13-amplify_e2e_tests - plugin-amplify_e2e_tests - schema-versioned-amplify_e2e_tests + - interactions-amplify_e2e_tests - feature-flags-amplify_e2e_tests - geo-remove-amplify_e2e_tests - schema-auth-3-amplify_e2e_tests @@ -11397,14 +11500,13 @@ workflows: - migration-api-key-migration2-amplify_e2e_tests - schema-auth-6-amplify_e2e_tests - schema-iterative-update-4-amplify_e2e_tests - - auth_6-amplify_e2e_tests - - frontend_config_drift-amplify_e2e_tests - - iam-permissions-boundary-amplify_e2e_tests - - layer-4-amplify_e2e_tests + - auth_7-amplify_e2e_tests + - function_5-amplify_e2e_tests + - import_auth_3-amplify_e2e_tests + - migration-api-connection-migration2-amplify_e2e_tests - schema-function-1-amplify_e2e_tests - init-special-case-amplify_e2e_tests - schema-data-access-patterns-amplify_e2e_tests - - interactions-amplify_e2e_tests - schema-iterative-update-2-amplify_e2e_tests - schema-auth-10-amplify_e2e_tests - delete-amplify_e2e_tests @@ -11412,10 +11514,10 @@ workflows: - schema-iterative-rollback-1-amplify_e2e_tests - function_1-amplify_e2e_tests - schema-iterative-update-3-amplify_e2e_tests - - auth_7-amplify_e2e_tests - - function_5-amplify_e2e_tests - - import_auth_3-amplify_e2e_tests - - migration-api-connection-migration2-amplify_e2e_tests + - auth_8-amplify_e2e_tests + - function_6-amplify_e2e_tests + - import_dynamodb_2-amplify_e2e_tests + - migration-node-function-amplify_e2e_tests - schema-function-2-amplify_e2e_tests - datastore-modelgen-amplify_e2e_tests - containers-api-amplify_e2e_tests @@ -11425,10 +11527,10 @@ workflows: - schema-iterative-rollback-2-amplify_e2e_tests - schema-auth-1-amplify_e2e_tests - schema-auth-2-amplify_e2e_tests - - auth_8-amplify_e2e_tests - - function_6-amplify_e2e_tests - - import_dynamodb_2-amplify_e2e_tests - - migration-node-function-amplify_e2e_tests + - configure-project-amplify_e2e_tests + - function_7-amplify_e2e_tests + - import_s3_2-amplify_e2e_tests + - pull-amplify_e2e_tests - schema-iterative-update-locking-amplify_e2e_tests - amplify-configure-amplify_e2e_tests - schema-predictions-amplify_e2e_tests @@ -11439,10 +11541,10 @@ workflows: - env-amplify_e2e_tests - function_4-amplify_e2e_tests - api_1-amplify_e2e_tests - - configure-project-amplify_e2e_tests - - function_7-amplify_e2e_tests - - import_s3_2-amplify_e2e_tests - - pull-amplify_e2e_tests + - container-hosting-amplify_e2e_tests + - function_8-amplify_e2e_tests + - layer-1-amplify_e2e_tests + - resolvers-amplify_e2e_tests - storage-1-amplify_e2e_tests - init-amplify_e2e_tests - amplify-app-amplify_e2e_tests @@ -11453,9 +11555,9 @@ workflows: - auth_2-amplify_e2e_tests - schema-model-amplify_e2e_tests - schema-auth-5-amplify_e2e_tests - - container-hosting-amplify_e2e_tests - - function_8-amplify_e2e_tests - - layer-1-amplify_e2e_tests + - custom_policies_container-amplify_e2e_tests + - function_9-amplify_e2e_tests + - layer-2-amplify_e2e_tests - s3-sse-amplify_e2e_tests - storage-2-amplify_e2e_tests - tags-amplify_e2e_tests @@ -11467,27 +11569,29 @@ workflows: - schema-auth-9-amplify_e2e_tests - migration-api-connection-migration-amplify_e2e_tests - api_2-amplify_e2e_tests - - custom_policies_container-amplify_e2e_tests - - function_9-amplify_e2e_tests - - layer-2-amplify_e2e_tests - - schema-auth-12-amplify_e2e_tests - - storage-3-amplify_e2e_tests - - notifications-amplify_e2e_tests - - analytics-amplify_e2e_tests - - geo-update-amplify_e2e_tests - - schema-iterative-update-1-amplify_e2e_tests - - schema-auth-7-amplify_e2e_tests - - import_s3_1-amplify_e2e_tests - - schema-auth-11-amplify_e2e_tests - - schema-connection-amplify_e2e_tests - - api_5-amplify_e2e_tests - api_4-amplify_e2e_tests_pkg - custom_policies_function-amplify_e2e_tests_pkg - hooks-amplify_e2e_tests_pkg - layer-3-amplify_e2e_tests_pkg + - schema-auth-12-amplify_e2e_tests_pkg + - storage-3-amplify_e2e_tests_pkg + - notifications-amplify_e2e_tests_pkg + - analytics-amplify_e2e_tests_pkg + - geo-update-amplify_e2e_tests_pkg + - schema-iterative-update-1-amplify_e2e_tests_pkg + - schema-auth-7-amplify_e2e_tests_pkg + - import_s3_1-amplify_e2e_tests_pkg + - schema-auth-11-amplify_e2e_tests_pkg + - schema-connection-amplify_e2e_tests_pkg + - api_5-amplify_e2e_tests_pkg + - auth_6-amplify_e2e_tests_pkg + - frontend_config_drift-amplify_e2e_tests_pkg + - iam-permissions-boundary-amplify_e2e_tests_pkg + - layer-4-amplify_e2e_tests_pkg - schema-auth-13-amplify_e2e_tests_pkg - plugin-amplify_e2e_tests_pkg - schema-versioned-amplify_e2e_tests_pkg + - interactions-amplify_e2e_tests_pkg - feature-flags-amplify_e2e_tests_pkg - geo-remove-amplify_e2e_tests_pkg - schema-auth-3-amplify_e2e_tests_pkg @@ -11496,14 +11600,13 @@ workflows: - migration-api-key-migration2-amplify_e2e_tests_pkg - schema-auth-6-amplify_e2e_tests_pkg - schema-iterative-update-4-amplify_e2e_tests_pkg - - auth_6-amplify_e2e_tests_pkg - - frontend_config_drift-amplify_e2e_tests_pkg - - iam-permissions-boundary-amplify_e2e_tests_pkg - - layer-4-amplify_e2e_tests_pkg + - auth_7-amplify_e2e_tests_pkg + - function_5-amplify_e2e_tests_pkg + - import_auth_3-amplify_e2e_tests_pkg + - migration-api-connection-migration2-amplify_e2e_tests_pkg - schema-function-1-amplify_e2e_tests_pkg - init-special-case-amplify_e2e_tests_pkg - schema-data-access-patterns-amplify_e2e_tests_pkg - - interactions-amplify_e2e_tests_pkg - schema-iterative-update-2-amplify_e2e_tests_pkg - schema-auth-10-amplify_e2e_tests_pkg - delete-amplify_e2e_tests_pkg @@ -11511,10 +11614,10 @@ workflows: - schema-iterative-rollback-1-amplify_e2e_tests_pkg - function_1-amplify_e2e_tests_pkg - schema-iterative-update-3-amplify_e2e_tests_pkg - - auth_7-amplify_e2e_tests_pkg - - function_5-amplify_e2e_tests_pkg - - import_auth_3-amplify_e2e_tests_pkg - - migration-api-connection-migration2-amplify_e2e_tests_pkg + - auth_8-amplify_e2e_tests_pkg + - function_6-amplify_e2e_tests_pkg + - import_dynamodb_2-amplify_e2e_tests_pkg + - migration-node-function-amplify_e2e_tests_pkg - schema-function-2-amplify_e2e_tests_pkg - datastore-modelgen-amplify_e2e_tests_pkg - containers-api-amplify_e2e_tests_pkg @@ -11524,10 +11627,10 @@ workflows: - schema-iterative-rollback-2-amplify_e2e_tests_pkg - schema-auth-1-amplify_e2e_tests_pkg - schema-auth-2-amplify_e2e_tests_pkg - - auth_8-amplify_e2e_tests_pkg - - function_6-amplify_e2e_tests_pkg - - import_dynamodb_2-amplify_e2e_tests_pkg - - migration-node-function-amplify_e2e_tests_pkg + - configure-project-amplify_e2e_tests_pkg + - function_7-amplify_e2e_tests_pkg + - import_s3_2-amplify_e2e_tests_pkg + - pull-amplify_e2e_tests_pkg - schema-iterative-update-locking-amplify_e2e_tests_pkg - amplify-configure-amplify_e2e_tests_pkg - schema-predictions-amplify_e2e_tests_pkg @@ -11538,10 +11641,10 @@ workflows: - env-amplify_e2e_tests_pkg - function_4-amplify_e2e_tests_pkg - api_1-amplify_e2e_tests_pkg - - configure-project-amplify_e2e_tests_pkg - - function_7-amplify_e2e_tests_pkg - - import_s3_2-amplify_e2e_tests_pkg - - pull-amplify_e2e_tests_pkg + - container-hosting-amplify_e2e_tests_pkg + - function_8-amplify_e2e_tests_pkg + - layer-1-amplify_e2e_tests_pkg + - resolvers-amplify_e2e_tests_pkg - storage-1-amplify_e2e_tests_pkg - init-amplify_e2e_tests_pkg - amplify-app-amplify_e2e_tests_pkg @@ -11552,9 +11655,9 @@ workflows: - auth_2-amplify_e2e_tests_pkg - schema-model-amplify_e2e_tests_pkg - schema-auth-5-amplify_e2e_tests_pkg - - container-hosting-amplify_e2e_tests_pkg - - function_8-amplify_e2e_tests_pkg - - layer-1-amplify_e2e_tests_pkg + - custom_policies_container-amplify_e2e_tests_pkg + - function_9-amplify_e2e_tests_pkg + - layer-2-amplify_e2e_tests_pkg - s3-sse-amplify_e2e_tests_pkg - storage-2-amplify_e2e_tests_pkg - tags-amplify_e2e_tests_pkg @@ -11566,20 +11669,6 @@ workflows: - schema-auth-9-amplify_e2e_tests_pkg - migration-api-connection-migration-amplify_e2e_tests_pkg - api_2-amplify_e2e_tests_pkg - - custom_policies_container-amplify_e2e_tests_pkg - - function_9-amplify_e2e_tests_pkg - - layer-2-amplify_e2e_tests_pkg - - schema-auth-12-amplify_e2e_tests_pkg - - storage-3-amplify_e2e_tests_pkg - - notifications-amplify_e2e_tests_pkg - - analytics-amplify_e2e_tests_pkg - - geo-update-amplify_e2e_tests_pkg - - schema-iterative-update-1-amplify_e2e_tests_pkg - - schema-auth-7-amplify_e2e_tests_pkg - - import_s3_1-amplify_e2e_tests_pkg - - schema-auth-11-amplify_e2e_tests_pkg - - schema-connection-amplify_e2e_tests_pkg - - api_5-amplify_e2e_tests_pkg - >- migration_tests-auth-deployment-migration-auth-deployment-secrets-amplify_migration_tests_v4 - update_tests-function_migration_update-amplify_migration_tests_v4 @@ -11628,9 +11717,25 @@ workflows: - custom_policies_function-amplify_e2e_tests - hooks-amplify_e2e_tests - layer-3-amplify_e2e_tests + - schema-auth-12-amplify_e2e_tests + - storage-3-amplify_e2e_tests + - notifications-amplify_e2e_tests + - analytics-amplify_e2e_tests + - geo-update-amplify_e2e_tests + - schema-iterative-update-1-amplify_e2e_tests + - schema-auth-7-amplify_e2e_tests + - import_s3_1-amplify_e2e_tests + - schema-auth-11-amplify_e2e_tests + - schema-connection-amplify_e2e_tests + - api_5-amplify_e2e_tests + - auth_6-amplify_e2e_tests + - frontend_config_drift-amplify_e2e_tests + - iam-permissions-boundary-amplify_e2e_tests + - layer-4-amplify_e2e_tests - schema-auth-13-amplify_e2e_tests - plugin-amplify_e2e_tests - schema-versioned-amplify_e2e_tests + - interactions-amplify_e2e_tests - feature-flags-amplify_e2e_tests - geo-remove-amplify_e2e_tests - schema-auth-3-amplify_e2e_tests @@ -11639,14 +11744,13 @@ workflows: - migration-api-key-migration2-amplify_e2e_tests - schema-auth-6-amplify_e2e_tests - schema-iterative-update-4-amplify_e2e_tests - - auth_6-amplify_e2e_tests - - frontend_config_drift-amplify_e2e_tests - - iam-permissions-boundary-amplify_e2e_tests - - layer-4-amplify_e2e_tests + - auth_7-amplify_e2e_tests + - function_5-amplify_e2e_tests + - import_auth_3-amplify_e2e_tests + - migration-api-connection-migration2-amplify_e2e_tests - schema-function-1-amplify_e2e_tests - init-special-case-amplify_e2e_tests - schema-data-access-patterns-amplify_e2e_tests - - interactions-amplify_e2e_tests - schema-iterative-update-2-amplify_e2e_tests - schema-auth-10-amplify_e2e_tests - delete-amplify_e2e_tests @@ -11654,10 +11758,10 @@ workflows: - schema-iterative-rollback-1-amplify_e2e_tests - function_1-amplify_e2e_tests - schema-iterative-update-3-amplify_e2e_tests - - auth_7-amplify_e2e_tests - - function_5-amplify_e2e_tests - - import_auth_3-amplify_e2e_tests - - migration-api-connection-migration2-amplify_e2e_tests + - auth_8-amplify_e2e_tests + - function_6-amplify_e2e_tests + - import_dynamodb_2-amplify_e2e_tests + - migration-node-function-amplify_e2e_tests - schema-function-2-amplify_e2e_tests - datastore-modelgen-amplify_e2e_tests - containers-api-amplify_e2e_tests @@ -11667,10 +11771,10 @@ workflows: - schema-iterative-rollback-2-amplify_e2e_tests - schema-auth-1-amplify_e2e_tests - schema-auth-2-amplify_e2e_tests - - auth_8-amplify_e2e_tests - - function_6-amplify_e2e_tests - - import_dynamodb_2-amplify_e2e_tests - - migration-node-function-amplify_e2e_tests + - configure-project-amplify_e2e_tests + - function_7-amplify_e2e_tests + - import_s3_2-amplify_e2e_tests + - pull-amplify_e2e_tests - schema-iterative-update-locking-amplify_e2e_tests - amplify-configure-amplify_e2e_tests - schema-predictions-amplify_e2e_tests @@ -11681,10 +11785,10 @@ workflows: - env-amplify_e2e_tests - function_4-amplify_e2e_tests - api_1-amplify_e2e_tests - - configure-project-amplify_e2e_tests - - function_7-amplify_e2e_tests - - import_s3_2-amplify_e2e_tests - - pull-amplify_e2e_tests + - container-hosting-amplify_e2e_tests + - function_8-amplify_e2e_tests + - layer-1-amplify_e2e_tests + - resolvers-amplify_e2e_tests - storage-1-amplify_e2e_tests - init-amplify_e2e_tests - amplify-app-amplify_e2e_tests @@ -11695,9 +11799,9 @@ workflows: - auth_2-amplify_e2e_tests - schema-model-amplify_e2e_tests - schema-auth-5-amplify_e2e_tests - - container-hosting-amplify_e2e_tests - - function_8-amplify_e2e_tests - - layer-1-amplify_e2e_tests + - custom_policies_container-amplify_e2e_tests + - function_9-amplify_e2e_tests + - layer-2-amplify_e2e_tests - s3-sse-amplify_e2e_tests - storage-2-amplify_e2e_tests - tags-amplify_e2e_tests @@ -11709,27 +11813,29 @@ workflows: - schema-auth-9-amplify_e2e_tests - migration-api-connection-migration-amplify_e2e_tests - api_2-amplify_e2e_tests - - custom_policies_container-amplify_e2e_tests - - function_9-amplify_e2e_tests - - layer-2-amplify_e2e_tests - - schema-auth-12-amplify_e2e_tests - - storage-3-amplify_e2e_tests - - notifications-amplify_e2e_tests - - analytics-amplify_e2e_tests - - geo-update-amplify_e2e_tests - - schema-iterative-update-1-amplify_e2e_tests - - schema-auth-7-amplify_e2e_tests - - import_s3_1-amplify_e2e_tests - - schema-auth-11-amplify_e2e_tests - - schema-connection-amplify_e2e_tests - - api_5-amplify_e2e_tests - api_4-amplify_e2e_tests_pkg - custom_policies_function-amplify_e2e_tests_pkg - hooks-amplify_e2e_tests_pkg - layer-3-amplify_e2e_tests_pkg + - schema-auth-12-amplify_e2e_tests_pkg + - storage-3-amplify_e2e_tests_pkg + - notifications-amplify_e2e_tests_pkg + - analytics-amplify_e2e_tests_pkg + - geo-update-amplify_e2e_tests_pkg + - schema-iterative-update-1-amplify_e2e_tests_pkg + - schema-auth-7-amplify_e2e_tests_pkg + - import_s3_1-amplify_e2e_tests_pkg + - schema-auth-11-amplify_e2e_tests_pkg + - schema-connection-amplify_e2e_tests_pkg + - api_5-amplify_e2e_tests_pkg + - auth_6-amplify_e2e_tests_pkg + - frontend_config_drift-amplify_e2e_tests_pkg + - iam-permissions-boundary-amplify_e2e_tests_pkg + - layer-4-amplify_e2e_tests_pkg - schema-auth-13-amplify_e2e_tests_pkg - plugin-amplify_e2e_tests_pkg - schema-versioned-amplify_e2e_tests_pkg + - interactions-amplify_e2e_tests_pkg - feature-flags-amplify_e2e_tests_pkg - geo-remove-amplify_e2e_tests_pkg - schema-auth-3-amplify_e2e_tests_pkg @@ -11738,14 +11844,13 @@ workflows: - migration-api-key-migration2-amplify_e2e_tests_pkg - schema-auth-6-amplify_e2e_tests_pkg - schema-iterative-update-4-amplify_e2e_tests_pkg - - auth_6-amplify_e2e_tests_pkg - - frontend_config_drift-amplify_e2e_tests_pkg - - iam-permissions-boundary-amplify_e2e_tests_pkg - - layer-4-amplify_e2e_tests_pkg + - auth_7-amplify_e2e_tests_pkg + - function_5-amplify_e2e_tests_pkg + - import_auth_3-amplify_e2e_tests_pkg + - migration-api-connection-migration2-amplify_e2e_tests_pkg - schema-function-1-amplify_e2e_tests_pkg - init-special-case-amplify_e2e_tests_pkg - schema-data-access-patterns-amplify_e2e_tests_pkg - - interactions-amplify_e2e_tests_pkg - schema-iterative-update-2-amplify_e2e_tests_pkg - schema-auth-10-amplify_e2e_tests_pkg - delete-amplify_e2e_tests_pkg @@ -11753,10 +11858,10 @@ workflows: - schema-iterative-rollback-1-amplify_e2e_tests_pkg - function_1-amplify_e2e_tests_pkg - schema-iterative-update-3-amplify_e2e_tests_pkg - - auth_7-amplify_e2e_tests_pkg - - function_5-amplify_e2e_tests_pkg - - import_auth_3-amplify_e2e_tests_pkg - - migration-api-connection-migration2-amplify_e2e_tests_pkg + - auth_8-amplify_e2e_tests_pkg + - function_6-amplify_e2e_tests_pkg + - import_dynamodb_2-amplify_e2e_tests_pkg + - migration-node-function-amplify_e2e_tests_pkg - schema-function-2-amplify_e2e_tests_pkg - datastore-modelgen-amplify_e2e_tests_pkg - containers-api-amplify_e2e_tests_pkg @@ -11766,10 +11871,10 @@ workflows: - schema-iterative-rollback-2-amplify_e2e_tests_pkg - schema-auth-1-amplify_e2e_tests_pkg - schema-auth-2-amplify_e2e_tests_pkg - - auth_8-amplify_e2e_tests_pkg - - function_6-amplify_e2e_tests_pkg - - import_dynamodb_2-amplify_e2e_tests_pkg - - migration-node-function-amplify_e2e_tests_pkg + - configure-project-amplify_e2e_tests_pkg + - function_7-amplify_e2e_tests_pkg + - import_s3_2-amplify_e2e_tests_pkg + - pull-amplify_e2e_tests_pkg - schema-iterative-update-locking-amplify_e2e_tests_pkg - amplify-configure-amplify_e2e_tests_pkg - schema-predictions-amplify_e2e_tests_pkg @@ -11780,10 +11885,10 @@ workflows: - env-amplify_e2e_tests_pkg - function_4-amplify_e2e_tests_pkg - api_1-amplify_e2e_tests_pkg - - configure-project-amplify_e2e_tests_pkg - - function_7-amplify_e2e_tests_pkg - - import_s3_2-amplify_e2e_tests_pkg - - pull-amplify_e2e_tests_pkg + - container-hosting-amplify_e2e_tests_pkg + - function_8-amplify_e2e_tests_pkg + - layer-1-amplify_e2e_tests_pkg + - resolvers-amplify_e2e_tests_pkg - storage-1-amplify_e2e_tests_pkg - init-amplify_e2e_tests_pkg - amplify-app-amplify_e2e_tests_pkg @@ -11794,9 +11899,9 @@ workflows: - auth_2-amplify_e2e_tests_pkg - schema-model-amplify_e2e_tests_pkg - schema-auth-5-amplify_e2e_tests_pkg - - container-hosting-amplify_e2e_tests_pkg - - function_8-amplify_e2e_tests_pkg - - layer-1-amplify_e2e_tests_pkg + - custom_policies_container-amplify_e2e_tests_pkg + - function_9-amplify_e2e_tests_pkg + - layer-2-amplify_e2e_tests_pkg - s3-sse-amplify_e2e_tests_pkg - storage-2-amplify_e2e_tests_pkg - tags-amplify_e2e_tests_pkg @@ -11808,20 +11913,6 @@ workflows: - schema-auth-9-amplify_e2e_tests_pkg - migration-api-connection-migration-amplify_e2e_tests_pkg - api_2-amplify_e2e_tests_pkg - - custom_policies_container-amplify_e2e_tests_pkg - - function_9-amplify_e2e_tests_pkg - - layer-2-amplify_e2e_tests_pkg - - schema-auth-12-amplify_e2e_tests_pkg - - storage-3-amplify_e2e_tests_pkg - - notifications-amplify_e2e_tests_pkg - - analytics-amplify_e2e_tests_pkg - - geo-update-amplify_e2e_tests_pkg - - schema-iterative-update-1-amplify_e2e_tests_pkg - - schema-auth-7-amplify_e2e_tests_pkg - - import_s3_1-amplify_e2e_tests_pkg - - schema-auth-11-amplify_e2e_tests_pkg - - schema-connection-amplify_e2e_tests_pkg - - api_5-amplify_e2e_tests_pkg - AuthV2Transformer-e2e-graphql_e2e_tests - IndexTransformer-e2e-graphql_e2e_tests - ModelTransformer-e2e-graphql_e2e_tests @@ -11971,7 +12062,7 @@ workflows: parameters: os: - linux - - schema-auth-13-amplify_e2e_tests: + - schema-auth-12-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -11989,7 +12080,7 @@ workflows: parameters: os: - linux - - plugin-amplify_e2e_tests: + - storage-3-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12007,7 +12098,7 @@ workflows: parameters: os: - linux - - schema-versioned-amplify_e2e_tests: + - notifications-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12025,7 +12116,7 @@ workflows: parameters: os: - linux - - feature-flags-amplify_e2e_tests: + - analytics-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12043,7 +12134,7 @@ workflows: parameters: os: - linux - - geo-remove-amplify_e2e_tests: + - geo-update-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12061,7 +12152,7 @@ workflows: parameters: os: - linux - - schema-auth-3-amplify_e2e_tests: + - schema-iterative-update-1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12079,7 +12170,7 @@ workflows: parameters: os: - linux - - schema-auth-8-amplify_e2e_tests: + - schema-auth-7-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12097,7 +12188,7 @@ workflows: parameters: os: - linux - - import_dynamodb_1-amplify_e2e_tests: + - import_s3_1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12115,7 +12206,7 @@ workflows: parameters: os: - linux - - migration-api-key-migration2-amplify_e2e_tests: + - schema-auth-11-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12133,7 +12224,7 @@ workflows: parameters: os: - linux - - schema-auth-6-amplify_e2e_tests: + - schema-connection-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12151,7 +12242,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-4-amplify_e2e_tests: + - api_5-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12241,7 +12332,7 @@ workflows: parameters: os: - linux - - schema-function-1-amplify_e2e_tests: + - schema-auth-13-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12259,7 +12350,7 @@ workflows: parameters: os: - linux - - init-special-case-amplify_e2e_tests: + - plugin-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12277,7 +12368,7 @@ workflows: parameters: os: - linux - - schema-data-access-patterns-amplify_e2e_tests: + - schema-versioned-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12313,7 +12404,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-2-amplify_e2e_tests: + - feature-flags-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12331,7 +12422,7 @@ workflows: parameters: os: - linux - - schema-auth-10-amplify_e2e_tests: + - geo-remove-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12349,7 +12440,7 @@ workflows: parameters: os: - linux - - delete-amplify_e2e_tests: + - schema-auth-3-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12367,7 +12458,7 @@ workflows: parameters: os: - linux - - schema-searchable-amplify_e2e_tests: + - schema-auth-8-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12385,7 +12476,7 @@ workflows: parameters: os: - linux - - schema-iterative-rollback-1-amplify_e2e_tests: + - import_dynamodb_1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12403,7 +12494,7 @@ workflows: parameters: os: - linux - - function_1-amplify_e2e_tests: + - migration-api-key-migration2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12421,7 +12512,25 @@ workflows: parameters: os: - linux - - schema-iterative-update-3-amplify_e2e_tests: + - schema-auth-6-amplify_e2e_tests: + context: + - amplify-ecr-image-pull + - cleanup-resources + - e2e-auth-credentials + - e2e-test-context + filters: + branches: + only: + - master + - /tagged-release\/.*/ + - /run-e2e\/.*/ + requires: + - publish_to_local_registry + matrix: + parameters: + os: + - linux + - schema-iterative-update-4-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12511,7 +12620,7 @@ workflows: parameters: os: - linux - - schema-function-2-amplify_e2e_tests: + - schema-function-1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12529,7 +12638,7 @@ workflows: parameters: os: - linux - - datastore-modelgen-amplify_e2e_tests: + - init-special-case-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12547,7 +12656,7 @@ workflows: parameters: os: - linux - - containers-api-amplify_e2e_tests: + - schema-data-access-patterns-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12565,7 +12674,7 @@ workflows: parameters: os: - linux - - schema-key-amplify_e2e_tests: + - schema-iterative-update-2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12583,7 +12692,7 @@ workflows: parameters: os: - linux - - function_2-amplify_e2e_tests: + - schema-auth-10-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12601,7 +12710,7 @@ workflows: parameters: os: - linux - - schema-auth-4-amplify_e2e_tests: + - delete-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12619,7 +12728,7 @@ workflows: parameters: os: - linux - - schema-iterative-rollback-2-amplify_e2e_tests: + - schema-searchable-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12637,7 +12746,7 @@ workflows: parameters: os: - linux - - schema-auth-1-amplify_e2e_tests: + - schema-iterative-rollback-1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12655,7 +12764,7 @@ workflows: parameters: os: - linux - - schema-auth-2-amplify_e2e_tests: + - function_1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12673,7 +12782,7 @@ workflows: parameters: os: - linux - - auth_8-amplify_e2e_tests: + - schema-iterative-update-3-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12691,7 +12800,7 @@ workflows: parameters: os: - linux - - function_6-amplify_e2e_tests: + - auth_8-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12709,7 +12818,7 @@ workflows: parameters: os: - linux - - import_dynamodb_2-amplify_e2e_tests: + - function_6-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12727,7 +12836,7 @@ workflows: parameters: os: - linux - - migration-node-function-amplify_e2e_tests: + - import_dynamodb_2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12745,7 +12854,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-locking-amplify_e2e_tests: + - migration-node-function-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12763,7 +12872,7 @@ workflows: parameters: os: - linux - - amplify-configure-amplify_e2e_tests: + - schema-function-2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12781,7 +12890,7 @@ workflows: parameters: os: - linux - - schema-predictions-amplify_e2e_tests: + - datastore-modelgen-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12799,7 +12908,7 @@ workflows: parameters: os: - linux - - predictions-amplify_e2e_tests: + - containers-api-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12817,7 +12926,7 @@ workflows: parameters: os: - linux - - auth_1-amplify_e2e_tests: + - schema-key-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12835,7 +12944,7 @@ workflows: parameters: os: - linux - - auth_3-amplify_e2e_tests: + - function_2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12853,7 +12962,7 @@ workflows: parameters: os: - linux - - api_3-amplify_e2e_tests: + - schema-auth-4-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12871,7 +12980,7 @@ workflows: parameters: os: - linux - - env-amplify_e2e_tests: + - schema-iterative-rollback-2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12889,7 +12998,7 @@ workflows: parameters: os: - linux - - function_4-amplify_e2e_tests: + - schema-auth-1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12907,7 +13016,7 @@ workflows: parameters: os: - linux - - api_1-amplify_e2e_tests: + - schema-auth-2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -12997,7 +13106,7 @@ workflows: parameters: os: - linux - - storage-1-amplify_e2e_tests: + - schema-iterative-update-locking-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13015,7 +13124,7 @@ workflows: parameters: os: - linux - - init-amplify_e2e_tests: + - amplify-configure-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13033,7 +13142,7 @@ workflows: parameters: os: - linux - - amplify-app-amplify_e2e_tests: + - schema-predictions-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13051,7 +13160,7 @@ workflows: parameters: os: - linux - - hostingPROD-amplify_e2e_tests: + - predictions-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13069,7 +13178,7 @@ workflows: parameters: os: - linux - - auth_5-amplify_e2e_tests: + - auth_1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13087,7 +13196,7 @@ workflows: parameters: os: - linux - - migration-api-key-migration1-amplify_e2e_tests: + - auth_3-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13105,7 +13214,7 @@ workflows: parameters: os: - linux - - import_auth_1-amplify_e2e_tests: + - api_3-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13123,7 +13232,7 @@ workflows: parameters: os: - linux - - auth_2-amplify_e2e_tests: + - env-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13141,7 +13250,7 @@ workflows: parameters: os: - linux - - schema-model-amplify_e2e_tests: + - function_4-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13159,7 +13268,7 @@ workflows: parameters: os: - linux - - schema-auth-5-amplify_e2e_tests: + - api_1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13231,7 +13340,7 @@ workflows: parameters: os: - linux - - s3-sse-amplify_e2e_tests: + - resolvers-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13249,7 +13358,7 @@ workflows: parameters: os: - linux - - storage-2-amplify_e2e_tests: + - storage-1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13267,7 +13376,7 @@ workflows: parameters: os: - linux - - tags-amplify_e2e_tests: + - init-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13285,7 +13394,7 @@ workflows: parameters: os: - linux - - hosting-amplify_e2e_tests: + - amplify-app-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13303,7 +13412,7 @@ workflows: parameters: os: - linux - - geo-add-amplify_e2e_tests: + - hostingPROD-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13321,7 +13430,7 @@ workflows: parameters: os: - linux - - function_3-amplify_e2e_tests: + - auth_5-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13339,7 +13448,7 @@ workflows: parameters: os: - linux - - auth_4-amplify_e2e_tests: + - migration-api-key-migration1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13357,7 +13466,7 @@ workflows: parameters: os: - linux - - import_auth_2-amplify_e2e_tests: + - import_auth_1-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13375,7 +13484,7 @@ workflows: parameters: os: - linux - - schema-auth-9-amplify_e2e_tests: + - auth_2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13393,7 +13502,7 @@ workflows: parameters: os: - linux - - migration-api-connection-migration-amplify_e2e_tests: + - schema-model-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13411,7 +13520,7 @@ workflows: parameters: os: - linux - - api_2-amplify_e2e_tests: + - schema-auth-5-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13483,7 +13592,7 @@ workflows: parameters: os: - linux - - schema-auth-12-amplify_e2e_tests: + - s3-sse-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13501,7 +13610,7 @@ workflows: parameters: os: - linux - - storage-3-amplify_e2e_tests: + - storage-2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13519,7 +13628,7 @@ workflows: parameters: os: - linux - - notifications-amplify_e2e_tests: + - tags-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13537,7 +13646,7 @@ workflows: parameters: os: - linux - - analytics-amplify_e2e_tests: + - hosting-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13555,7 +13664,7 @@ workflows: parameters: os: - linux - - geo-update-amplify_e2e_tests: + - geo-add-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13573,7 +13682,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-1-amplify_e2e_tests: + - function_3-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13591,7 +13700,7 @@ workflows: parameters: os: - linux - - schema-auth-7-amplify_e2e_tests: + - auth_4-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13609,7 +13718,7 @@ workflows: parameters: os: - linux - - import_s3_1-amplify_e2e_tests: + - import_auth_2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13627,7 +13736,7 @@ workflows: parameters: os: - linux - - schema-auth-11-amplify_e2e_tests: + - schema-auth-9-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13645,7 +13754,7 @@ workflows: parameters: os: - linux - - schema-connection-amplify_e2e_tests: + - migration-api-connection-migration-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13663,7 +13772,7 @@ workflows: parameters: os: - linux - - api_5-amplify_e2e_tests: + - api_2-amplify_e2e_tests: context: - amplify-ecr-image-pull - cleanup-resources @@ -13753,7 +13862,7 @@ workflows: parameters: os: - linux - - schema-auth-13-amplify_e2e_tests_pkg: + - schema-auth-12-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13771,7 +13880,7 @@ workflows: parameters: os: - linux - - plugin-amplify_e2e_tests_pkg: + - storage-3-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13789,8 +13898,7 @@ workflows: parameters: os: - linux - - windows - - schema-versioned-amplify_e2e_tests_pkg: + - notifications-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13808,7 +13916,7 @@ workflows: parameters: os: - linux - - feature-flags-amplify_e2e_tests_pkg: + - analytics-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13826,7 +13934,7 @@ workflows: parameters: os: - linux - - geo-remove-amplify_e2e_tests_pkg: + - geo-update-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13844,7 +13952,7 @@ workflows: parameters: os: - linux - - schema-auth-3-amplify_e2e_tests_pkg: + - schema-iterative-update-1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13862,7 +13970,7 @@ workflows: parameters: os: - linux - - schema-auth-8-amplify_e2e_tests_pkg: + - schema-auth-7-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13880,7 +13988,7 @@ workflows: parameters: os: - linux - - import_dynamodb_1-amplify_e2e_tests_pkg: + - import_s3_1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13898,7 +14006,7 @@ workflows: parameters: os: - linux - - migration-api-key-migration2-amplify_e2e_tests_pkg: + - schema-auth-11-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13916,7 +14024,7 @@ workflows: parameters: os: - linux - - schema-auth-6-amplify_e2e_tests_pkg: + - schema-connection-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -13934,7 +14042,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-4-amplify_e2e_tests_pkg: + - api_5-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14024,7 +14132,7 @@ workflows: parameters: os: - linux - - schema-function-1-amplify_e2e_tests_pkg: + - schema-auth-13-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14042,7 +14150,7 @@ workflows: parameters: os: - linux - - init-special-case-amplify_e2e_tests_pkg: + - plugin-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14061,7 +14169,7 @@ workflows: os: - linux - windows - - schema-data-access-patterns-amplify_e2e_tests_pkg: + - schema-versioned-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14097,7 +14205,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-2-amplify_e2e_tests_pkg: + - feature-flags-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14115,7 +14223,7 @@ workflows: parameters: os: - linux - - schema-auth-10-amplify_e2e_tests_pkg: + - geo-remove-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14133,7 +14241,7 @@ workflows: parameters: os: - linux - - delete-amplify_e2e_tests_pkg: + - schema-auth-3-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14151,7 +14259,7 @@ workflows: parameters: os: - linux - - schema-searchable-amplify_e2e_tests_pkg: + - schema-auth-8-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14169,7 +14277,7 @@ workflows: parameters: os: - linux - - schema-iterative-rollback-1-amplify_e2e_tests_pkg: + - import_dynamodb_1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14187,7 +14295,7 @@ workflows: parameters: os: - linux - - function_1-amplify_e2e_tests_pkg: + - migration-api-key-migration2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14205,7 +14313,25 @@ workflows: parameters: os: - linux - - schema-iterative-update-3-amplify_e2e_tests_pkg: + - schema-auth-6-amplify_e2e_tests_pkg: + context: + - amplify-ecr-image-pull + - cleanup-resources + - e2e-auth-credentials + - e2e-test-context + filters: + branches: + only: + - master + - /tagged-release\/.*/ + - /run-e2e\/.*/ + requires: + - build_pkg_binaries + matrix: + parameters: + os: + - linux + - schema-iterative-update-4-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14295,7 +14421,7 @@ workflows: parameters: os: - linux - - schema-function-2-amplify_e2e_tests_pkg: + - schema-function-1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14313,7 +14439,7 @@ workflows: parameters: os: - linux - - datastore-modelgen-amplify_e2e_tests_pkg: + - init-special-case-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14331,7 +14457,8 @@ workflows: parameters: os: - linux - - containers-api-amplify_e2e_tests_pkg: + - windows + - schema-data-access-patterns-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14349,7 +14476,7 @@ workflows: parameters: os: - linux - - schema-key-amplify_e2e_tests_pkg: + - schema-iterative-update-2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14367,7 +14494,7 @@ workflows: parameters: os: - linux - - function_2-amplify_e2e_tests_pkg: + - schema-auth-10-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14385,7 +14512,7 @@ workflows: parameters: os: - linux - - schema-auth-4-amplify_e2e_tests_pkg: + - delete-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14403,7 +14530,7 @@ workflows: parameters: os: - linux - - schema-iterative-rollback-2-amplify_e2e_tests_pkg: + - schema-searchable-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14421,7 +14548,7 @@ workflows: parameters: os: - linux - - schema-auth-1-amplify_e2e_tests_pkg: + - schema-iterative-rollback-1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14439,7 +14566,7 @@ workflows: parameters: os: - linux - - schema-auth-2-amplify_e2e_tests_pkg: + - function_1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14457,7 +14584,7 @@ workflows: parameters: os: - linux - - auth_8-amplify_e2e_tests_pkg: + - schema-iterative-update-3-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14475,7 +14602,7 @@ workflows: parameters: os: - linux - - function_6-amplify_e2e_tests_pkg: + - auth_8-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14493,7 +14620,7 @@ workflows: parameters: os: - linux - - import_dynamodb_2-amplify_e2e_tests_pkg: + - function_6-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14511,7 +14638,7 @@ workflows: parameters: os: - linux - - migration-node-function-amplify_e2e_tests_pkg: + - import_dynamodb_2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14529,7 +14656,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-locking-amplify_e2e_tests_pkg: + - migration-node-function-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14547,7 +14674,7 @@ workflows: parameters: os: - linux - - amplify-configure-amplify_e2e_tests_pkg: + - schema-function-2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14565,8 +14692,7 @@ workflows: parameters: os: - linux - - windows - - schema-predictions-amplify_e2e_tests_pkg: + - datastore-modelgen-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14584,7 +14710,7 @@ workflows: parameters: os: - linux - - predictions-amplify_e2e_tests_pkg: + - containers-api-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14602,7 +14728,7 @@ workflows: parameters: os: - linux - - auth_1-amplify_e2e_tests_pkg: + - schema-key-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14620,7 +14746,7 @@ workflows: parameters: os: - linux - - auth_3-amplify_e2e_tests_pkg: + - function_2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14638,7 +14764,7 @@ workflows: parameters: os: - linux - - api_3-amplify_e2e_tests_pkg: + - schema-auth-4-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14656,7 +14782,7 @@ workflows: parameters: os: - linux - - env-amplify_e2e_tests_pkg: + - schema-iterative-rollback-2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14674,7 +14800,7 @@ workflows: parameters: os: - linux - - function_4-amplify_e2e_tests_pkg: + - schema-auth-1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14692,7 +14818,7 @@ workflows: parameters: os: - linux - - api_1-amplify_e2e_tests_pkg: + - schema-auth-2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14783,7 +14909,7 @@ workflows: parameters: os: - linux - - storage-1-amplify_e2e_tests_pkg: + - schema-iterative-update-locking-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14801,7 +14927,7 @@ workflows: parameters: os: - linux - - init-amplify_e2e_tests_pkg: + - amplify-configure-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14819,7 +14945,8 @@ workflows: parameters: os: - linux - - amplify-app-amplify_e2e_tests_pkg: + - windows + - schema-predictions-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14837,7 +14964,7 @@ workflows: parameters: os: - linux - - hostingPROD-amplify_e2e_tests_pkg: + - predictions-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14855,7 +14982,7 @@ workflows: parameters: os: - linux - - auth_5-amplify_e2e_tests_pkg: + - auth_1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14873,7 +15000,7 @@ workflows: parameters: os: - linux - - migration-api-key-migration1-amplify_e2e_tests_pkg: + - auth_3-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14891,7 +15018,7 @@ workflows: parameters: os: - linux - - import_auth_1-amplify_e2e_tests_pkg: + - api_3-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14909,7 +15036,7 @@ workflows: parameters: os: - linux - - auth_2-amplify_e2e_tests_pkg: + - env-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14927,7 +15054,7 @@ workflows: parameters: os: - linux - - schema-model-amplify_e2e_tests_pkg: + - function_4-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -14945,7 +15072,7 @@ workflows: parameters: os: - linux - - schema-auth-5-amplify_e2e_tests_pkg: + - api_1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15018,7 +15145,7 @@ workflows: parameters: os: - linux - - s3-sse-amplify_e2e_tests_pkg: + - resolvers-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15036,7 +15163,8 @@ workflows: parameters: os: - linux - - storage-2-amplify_e2e_tests_pkg: + - windows + - storage-1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15054,7 +15182,7 @@ workflows: parameters: os: - linux - - tags-amplify_e2e_tests_pkg: + - init-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15072,7 +15200,7 @@ workflows: parameters: os: - linux - - hosting-amplify_e2e_tests_pkg: + - amplify-app-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15090,7 +15218,7 @@ workflows: parameters: os: - linux - - geo-add-amplify_e2e_tests_pkg: + - hostingPROD-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15108,7 +15236,7 @@ workflows: parameters: os: - linux - - function_3-amplify_e2e_tests_pkg: + - auth_5-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15126,7 +15254,7 @@ workflows: parameters: os: - linux - - auth_4-amplify_e2e_tests_pkg: + - migration-api-key-migration1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15144,7 +15272,7 @@ workflows: parameters: os: - linux - - import_auth_2-amplify_e2e_tests_pkg: + - import_auth_1-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15162,7 +15290,7 @@ workflows: parameters: os: - linux - - schema-auth-9-amplify_e2e_tests_pkg: + - auth_2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15180,7 +15308,7 @@ workflows: parameters: os: - linux - - migration-api-connection-migration-amplify_e2e_tests_pkg: + - schema-model-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15198,7 +15326,7 @@ workflows: parameters: os: - linux - - api_2-amplify_e2e_tests_pkg: + - schema-auth-5-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15270,7 +15398,7 @@ workflows: parameters: os: - linux - - schema-auth-12-amplify_e2e_tests_pkg: + - s3-sse-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15288,7 +15416,7 @@ workflows: parameters: os: - linux - - storage-3-amplify_e2e_tests_pkg: + - storage-2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15306,7 +15434,7 @@ workflows: parameters: os: - linux - - notifications-amplify_e2e_tests_pkg: + - tags-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15324,7 +15452,7 @@ workflows: parameters: os: - linux - - analytics-amplify_e2e_tests_pkg: + - hosting-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15342,7 +15470,7 @@ workflows: parameters: os: - linux - - geo-update-amplify_e2e_tests_pkg: + - geo-add-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15360,7 +15488,7 @@ workflows: parameters: os: - linux - - schema-iterative-update-1-amplify_e2e_tests_pkg: + - function_3-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15378,7 +15506,7 @@ workflows: parameters: os: - linux - - schema-auth-7-amplify_e2e_tests_pkg: + - auth_4-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15396,7 +15524,7 @@ workflows: parameters: os: - linux - - import_s3_1-amplify_e2e_tests_pkg: + - import_auth_2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15414,7 +15542,7 @@ workflows: parameters: os: - linux - - schema-auth-11-amplify_e2e_tests_pkg: + - schema-auth-9-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15432,7 +15560,7 @@ workflows: parameters: os: - linux - - schema-connection-amplify_e2e_tests_pkg: + - migration-api-connection-migration-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources @@ -15450,7 +15578,7 @@ workflows: parameters: os: - linux - - api_5-amplify_e2e_tests_pkg: + - api_2-amplify_e2e_tests_pkg: context: - amplify-ecr-image-pull - cleanup-resources diff --git a/packages/amplify-e2e-core/src/utils/api.ts b/packages/amplify-e2e-core/src/utils/api.ts index f1588fb348e..d47bd1fb943 100644 --- a/packages/amplify-e2e-core/src/utils/api.ts +++ b/packages/amplify-e2e-core/src/utils/api.ts @@ -11,3 +11,8 @@ export function updateConfig(projectDir: string, projectName: string, config: an const configPath = path.join(projectDir, 'amplify', 'backend', 'api', projectName, TRANSFORM_CONFIG_FILE_NAME); fs.writeFileSync(configPath, JSON.stringify(config, null, 4)); } + +export function addCustomResolver(projectDir: string, projectName: string, resolverName: string, resolver: string) { + const resolverPath = path.join(projectDir, 'amplify', 'backend', 'api', projectName, 'resolvers', resolverName); + fs.writeFileSync(resolverPath, resolver); +} diff --git a/packages/amplify-e2e-tests/src/__tests__/resolvers.test.ts b/packages/amplify-e2e-tests/src/__tests__/resolvers.test.ts new file mode 100644 index 00000000000..cbbded97b37 --- /dev/null +++ b/packages/amplify-e2e-tests/src/__tests__/resolvers.test.ts @@ -0,0 +1,47 @@ +import { + initJSProjectWithProfile, + deleteProject, + createNewProjectDir, + deleteProjectDir, + addFeatureFlag, + addApiWithoutSchema, + addCustomResolver, + apiGqlCompile, + updateApiSchema, +} from 'amplify-e2e-core'; +import { join } from 'path'; +import * as fs from 'fs-extra'; + +describe('overriding generated resolvers', () => { + let projectDir: string; + let apiName = 'simpleapi'; + + beforeAll(async () => { + projectDir = await createNewProjectDir('overrideresolvers'); + await initJSProjectWithProfile(projectDir, {}); + + addFeatureFlag(projectDir, 'graphqltransformer', 'useexperimentalpipelinedtransformer', true); + }); + + afterAll(async () => { + await deleteProject(projectDir); + deleteProjectDir(projectDir); + }); + + it('adds the overwritten resolver to the build', async () => { + const resolverName = 'Query.listTodos.req.vtl'; + const resolver = '$util.unauthorized()'; + const generatedResolverPath = join(projectDir, 'amplify', 'backend', 'api', apiName, 'build', 'pipelineFunctions', resolverName); + + await addApiWithoutSchema(projectDir, { apiName }); + await updateApiSchema(projectDir, apiName, 'simple_model.graphql'); + await apiGqlCompile(projectDir, true); + + expect(fs.readFileSync(generatedResolverPath).toString()).not.toEqual(resolver); + + addCustomResolver(projectDir, apiName, resolverName, resolver); + await apiGqlCompile(projectDir, true); + + expect(fs.readFileSync(generatedResolverPath).toString()).toEqual(resolver); + }); +}); diff --git a/packages/amplify-provider-awscloudformation/src/__tests__/graphql-transformer/utils.test.ts b/packages/amplify-provider-awscloudformation/src/__tests__/graphql-transformer/utils.test.ts new file mode 100644 index 00000000000..dd6f0e2db62 --- /dev/null +++ b/packages/amplify-provider-awscloudformation/src/__tests__/graphql-transformer/utils.test.ts @@ -0,0 +1,63 @@ +import { mergeUserConfigWithTransformOutput } from '../../graphql-transformer/utils'; +import { TransformerProjectConfig, DeploymentResources } from '@aws-amplify/graphql-transformer-core'; + +describe('mergeUserConfigWithTransformOutput', () => { + let userConfig; + let transformerOutput; + + beforeAll(() => { + transformerOutput = { + resolvers: {}, + pipelineFunctions: { + 'Query.listTodos.req.vtl': '## [Start] List Request. **\n' + '#set( $limit = $util.defaultIfNull($context.args.limit, 100) )\n', + }, + functions: {}, + schema: '', + stackMapping: {}, + stacks: {}, + rootStack: null, + } as DeploymentResources; + }); + + describe('has user-created resolvers', () => { + beforeAll(() => { + userConfig = { + schema: '', + functions: {}, + pipelineFunctions: {}, + resolvers: { + 'Query.listTodos.req.vtl': '$util.unauthorized\n', + }, + stacks: {}, + config: { Version: 5, ElasticsearchWarning: true }, + } as TransformerProjectConfig; + }); + + it('merges the custom resolver with transformer output', () => { + const output = mergeUserConfigWithTransformOutput(userConfig, transformerOutput); + + expect(output.pipelineFunctions['Query.listTodos.req.vtl']).toEqual('$util.unauthorized\n'); + }); + }); + + describe('has user created pipeline function', () => { + beforeAll(() => { + userConfig = { + schema: '', + functions: {}, + pipelineFunctions: { + 'Query.listTodos.req.vtl': '$util.unauthorized\n', + }, + resolvers: {}, + stacks: {}, + config: { Version: 5, ElasticsearchWarning: true }, + } as TransformerProjectConfig; + }); + + it('merges custom pipeline function with transformer output', () => { + const output = mergeUserConfigWithTransformOutput(userConfig, transformerOutput); + + expect(output.pipelineFunctions['Query.listTodos.req.vtl']).toEqual('$util.unauthorized\n'); + }); + }); +}); diff --git a/packages/amplify-provider-awscloudformation/src/graphql-transformer/transform-graphql-schema.ts b/packages/amplify-provider-awscloudformation/src/graphql-transformer/transform-graphql-schema.ts index 55ebedb2f44..12d45317e26 100644 --- a/packages/amplify-provider-awscloudformation/src/graphql-transformer/transform-graphql-schema.ts +++ b/packages/amplify-provider-awscloudformation/src/graphql-transformer/transform-graphql-schema.ts @@ -27,7 +27,7 @@ import { SearchableModelTransformer } from '@aws-amplify/graphql-searchable-tran import { DefaultValueTransformer } from '@aws-amplify/graphql-default-value-transformer'; import { ProviderName as providerName } from '../constants'; import { hashDirectory } from '../upload-appsync-files'; -import { writeDeploymentToDisk } from './utils'; +import { mergeUserConfigWithTransformOutput, writeDeploymentToDisk } from './utils'; import { loadProject as readTransformerConfiguration } from './transform-config'; import { loadProject } from 'graphql-transformer-core'; import { Template } from '@aws-amplify/graphql-transformer-core/lib/config/project-config'; @@ -493,5 +493,7 @@ async function _buildProject(opts: ProjectOptions) { let schema = userProjectConfig.schema.toString(); if (opts.sandboxModeEnabled) schema = removeSandboxDirectiveFromSchema(schema); - return transform.transform(schema); + const transformOutput = transform.transform(schema); + + return mergeUserConfigWithTransformOutput(userProjectConfig, transformOutput); } diff --git a/packages/amplify-provider-awscloudformation/src/graphql-transformer/utils.ts b/packages/amplify-provider-awscloudformation/src/graphql-transformer/utils.ts index c849a903223..6eddd579f84 100644 --- a/packages/amplify-provider-awscloudformation/src/graphql-transformer/utils.ts +++ b/packages/amplify-provider-awscloudformation/src/graphql-transformer/utils.ts @@ -85,6 +85,20 @@ export function readFromPath(directory: string): any { return accum; } +export function mergeUserConfigWithTransformOutput(userConfig: any, transformOutput: any) { + const userResolvers = userConfig.resolvers || {}; + const userPipelineFunctions = userConfig.pipelineFunctions || {}; + const pipelineFunctions = transformOutput.pipelineFunctions; + + for (const userResolver of Object.keys(userResolvers)) pipelineFunctions[userResolver] = userResolvers[userResolver]; + for (const userResolver of Object.keys(userPipelineFunctions)) pipelineFunctions[userResolver] = userPipelineFunctions[userResolver]; + + return { + ...transformOutput, + pipelineFunctions, + }; +} + /** * Writes a deployment to disk at a path. */