Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jul 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
077d190
chore(infra): Api migrate to Gen 2 E2E
Equartey Jun 20, 2024
e2d65b4
fix: git update-index --chmod=+x
Equartey Jun 26, 2024
6ecd0ae
fix: code review
Equartey Jun 27, 2024
b301ea0
chore: allow existing amplify_outputs/amplifyconfiguration files
Jordan-Nelson Jul 2, 2024
abd3fcc
wip: remove gen 1 refactor
Equartey Jul 10, 2024
1a2ef99
fix for infra-common js building
Equartey Jul 11, 2024
601633b
fix cpk tests
Equartey Jul 11, 2024
0c93487
add custom rest api cdk stack
Equartey Jul 12, 2024
286013b
Consolidate pull backend script into original
Equartey Jul 12, 2024
960458d
rest api backend now mirrors gen 1
Equartey Jul 12, 2024
c6f6d6d
update bootstrap command to include gen2 formatted config entrypoint
Equartey Jul 12, 2024
ac57a27
actions clean
Equartey Jul 12, 2024
9cd8662
fix: config typo
Equartey Jul 12, 2024
ddc5cee
skip test on web for unauthed user failing cors
Equartey Jul 16, 2024
d9e68a2
small refactor to configure method
Equartey Jul 16, 2024
61b6f3c
refactor copy/upload to accept list of files
Equartey Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 0 additions & 11 deletions .github/composite_actions/fetch_backends/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/amplify_analytics_pinpoint_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions .github/workflows/amplify_api_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions .github/workflows/amplify_auth_cognito_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions .github/workflows/amplify_authenticator_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 0 additions & 2 deletions .github/workflows/amplify_datastore_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -153,4 +152,3 @@ jobs:
package-name: amplify_datastore_example
working-directory: packages/amplify_datastore/example
needs-aws-config: true
needs-gen2-config: false
5 changes: 0 additions & 5 deletions .github/workflows/amplify_db_common_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions .github/workflows/amplify_secure_storage_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions .github/workflows/amplify_storage_s3_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions .github/workflows/e2e_android.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/e2e_ios.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/e2e_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/e2e_web.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/e2e_windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading