Merge branch 'dev' into dependabot-221-follow-redirects

aws-amplify · Apr 3, 2024 · 9f58065 · 9f58065
2 parents e00489d + 4d0677d
commit 9f58065
Show file tree

Hide file tree

Showing 101 changed files with 1,526 additions and 1,631 deletions.
diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml
diff --git a/codebuild_specs/wait_for_ids.json b/codebuild_specs/wait_for_ids.json
@@ -1,18 +1,16 @@
 [
-  "l_S3server_api_8_function_8",
   "l_amplify_app",
   "l_amplify_configure_env_2_init_d",
   "l_analytics_kinesis_analytics_pinpoint_flutter_analytics_pinpoint_js",
-  "l_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config_flutter_notifications_pinpoint_config",
+  "l_android_analytics_pinpoint_config_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config",
   "l_api_2b_api_6c_api_9a",
+  "l_api_3_api_6b_api_1",
+  "l_api_4_containers_api_secrets_storage_4",
   "l_api_6a_auth_7b_export_pull_b",
-  "l_api_6b_api_1_layer_1",
   "l_api_7_export_pull_a_function_9a",
-  "l_api_key_migration1_schema_auth_14_api_3",
-  "l_api_key_migration4_schema_iterative_update_4_function_1",
   "l_api_key_migration_2_v8",
   "l_api_key_migration_v8",
-  "l_api_lambda_auth_1_api_key_migration2_schema_searchable",
+  "l_apigw_api_lambda_auth_1_api_key_migration2",
   "l_auth_12_auth_2g_auth_2h",
   "l_auth_1a_auth_trigger_custom_policies_function",
   "l_auth_1b_delete_geo_add_c",
@@ -25,7 +23,6 @@
   "l_auth_4b_auth_8a_export_pull_d",
   "l_auth_4c_auth_5a_auth_5c",
   "l_auth_5g_admin_api_hosted_ui",
-  "l_auth_6_function_2a_schema_connection_2",
   "l_auth_7a_auth_8c_feature_flags",
   "l_auth_9_custom_resources_env_5",
   "l_auth_app_client_secret_migration_v12",
@@ -36,39 +33,40 @@
   "l_auth_migration_amplify_remove_api_2a",
   "l_auth_migration_v12",
   "l_auth_oauth_lambda_migration_v12",
+  "l_build_function_custom_resource_with_storage_dynamodb_simulator",
   "l_container_hosting_init_b_notifications_apns",
   "l_containers_api_1",
   "l_containers_api_2",
-  "l_containers_api_secrets_storage_4_schema_auth_10",
-  "l_custom_resource_with_storage_dynamodb_simulator_export_pull_c",
+  "l_custom_policies_container_function_9b_schema_iterative_update_2",
   "l_datastore_modelgen",
   "l_diagnose_hooks_a_mock_api",
   "l_env_1_geo_add_a_init_a",
   "l_env_3",
   "l_env_4_frontend_config_drift_schema_auth_4d",
+  "l_export_pull_c_function_12_function_13",
+  "l_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config",
   "l_function_10_function_9c_function_permissions",
-  "l_function_12_function_13_function_14",
-  "l_function_15_function_2d_general_config_headless_init",
+  "l_function_14_function_15_function_2d",
+  "l_function_1_storage_5",
+  "l_function_2b_function_7_api_connection_migration2",
   "l_function_2c_function_3b_function_4",
   "l_function_3a_init_special_case_http_migration",
   "l_function_6_storage_2_export",
-  "l_function_7_api_connection_migration2_api_4",
-  "l_function_9b_schema_iterative_update_2_storage_1a",
+  "l_function_8_schema_iterative_update_locking_api_lambda_auth_2",
+  "l_general_config_headless_init_help_hooks_c",
   "l_geo_add_b_s3_sse_schema_auth_4a",
   "l_geo_add_d_geo_import_3_hosting",
   "l_geo_add_e",
   "l_geo_add_f",
   "l_geo_headless_api_key_migration5_schema_auth_1a",
   "l_geo_import_1a_geo_import_2_global_sandbox_b",
   "l_geo_import_1b_global_sandbox_a_init_e",
-  "l_geo_multi_env_searchable_datastore_resolvers",
   "l_geo_remove_1",
   "l_geo_remove_2",
   "l_geo_remove_3",
   "l_geo_update_1",
   "l_geo_update_2",
   "l_git_clone_attach_init_c_layer_4",
-  "l_help_hooks_c_init_force_push",
   "l_hooks_b_notifications_analytics_compatibility_sms_1_plugin",
   "l_hostingPROD",
   "l_iam_permissions_boundary_node_function_notifications_sms",
@@ -87,24 +85,26 @@
   "l_import_s3_2c",
   "l_import_s3_3",
   "l_init_f_auth_5d_configure_project",
-  "l_interactions_1_interactions_2_minify_cloudformation",
+  "l_init_force_push_interactions_1_interactions_2",
   "l_interactions_schema_model_a_tags",
-  "l_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config_javascript_analytics_pinpoint_config",
-  "l_javascript_notifications_pinpoint_config_pr_previews_multi_env_1_pull_2",
+  "l_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config_pr_previews_multi_env_1",
   "l_js_frontend_config",
+  "l_layer_1_api_key_migration4_schema_iterative_update_4",
+  "l_layer_2_schema_auth_13_function_5",
   "l_layer_3_api_connection_migration_api_key_migration3",
+  "l_minify_cloudformation_notifications_multi_env_notifications_sms_update",
   "l_notifications_analytics_compatibility_in_app_2_schema_auth_11_c_schema_auth_2b",
   "l_notifications_analytics_compatibility_sms_2_analytics_2_global_sandbox_c",
   "l_notifications_fcm_notifications_in_app_messaging_env_2_with_babel_config",
   "l_notifications_in_app_messaging",
-  "l_notifications_multi_env_notifications_sms_update_opensearch_simulator",
   "l_notifications_sms_pull_pull_auth_10",
-  "l_parameter_store_1_parameter_store_2_android_analytics_pinpoint_config",
+  "l_opensearch_simulator_parameter_store_1_parameter_store_2",
   "l_predictions_schema_auth_11_b_schema_auth_1b",
-  "l_push_smoketest_ios_smoketest",
+  "l_pull_2_push_smoketest_ios",
+  "l_resolvers_schema_key_api_5",
+  "l_schema_auth_10_geo_multi_env_searchable_datastore",
   "l_schema_auth_11_a",
   "l_schema_auth_12_schema_auth_3_schema_function_2",
-  "l_schema_auth_13_function_5_schema_iterative_update_1",
   "l_schema_auth_15",
   "l_schema_auth_2a_schema_auth_7a_schema_auth_7b",
   "l_schema_auth_4b_schema_model_e_schema_versioned",
@@ -118,32 +118,38 @@
   "l_schema_auth_9_b_schema_iterative_rollback_1_predictions_migration",
   "l_schema_auth_9_c_storage_3_auth_11",
   "l_schema_connection_1",
-  "l_schema_function_1_api_9b_custom_policies_container",
-  "l_schema_iterative_update_locking_api_lambda_auth_2_layer_2",
-  "l_schema_key_api_5_apigw",
+  "l_schema_connection_2_schema_function_1_api_9b",
+  "l_schema_iterative_update_1_auth_6_function_2a",
   "l_schema_model_b_schema_model_d_auth_5f",
   "l_schema_predictions_model_migration_auth_3c",
+  "l_schema_searchable_api_key_migration1_schema_auth_14",
   "l_searchable_migration",
+  "l_smoketest_S3server_api_8",
   "l_smoketest_amplify_app",
-  "l_storage_1b_function_11_function_2b",
-  "l_storage_5",
+  "l_storage_1a_storage_1b_function_11",
   "l_studio_modelgen_custom_transformers_notifications_in_app_messaging_env_1",
   "l_uibuilder",
-  "l_user_groups_s3_access_user_groups_build_function",
+  "l_user_groups_s3_access_user_groups_build_function_yarn_modern",
   "w_amplify_configure_init_d",
   "w_amplify_remove_api_2a",
   "w_analytics_2_global_sandbox_c",
   "w_analytics_kinesis_analytics_pinpoint_flutter",
   "w_analytics_pinpoint_js_auth_2a",
   "w_api_10_api_7",
+  "w_api_1_layer_1",
   "w_api_2b_api_6c",
-  "w_api_4_containers_api_secrets",
-  "w_api_5_apigw",
+  "w_api_3_api_6b",
   "w_api_6a_auth_7b",
-  "w_api_6b_api_1",
+  "w_api_8_schema_iterative_update_locking",
   "w_api_9a_auth_2h",
+  "w_api_9b_custom_policies_container",
+  "w_api_connection_migration2_api_4",
   "w_api_connection_migration_api_key_migration3",
-  "w_api_lambda_auth_1_api_key_migration2",
+  "w_api_key_migration1_schema_auth_14",
+  "w_api_key_migration2_schema_searchable",
+  "w_api_key_migration4_schema_iterative_update_4",
+  "w_api_lambda_auth_2_schema_auth_13",
+  "w_apigw_api_lambda_auth_1",
   "w_auth_11_auth_1b",
   "w_auth_2b_auth_2d",
   "w_auth_2c",
@@ -155,38 +161,41 @@
   "w_auth_5a_auth_5c",
   "w_auth_5e_auth_8b",
   "w_auth_5g_admin_api",
+  "w_auth_6_function_2a",
   "w_auth_7a_auth_8c",
   "w_auth_9_env_5",
   "w_auth_trigger_custom_policies_function",
+  "w_build_function_dynamodb_simulator",
   "w_configure_project_init_c",
   "w_container_hosting_init_b",
   "w_containers_api_1",
   "w_containers_api_2",
-  "w_custom_policies_container_function_9b",
+  "w_containers_api_secrets_storage_4",
   "w_custom_transformers_notifications_in_app_messaging_env_1",
   "w_delete_geo_add_c",
-  "w_dynamodb_simulator_export_pull_c",
   "w_env_1_geo_add_a",
   "w_env_3",
   "w_env_4_frontend_config_drift",
   "w_export_pull_a_function_9a",
   "w_export_pull_b_init_special_case",
+  "w_export_pull_c_function_12",
   "w_export_pull_d_schema_auth_5a",
   "w_feature_flags_geo_import_1b",
+  "w_function_1",
   "w_function_10_function_9c",
-  "w_function_12_function_13",
-  "w_function_14_function_2d",
-  "w_function_2a_schema_connection_2",
-  "w_function_2b_api_connection_migration2",
+  "w_function_11_function_2b",
+  "w_function_13_function_14",
+  "w_function_2d_general_config_headless_init",
+  "w_function_5_schema_iterative_update_1",
+  "w_function_9b_schema_iterative_update_2",
   "w_function_permissions_geo_import_1a",
-  "w_general_config_headless_init_help",
   "w_geo_add_b_s3_sse",
   "w_geo_add_d_geo_import_3",
   "w_geo_headless_api_key_migration5",
   "w_geo_import_2_global_sandbox_b",
-  "w_geo_multi_env_searchable_datastore",
   "w_geo_remove_1",
   "w_global_sandbox_a_init_e",
+  "w_help_init_force_push",
   "w_hooks_b_notifications_analytics_compatibility_sms_1",
   "w_hosted_ui_user_groups_s3_access",
   "w_hostingPROD",
@@ -197,28 +206,24 @@
   "w_import_s3_3",
   "w_init_a_schema_auth_4c",
   "w_init_f_auth_5d",
-  "w_init_force_push_interactions_1",
-  "w_interactions_2_minify_cloudformation",
+  "w_interactions_1_interactions_2",
   "w_interactions_schema_model_a",
   "w_js_frontend_config",
-  "w_layer_1_api_key_migration4",
   "w_layer_4_function_2c",
+  "w_minify_cloudformation_notifications_multi_env",
   "w_node_function_notifications_sms",
   "w_notifications_analytics_compatibility_in_app_1_notifications_analytics_compatibility_sms_2",
   "w_notifications_analytics_compatibility_in_app_2_schema_auth_11_c",
   "w_notifications_apns_notifications_fcm",
   "w_notifications_in_app_messaging",
   "w_notifications_in_app_messaging_env_2_with_babel_config",
-  "w_notifications_multi_env_notifications_sms_update",
   "w_notifications_sms_pull_auth_10",
-  "w_parameter_store_1_parameter_store_2",
+  "w_notifications_sms_update_parameter_store_1",
+  "w_parameter_store_2_push",
   "w_plugin_studio_modelgen",
   "w_predictions_schema_auth_11_b",
-  "w_push_smoketest_ios",
-  "w_resolvers_schema_key",
+  "w_schema_auth_10_geo_multi_env",
   "w_schema_auth_11_a",
-  "w_schema_auth_13_function_5",
-  "w_schema_auth_14_api_3",
   "w_schema_auth_15",
   "w_schema_auth_1a_schema_auth_5b",
   "w_schema_auth_1b_schema_auth_2a",
@@ -237,22 +242,18 @@
   "w_schema_auth_9_b_predictions_migration",
   "w_schema_auth_9_c_storage_3",
   "w_schema_connection_1",
+  "w_schema_connection_2_schema_function_1",
   "w_schema_data_access_patterns_schema_model_c",
-  "w_schema_function_1_api_9b",
-  "w_schema_iterative_update_1_auth_6",
-  "w_schema_iterative_update_2_storage_1a",
   "w_schema_iterative_update_3_auth_migration",
-  "w_schema_iterative_update_4_function_1",
-  "w_schema_iterative_update_locking_api_lambda_auth_2",
+  "w_schema_key_api_5",
   "w_schema_model_d_auth_5f",
   "w_schema_predictions_model_migration",
-  "w_schema_searchable_api_key_migration1",
   "w_schema_versioned_auth_1c",
+  "w_searchable_datastore_resolvers",
   "w_searchable_migration",
-  "w_smoketest_api_8",
-  "w_storage_1b_function_11",
+  "w_smoketest_ios_smoketest",
+  "w_storage_1a_storage_1b",
   "w_storage_2_iam_permissions_boundary",
-  "w_storage_4_schema_auth_10",
   "w_tags_auth_1a",
-  "w_user_groups_build_function"
+  "w_user_groups_build_function_yarn_modern"
 ]
diff --git a/package.json b/package.json
@@ -174,6 +174,8 @@
     "tough-cookie": "^4.1.3",
     "semver": "^7.5.4",
     "word-wrap": "^1.2.4",
-    "follow-redirects": "^1.15.6"
+    "follow-redirects": "^1.15.6",
+    "amplify-codegen": "4.7.3",
+    "@aws-amplify/appsync-modelgen-plugin": "2.8.1"
   }
 }
diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.28](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
 ## [5.0.27](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-06)
 
 **Note:** Version bump only for package @aws-amplify/amplify-app

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-app",
-  "version": "5.0.27",
+  "version": "5.0.28",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@aws-amplify/amplify-frontend-android": "3.5.8",
     "@aws-amplify/amplify-frontend-flutter": "1.4.7",
-    "@aws-amplify/amplify-frontend-ios": "3.6.28",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.9",
+    "@aws-amplify/amplify-frontend-ios": "3.6.29",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.10",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-appsync-simulator/API.md b/packages/amplify-appsync-simulator/API.md
@@ -89,6 +89,8 @@ export class AmplifyAppSyncSimulator {
     // (undocumented)
     init(config: AmplifyAppSyncSimulatorConfig): void;
     // (undocumented)
+    get localhostUrl(): string;
+    // (undocumented)
     get pubsub(): PubSub;
     // (undocumented)
     reload(config: AmplifyAppSyncSimulatorConfig): void;

diff --git a/packages/amplify-appsync-simulator/CHANGELOG.md b/packages/amplify-appsync-simulator/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.8](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
+
+**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
+
+
+
+
+
 ## [2.15.7](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-06)
 
 **Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.15.7",
+  "version": "2.15.8",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.1",
+    "@aws-amplify/amplify-cli-core": "4.3.2",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
@@ -64,7 +64,7 @@
     "@types/express": "^4.17.3",
     "@types/node": "^12.12.6",
     "@types/ws": "^8.2.2",
-    "jsonwebtoken": "^9.0.0"
+    "jose": "^5.2.0"
   },
   "packageExtensions": {
     "graphql-iso-date": {