Merge branch 'main' into actions-e2e-datastore-fix

ashwinkumar6 · Aug 15, 2023 · ca7b206 · ca7b206
2 parents 248cf9e + c3ec8a5
commit ca7b206
Show file tree

Hide file tree

Showing 581 changed files with 12,289 additions and 11,142 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -52,7 +52,7 @@ executors:
 
   macos-executor:
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
     resource_class: large
 
   webkit-test-executor:
@@ -1091,12 +1091,12 @@ jobs:
     steps:
       - integ_test_rn_ios
 
-  integ_rn_ios_push_notifications:
-    executor: macos-executor
-    <<: *test_env_vars
-    working_directory: ~/amplify-js-samples-staging/samples/react-native/push-notifications/PushNotificationApp
-    steps:
-      - integ_test_rn_ios
+  # integ_rn_ios_push_notifications:
+  #   executor: macos-executor
+  #   <<: *test_env_vars
+  #   working_directory: ~/amplify-js-samples-staging/samples/react-native/push-notifications/PushNotificationApp
+  #   steps:
+  #     - integ_test_rn_ios
 
   # integ_rn_android_storage:
   #   executor: macos-executor
@@ -2013,12 +2013,12 @@ workflows:
             - build
           filters:
             <<: *releasable_branches
-      - integ_rn_ios_push_notifications:
-          requires:
-            - integ_setup
-            - build
-          filters:
-            <<: *releasable_branches
+      # - integ_rn_ios_push_notifications:
+      #     requires:
+      #       - integ_setup
+      #       - build
+      #     filters:
+      #       <<: *releasable_branches
       - integ_rn_ios_device_tracking:
           requires:
             - integ_setup

diff --git a/.github/actions/node-and-build/action.yml b/.github/actions/node-and-build/action.yml
@@ -25,7 +25,7 @@ runs:
           **/esm/
           **/cjs/
           **/packages/core/src/Platform/version.ts
-        key: ${{ runner.os }}-build-artifacts-${{ hashFiles('./amplify-js/yarn.lock') }}
+        key: ${{ runner.os }}-build-artifacts-${{ github.sha }}
         restore-keys: |
           ${{ runner.os }}-build-artifacts-
       env:

diff --git a/.github/canary-config/canary-all.yml b/.github/canary-config/canary-all.yml
@@ -8,7 +8,7 @@ extended_browser_list: &extended_browser_list
   - edge
 
 tests:
-    # DATASTORE
+  # DATASTORE
   - test_name: integ_datastore_auth-owner-based-default
     desc: 'DataStore Auth - Chrome'
     framework: react
@@ -243,7 +243,7 @@ tests:
     sample_name: [multi-part-copy-with-progress]
     spec: multi-part-copy-with-progress
     browser: *minimal_browser_list
- 
+
     # API
   - test_name: integ_react_graphql_api
     desc: 'React GraphQL API'
@@ -330,4 +330,4 @@ tests:
     framework: node
     category: auth
     sample_name: [amazon-cognito-identity-js]
-    build_type: dev
+    build_type: dev
diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
@@ -135,6 +135,8 @@ tests:
     sample_name: v2/owner-and-group-different-models-default-v2
     spec: owner-and-group-different-models-default
     browser: *minimal_browser_list
+    timeout_minutes: 45
+    retry_count: 10
   - test_name: integ_datastore_auth_v2-owner-and-group-same-model-default
     desc: 'DataStore Auth CLI v2'
     framework: react
@@ -156,6 +158,8 @@ tests:
     sample_name: v2/dynamic-user-pool-groups-default-v2
     spec: dynamic-user-pool-groups-default
     browser: *minimal_browser_list
+    timeout_minutes: 45
+    retry_count: 10
   - test_name: integ_datastore_auth_v2-dynamic-user-pool-groups-owner-based-default
     desc: 'DataStore Auth CLI v2'
     framework: react
@@ -319,6 +323,7 @@ tests:
     sample_name: [v2/custom-pk-unconnected-models]
     spec: custom-pk-unconnected-models
     browser: *extended_browser_list
