Skip to content

Commit 9ffe59d

Browse files
5d5d
authored
Merge pull request #2677 from aws-amplify/main
chore: kickoff release
2 parents cb5124b + 3ca5f97 commit 9ffe59d

File tree

113 files changed

+5387
-1612
lines changed

Some content is hidden

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

113 files changed

+5387
-1612
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
steps:
229229
- add_ssh_keys:
230230
fingerprints:
231-
- '7a:f2:7f:a6:62:1a:9e:0f:f1:03:8c:fc:86:93:77:6e'
231+
- '3f:b4:9f:aa:0b:d7:c5:16:fb:44:44:35:cb:a7:70:e0'
232232
- *restore_repo
233233
- restore_gems
234234
- check_bundle

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
*Issue #, if available:*
1+
## Issue \#
2+
<!-- If applicable, please link to issue(s) this change addresses -->
23

3-
*Description of changes:*
4+
## Description
5+
<!-- Why is this change required? What problem does it solve? -->
46

5-
*Check points: (check or cross out if not relevant)*
7+
## General Checklist
8+
<!-- Check or cross out if not relevant -->
69

710
- [ ] Added new tests to cover change, if needed
811
- [ ] Build succeeds with all target using Swift Package Manager
@@ -11,15 +14,7 @@
1114
- [ ] Security oriented best practices and standards are followed (e.g. using input sanitization, principle of least privilege, etc)
1215
- [ ] Documentation update for the change if required
1316
- [ ] PR title conforms to conventional commit style
17+
- [ ] New or updated tests include `Given When Then` inline code documentation and are named accordingly `testThing_condition_expectation()`
1418
- [ ] If breaking change, documentation/changelog update with migration instructions
1519

16-
*DataStore checkpoints (check when completed)*
17-
18-
- [ ] Ran AWSDataStorePluginIntegrationTests
19-
- [ ] Ran AWSDataStorePluginV2Tests
20-
- [ ] Ran AWSDataStorePluginMultiAuthTests
21-
- [ ] Ran AWSDataStorePluginCPKTests
22-
- [ ] Ran AWSDataStorePluginAuthCognitoTests
23-
- [ ] Ran AWSDataStorePluginAuthIAMTests
24-
2520
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

‎.github/workflows/integ_test.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
uses: ./.github/composite_actions/run_xcodebuild_test
5454
with:
5555
project_path: ./AmplifyPlugins/Analytics/Tests/AnalyticsHostApp
56-
scheme: AnalyticsHostApp
56+
scheme: AWSPinpointAnalyticsPluginIntegrationTests
5757

5858
auth-integration-test:
5959
needs: prepare-for-test
@@ -79,7 +79,7 @@ jobs:
7979
uses: ./.github/composite_actions/run_xcodebuild_test
8080
with:
8181
project_path: ./AmplifyPlugins/Auth/Tests/AuthHostApp/
82-
scheme: AuthHostApp
82+
scheme: AuthIntegrationTests
8383

8484
geo-integration-test:
8585
needs: prepare-for-test
@@ -105,11 +105,10 @@ jobs:
105105
uses: ./.github/composite_actions/run_xcodebuild_test
106106
with:
107107
project_path: ./AmplifyPlugins/Geo/Tests/GeoHostApp/
108-
scheme: GeoHostApp
108+
scheme: AWSLocationGeoPluginIntegrationTests
109109

110110

111111
storage-integration-test:
112-
continue-on-error: true
113112
needs: prepare-for-test
114113
runs-on: macos-12
115114
environment: IntegrationTest
@@ -133,4 +132,4 @@ jobs:
133132
uses: ./.github/composite_actions/run_xcodebuild_test
134133
with:
135134
project_path: ./AmplifyPlugins/Storage/Tests/StorageHostApp/
136-
scheme: StorageHostApp
135+
scheme: AWSS3StoragePluginIntegrationTests

‎.github/workflows/integ_test_api.yml‎

Lines changed: 159 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,60 @@ jobs:
3030
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
3131

3232
api-functional-test:
33-
continue-on-error: true
34-
needs: prepare-for-test
35-
runs-on: macos-12
36-
environment: IntegrationTest
37-
steps:
38-
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
39-
with:
40-
persist-credentials: false
41-
42-
- name: Make directory
43-
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
44-
45-
- name: Copy integration test resouces
46-
uses: ./.github/composite_actions/download_test_configuration
47-
with:
48-
resource_subfolder: api
49-
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
50-
aws_region: ${{ secrets.AWS_REGION }}
51-
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
52-
53-
- name: Run Integration test
54-
uses: ./.github/composite_actions/run_xcodebuild_test
55-
with:
56-
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
57-
scheme: AWSAPIPluginFunctionalTests
33+
needs: prepare-for-test
34+
runs-on: macos-12
35+
environment: IntegrationTest
36+
steps:
37+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
38+
with:
39+
persist-credentials: false
40+
41+
- name: Make directory
42+
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
43+
44+
- name: Copy integration test resouces
45+
uses: ./.github/composite_actions/download_test_configuration
46+
with:
47+
resource_subfolder: api
48+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
49+
aws_region: ${{ secrets.AWS_REGION }}
50+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
51+
52+
- name: Run Integration test
53+
uses: ./.github/composite_actions/run_xcodebuild_test
54+
with:
55+
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
56+
scheme: AWSAPIPluginFunctionalTests
5857

