From a615eb2754f505f5da4fd4525aecc010d33410e8 Mon Sep 17 00:00:00 2001
From: yuhengshs <yuhengsh@gmail.com>
Date: Wed, 26 Feb 2025 13:21:04 -0800
Subject: [PATCH] update auth-ssr and auth-rsc to run against consolidated app
 and add backend_name in integ test

---
 .github/integ-config/integ-all.yml       | 20 ++++++++++++--------
 .github/workflows/callable-e2e-test.yml  |  7 +++++++
 .github/workflows/callable-e2e-tests.yml |  1 +
 .github/workflows/push-integ-test.yml    |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
index ae929e7def0..b2bee1fccfc 100644
--- a/.github/integ-config/integ-all.yml
+++ b/.github/integ-config/integ-all.yml
@@ -503,17 +503,19 @@ tests:
   - test_name: integ_next_auth_authenticator_and_ssr_page
     desc: 'Authenticator and SSR page'
     framework: next
-    category: auth
-    sample_name: [auth-ssr]
+    category: consolidated
+    sample_name: [next-sample]
     spec: auth-ssr
     browser: [chrome]
+    backend_name: sign-in-with-email
   - test_name: integ_next_auth_authenticator_and_rsc_page
     desc: 'Authenticator and RSC page'
     framework: next
-    category: auth
-    sample_name: [auth-rsc]
+    category: consolidated
+    sample_name: [next-sample]
     spec: auth-rsc
     browser: [chrome]
+    backend_name: sign-in-with-email
   - test_name: integ_next_sign_in_with_oauth
     desc: 'Sign-in with the OAuth flow'
     framework: next
@@ -581,19 +583,21 @@ tests:
   - test_name: integ_next_auth_authenticator_and_ssr_page_gen2
     desc: 'Authenticator and SSR page'
     framework: next
-    category: auth
-    sample_name: [auth-ssr]
+    category: consolidated
+    sample_name: [next-sample]
     spec: auth-ssr
     browser: [chrome]
     backend: gen2
+    backend_name: sign-in-with-email
   - test_name: integ_next_auth_authenticator_and_rsc_page_gen2
     desc: 'Authenticator and RSC page'
     framework: next
-    category: auth
-    sample_name: [auth-rsc]
+    category: consolidated
+    sample_name: [next-sample]
     spec: auth-rsc
     browser: [chrome]
     backend: gen2
+    backend_name: sign-in-with-email
   - test_name: integ_next_sign_in_with_oauth_gen2
     desc: 'Sign-in with the OAuth flow'
     framework: next
diff --git a/.github/workflows/callable-e2e-test.yml b/.github/workflows/callable-e2e-test.yml
index 4de5e34c30b..4b99c453aaf 100644
--- a/.github/workflows/callable-e2e-test.yml
+++ b/.github/workflows/callable-e2e-test.yml
@@ -25,6 +25,9 @@ on:
       backend:
         required: true
         type: string
+      backend_name:
+        required: false
+        type: string
       amplifyjs_dir:
         required: true
         type: boolean
@@ -86,6 +89,7 @@ jobs:
           E2E_SPEC: ${{ inputs.spec }}
           E2E_BROWSER: ${{ matrix.browser }}
           E2E_BACKEND: ${{ inputs.backend }}
+          E2E_BACKEND_NAME: ${{ inputs.backend_name }}
           E2E_AMPLIFY_JS_DIR: ${{ inputs.amplifyjs_dir == true && env.AMPLIFY_DIR || ''}}
           E2E_RETRY_COUNT: ${{ inputs.retry_count }}
           E2E_TEST_NAME: ${{ inputs.test_name }}
@@ -102,6 +106,7 @@ jobs:
             $E2E_BROWSER \
             dev \
             $E2E_BACKEND \
+            $E2E_BACKEND_NAME \
             $E2E_AMPLIFY_JS_DIR \
             --env $(echo $E2E_ENV | jq -r 'tostring')" \
             $E2E_YARN_SCRIPT \
@@ -119,6 +124,7 @@ jobs:
           E2E_SPEC: ${{ inputs.spec }}
           E2E_BROWSER: ${{ matrix.browser }}
           E2E_BACKEND: ${{ inputs.backend }}
+          E2E_BACKEND_NAME: ${{ inputs.backend_name }}
           E2E_AMPLIFY_JS_DIR: ${{ inputs.amplifyjs_dir == true && env.AMPLIFY_DIR || ''}}
           E2E_RETRY_COUNT: ${{ inputs.retry_count }}
           E2E_TEST_NAME: ${{ inputs.test_name }}
@@ -136,6 +142,7 @@ jobs:
             $E2E_BROWSER \
             prod \
             $E2E_BACKEND \
+            $E2E_BACKEND_NAME \
             $E2E_AMPLIFY_JS_DIR \
             --env $(echo $E2E_ENV | jq -r 'tostring')" \
             $E2E_YARN_SCRIPT \
diff --git a/.github/workflows/callable-e2e-tests.yml b/.github/workflows/callable-e2e-tests.yml
index 2dc95a286bf..1460a15cd3f 100644
--- a/.github/workflows/callable-e2e-tests.yml
+++ b/.github/workflows/callable-e2e-tests.yml
@@ -41,6 +41,7 @@ jobs:
       sample_name: ${{ toJSON(matrix.integ-config.sample_name) || '[""]' }}
       browser: ${{ toJSON(matrix.integ-config.browser) || '[""]' }}
       backend: ${{ matrix.integ-config.backend }}
+      backend_name: ${{ matrix.integ-config.backend_name || '' }}
       timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }}
       retry_count: ${{ matrix.integ-config.retry_count || 3 }}
       yarn_script: ${{ matrix.integ-config.yarn_script || '' }}
diff --git a/.github/workflows/push-integ-test.yml b/.github/workflows/push-integ-test.yml
index 03e43dd2865..6741b2af247 100644
--- a/.github/workflows/push-integ-test.yml
+++ b/.github/workflows/push-integ-test.yml
@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - replace-with-your-branch
+      - yuhengsh-ci-test-auth
 
 jobs:
   e2e: