chore(infra): Api migrate to Gen 2 E2E (#5043)

.gitattributes

@@ -97,3 +97,7 @@ yarn.lock                                   linguist-generated
 **/dist/*.mjs                               linguist-generated
 **/dist/*.cjs                               linguist-generated
 **/dist/*.cjs.map                           linguist-generated
+
+## Codegen Models
+**/example/lib/models/**                          linguist-generated
+**/example/lib/models/gen2/Gen2ModelProvider.dart linguist-generated=false

.github/composite_actions/fetch_backends/action.yaml

@@ -17,9 +17,6 @@ inputs:
   secret-identifier:
     required: true
     description: ARN of secret from AWS Secrets Manger which is a JSON object of app IDs / s3 bucket ARNs
-  needs-gen2-config:
-    required: true
-    description: Whether the E2E workflow needs amplify_outputs from AWS
 
 runs:
   using: "composite"
@@ -47,14 +44,6 @@ runs:
       shell: bash
       run: dart pub global run aft exec --include=${{ inputs.scope }} -- tool/pull_test_backend.sh
 
-    - name: Pull Amplify Outputs
-      shell: bash
-      run: |
-        if [[ "${{inputs.needs-gen2-config}}" == true ]]; then
-          dart pub global run aft exec --include=${{ inputs.scope }} -- tool/pull_test_gen2_backend.sh ...
-        fi
-        exit 0
-
     - name: Undo any codegen changes from amplify pull
       shell: bash
       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

@@ -166,7 +166,6 @@ jobs:
       package-name: amplify_analytics_pinpoint_example
       working-directory: packages/analytics/amplify_analytics_pinpoint/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -175,7 +174,6 @@ jobs:
       package-name: amplify_analytics_pinpoint_example
       working-directory: packages/analytics/amplify_analytics_pinpoint/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_web_test:
     needs: [test]
     uses: ./.github/workflows/e2e_web.yaml
@@ -184,7 +182,6 @@ jobs:
       package-name: amplify_analytics_pinpoint_example
       working-directory: packages/analytics/amplify_analytics_pinpoint/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_linux_test:
     needs: [test]
     uses: ./.github/workflows/e2e_linux.yaml
@@ -193,7 +190,6 @@ jobs:
       package-name: amplify_analytics_pinpoint_example
       working-directory: packages/analytics/amplify_analytics_pinpoint/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_windows_test:
     needs: [test]
     uses: ./.github/workflows/e2e_windows.yaml
@@ -202,4 +198,3 @@ jobs:
       package-name: amplify_analytics_pinpoint_example
       working-directory: packages/analytics/amplify_analytics_pinpoint/example
       needs-aws-config: true
-      needs-gen2-config: false

.github/workflows/amplify_api_example.yaml

@@ -170,7 +170,6 @@ jobs:
       package-name: amplify_api_example
       working-directory: packages/api/amplify_api/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -179,7 +178,6 @@ jobs:
       package-name: amplify_api_example
       working-directory: packages/api/amplify_api/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_web_test:
     needs: [test]
     uses: ./.github/workflows/e2e_web.yaml
@@ -188,7 +186,6 @@ jobs:
       package-name: amplify_api_example
       working-directory: packages/api/amplify_api/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_linux_test:
     needs: [test]
     uses: ./.github/workflows/e2e_linux.yaml
@@ -197,7 +194,6 @@ jobs:
       package-name: amplify_api_example
       working-directory: packages/api/amplify_api/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_windows_test:
     needs: [test]
     uses: ./.github/workflows/e2e_windows.yaml
@@ -206,4 +202,3 @@ jobs:
       package-name: amplify_api_example
       working-directory: packages/api/amplify_api/example
       needs-aws-config: true
-      needs-gen2-config: false

.github/workflows/amplify_auth_cognito_example.yaml

@@ -178,7 +178,6 @@ jobs:
       package-name: amplify_auth_cognito_example
       working-directory: packages/auth/amplify_auth_cognito/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -187,7 +186,6 @@ jobs:
       package-name: amplify_auth_cognito_example
       working-directory: packages/auth/amplify_auth_cognito/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_web_test:
     needs: [test]
     uses: ./.github/workflows/e2e_web.yaml
@@ -196,7 +194,6 @@ jobs:
       package-name: amplify_auth_cognito_example
       working-directory: packages/auth/amplify_auth_cognito/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_linux_test:
     needs: [test]
     uses: ./.github/workflows/e2e_linux.yaml
@@ -205,7 +202,6 @@ jobs:
       package-name: amplify_auth_cognito_example
       working-directory: packages/auth/amplify_auth_cognito/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_windows_test:
     needs: [test]
     uses: ./.github/workflows/e2e_windows.yaml
@@ -214,4 +210,3 @@ jobs:
       package-name: amplify_auth_cognito_example
       working-directory: packages/auth/amplify_auth_cognito/example
       needs-aws-config: true
-      needs-gen2-config: false

.github/workflows/amplify_authenticator_example.yaml

@@ -170,7 +170,6 @@ jobs:
       package-name: amplify_authenticator_example
       working-directory: packages/authenticator/amplify_authenticator/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -179,7 +178,6 @@ jobs:
       package-name: amplify_authenticator_example
       working-directory: packages/authenticator/amplify_authenticator/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_web_test:
     needs: [test]
     uses: ./.github/workflows/e2e_web.yaml
@@ -188,7 +186,6 @@ jobs:
       package-name: amplify_authenticator_example
       working-directory: packages/authenticator/amplify_authenticator/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_linux_test:
     needs: [test]
     uses: ./.github/workflows/e2e_linux.yaml
@@ -197,7 +194,6 @@ jobs:
       package-name: amplify_authenticator_example
       working-directory: packages/authenticator/amplify_authenticator/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_windows_test:
     needs: [test]
     uses: ./.github/workflows/e2e_windows.yaml
@@ -206,4 +202,3 @@ jobs:
       package-name: amplify_authenticator_example
       working-directory: packages/authenticator/amplify_authenticator/example
       needs-aws-config: true
-      needs-gen2-config: false

.github/workflows/amplify_datastore_example.yaml

@@ -144,7 +144,6 @@ jobs:
       package-name: amplify_datastore_example
       working-directory: packages/amplify_datastore/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -153,4 +152,3 @@ jobs:
       package-name: amplify_datastore_example
       working-directory: packages/amplify_datastore/example
       needs-aws-config: true
-      needs-gen2-config: false

.github/workflows/amplify_db_common_example.yaml

@@ -98,7 +98,6 @@ jobs:
       package-name: amplify_db_common_example
       working-directory: packages/common/amplify_db_common/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -107,7 +106,6 @@ jobs:
       package-name: amplify_db_common_example
       working-directory: packages/common/amplify_db_common/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_web_test:
     needs: [test]
     uses: ./.github/workflows/e2e_web.yaml
@@ -116,7 +114,6 @@ jobs:
       package-name: amplify_db_common_example
       working-directory: packages/common/amplify_db_common/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_linux_test:
     needs: [test]
     uses: ./.github/workflows/e2e_linux.yaml
@@ -125,7 +122,6 @@ jobs:
       package-name: amplify_db_common_example
       working-directory: packages/common/amplify_db_common/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_windows_test:
     needs: [test]
     uses: ./.github/workflows/e2e_windows.yaml
@@ -134,4 +130,3 @@ jobs:
       package-name: amplify_db_common_example
       working-directory: packages/common/amplify_db_common/example
       needs-aws-config: true
-      needs-gen2-config: false

.github/workflows/amplify_secure_storage_example.yaml

@@ -94,7 +94,6 @@ jobs:
       package-name: amplify_secure_storage_example
       working-directory: packages/secure_storage/amplify_secure_storage/example
       needs-aws-config: false
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -103,7 +102,6 @@ jobs:
       package-name: amplify_secure_storage_example
       working-directory: packages/secure_storage/amplify_secure_storage/example
       needs-aws-config: false
-      needs-gen2-config: false
   e2e_web_test:
     needs: [test]
     uses: ./.github/workflows/e2e_web.yaml
@@ -112,7 +110,6 @@ jobs:
       package-name: amplify_secure_storage_example
       working-directory: packages/secure_storage/amplify_secure_storage/example
       needs-aws-config: false
-      needs-gen2-config: false
   e2e_linux_test:
     needs: [test]
     uses: ./.github/workflows/e2e_linux.yaml
@@ -121,7 +118,6 @@ jobs:
       package-name: amplify_secure_storage_example
       working-directory: packages/secure_storage/amplify_secure_storage/example
       needs-aws-config: false
-      needs-gen2-config: false
   e2e_windows_test:
     needs: [test]
     uses: ./.github/workflows/e2e_windows.yaml
@@ -130,4 +126,3 @@ jobs:
       package-name: amplify_secure_storage_example
       working-directory: packages/secure_storage/amplify_secure_storage/example
       needs-aws-config: false
-      needs-gen2-config: false

.github/workflows/amplify_storage_s3_example.yaml

@@ -170,7 +170,6 @@ jobs:
       package-name: amplify_storage_s3_example
       working-directory: packages/storage/amplify_storage_s3/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_ios_test:
     needs: [test]
     uses: ./.github/workflows/e2e_ios.yaml
@@ -179,7 +178,6 @@ jobs:
       package-name: amplify_storage_s3_example
       working-directory: packages/storage/amplify_storage_s3/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_web_test:
     needs: [test]
     uses: ./.github/workflows/e2e_web.yaml
@@ -188,7 +186,6 @@ jobs:
       package-name: amplify_storage_s3_example
       working-directory: packages/storage/amplify_storage_s3/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_linux_test:
     needs: [test]
     uses: ./.github/workflows/e2e_linux.yaml
@@ -197,7 +194,6 @@ jobs:
       package-name: amplify_storage_s3_example
       working-directory: packages/storage/amplify_storage_s3/example
       needs-aws-config: true
-      needs-gen2-config: false
   e2e_windows_test:
     needs: [test]
     uses: ./.github/workflows/e2e_windows.yaml
@@ -206,4 +202,3 @@ jobs:
       package-name: amplify_storage_s3_example
       working-directory: packages/storage/amplify_storage_s3/example
       needs-aws-config: true
-      needs-gen2-config: false

.github/workflows/e2e_android.yaml

@@ -14,10 +14,6 @@ on:
         description: Whether the E2E workflow needs configuration pulled from AWS
         required: true
         type: boolean
-      needs-gen2-config:
-        required: true
-        description: Whether the E2E workflow needs amplify_outputs from AWS
-        type: boolean
 
 jobs:
   e2e-test-android:
@@ -66,7 +62,6 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           scope: ${{ inputs.package-name }}
           secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
-          needs-gen2-config: ${{ inputs.needs-gen2-config }}
 
       - name: Launch Android emulator
         uses: ./.github/composite_actions/launch_android_emulator

.github/workflows/e2e_ios.yaml

@@ -14,10 +14,6 @@ on:
         description: Whether the E2E workflow needs configuration pulled from AWS
         required: true
         type: boolean
-      needs-gen2-config:
-        required: true
-        description: Whether the E2E workflow needs amplify_outputs from AWS
-        type: boolean
 
 jobs:
   e2e-test-ios:
@@ -64,7 +60,6 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           scope: ${{ inputs.package-name }}
           secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
-          needs-gen2-config: ${{ inputs.needs-gen2-config }}
 
       - name: Run integration tests
         timeout-minutes: 60

.github/workflows/e2e_linux.yaml

@@ -14,10 +14,6 @@ on:
         description: Whether the E2E workflow needs configuration pulled from AWS
         required: true
         type: boolean
-      needs-gen2-config:
-        required: true
-        description: Whether the E2E workflow needs amplify_outputs from AWS
-        type: boolean
 
 jobs:
   e2e-test-linux:
@@ -59,7 +55,6 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           scope: ${{ inputs.package-name }}
           secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
-          needs-gen2-config: ${{ inputs.needs-gen2-config }}
 
       - name: Run integration tests
         timeout-minutes: 60

.github/workflows/e2e_web.yaml

@@ -14,10 +14,6 @@ on:
         description: Whether the E2E workflow needs configuration pulled from AWS
         required: true
         type: boolean
-      needs-gen2-config:
-        required: true
-        description: Whether the E2E workflow needs amplify_outputs from AWS
-        type: boolean
 
 jobs:
   e2e-test-web:
@@ -59,7 +55,6 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           scope: ${{ inputs.package-name }}
           secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
-          needs-gen2-config: ${{ inputs.needs-gen2-config }}
 
       - uses: ./.github/composite_actions/setup_chromedriver
 

.github/workflows/e2e_windows.yaml

@@ -14,10 +14,6 @@ on:
         description: Whether the E2E workflow needs configuration pulled from AWS
         required: true
         type: boolean
-      needs-gen2-config:
-        required: true
-        description: Whether the E2E workflow needs amplify_outputs from AWS
-        type: boolean
 
 jobs:
   e2e-test-windows:
@@ -62,7 +58,6 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           scope: ${{ inputs.package-name }}
           secret-identifier: ${{ secrets.AWS_SECRET_IDENTIFIER }}
-          needs-gen2-config: ${{ inputs.needs-gen2-config }}
 
       - name: Run integration tests
         timeout-minutes: 60