58+
api-graphql-user-pool-test:
59+
if: ${{ false }}
60+
needs: prepare-for-test
61+
runs-on: macos-12
62+
environment: IntegrationTest
63+
steps:
64+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
65+
with:
66+
persist-credentials: false
67+
68+
- name: Make directory
69+
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
70+
71+
- name: Copy integration test resouces
72+
uses: ./.github/composite_actions/download_test_configuration
73+
with:
74+
resource_subfolder: api
75+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
76+
aws_region: ${{ secrets.AWS_REGION }}
77+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
78+
79+
- name: Run Integration test
80+
uses: ./.github/composite_actions/run_xcodebuild_test
81+
with:
82+
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
83+
scheme: AWSAPIPluginGraphQLUserPoolTests
84+
5985
api-graphql-iam-test:
6086
if: ${{ false }}
61-
continue-on-error: true
6287
needs: prepare-for-test
6388
runs-on: macos-12
6489
environment: IntegrationTest
@@ -82,4 +107,111 @@ jobs:
82107
uses: ./.github/composite_actions/run_xcodebuild_test
83108
with:
84109
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
85-
scheme: AWSAPIPluginGraphQLIAMTests
110+
scheme: AWSAPIPluginGraphQLIAMTests
111+
112+
api-graphql-lambda-auth-test:
113+
needs: prepare-for-test
114+
runs-on: macos-12
115+
environment: IntegrationTest
116+
steps:
117+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
118+
with:
119+
persist-credentials: false
120+
121+
- name: Make directory
122+
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
123+
124+
- name: Copy integration test resouces
125+
uses: ./.github/composite_actions/download_test_configuration
126+
with:
127+
resource_subfolder: api
128+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
129+
aws_region: ${{ secrets.AWS_REGION }}
130+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
131+
132+
- name: Run Integration test
133+
uses: ./.github/composite_actions/run_xcodebuild_test
134+
with:
135+
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
136+
scheme: AWSAPIPluginGraphQLLambdaAuthTests
137+
138+
api-lazy-load-test:
139+
if: ${{ false }}
140+
needs: prepare-for-test
141+
runs-on: macos-12
142+
environment: IntegrationTest
143+
steps:
144+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
145+
with:
146+
persist-credentials: false
147+
148+
- name: Make directory
149+
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
150+
151+
- name: Copy integration test resouces
152+
uses: ./.github/composite_actions/download_test_configuration
153+
with:
154+
resource_subfolder: api
155+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
156+
aws_region: ${{ secrets.AWS_REGION }}
157+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
158+
159+
- name: Run Integration test
160+
uses: ./.github/composite_actions/run_xcodebuild_test
161+
with:
162+
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
163+
scheme: AWSAPIPluginLazyLoadTests
164+
165+
api-rest-user-pool-test:
166+
if: ${{ false }}
167+
needs: prepare-for-test
168+
runs-on: macos-12
169+
environment: IntegrationTest
170+
steps:
171+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
172+
with:
173+
persist-credentials: false
174+
175+
- name: Make directory
176+
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
177+
178+
- name: Copy integration test resouces
179+
uses: ./.github/composite_actions/download_test_configuration
180+
with:
181+
resource_subfolder: api
182+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
183+
aws_region: ${{ secrets.AWS_REGION }}
184+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
185+
186+
- name: Run Integration test
187+
uses: ./.github/composite_actions/run_xcodebuild_test
188+
with:
189+
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
190+
scheme: AWSAPIPluginRESTUserPoolTests
191+
192+
api-rest-iam-test:
193+
if: ${{ false }}
194+
needs: prepare-for-test
195+
runs-on: macos-12
196+
environment: IntegrationTest
197+
steps:
198+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
199+
with:
200+
persist-credentials: false
201+
202+
- name: Make directory
203+
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
204+
205+
- name: Copy integration test resouces
206+
uses: ./.github/composite_actions/download_test_configuration
207+
with:
208+
resource_subfolder: api
209+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
210+
aws_region: ${{ secrets.AWS_REGION }}
211+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
212+
213+
- name: Run Integration test
214+
uses: ./.github/composite_actions/run_xcodebuild_test
215+
with:
216+
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
217+
scheme: AWSAPIPluginRESTIAMTests

‎.github/workflows/integ_test_datastore.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ jobs:
3030
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
3131

3232
datastore-integration-test:
33-
continue-on-error: true
34-
timeout-minutes: 15
33+
timeout-minutes: 30
3534
needs: prepare-for-test
3635
runs-on: macos-12
3736
environment: IntegrationTest

‎.github/workflows/integ_test_datastore_auth_cognito.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: DataStore Auth Cognito Tests
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches: [main]
6+
7+
permissions:
8+
id-token: write
9+
contents: read
10+
11+
concurrency:
12+
group: ${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
prepare-for-test:
17+
runs-on: macos-12
18+
environment: IntegrationTest
19+
steps:
20+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
21+
with:
22+
persist-credentials: false
23+
24+
- name: Verify copy resources
25+
uses: ./.github/composite_actions/download_test_configuration
26+
with:
27+
resource_subfolder: NA
28+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
29+
aws_region: ${{ secrets.AWS_REGION }}
30+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
31+
32+
datastore-integration-v2-test:
33+
timeout-minutes: 30
34+
needs: prepare-for-test
35+
runs-on: macos-12
36+
environment: IntegrationTest
37+
steps:
38+
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
39+
with:
40+
persist-credentials: false
41+
42+
- name: Make directory
43+
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
44+
45+
- name: Copy integration test resouces
46+
uses: ./.github/composite_actions/download_test_configuration
47+
with:
48+
resource_subfolder: datastore
49+
aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
50+
aws_region: ${{ secrets.AWS_REGION }}
51+
aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG }}
52+
53+
- name: Run Integration test
54+
uses: ./.github/composite_actions/run_xcodebuild_test
55+
with:
56+
project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
57+
scheme: AWSDataStorePluginAuthCognitoTests
58+
59+

0 commit comments

Comments
 (0)