fix(gce): fix camel case naming for service_account

Fixes: GH # 428
canonical · Sep 25, 2024 · 2c78910 · 2c78910
1 parent c468a92
commit 2c78910
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1!9.3.2
+1!9.3.3
diff --git a/pycloudlib/gce/cloud.py b/pycloudlib/gce/cloud.py
@@ -125,8 +125,10 @@ def __init__(
         self.instance_counter = count()
         # Prefer service_account_email from pycloudlib.toml and fallback to
         # the credentials listed in GOOGLE_APPLICATION_CREDENTIALS otherwise
-        self.service_account_email = service_account_email or self.config.get(
-            "service_account_email", credentials.service_account_email
+        self.service_account_email = (
+            service_account_email
+            or self.config.get("service_account_email") 
+            or getattr(credentials, "service_account_email", None)
         )
 
     def released_image(
@@ -430,7 +432,7 @@ def launch(
         config.update(kwargs)
 
         if self.service_account_email:
-            config["serviceAccounts"] = [{"email": self.service_account_email}]
+            config["service_accounts"] = [{"email": self.service_account_email}]
 
         if user_data:
             user_metadata = {"key": "user-data", "value": user_data}