Merge pull request aws-amplify#1782 from sundersc/merge-main-rds-prev…

…iew2

chore(api): merge main branch into rds feature branch

.gitignore

@@ -44,4 +44,5 @@ packages/**/reports/junit/*
 test.out.log
 *.tsbuildinfo
 packages/amplify-graphiql-explorer/.eslintcache
-!packages/amplify-graphql-model-transformer/src/__tests__/overrides/build/override.js
+!packages/amplify-graphql-model-transformer/src/__tests__/overrides/build/override.js
+codebuild_specs/debug_workflow.yml

codebuild_specs/cleanup_e2e_resources.yml

@@ -9,3 +9,7 @@ phases:
  build:
  commands:
  - source ./shared-scripts.sh && _cleanupE2EResources
+artifacts:
+ files:
+ - '**/*'
+ base-directory: $CODEBUILD_SRC_DIR/packages/amplify-e2e-tests/amplify-e2e-reports

codebuild_specs/cleanup_workflow.yml

@@ -10,3 +10,7 @@ phases:
  commands:
  - yarn production-build
  - cd packages/amplify-e2e-tests && yarn clean-e2e-resources
+artifacts:
+ files:
+ - '**/*'
+ base-directory: $CODEBUILD_SRC_DIR/packages/amplify-e2e-tests/amplify-e2e-reports

codebuild_specs/e2e_workflow.yml

@@ -116,64 +116,54 @@ batch:
  depend-on:
  - publish_to_local_registry
  - identifier: >-
- index_with_stack_mappings_api_4_custom_policies_container_schema_iterative_rollback_1
+ index_with_stack_mappings_api_4_custom_policies_container_schema_iterative_update_2
  buildspec: codebuild_specs/run_e2e_tests.yml
  env:
  compute-type: BUILD_GENERAL1_MEDIUM
  variables:
  TEST_SUITE: >-
- src/__tests__/graphql-v2/index-with-stack-mappings.test.ts|src/__tests__/api_4.test.ts|src/__tests__/custom_policies_container.test.ts|src/__tests__/schema-iterative-rollback-1.test.ts
+ src/__tests__/graphql-v2/index-with-stack-mappings.test.ts|src/__tests__/api_4.test.ts|src/__tests__/custom_policies_container.test.ts|src/__tests__/schema-iterative-update-2.test.ts
  CLI_REGION: ap-southeast-1
  depend-on:
  - publish_to_local_registry
- - identifier: >-
- schema_iterative_update_2_api_connection_migration2_schema_iterative_rollback_2_api_5
- buildspec: codebuild_specs/run_e2e_tests.yml
- env:
- compute-type: BUILD_GENERAL1_MEDIUM
- variables:
- TEST_SUITE: >-
- src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/schema-iterative-rollback-2.test.ts|src/__tests__/api_5.test.ts
- CLI_REGION: eu-central-1
- depend-on:
- - publish_to_local_registry
- - identifier: containers_api_secrets_schema_function_1_api_3_base_cdk
+ - identifier: api_connection_migration2_api_5_containers_api_secrets_schema_function_1
  buildspec: codebuild_specs/run_e2e_tests.yml
  env:
  compute-type: BUILD_GENERAL1_MEDIUM
  variables:
  TEST_SUITE: >-
- src/__tests__/containers-api-secrets.test.ts|src/__tests__/schema-function-1.test.ts|src/__tests__/api_3.test.ts|src/__tests__/cdk/base-cdk.test.ts
+ src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_5.test.ts|src/__tests__/containers-api-secrets.test.ts|src/__tests__/schema-function-1.test.ts
  CLI_REGION: us-east-1
  depend-on:
  - publish_to_local_registry
- - identifier: rds_import_vpc_rds_model_v2_rds_relational_directives_api_1
+ - identifier: api_3_base_cdk_rds_import_vpc_rds_model_v2
  buildspec: codebuild_specs/run_e2e_tests.yml
  env:
  compute-type: BUILD_GENERAL1_MEDIUM
  variables:
  TEST_SUITE: >-
- src/__tests__/rds-import-vpc.test.ts|src/__tests__/rds-model-v2.test.ts|src/__tests__/rds-relational-directives.test.ts|src/__tests__/api_1.test.ts
+ src/__tests__/api_3.test.ts|src/__tests__/cdk/base-cdk.test.ts|src/__tests__/rds-import-vpc.test.ts|src/__tests__/rds-model-v2.test.ts
  CLI_REGION: ap-northeast-1
  depend-on:
  - publish_to_local_registry
- - identifier: resolvers_sync_query_datastore_api_6_api_lambda_auth
+ - identifier: rds_relational_directives_api_1_resolvers_sync_query_datastore
  buildspec: codebuild_specs/run_e2e_tests.yml
  env:
  compute-type: BUILD_GENERAL1_MEDIUM
  variables:
  TEST_SUITE: >-
