From 085eec01f8e79e90b1f2a5cd71139005eb26a9f2 Mon Sep 17 00:00:00 2001
From: Mike Dial <48921055+mdial89f@users.noreply.github.com>
Date: Thu, 30 Nov 2023 07:12:03 -0500
Subject: [PATCH] fix(val auth):  Disable cognito auth in val, and skip e2e
 (#232)

* fix(val auth):  Disable cognito auth in val, and skip e2e

* test condition

* Revert "test condition"

This reverts commit c0ece0ffc519f3aa6c239ca60d3bcaef0aa84bdf.
---
 .github/workflows/deploy.yml     |  2 +-
 src/services/auth/serverless.yml | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 16189ce3e2..243a97b2e0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -128,7 +128,7 @@ jobs:
       - deploy
     env:
       baseurl: ${{ needs.deploy.outputs.app-url }}
-    if: ${{ github.ref != 'refs/heads/production' }}
+    if: ${{ github.ref != 'refs/heads/production' && github.ref != 'refs/heads/val' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/src/services/auth/serverless.yml b/src/services/auth/serverless.yml
index d26ef6c25b..17c0f85508 100644
--- a/src/services/auth/serverless.yml
+++ b/src/services/auth/serverless.yml
@@ -85,9 +85,13 @@ resources:
             - ${self:custom.idmInfo.oidc_issuer, ""}
     BackWithCognito:
       Fn::Not:
-        - Fn::Equals:
-            - ${sls:stage}
-            - production
+        - Fn::Or:
+            - Fn::Equals:
+                - ${sls:stage}
+                - production
+            - Fn::Equals:
+                - ${sls:stage}
+                - val
   Resources:
     CognitoUserPool:
       Type: AWS::Cognito::UserPool