+    timeout_minutes: 60
   # - test_name: integ_react_datastore_custom_pk_unconnected_models_webkit
   #   desc: 'DataStore - Custom Primary Key (Connected Models)'
   #   framework: react
@@ -333,13 +338,15 @@ tests:
     sample_name: [v2/custom-pk-has-one]
     spec: custom-pk-has-one
     browser: *minimal_browser_list
+    timeout_minutes: 60
   - test_name: integ_react_datastore_custom_pk_has_many_many_to_many
     desc: 'DataStore - Custom Primary Key (Has Many / Many to Many)'
     framework: react
     category: datastore
     sample_name: [v2/custom-pk-has-many-many-to-many]
     spec: custom-pk-has-many-many-to-many
     browser: *minimal_browser_list
+    timeout_minutes: 60
   - test_name: integ_react_datastore_background_process_manager
     desc: 'DataStore - Background Process Manager'
     framework: react

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.9)
+    commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
     dnsruby (1.61.9)
       simpleidn (~> 0.1)

diff --git a/docs/api/assets/js/search.json b/docs/api/assets/js/search.json
diff --git a/docs/api/classes/abstractconvertpredictionsprovider.html b/docs/api/classes/abstractconvertpredictionsprovider.html
@@ -1001,7 +1001,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> _config</h3>
 			<aside class="tsd-sources">
 				<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#_config">_config</a></p>
 				<ul>
-					<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
+					<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
 				</ul>
 			</aside>
 		</section>
@@ -1019,7 +1019,7 @@ <h3>configure</h3>
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#configure">configure</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L11">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:11</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L11">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:11</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1042,7 +1042,7 @@ <h3>convert</h3>
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L23">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:23</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L23">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:23</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1065,7 +1065,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> convert<wbr>Speech<
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L50">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:50</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L50">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:50</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1088,7 +1088,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> convert<wbr>Text<wb
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L44">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:44</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L44">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:44</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1112,7 +1112,7 @@ <h3>get<wbr>Category</h3>
 					<aside class="tsd-sources">
 						<p>Overrides <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getcategory">getCategory</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L19">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:19</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L19">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:19</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
@@ -1130,7 +1130,7 @@ <h3><span class="tsd-flag ts-flagAbstract">Abstract</span> get<wbr>Provider<wbr>
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getprovidername">getProviderName</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:17</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:17</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
@@ -1147,7 +1147,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> translate<wbr>Text<
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L38">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:38</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L38">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:38</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>

diff --git a/docs/api/classes/abstractidentifypredictionsprovider.html b/docs/api/classes/abstractidentifypredictionsprovider.html
@@ -1001,7 +1001,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> _config</h3>
 			<aside class="tsd-sources">
 				<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#_config">_config</a></p>
 				<ul>
-					<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
+					<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
 				</ul>
 			</aside>
 		</section>
@@ -1019,7 +1019,7 @@ <h3>configure</h3>
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#configure">configure</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L11">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:11</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L11">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:11</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1043,7 +1043,7 @@ <h3>get<wbr>Category</h3>
 					<aside class="tsd-sources">
 						<p>Overrides <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getcategory">getCategory</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L19">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:19</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L19">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:19</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
@@ -1061,7 +1061,7 @@ <h3><span class="tsd-flag ts-flagAbstract">Abstract</span> get<wbr>Provider<wbr>
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getprovidername">getProviderName</a></p>
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:17</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:17</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
@@ -1078,7 +1078,7 @@ <h3>identify</h3>
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L23">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:23</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L23">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:23</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1101,7 +1101,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> identify<wbr>Entiti
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L52">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:52</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L52">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:52</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1124,7 +1124,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> identify<wbr>Labels
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L46">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:46</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L46">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:46</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>
@@ -1147,7 +1147,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> identify<wbr>Text</
 				<li class="tsd-description">
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/346091cd8/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L40">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:40</a></li>
+							<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/16a0c2610/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L40">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:40</a></li>
 						</ul>
 					</aside>
 					<h4 class="tsd-parameters-title">Parameters</h4>