- src/__tests__/resolvers.test.ts|src/__tests__/graphql-v2/sync_query_datastore.test.ts|src/__tests__/api_6.test.ts|src/__tests__/graphql-v2/api_lambda_auth.test.ts
- CLI_REGION: eu-central-1
+ src/__tests__/rds-relational-directives.test.ts|src/__tests__/api_1.test.ts|src/__tests__/resolvers.test.ts|src/__tests__/graphql-v2/sync_query_datastore.test.ts
+ CLI_REGION: us-east-1
  depend-on:
  - publish_to_local_registry
- - identifier: api_9
+ - identifier: api_6_api_lambda_auth_api_9
  buildspec: codebuild_specs/run_e2e_tests.yml
  env:
  compute-type: BUILD_GENERAL1_MEDIUM
  variables:
- TEST_SUITE: src/__tests__/api_9.test.ts
- CLI_REGION: ap-northeast-1
+ TEST_SUITE: >-
+ src/__tests__/api_6.test.ts|src/__tests__/graphql-v2/api_lambda_auth.test.ts|src/__tests__/api_9.test.ts
+ CLI_REGION: ap-southeast-2
  depend-on:
  - publish_to_local_registry
  - identifier: function_migration
@@ -296,13 +286,31 @@ batch:
  USE_PARENT_ACCOUNT: 1
  depend-on:
  - publish_to_local_registry
+ - identifier: schema_iterative_rollback_1
+ buildspec: codebuild_specs/run_e2e_tests.yml
+ env:
+ compute-type: BUILD_GENERAL1_SMALL
+ variables:
+ TEST_SUITE: src/__tests__/schema-iterative-rollback-1.test.ts
+ CLI_REGION: eu-central-1
+ depend-on:
+ - publish_to_local_registry
+ - identifier: schema_iterative_rollback_2
+ buildspec: codebuild_specs/run_e2e_tests.yml
+ env:
+ compute-type: BUILD_GENERAL1_SMALL
+ variables:
+ TEST_SUITE: src/__tests__/schema-iterative-rollback-2.test.ts
+ CLI_REGION: ap-southeast-1
+ depend-on:
+ - publish_to_local_registry
  - identifier: schema_key
  buildspec: codebuild_specs/run_e2e_tests.yml
  env:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-key.test.ts
- CLI_REGION: ap-northeast-1
+ CLI_REGION: ap-southeast-2
  depend-on:
  - publish_to_local_registry
  - identifier: containers_api_1
@@ -320,7 +328,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-4.test.ts
- CLI_REGION: us-east-1
+ CLI_REGION: us-east-2
  depend-on:
  - publish_to_local_registry
  - identifier: schema_auth_8
@@ -329,7 +337,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-8.test.ts
- CLI_REGION: us-east-2
+ CLI_REGION: us-west-2
  depend-on:
  - publish_to_local_registry
  - identifier: api_key_migration2
@@ -338,7 +346,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/migration/api.key.migration2.test.ts
- CLI_REGION: us-west-2
+ CLI_REGION: eu-west-2
  USE_PARENT_ACCOUNT: 1
  depend-on:
  - publish_to_local_registry
@@ -348,7 +356,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-11.test.ts
- CLI_REGION: eu-west-2
+ CLI_REGION: eu-central-1
  depend-on:
  - publish_to_local_registry
  - identifier: api_key_migration1
@@ -357,7 +365,16 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts
- CLI_REGION: eu-central-1
+ CLI_REGION: ap-southeast-1
+ depend-on:
+ - publish_to_local_registry
+ - identifier: api_11
+ buildspec: codebuild_specs/run_e2e_tests.yml
+ env:
+ compute-type: BUILD_GENERAL1_SMALL
+ variables:
+ TEST_SUITE: src/__tests__/api_11.test.ts
+ CLI_REGION: ap-southeast-2
  depend-on:
  - publish_to_local_registry
  - identifier: schema_model
@@ -366,7 +383,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-model.test.ts
- CLI_REGION: ap-southeast-1
+ CLI_REGION: us-east-2
  depend-on:
  - publish_to_local_registry
  - identifier: apigw
@@ -375,7 +392,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/apigw.test.ts
- CLI_REGION: ap-southeast-2
+ CLI_REGION: us-west-2
  depend-on:
  - publish_to_local_registry
  - identifier: containers_api_2
@@ -393,7 +410,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-14.test.ts
- CLI_REGION: us-east-2
+ CLI_REGION: eu-central-1
  depend-on:
  - publish_to_local_registry
  - identifier: schema_auth_7
@@ -402,7 +419,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-7.test.ts
- CLI_REGION: us-west-2
+ CLI_REGION: ap-northeast-1
  depend-on:
  - publish_to_local_registry
  - identifier: schema_auth_9
