Skip to content

Merge main to migration #2976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Oct 23, 2024
Merged

Merge main to migration #2976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b3fb28f
feat: import existing table to amplify managed table (#2634)
Jul 12, 2024
02c7da0
feat: get datasource map for migration (#2668)
Jul 12, 2024
de6d344
Merge branch 'main' into main-to-migration
Jul 15, 2024
07039d1
Merge branch 'main' into main-to-migration
Jul 15, 2024
a50ba78
Merge pull request #2709 from aws-amplify/main-to-migration
Jul 17, 2024
8c684a9
feat: validate imported tables (#2696)
Jul 24, 2024
f74c0f9
test: basic migration e2es (#2703)
Aug 2, 2024
9eb3ffd
Merge branch 'main' into merge-main-to-migration
Aug 2, 2024
df3a50b
fix: adjust default table properties (#2726)
Aug 5, 2024
c4e59d3
feat: add overrideIndexName to configure index name (#2738)
Aug 8, 2024
b1d350c
Merge branch 'main' into merge-main-to-migration
Aug 8, 2024
86fe20a
Merge pull request #2739 from aws-amplify/merge-main-to-migration
Aug 9, 2024
0f8619f
refactor: a few migration pr followups (#2753)
Aug 9, 2024
c31ba1a
test: migration validation e2e (#2752)
Aug 20, 2024
57cbc98
test: add additional migration validation test cases (#2792)
Aug 22, 2024
d3b0dd1
Merge branch 'main' into feature/gen2-migration
Sep 24, 2024
2a64485
Merge pull request #2895 from aws-amplify/merge-main-to-migration
Sep 25, 2024
2b17871
Revert "feat: get datasource map for migration (#2668)" (#2907)
Sep 25, 2024
5b593d0
Merge branch 'main' into merge-main-to-migration
Oct 8, 2024
a5b2828
Merge pull request #2931 from aws-amplify/merge-main-to-migration
Oct 9, 2024
ae1f860
fix: allowlist comparison properties on imported table (#2908)
Oct 11, 2024
1a3663f
Merge branch 'main' into merge-main-to-migration
Oct 11, 2024
9aa790a
Merge pull request #2949 from aws-amplify/merge-main-to-migration
Oct 14, 2024
072b743
Merge branch 'main' into merge-main-to-migration
Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 41 additions & 29 deletions codebuild_specs/e2e_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,52 +767,64 @@ batch:
depend-on:
- publish_to_local_registry
- identifier: >-
add_resources_single_gsi_single_record_single_gsi_empty_table_single_gsi_1k_records_single_gsi_10k_records
add_resources_references_migration_migration_validation_many_to_many_migration_base_migration
buildspec: codebuild_specs/run_cdk_tests.yml
env:
compute-type: BUILD_GENERAL1_LARGE
variables:
NODE_OPTIONS: '--max-old-space-size=14848'
TEST_SUITE: >-
src/__tests__/add-resources.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-single-record.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-empty-table.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-1k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-10k-records.test.ts
CLI_REGION: ap-northeast-2
src/__tests__/add-resources.test.ts|src/__tests__/migration/references-migration.test.ts|src/__tests__/migration/migration-validation.test.ts|src/__tests__/migration/many-to-many-migration.test.ts|src/__tests__/migration/base-migration.test.ts
CLI_REGION: ap-southeast-1
depend-on:
- publish_to_local_registry
- identifier: >-
replace_2_gsis_update_attr_single_record_replace_2_gsis_update_attr_empty_table_replace_2_gsis_update_attr_1k_records_replace_2
single_gsi_single_record_single_gsi_empty_table_single_gsi_1k_records_single_gsi_10k_records_replace_2_gsis_update_attr_single_
buildspec: codebuild_specs/run_cdk_tests.yml
env:
compute-type: BUILD_GENERAL1_LARGE
variables:
NODE_OPTIONS: '--max-old-space-size=14848'
TEST_SUITE: >-
src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-single-record.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-empty-table.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-1k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-10k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-single-record.test.ts
src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-single-record.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-empty-table.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-1k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/single-gsi-10k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-single-record.test.ts
CLI_REGION: ap-northeast-3
depend-on:
- publish_to_local_registry
- identifier: >-
replace_2_gsis_empty_table_replace_2_gsis_1k_records_replace_2_gsis_10k_records_3_gsis_single_record_3_gsis_empty_table
replace_2_gsis_update_attr_empty_table_replace_2_gsis_update_attr_1k_records_replace_2_gsis_update_attr_10k_records_replace_2_g
buildspec: codebuild_specs/run_cdk_tests.yml
env:
compute-type: BUILD_GENERAL1_LARGE
variables:
NODE_OPTIONS: '--max-old-space-size=14848'
TEST_SUITE: >-
src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-empty-table.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-1k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-10k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-single-record.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-empty-table.test.ts
src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-empty-table.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-1k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-update-attr-10k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-single-record.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-empty-table.test.ts
CLI_REGION: ap-south-1
depend-on:
- publish_to_local_registry
- identifier: 3_gsis_1k_records_3_gsis_10k_records
- identifier: >-
replace_2_gsis_1k_records_replace_2_gsis_10k_records_3_gsis_single_record_3_gsis_empty_table_3_gsis_1k_records
buildspec: codebuild_specs/run_cdk_tests.yml
env:
compute-type: BUILD_GENERAL1_LARGE
variables:
NODE_OPTIONS: '--max-old-space-size=14848'
TEST_SUITE: >-
src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-1k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-10k-records.test.ts
src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-1k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/replace-2-gsis-10k-records.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-single-record.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-empty-table.test.ts|src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-1k-records.test.ts
CLI_REGION: ap-southeast-1
depend-on:
- publish_to_local_registry
- identifier: 3_gsis_10k_records
buildspec: codebuild_specs/run_cdk_tests.yml
env:
compute-type: BUILD_GENERAL1_LARGE
variables:
NODE_OPTIONS: '--max-old-space-size=14848'
TEST_SUITE: >-
src/__tests__/deploy-velocity-temporarily-disabled/3-gsis-10k-records.test.ts
CLI_REGION: ap-southeast-2
depend-on:
- publish_to_local_registry
- identifier: sql_pg_userpool_auth
buildspec: codebuild_specs/run_cdk_tests.yml
env:
Expand Down Expand Up @@ -1474,7 +1486,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/static-group-auth/static-group-auth-sqlprimary-sqlrelated-subscriptions-off.test.ts
CLI_REGION: eu-south-1
CLI_REGION: eu-west-1
depend-on:
- publish_to_local_registry
- identifier: static_group_auth_sqlprimary_ddbrelated_subscriptions_off
Expand All @@ -1485,7 +1497,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/static-group-auth/static-group-auth-sqlprimary-ddbrelated-subscriptions-off.test.ts
CLI_REGION: eu-west-1
CLI_REGION: eu-west-2
depend-on:
- publish_to_local_registry
- identifier: static_group_auth_ddbprimary_sqlrelated_subscriptions_off
Expand All @@ -1496,7 +1508,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/static-group-auth/static-group-auth-ddbprimary-sqlrelated-subscriptions-off.test.ts
CLI_REGION: eu-west-2
CLI_REGION: eu-west-3
depend-on:
- publish_to_local_registry
- identifier: static_group_auth_ddbprimary_ddbrelated_subscriptions_off
Expand All @@ -1507,7 +1519,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/static-group-auth/static-group-auth-ddbprimary-ddbrelated-subscriptions-off.test.ts
CLI_REGION: eu-west-3
CLI_REGION: me-south-1
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_sqlprimary_sqlrelated_subscriptions_off
Expand All @@ -1518,7 +1530,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/dynamic-group-auth/dynamic-group-auth-sqlprimary-sqlrelated-subscriptions-off.test.ts
CLI_REGION: me-south-1
CLI_REGION: sa-east-1
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_sqlprimary_ddbrelated_subscriptions_off
Expand All @@ -1529,7 +1541,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/dynamic-group-auth/dynamic-group-auth-sqlprimary-ddbrelated-subscriptions-off.test.ts
CLI_REGION: sa-east-1
CLI_REGION: us-east-1
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_ddbprimary_sqlrelated_subscriptions_off
Expand All @@ -1540,7 +1552,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/dynamic-group-auth/dynamic-group-auth-ddbprimary-sqlrelated-subscriptions-off.test.ts
CLI_REGION: us-east-1
CLI_REGION: us-east-2
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_ddbprimary_ddbrelated_subscriptions_off
Expand All @@ -1551,7 +1563,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/subscriptions-off/dynamic-group-auth/dynamic-group-auth-ddbprimary-ddbrelated-subscriptions-off.test.ts
CLI_REGION: us-east-2
CLI_REGION: us-west-1
depend-on:
- publish_to_local_registry
- identifier: static_group_auth_sqlprimary_sqlrelated
Expand All @@ -1562,7 +1574,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/static-group-auth/static-group-auth-sqlprimary-sqlrelated.test.ts
CLI_REGION: us-west-1
CLI_REGION: us-west-2
depend-on:
- publish_to_local_registry
- identifier: static_group_auth_sqlprimary_ddbrelated
Expand All @@ -1573,7 +1585,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/static-group-auth/static-group-auth-sqlprimary-ddbrelated.test.ts
CLI_REGION: us-west-2
CLI_REGION: ap-northeast-1
depend-on:
- publish_to_local_registry
- identifier: static_group_auth_ddbprimary_sqlrelated
Expand All @@ -1584,7 +1596,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/static-group-auth/static-group-auth-ddbprimary-sqlrelated.test.ts
CLI_REGION: ap-northeast-1
CLI_REGION: ap-northeast-2
depend-on:
- publish_to_local_registry
- identifier: static_group_auth_ddbprimary_ddbrelated
Expand All @@ -1595,7 +1607,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/static-group-auth/static-group-auth-ddbprimary-ddbrelated.test.ts
CLI_REGION: ap-northeast-2
CLI_REGION: ap-northeast-3
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_sqlprimary_sqlrelated
Expand All @@ -1606,7 +1618,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/dynamic-group-auth/dynamic-group-auth-sqlprimary-sqlrelated.test.ts
CLI_REGION: ap-northeast-3
CLI_REGION: ap-south-1
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_sqlprimary_ddbrelated
Expand All @@ -1617,7 +1629,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/dynamic-group-auth/dynamic-group-auth-sqlprimary-ddbrelated.test.ts
CLI_REGION: ap-south-1
CLI_REGION: ap-southeast-1
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_ddbprimary_sqlrelated
Expand All @@ -1628,7 +1640,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/dynamic-group-auth/dynamic-group-auth-ddbprimary-sqlrelated.test.ts
CLI_REGION: ap-southeast-1
CLI_REGION: ap-southeast-2
depend-on:
- publish_to_local_registry
- identifier: dynamic_group_auth_ddbprimary_ddbrelated
Expand All @@ -1639,7 +1651,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/group-auth/dynamic-group-auth/dynamic-group-auth-ddbprimary-ddbrelated.test.ts
CLI_REGION: ap-southeast-2
CLI_REGION: ca-central-1
depend-on:
- publish_to_local_registry
- identifier: generation
Expand All @@ -1660,7 +1672,7 @@ batch:
variables:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: src/__tests__/deploy-velocity/single-gsi-100k-records.test.ts
CLI_REGION: ap-southeast-2
CLI_REGION: ca-central-1
depend-on:
- publish_to_local_registry
- identifier: replace_2_gsis_update_attr_100k_records
Expand All @@ -1671,7 +1683,7 @@ batch:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: >-
src/__tests__/deploy-velocity/replace-2-gsis-update-attr-100k-records.test.ts
CLI_REGION: ca-central-1
CLI_REGION: eu-central-1
depend-on:
- publish_to_local_registry
- identifier: replace_2_gsis_100k_records
Expand All @@ -1681,7 +1693,7 @@ batch:
variables:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: src/__tests__/deploy-velocity/replace-2-gsis-100k-records.test.ts
CLI_REGION: eu-central-1
CLI_REGION: eu-north-1
depend-on:
- publish_to_local_registry
- identifier: 3_gsis_100k_records
Expand All @@ -1691,7 +1703,7 @@ batch:
variables:
NODE_OPTIONS: '--max-old-space-size=6656'
TEST_SUITE: src/__tests__/deploy-velocity/3-gsis-100k-records.test.ts
CLI_REGION: eu-north-1
CLI_REGION: eu-south-1
depend-on:
- publish_to_local_registry
- identifier: conversation
Expand Down
Loading
Loading