fix(cloudrun): clean up before sharing for internal review

Author: eapl-gemugami

run/service-auth/build_image.py

@@ -4,11 +4,9 @@
 import time
 
 from google.cloud.devtools import cloudbuild_v1
-from google.cloud.devtools.cloudbuild_v1.types import Build, BuildStep, BuildOptions, Source, StorageSource
+from google.cloud.devtools.cloudbuild_v1.types import Build, BuildStep, Source, StorageSource
 from google.cloud import storage
 
-# from google.api_core.exceptions import NotFound
-
 from deploy import deploy_cloud_run_service
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
@@ -76,9 +74,6 @@ def build_image_from_source(
             )
         ],
         timeout={"seconds": 1200},
-        options=BuildOptions(
-            # Example: machine_type=BuildOptions.MachineType.E2_MEDIUM
-        )
     )
 
     print(f"Starting Cloud Build for image {full_image_uri}...")
@@ -123,13 +118,11 @@ def build_image_from_source(
     SOURCE_DIRECTORY = "./source/"
     GCS_BUILD_BUCKET = f"{PROJECT_ID}_cloudbuild_sources"
 
-    ENVIRONMENT_VARIABLES = {
-        # "APP_MESSAGE": "Deployed from source via Python!",
-    }
+    ENVIRONMENT_VARIABLES = {}
 
     built_image_uri = None
     try:
-        print(f"--- Step 1: Building image for {SERVICE_NAME} from source {SOURCE_DIRECTORY} ---")
+        print(f"Step 1: Building image for {SERVICE_NAME} from source {SOURCE_DIRECTORY}.")
         built_image_uri = build_image_from_source(
             project_id=PROJECT_ID,
             region=REGION,
@@ -139,7 +132,7 @@ def build_image_from_source(
         )
 
         if built_image_uri:
-            print(f"\n--- Step 2: Deploying image {built_image_uri} to Cloud Run service {SERVICE_NAME} ---")
+            print(f"\nStep 2: Deploying image {built_image_uri} to Cloud Run service {SERVICE_NAME}.")
             deploy_cloud_run_service(
                 project_id=PROJECT_ID,
                 region=REGION,
@@ -148,11 +141,11 @@ def build_image_from_source(
                 env_vars=ENVIRONMENT_VARIABLES,
                 allow_unauthenticated=True,
             )
-            print(f"\n--- Deployment process for {SERVICE_NAME} finished ---")
+            print(f"\nDeployment process for {SERVICE_NAME} finished.")
         else:
             print(f"Image build failed for {SERVICE_NAME}. Deployment aborted.")
 
     except Exception as e:
         print(f"An error occurred during the build or deployment process: {e}")
         import traceback
-        traceback.print_exc()
+        traceback.print_exc()

run/service-auth/deploy.py

@@ -89,7 +89,7 @@ def deploy_cloud_run_service(
             print(f"An error occurred during service deployment: {e}")
             raise
 
-    # --- Allow unauthenticated requests if requested ---
+    # Allow unauthenticated requests if requested
     if deployed_service and allow_unauthenticated:
         try:
             print(f"Attempting to allow unauthenticated access for {service_name}...")