update token

Author: averikitsch

run/idp-sql/postcreate.sh

@@ -20,7 +20,7 @@ export SERVICE_ACCOUNT="idp-sql-identity"
 
 # Update Cloud Run service to include Cloud SQL instance, Secret Manager secret,
 # and service account
-gcloud beta run services update ${K_SERVICE} \
+gcloud run services update ${K_SERVICE} \
     --platform managed \
     --region ${GOOGLE_CLOUD_REGION} \
     --service-account ${SERVICE_ACCOUNT}@${GOOGLE_CLOUD_PROJECT}.iam.gserviceaccount.com \

run/idp-sql/test/e2e_test.py

@@ -144,8 +144,23 @@ def deployed_service() -> str:
         .stdout.strip()
         .decode()
     )
+    auth_token = (
+        subprocess.run(
+            [
+                "gcloud",
+                "auth",
+                "print-identity-token",
+                "--project",
+                GOOGLE_CLOUD_PROJECT,
+            ],
+            stdout=subprocess.PIPE,
+            check=True,
+        )
+        .stdout.strip()
+        .decode()
+    )
 
-    yield service_url
+    yield service_url, auth_token
 
     # Cleanup
 
@@ -199,15 +214,15 @@ def jwt_token() -> str:
 
 def test_end_to_end(jwt_token: str, deployed_service: str) -> None:
     token = jwt_token
-    service_url = deployed_service
+    service_url, auth_token = deployed_service
 
     adapter = HTTPAdapter(max_retries=retry_strategy)
 
     client = requests.session()
     client.mount("https://", adapter)
 
     # Can successfully make a request
-    response = client.get(service_url, headers={"Authorization": f"Bearer {token}"})
+    response = client.get(service_url, headers={"Authorization": f"Bearer {auth_token}"})
     assert response.status_code == 200
 
     # Can make post with token
@@ -218,7 +233,7 @@ def test_end_to_end(jwt_token: str, deployed_service: str) -> None:
     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

@@ -63,7 +63,7 @@ steps:
   args:
   - '-c'
   - |
-    ./test/retry.sh "gcloud beta run deploy ${_SERVICE} \
+    ./test/retry.sh "gcloud run deploy ${_SERVICE} \
       --project $PROJECT_ID \
       --image gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} \
       --allow-unauthenticated \