Update

Author: averikitsch

run/idp-sql/test/e2e_test.py

@@ -31,7 +31,7 @@
 default_app = firebase_admin.initialize_app()
 
 # Unique suffix to create distinct service names
-SUFFIX = uuid.uuid4().hex[:10]
+SUFFIX = '0c6fc5c6e1'#uuid.uuid4().hex[:10] #idp-sql-
 
 GOOGLE_CLOUD_PROJECT = os.environ.get("GOOGLE_CLOUD_PROJECT", None)
 if not GOOGLE_CLOUD_PROJECT:
@@ -79,7 +79,7 @@
 
 retry_strategy = Retry(
     total=3,
-    status_forcelist=[400, 401, 403, 500, 502, 503, 504],
+    status_forcelist=[400, 403, 500, 502, 503, 504],
     allowed_methods=["GET", "POST"],
     backoff_factor=3
 )
@@ -106,20 +106,20 @@ def deployed_service() -> str:
     if SAMPLE_VERSION:
         substitutions.append(f"_SAMPLE_VERSION={SAMPLE_VERSION}")
 
-    subprocess.run(
-        [
-            "gcloud",
-            "builds",
-            "submit",
-            "--project",
-            GOOGLE_CLOUD_PROJECT,
-            "--config",
-            "./test/e2e_test_setup.yaml",
-            "--substitutions",
-        ]
-        + substitutions,
-        check=True,
-    )
+    # subprocess.run(
+    #     [
+    #         "gcloud",
+    #         "builds",
+    #         "submit",
+    #         "--project",
+    #         GOOGLE_CLOUD_PROJECT,
+    #         "--config",
+    #         "./test/e2e_test_setup.yaml",
+    #         "--substitutions",
+    #     ]
+    #     + substitutions,
+    #     check=True,
+    # )
 
     service_url = (
         subprocess.run(
@@ -159,46 +159,63 @@ def deployed_service() -> str:
     if SAMPLE_VERSION:
         substitutions.append(f"_SAMPLE_VERSION={SAMPLE_VERSION}")
 
-    subprocess.run(
-        [
-            "gcloud",
-            "builds",
-            "submit",
-            "--project",
-            GOOGLE_CLOUD_PROJECT,
-            "--config",
-            "./test/e2e_test_cleanup.yaml",
-            "--substitutions",
-        ]
-        + substitutions,
-        check=True,
-    )
+    # subprocess.run(
+    #     [
+    #         "gcloud",
+    #         "builds",
+    #         "submit",
+    #         "--project",
+    #         GOOGLE_CLOUD_PROJECT,
+    #         "--config",
+    #         "./test/e2e_test_cleanup.yaml",
+    #         "--substitutions",
+    #     ]
+    #     + substitutions,
+    #     check=True,
+    # )
 
 
 @pytest.fixture
 def jwt_token() -> str:
+    auth_token = (
+        subprocess.run(
+            [
+                "gcloud",
+                "auth",
+                "print-identity-token",
+                "--project",
+                GOOGLE_CLOUD_PROJECT,
+            ],
+            stdout=subprocess.PIPE,
+            check=True,
+        )
+        .stdout.strip()
+        .decode()
+    )
+
     custom_token = auth.create_custom_token("a-user-id").decode("UTF-8")
+
     adapter = HTTPAdapter(max_retries=retry_strategy)
 
     client = requests.session()
     client.mount("https://", adapter)
 
     resp = client.post(
-        f"https://identitytoolkit.googleapis.com/v1/accounts:signInWithCustomToken?key={IDP_KEY}",
+        f"https://identitytoolkit.googleapis.com/v1/accounts:signInWithIdp?key={IDP_KEY}",
         data=json.dumps({"token": custom_token, "returnSecureToken": True}),
     )
     response = resp.json()
     assert "error" not in response.keys()
     assert "idToken" in response.keys()
 
     id_token = response["idToken"]
-    yield id_token
+    yield id_token, auth_token
 
     # no cleanup required
 
 
 def test_end_to_end(jwt_token: str, deployed_service: str) -> None:
-    token = jwt_token
+    token, auth_token = jwt_token
     service_url = deployed_service
 
     adapter = HTTPAdapter(max_retries=retry_strategy)
@@ -207,18 +224,18 @@ def test_end_to_end(jwt_token: str, deployed_service: str) -> None:
     client.mount("https://", adapter)
 
     # Can successfully make a request
-    response = client.get(service_url)
+    response = client.get(service_url, headers={"Authorization": f"Bearer {auth_token}, Bearer {token}"})
     assert response.status_code == 200
-
+ 
     # Can make post with token
     response = client.post(
-        service_url, data={"team": "DOGS"}, headers={"Authorization": f"Bearer {token}"}
+        service_url, data={"team": "DOGS"}, headers={"Authorization": f"Bearer {auth_token},Bearer {token}"}
     )
     assert response.status_code == 200
     assert "Vote successfully cast" in response.content.decode("UTF-8")
 
     # Confirm updated results
-    response = client.get(service_url)
+    response = client.get(service_url, headers={"Authorization": f"Bearer {auth_token}"})
     assert response.status_code == 200
     assert "🐶" in response.content.decode("UTF-8")
 

run/idp-sql/test/e2e_test_setup.yaml

@@ -66,7 +66,6 @@ steps:
     ./test/retry.sh "gcloud beta run deploy ${_SERVICE} \
       --project $PROJECT_ID \
       --image gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} \
-      --allow-unauthenticated \
       --region ${_REGION} \
       --platform ${_PLATFORM} \
       --add-cloudsql-instances ${_CLOUD_SQL_CONNECTION_NAME} \