Skip to content

Commit 338685f

Browse files
iliapoloiliapolo
committed
Merge branch 'dev' into gen2-migration
2 parents d0f1037 + 85839aa commit 338685f

152 files changed

Lines changed: 6478 additions & 5935 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/local_publish_helpers_codebuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function verifyPkgCli {
141141

142142
# TODO: After V3 migrations are done, decrease 1095 back to 930 and 875 back to 750
143143
verifySinglePkg "amplify-pkg-linux-x64" "amplify-pkg-linux-x64.tgz" $((1095 * 1024 * 1024))
144-
verifySinglePkg "amplify-pkg-macos-x64" "amplify-pkg-macos-x64.tgz" $((1095 * 1024 * 1024))
144+
verifySinglePkg "amplify-pkg-macos-x64" "amplify-pkg-macos-x64.tgz" $((1105 * 1024 * 1024))
145145
verifySinglePkg "amplify-pkg-win-x64.exe" "amplify-pkg-win-x64.tgz" $((1095 * 1024 * 1024))
146146
verifySinglePkg "amplify-pkg-linux-arm64" "amplify-pkg-linux-arm64.tgz" $((875 * 1024 * 1024))
147147
}

‎.github/actions/run-smoke-tests/action.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ runs:
6767
CLI_REGION: ${{ inputs.region }}
6868
CI: true
6969
CIRCLECI: true
70+
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: ${{ runner.os == 'macOS' && '60' || '' }}
71+
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: ${{ runner.os == 'macOS' && '2' || '' }}
7072

7173
- name: Upload Report
7274
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 #v4.6.0

‎codebuild_specs/e2e_workflow_generated.yml‎

Lines changed: 100 additions & 92 deletions
Large diffs are not rendered by default.

‎codebuild_specs/wait_for_ids.json‎

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,64 @@
11
[
2+
"l_S3server_smoketest_smoketest_ios",
23
"l_amplify_app",
34
"l_analytics_pinpoint_flutter_analytics_kinesis_notifications_analytics_compatibility_sms_2",
4-
"l_android_analytics_pinpoint_config_opensearch_simulator_general_config_headless_init",
5-
"l_api_10_api_key_migration5_schema_iterative_rollback_1",
6-
"l_api_2a_amplify_remove_S3server",
7-
"l_api_3_layer_1_api_1",
8-
"l_api_5_api_key_migration2_api_lambda_auth_1",
9-
"l_api_6a_http_migration_schema_function_2",
10-
"l_api_6c_api_2b",
11-
"l_api_key_migration3_api_connection_migration_init_special_case",
12-
"l_api_key_migration4_schema_iterative_update_4",
5+
"l_android_notifications_pinpoint_config_android_analytics_pinpoint_config_opensearch_simulator",
6+
"l_api_10_api_key_migration5",
7+
"l_api_1_api_key_migration4",
8+
"l_api_2b_api_2a_amplify_remove",
9+
"l_api_6b_api_3_layer_1",
10+
"l_api_9a_api_6c",
11+
"l_api_9b_function_7_function_2b",
12+
"l_api_lambda_auth_1_schema_auth_14_api_key_migration1",
13+
"l_apigw_api_5_api_key_migration2",
1314
"l_auth_10_init_f_init_d",
14-
"l_auth_12_api_9a",
1515
"l_auth_1a_auth_trigger_schema_versioned",
16-
"l_auth_1b_auth_11_predictions_migration",
1716
"l_auth_2b_auth_2a_analytics_pinpoint_js",
1817
"l_auth_2c",
1918
"l_auth_2e",
19+
"l_auth_2h_auth_2g_auth_12",
2020
"l_auth_4a_auth_3b_auth_3a",
2121
"l_auth_4c_auth_3c_schema_auth_8c",
2222
"l_auth_5b_schema_auth_8a_schema_auth_7c",
2323
"l_auth_5d_tags_schema_model_a",
2424
"l_auth_5e_auth_1c_schema_predictions",
2525
"l_auth_5f_model_migration_schema_auth_5c",
26-
"l_auth_5g_auth_2h_auth_2g",
27-
"l_auth_8a_auth_4b_auth_migration",
26+
"l_auth_6_storage_1b_storage_1a",
27+
"l_auth_7b_api_6a_http_migration",
28+
"l_auth_migration_push_pull_2",
29+
"l_build_function_build_function_yarn_modern_auth_5g",
2830
"l_containers_api_1",
2931
"l_containers_api_2",
30-
"l_custom_policies_container_api_9b_function_7",
31-
"l_custom_resource_with_storage_build_function_build_function_yarn_modern",
32+
"l_containers_api_secrets_api_4_schema_auth_10",
3233
"l_custom_resources_auth_9",
3334
"l_datastore_modelgen",
35+
"l_delete_auth_1b_auth_11",
3436
"l_diagnose_mock_api_hooks_a",
35-
"l_dynamodb_simulator_user_groups_user_groups_s3_access",
3637
"l_env_1_auth_5c_auth_5a",
3738
"l_env_2_amplify_configure_layer_4",
3839
"l_env_3",
3940
"l_export_pull_a_api_7",
41+
"l_export_pull_c_custom_resource_with_storage",
42+
"l_export_pull_d_auth_8a_auth_4b",
4043
"l_feature_flags_auth_8c_auth_7a",
41-
"l_flutter_notifications_pinpoint_config_flutter_analytics_pinpoint_config_android_notifications_pinpoint_config",
4244
"l_function_10_function_permissions_env_5",
43-
"l_function_12_export_pull_c",
44-
"l_function_15_function_14_function_13",
45-
"l_function_1_storage_5",
46-
"l_function_2a_auth_6_storage_1b",
47-
"l_function_2b_function_11_api_connection_migration2",
48-
"l_function_3a_dotnet_export_pull_b_auth_7b",
49-
"l_function_3a_python_function_3a_nodejs_function_3a_go",
45+
"l_function_11_api_connection_migration2_storage_4",
46+
"l_function_13_function_12",
47+
"l_function_2d_function_15_function_14",
48+
"l_function_3a_go_function_3a_dotnet_export_pull_b",
5049
"l_function_4_function_3b_function_2c",
51-
"l_function_5_schema_function_1_schema_connection_2",
52-
"l_function_8_api_8_schema_auth_13",
5350
"l_function_migration_storage_3_schema_auth_9_c",
54-
"l_geo_add_d_geo_add_c_delete",
51+
"l_general_config_headless_init_dynamodb_simulator_user_groups",
52+
"l_geo_add_d_geo_add_c",
5553
"l_geo_add_e",
5654
"l_geo_add_f",
5755
"l_geo_import_2_geo_import_1a_function_9c",
58-
"l_geo_multi_env_searchable_datastore",
5956
"l_geo_remove_1",
6057
"l_geo_remove_2",
6158
"l_geo_remove_3",
6259
"l_geo_update_1",
6360
"l_geo_update_2",
6461
"l_global_sandbox_c_analytics_2_pull",
65-
"l_hooks_c_help_function_2d",
66-
"l_hosted_ui_admin_api_schema_iterative_update_locking",
6762
"l_hostingPROD",
6863
"l_hosting_geo_import_3",
6964
"l_iam_permissions_boundary_export_node_function",
@@ -83,47 +78,53 @@
8378
"l_import_s3_3",
8479
"l_init_c_git_clone_attach_configure_project",
8580
"l_init_e_global_sandbox_a_geo_import_1b",
86-
"l_javascript_analytics_pinpoint_config_ios_notifications_pinpoint_config_ios_analytics_pinpoint_config",
81+
"l_init_force_push_hooks_c_help",
82+
"l_init_special_case_function_3a_python_function_3a_nodejs",
83+
"l_ios_analytics_pinpoint_config_flutter_notifications_pinpoint_config_flutter_analytics_pinpoint_config",
84+
"l_javascript_notifications_pinpoint_config_javascript_analytics_pinpoint_config_ios_notifications_pinpoint_config",
8785
"l_js_frontend_config",
88-
"l_layer_2_api_lambda_auth_2_schema_iterative_update_1",
8986
"l_notifications_analytics_compatibility_in_app_1_studio_modelgen",
9087
"l_notifications_apns_init_b_container_hosting",
9188
"l_notifications_in_app_messaging",
9289
"l_notifications_lifecycle_auth_2f_auth_2d",
93-
"l_notifications_multi_env_minify_cloudformation_init_force_push",
9490
"l_notifications_sms_pull_notifications_in_app_messaging_env_1_custom_transformers",
95-
"l_parameter_store_2_parameter_store_1_notifications_sms_update",
91+
"l_notifications_sms_update_notifications_multi_env_minify_cloudformation",
9692
"l_plugin_notifications_analytics_compatibility_sms_1_hooks_b",
97-
"l_predictions_layer_3",
98-
"l_push_pull_2_pr_previews_multi_env_1",
93+
"l_pr_previews_multi_env_1_parameter_store_2_parameter_store_1",
94+
"l_predictions_migration_api_key_migration3_api_connection_migration",
9995
"l_s3_sse_geo_add_b_auth_8b",
100-
"l_schema_auth_10_schema_key_resolvers",
10196
"l_schema_auth_11_a",
97+
"l_schema_auth_11_b_predictions_layer_3",
10298
"l_schema_auth_11_c_notifications_analytics_compatibility_in_app_2",
103-
"l_schema_auth_14_api_key_migration1_api_6b",
99+
"l_schema_auth_13_layer_2_api_lambda_auth_2",
104100
"l_schema_auth_15",
105101
"l_schema_auth_1a_geo_headless_function_9a",
106-
"l_schema_auth_2a_schema_auth_1b_schema_auth_11_b",
107-
"l_schema_auth_3_schema_auth_12_schema_iterative_update_3",
108102
"l_schema_auth_4c_init_a_geo_add_a",
109103
"l_schema_auth_4d_frontend_config_drift_env_4",
110104
"l_schema_auth_6b_schema_auth_5d_global_sandbox_b",
111105
"l_schema_auth_6d_schema_auth_6c_schema_auth_2b",
106+
"l_schema_auth_7a_schema_auth_2a_schema_auth_1b",
112107
"l_schema_auth_9_a_schema_auth_8b_schema_auth_5b",
113-
"l_schema_auth_9_b_schema_auth_7b_schema_auth_7a",
114108
"l_schema_connection_1",
115-
"l_schema_iterative_rollback_2_schema_auth_5a_export_pull_d",
109+
"l_schema_connection_2_function_2a",
110+
"l_schema_function_2_schema_auth_3_schema_auth_12",
111+
"l_schema_iterative_rollback_1_schema_auth_9_b_schema_auth_7b",
112+
"l_schema_iterative_update_1_function_5_schema_function_1",
113+
"l_schema_iterative_update_2_function_9b_custom_policies_container",
114+
"l_schema_iterative_update_3_schema_iterative_rollback_2_schema_auth_5a",
115+
"l_schema_iterative_update_4_function_1",
116+
"l_schema_iterative_update_locking_function_8_api_8",
117+
"l_schema_key_resolvers_geo_multi_env",
116118
"l_schema_model_c_schema_data_access_patterns_schema_auth_6a",
117119
"l_schema_model_d_schema_model_b_schema_auth_4a",
118120
"l_schema_model_e_schema_auth_4b_notifications_sms",
119-
"l_schema_searchable_apigw",
121+
"l_searchable_datastore_schema_searchable",
120122
"l_searchable_migration",
121123
"l_smoketest_amplify_app",
122-
"l_smoketest_smoketest_ios_javascript_notifications_pinpoint_config",
123-
"l_storage_1a_schema_iterative_update_2_function_9b",
124124
"l_storage_2_function_6_custom_policies_function",
125-
"l_storage_4_containers_api_secrets_api_4",
125+
"l_storage_5",
126126
"l_uibuilder",
127+
"l_user_groups_s3_access_hosted_ui_admin_api",
127128
"l_with_babel_config_notifications_in_app_messaging_env_2_notifications_fcm",
128129
"w_admin_api_schema_iterative_update_locking",
129130
"w_amplify_configure_layer_4",

‎packages/amplify-app/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.0.45](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.44...@aws-amplify/amplify-app@5.0.45) (2025-10-31)
7+
8+
**Note:** Version bump only for package @aws-amplify/amplify-app
9+
10+
11+
12+
13+
614
## [5.0.44](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.43...@aws-amplify/amplify-app@5.0.44) (2025-10-08)
715

816
**Note:** Version bump only for package @aws-amplify/amplify-app

‎packages/amplify-app/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws-amplify/amplify-app",
3-
"version": "5.0.44",
3+
"version": "5.0.45",
44
"description": "Amplify CLI",
55
"repository": {
66
"type": "git",
@@ -28,8 +28,8 @@
2828
"dependencies": {
2929
"@aws-amplify/amplify-frontend-android": "3.5.8",
3030
"@aws-amplify/amplify-frontend-flutter": "1.4.7",
31-
"@aws-amplify/amplify-frontend-ios": "3.7.14",
32-
"@aws-amplify/amplify-frontend-javascript": "3.10.24",
31+
"@aws-amplify/amplify-frontend-ios": "3.7.15",
32+
"@aws-amplify/amplify-frontend-javascript": "3.10.25",
3333
"chalk": "^4.1.1",
3434
"execa": "^5.1.1",
3535
"fs-extra": "^8.1.0",

‎packages/amplify-appsync-simulator/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.16.17](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.16.16...@aws-amplify/amplify-appsync-simulator@2.16.17) (2025-10-31)
7+
8+
9+
### Bug Fixes
10+
11+
* upgrade `@aws-sdk/*` to latest ([#14306](https://github.com/aws-amplify/amplify-cli/issues/14306)) ([faca740](https://github.com/aws-amplify/amplify-cli/commit/faca7400e65374536e28f58119bb6a66c48aa4d7))
12+
13+
14+
15+
16+
17+
## [2.16.16](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.16.15...@aws-amplify/amplify-appsync-simulator@2.16.16) (2025-10-22)
18+
19+
20+
### Reverts
21+
22+
* Revert "refactor: amplify-category-notifications aws sdk v3 migration (#14271)" (#14285) ([510560d](https://github.com/aws-amplify/amplify-cli/commit/510560decb0735a0e8633aadfa6c23fae376dfe1)), closes [#14271](https://github.com/aws-amplify/amplify-cli/issues/14271) [#14285](https://github.com/aws-amplify/amplify-cli/issues/14285)
23+
24+
25+
26+
27+
628
## [2.16.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.16.14...@aws-amplify/amplify-appsync-simulator@2.16.15) (2025-10-08)
729

830
**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator

‎packages/amplify-appsync-simulator/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws-amplify/amplify-appsync-simulator",
3-
"version": "2.16.15",
3+
"version": "2.16.17",
44
"description": "An AppSync Simulator to test AppSync API.",
55
"repository": {
66
"type": "git",
@@ -30,10 +30,10 @@
3030
"extract-api": "ts-node ../../scripts/extract-api.ts"
3131
},
3232
"dependencies": {
33-
"@aws-amplify/amplify-cli-core": "4.4.3",
33+
"@aws-amplify/amplify-cli-core": "4.4.4",
3434
"@aws-amplify/amplify-prompts": "2.8.7",
35-
"@aws-sdk/client-dynamodb": "^3.624.0",
36-
"@aws-sdk/util-dynamodb": "^3.624.0",
35+
"@aws-sdk/client-dynamodb": "^3.919.0",
36+
"@aws-sdk/util-dynamodb": "^3.919.0",
3737
"@graphql-tools/schema": "^8.3.1",
3838
"@graphql-tools/utils": "^8.5.1",
3939
"amplify-velocity-template": "1.4.17",

‎packages/amplify-category-analytics/CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,25 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.0.45](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.44...@aws-amplify/amplify-category-analytics@5.0.45) (2025-10-31)
7+
8+
**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
9+
10+
11+
12+
13+
14+
## [5.0.44](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.43...@aws-amplify/amplify-category-analytics@5.0.44) (2025-10-22)
15+
16+
17+
### Reverts
18+
19+
* Revert "refactor: amplify-category-notifications aws sdk v3 migration (#14271)" (#14285) ([510560d](https://github.com/aws-amplify/amplify-cli/commit/510560decb0735a0e8633aadfa6c23fae376dfe1)), closes [#14271](https://github.com/aws-amplify/amplify-cli/issues/14271) [#14285](https://github.com/aws-amplify/amplify-cli/issues/14285)
20+
21+
22+
23+
24+
625
## [5.0.43](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.42...@aws-amplify/amplify-category-analytics@5.0.43) (2025-10-08)
726

827
**Note:** Version bump only for package @aws-amplify/amplify-category-analytics

‎packages/amplify-category-analytics/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws-amplify/amplify-category-analytics",
3-
"version": "5.0.43",
3+
"version": "5.0.45",
44
"description": "amplify-cli analytics plugin",
55
"repository": {
66
"type": "git",
@@ -25,8 +25,8 @@
2525
"extract-api": "ts-node ../../scripts/extract-api.ts"
2626
},
2727
"dependencies": {
28-
"@aws-amplify/amplify-cli-core": "4.4.3",
29-
"@aws-amplify/amplify-environment-parameters": "1.9.21",
28+
"@aws-amplify/amplify-cli-core": "4.4.4",
29+
"@aws-amplify/amplify-environment-parameters": "1.9.23",
3030
"@aws-amplify/amplify-prompts": "2.8.7",
3131
"fs-extra": "^8.1.0",
3232
"uuid": "^8.3.2"

0 commit comments

Comments
 (0)