@@ -411,7 +428,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-9.test.ts
- CLI_REGION: eu-west-2
+ CLI_REGION: ap-southeast-1
  depend-on:
  - publish_to_local_registry
  - identifier: schema_auth_5
@@ -420,7 +437,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-5.test.ts
- CLI_REGION: ap-northeast-1
+ CLI_REGION: us-east-1
  depend-on:
  - publish_to_local_registry
  - identifier: searchable_datastore
@@ -429,7 +446,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/graphql-v2/searchable-datastore.test.ts
- CLI_REGION: ap-southeast-1
+ CLI_REGION: us-east-2
  USE_PARENT_ACCOUNT: 1
  depend-on:
  - publish_to_local_registry
@@ -439,7 +456,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-iterative-update-4.test.ts
- CLI_REGION: ap-southeast-2
+ CLI_REGION: us-west-2
  depend-on:
  - publish_to_local_registry
  - identifier: schema_searchable
@@ -448,7 +465,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-searchable.test.ts
- CLI_REGION: us-east-1
+ CLI_REGION: eu-west-2
  USE_PARENT_ACCOUNT: 1
  depend-on:
  - publish_to_local_registry
@@ -458,7 +475,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-auth-6.test.ts
- CLI_REGION: us-east-2
+ CLI_REGION: eu-central-1
  depend-on:
  - publish_to_local_registry
  - identifier: schema_connection
@@ -467,7 +484,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/schema-connection.test.ts
- CLI_REGION: us-west-2
+ CLI_REGION: ap-northeast-1
  depend-on:
  - publish_to_local_registry
  - identifier: searchable_previous_deployment_had_node_to_node
@@ -477,7 +494,7 @@ batch:
  variables:
  TEST_SUITE: >-
  src/__tests__/graphql-v2/searchable-node-to-node-encryption/searchable-previous-deployment-had-node-to-node.test.ts
- CLI_REGION: eu-west-2
+ CLI_REGION: ap-southeast-1
  depend-on:
  - publish_to_local_registry
  - identifier: searchable_previous_deployment_no_node_to_node
@@ -487,7 +504,7 @@ batch:
  variables:
  TEST_SUITE: >-
  src/__tests__/graphql-v2/searchable-node-to-node-encryption/searchable-previous-deployment-no-node-to-node.test.ts
- CLI_REGION: eu-central-1
+ CLI_REGION: ap-southeast-2
  depend-on:
  - publish_to_local_registry
  - identifier: api_2
@@ -496,7 +513,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/api_2.test.ts
- CLI_REGION: ap-southeast-1
+ CLI_REGION: us-east-1
  depend-on:
  - publish_to_local_registry
  - identifier: searchable_migration
@@ -505,7 +522,7 @@ batch:
  compute-type: BUILD_GENERAL1_SMALL
  variables:
  TEST_SUITE: src/__tests__/transformer-migrations/searchable-migration.test.ts
- CLI_REGION: ap-southeast-2
+ CLI_REGION: us-east-2
  USE_PARENT_ACCOUNT: 1
  depend-on:
  - publish_to_local_registry

codebuild_specs/graphql_e2e_tests.yml

@@ -11,6 +11,7 @@ env:
 phases:
  build:
  commands:
+ - codebuild-breakpoint
  - source ./shared-scripts.sh && _runGqlE2ETests
  post_build:
  commands:

codebuild_specs/migration_tests_v10.yml

@@ -13,6 +13,7 @@ env:
 phases:
  build:
  commands:
+ - codebuild-breakpoint
  - source ./shared-scripts.sh && _runMigrationV10Test
  post_build:
  commands:
@@ -21,5 +22,5 @@ phases:
 
 artifacts:
  files:
- - $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports/*
- discard-paths: yes
+ - '**/*'
+ base-directory: $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports

codebuild_specs/migration_tests_v5.yml

@@ -13,6 +13,7 @@ env:
 phases:
  build:
  commands:
+ - codebuild-breakpoint
  - source ./shared-scripts.sh && _runMigrationV5Test
  post_build:
  commands:
@@ -21,5 +22,5 @@ phases:
 
 artifacts:
  files:
- - $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports/*
- discard-paths: yes
+ - '**/*'
+ base-directory: $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports

codebuild_specs/migration_tests_v6.yml

@@ -13,6 +13,7 @@ env:
 phases:
  build:
  commands:
+ - codebuild-breakpoint
  - source ./shared-scripts.sh && _runMigrationV6Test
  post_build:
  commands:
@@ -21,5 +22,5 @@ phases:
 
 artifacts:
  files:
- - $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports/*
- discard-paths: yes
+ - '**/*'
+ base-directory: $CODEBUILD_SRC_DIR/packages/amplify-migration-tests/amplify-migration-reports