Skip to content

Commit 46d9ad2

Browse files
EquarteyEquartey
authored
chore(infra): Api migrate to Gen 2 E2E (#5043)
1 parent 0c80cdd commit 46d9ad2

File tree

61 files changed

+3701
-2574
lines changed

Some content is hidden

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

61 files changed

+3701
-2574
lines changed

‎.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,7 @@ yarn.lock linguist-generated
9797
**/dist/*.mjs linguist-generated
9898
**/dist/*.cjs linguist-generated
9999
**/dist/*.cjs.map linguist-generated
100+
101+
## Codegen Models
102+
**/example/lib/models/** linguist-generated
103+
**/example/lib/models/gen2/Gen2ModelProvider.dart linguist-generated=false

‎.github/composite_actions/fetch_backends/action.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ inputs:
1717
secret-identifier:
1818
required: true
1919
description: ARN of secret from AWS Secrets Manger which is a JSON object of app IDs / s3 bucket ARNs
20-
needs-gen2-config:
21-
required: true
22-
description: Whether the E2E workflow needs amplify_outputs from AWS
2320

2421
runs:
2522
using: "composite"
@@ -47,14 +44,6 @@ runs:
4744
shell: bash
4845
run: dart pub global run aft exec --include=${{ inputs.scope }} -- tool/pull_test_backend.sh
4946

50-
- name: Pull Amplify Outputs
51-
shell: bash
52-
run: |
53-
if [[ "${{inputs.needs-gen2-config}}" == true ]]; then
54-
dart pub global run aft exec --include=${{ inputs.scope }} -- tool/pull_test_gen2_backend.sh ...
55-
fi
56-
exit 0
57-
5847
- name: Undo any codegen changes from amplify pull
5948
shell: bash
6049
run: dart pub global run aft exec --include=${{ inputs.scope }} -- [ -d "lib/models" ] && git checkout '**/lib/models/*' || exit 0

‎.github/workflows/amplify_analytics_pinpoint_example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ jobs:
166166
package-name: amplify_analytics_pinpoint_example
167167
working-directory: packages/analytics/amplify_analytics_pinpoint/example
168168
needs-aws-config: true
169-
needs-gen2-config: false
170169
e2e_ios_test:
171170
needs: [test]
172171
uses: ./.github/workflows/e2e_ios.yaml
@@ -175,7 +174,6 @@ jobs:
175174
package-name: amplify_analytics_pinpoint_example
176175
working-directory: packages/analytics/amplify_analytics_pinpoint/example
177176
needs-aws-config: true
178-
needs-gen2-config: false
179177
e2e_web_test:
180178
needs: [test]
181179
uses: ./.github/workflows/e2e_web.yaml
@@ -184,7 +182,6 @@ jobs:
184182
package-name: amplify_analytics_pinpoint_example
185183
working-directory: packages/analytics/amplify_analytics_pinpoint/example
186184
needs-aws-config: true
187-
needs-gen2-config: false
188185
e2e_linux_test:
189186
needs: [test]
190187
uses: ./.github/workflows/e2e_linux.yaml
@@ -193,7 +190,6 @@ jobs:
193190
package-name: amplify_analytics_pinpoint_example
194191
working-directory: packages/analytics/amplify_analytics_pinpoint/example
195192
needs-aws-config: true
196-
needs-gen2-config: false
197193
e2e_windows_test:
198194
needs: [test]
199195
uses: ./.github/workflows/e2e_windows.yaml
@@ -202,4 +198,3 @@ jobs:
202198
package-name: amplify_analytics_pinpoint_example
203199
working-directory: packages/analytics/amplify_analytics_pinpoint/example
204200
needs-aws-config: true
205-
needs-gen2-config: false

‎.github/workflows/amplify_api_example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ jobs:
170170
package-name: amplify_api_example
171171
working-directory: packages/api/amplify_api/example
172172
needs-aws-config: true
173-
needs-gen2-config: false
174173
e2e_ios_test:
175174
needs: [test]
176175
uses: ./.github/workflows/e2e_ios.yaml
@@ -179,7 +178,6 @@ jobs:
179178
package-name: amplify_api_example
180179
working-directory: packages/api/amplify_api/example
181180
needs-aws-config: true
182-
needs-gen2-config: false
183181
e2e_web_test:
184182
needs: [test]
185183
uses: ./.github/workflows/e2e_web.yaml
@@ -188,7 +186,6 @@ jobs:
188186
package-name: amplify_api_example
189187
working-directory: packages/api/amplify_api/example
190188
needs-aws-config: true
191-
needs-gen2-config: false
192189
e2e_linux_test:
193190
needs: [test]
194191
uses: ./.github/workflows/e2e_linux.yaml
@@ -197,7 +194,6 @@ jobs:
197194
package-name: amplify_api_example
198195
working-directory: packages/api/amplify_api/example
199196
needs-aws-config: true
200-
needs-gen2-config: false
201197
e2e_windows_test:
202198
needs: [test]
203199
uses: ./.github/workflows/e2e_windows.yaml
@@ -206,4 +202,3 @@ jobs:
206202
package-name: amplify_api_example
207203
working-directory: packages/api/amplify_api/example
208204
needs-aws-config: true
209-
needs-gen2-config: false

‎.github/workflows/amplify_auth_cognito_example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ jobs:
178178
package-name: amplify_auth_cognito_example
179179
working-directory: packages/auth/amplify_auth_cognito/example
180180
needs-aws-config: true
181-
needs-gen2-config: false
182181
e2e_ios_test:
183182
needs: [test]
184183
uses: ./.github/workflows/e2e_ios.yaml
@@ -187,7 +186,6 @@ jobs:
187186
package-name: amplify_auth_cognito_example
188187
working-directory: packages/auth/amplify_auth_cognito/example
189188
needs-aws-config: true
190-
needs-gen2-config: false
191189
e2e_web_test:
192190
needs: [test]
193191
uses: ./.github/workflows/e2e_web.yaml
@@ -196,7 +194,6 @@ jobs:
196194
package-name: amplify_auth_cognito_example
197195
working-directory: packages/auth/amplify_auth_cognito/example
198196
needs-aws-config: true
199-
needs-gen2-config: false
200197
e2e_linux_test:
201198
needs: [test]
202199
uses: ./.github/workflows/e2e_linux.yaml
@@ -205,7 +202,6 @@ jobs:
205202
package-name: amplify_auth_cognito_example
206203
working-directory: packages/auth/amplify_auth_cognito/example
207204
needs-aws-config: true
208-
needs-gen2-config: false
209205
e2e_windows_test:
210206
needs: [test]
211207
uses: ./.github/workflows/e2e_windows.yaml
@@ -214,4 +210,3 @@ jobs:
214210
package-name: amplify_auth_cognito_example
215211
working-directory: packages/auth/amplify_auth_cognito/example
216212
needs-aws-config: true
217-
needs-gen2-config: false

‎.github/workflows/amplify_authenticator_example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ jobs:
170170
package-name: amplify_authenticator_example
171171
working-directory: packages/authenticator/amplify_authenticator/example
172172
needs-aws-config: true
173-
needs-gen2-config: false
174173
e2e_ios_test:
175174
needs: [test]
176175
uses: ./.github/workflows/e2e_ios.yaml
@@ -179,7 +178,6 @@ jobs:
179178
package-name: amplify_authenticator_example
180179
working-directory: packages/authenticator/amplify_authenticator/example
181180
needs-aws-config: true
182-
needs-gen2-config: false
183181
e2e_web_test:
184182
needs: [test]
185183
uses: ./.github/workflows/e2e_web.yaml
@@ -188,7 +186,6 @@ jobs:
188186
package-name: amplify_authenticator_example
189187
working-directory: packages/authenticator/amplify_authenticator/example
190188
needs-aws-config: true
191-
needs-gen2-config: false
192189
e2e_linux_test:
193190
needs: [test]
194191
uses: ./.github/workflows/e2e_linux.yaml
@@ -197,7 +194,6 @@ jobs:
197194
package-name: amplify_authenticator_example
198195
working-directory: packages/authenticator/amplify_authenticator/example
199196
needs-aws-config: true
200-
needs-gen2-config: false
201197
e2e_windows_test:
202198
needs: [test]
203199
uses: ./.github/workflows/e2e_windows.yaml
@@ -206,4 +202,3 @@ jobs:
206202
package-name: amplify_authenticator_example
207203
working-directory: packages/authenticator/amplify_authenticator/example
208204
needs-aws-config: true
209-
needs-gen2-config: false

‎.github/workflows/amplify_datastore_example.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ jobs:
144144
package-name: amplify_datastore_example
145145
working-directory: packages/amplify_datastore/example
146146
needs-aws-config: true
147-
needs-gen2-config: false
148147
e2e_ios_test:
149148
needs: [test]
150149
uses: ./.github/workflows/e2e_ios.yaml
@@ -153,4 +152,3 @@ jobs:
153152
package-name: amplify_datastore_example
154153
working-directory: packages/amplify_datastore/example
155154
needs-aws-config: true
156-
needs-gen2-config: false

‎.github/workflows/amplify_db_common_example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ jobs:
9898
package-name: amplify_db_common_example
9999
working-directory: packages/common/amplify_db_common/example
100100
needs-aws-config: true
101-
needs-gen2-config: false
102101
e2e_ios_test:
103102
needs: [test]
104103
uses: ./.github/workflows/e2e_ios.yaml
@@ -107,7 +106,6 @@ jobs:
107106
package-name: amplify_db_common_example
108107
working-directory: packages/common/amplify_db_common/example
109108
needs-aws-config: true
110-
needs-gen2-config: false
111109
e2e_web_test:
112110
needs: [test]
113111
uses: ./.github/workflows/e2e_web.yaml
@@ -116,7 +114,6 @@ jobs:
116114
package-name: amplify_db_common_example
117115
working-directory: packages/common/amplify_db_common/example
118116
needs-aws-config: true
119-
needs-gen2-config: false
120117
e2e_linux_test:
121118
needs: [test]
122119
uses: ./.github/workflows/e2e_linux.yaml
@@ -125,7 +122,6 @@ jobs:
125122
package-name: amplify_db_common_example
126123
working-directory: packages/common/amplify_db_common/example
127124
needs-aws-config: true
128-
needs-gen2-config: false
129125
e2e_windows_test:
130126
needs: [test]
131127
uses: ./.github/workflows/e2e_windows.yaml
@@ -134,4 +130,3 @@ jobs:
134130
package-name: amplify_db_common_example
135131
working-directory: packages/common/amplify_db_common/example
136132
needs-aws-config: true
137-
needs-gen2-config: false

‎.github/workflows/amplify_secure_storage_example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ jobs:
9494
package-name: amplify_secure_storage_example
9595
working-directory: packages/secure_storage/amplify_secure_storage/example
9696
needs-aws-config: false
97-
needs-gen2-config: false
9897
e2e_ios_test:
9998
needs: [test]
10099
uses: ./.github/workflows/e2e_ios.yaml
@@ -103,7 +102,6 @@ jobs:
103102
package-name: amplify_secure_storage_example
104103
working-directory: packages/secure_storage/amplify_secure_storage/example
105104
needs-aws-config: false
106-
needs-gen2-config: false
107105
e2e_web_test:
108106
needs: [test]
109107
uses: ./.github/workflows/e2e_web.yaml
@@ -112,7 +110,6 @@ jobs:
112110
package-name: amplify_secure_storage_example
113111
working-directory: packages/secure_storage/amplify_secure_storage/example
114112
needs-aws-config: false
115-
needs-gen2-config: false
116113
e2e_linux_test:
117114
needs: [test]
118115
uses: ./.github/workflows/e2e_linux.yaml
@@ -121,7 +118,6 @@ jobs:
121118
package-name: amplify_secure_storage_example
122119
working-directory: packages/secure_storage/amplify_secure_storage/example
123120
needs-aws-config: false
124-
needs-gen2-config: false
125121
e2e_windows_test:
126122
needs: [test]
127123
uses: ./.github/workflows/e2e_windows.yaml
@@ -130,4 +126,3 @@ jobs:
130126
package-name: amplify_secure_storage_example
131127
working-directory: packages/secure_storage/amplify_secure_storage/example
132128
needs-aws-config: false
133-
needs-gen2-config: false

‎.github/workflows/amplify_storage_s3_example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ jobs:
170170
package-name: amplify_storage_s3_example
171171
working-directory: packages/storage/amplify_storage_s3/example
172172
needs-aws-config: true
173-
needs-gen2-config: false
174173
e2e_ios_test:
175174
needs: [test]
176175
uses: ./.github/workflows/e2e_ios.yaml
@@ -179,7 +178,6 @@ jobs:
179178
package-name: amplify_storage_s3_example
180179
working-directory: packages/storage/amplify_storage_s3/example
181180
needs-aws-config: true
182-
needs-gen2-config: false
183181
e2e_web_test:
184182
needs: [test]
185183
uses: ./.github/workflows/e2e_web.yaml
@@ -188,7 +186,6 @@ jobs:
188186
package-name: amplify_storage_s3_example
189187
working-directory: packages/storage/amplify_storage_s3/example
190188
needs-aws-config: true
191-
needs-gen2-config: false
192189
e2e_linux_test:
193190
needs: [test]
194191
uses: ./.github/workflows/e2e_linux.yaml
@@ -197,7 +194,6 @@ jobs:
197194
package-name: amplify_storage_s3_example
198195
working-directory: packages/storage/amplify_storage_s3/example
199196
needs-aws-config: true
200-
needs-gen2-config: false
201197
e2e_windows_test:
202198
needs: [test]
203199
uses: ./.github/workflows/e2e_windows.yaml
@@ -206,4 +202,3 @@ jobs:
206202
package-name: amplify_storage_s3_example
207203
working-directory: packages/storage/amplify_storage_s3/example
208204
needs-aws-config: true
209-
needs-gen2-config: false

‎.github/workflows/e2e_android.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
description: Whether the E2E workflow needs configuration pulled from AWS
1515
required: true
1616
type: boolean
17-
needs-gen2-config:
18-
required: true
19-
description: Whether the E2E workflow needs amplify_outputs from AWS
20-
type: boolean
2117

2218
jobs:
2319
e2e-test-android:
@@ -66,7 +62,6 @@ jobs:
6662
aws-region: ${{ secrets.AWS_REGION }}
6763
scope: ${{ inputs.package-name }}
6864
secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
69-
needs-gen2-config: ${{ inputs.needs-gen2-config }}
7065

7166
- name: Launch Android emulator
7267
uses: ./.github/composite_actions/launch_android_emulator

‎.github/workflows/e2e_ios.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
description: Whether the E2E workflow needs configuration pulled from AWS
1515
required: true
1616
type: boolean
17-
needs-gen2-config:
18-
required: true
19-
description: Whether the E2E workflow needs amplify_outputs from AWS
20-
type: boolean
2117

2218
jobs:
2319
e2e-test-ios:
@@ -64,7 +60,6 @@ jobs:
6460
aws-region: ${{ secrets.AWS_REGION }}
6561
scope: ${{ inputs.package-name }}
6662
secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
67-
needs-gen2-config: ${{ inputs.needs-gen2-config }}
6863

6964
- name: Run integration tests
7065
timeout-minutes: 60

‎.github/workflows/e2e_linux.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
description: Whether the E2E workflow needs configuration pulled from AWS
1515
required: true
1616
type: boolean
17-
needs-gen2-config:
18-
required: true
19-
description: Whether the E2E workflow needs amplify_outputs from AWS
20-
type: boolean
2117

2218
jobs:
2319
e2e-test-linux:
@@ -59,7 +55,6 @@ jobs:
5955
aws-region: ${{ secrets.AWS_REGION }}
6056
scope: ${{ inputs.package-name }}
6157
secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
62-
needs-gen2-config: ${{ inputs.needs-gen2-config }}
6358

6459
- name: Run integration tests
6560
timeout-minutes: 60

‎.github/workflows/e2e_web.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
description: Whether the E2E workflow needs configuration pulled from AWS
1515
required: true
1616
type: boolean
17-
needs-gen2-config:
18-
required: true
19-
description: Whether the E2E workflow needs amplify_outputs from AWS
20-
type: boolean
2117

2218
jobs:
2319
e2e-test-web:
@@ -59,7 +55,6 @@ jobs:
5955
aws-region: ${{ secrets.AWS_REGION }}
6056
scope: ${{ inputs.package-name }}
6157
secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
62-
needs-gen2-config: ${{ inputs.needs-gen2-config }}
6358

6459
- uses: ./.github/composite_actions/setup_chromedriver
6560

‎.github/workflows/e2e_windows.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
description: Whether the E2E workflow needs configuration pulled from AWS
1515
required: true
1616
type: boolean
17-
needs-gen2-config:
18-
required: true
19-
description: Whether the E2E workflow needs amplify_outputs from AWS
20-
type: boolean
2117

2218
jobs:
2319
e2e-test-windows:
@@ -62,7 +58,6 @@ jobs:
6258
aws-region: ${{ secrets.AWS_REGION }}
6359
scope: ${{ inputs.package-name }}
6460
secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
65-
needs-gen2-config: ${{ inputs.needs-gen2-config }}
6661

6762
- name: Run integration tests
6863
timeout-minutes: 60

0 commit comments

Comments
 (0)