Fixing issue 7277 (GoogleCloudPlatform#7370)

m-strzelczyk · web-flow · commit eea819b4fd36 · 2022-07-22T16:47:30.000+02:00
* WIP: Triggering a new PR to have a stage for running tests and experimenting. * fix(ssh-test): Trying to fix GoogleCloudPlatform#7277 * Import reordering
diff --git a/compute/oslogin/service_account_ssh.py b/compute/oslogin/service_account_ssh.py
@@ -27,11 +27,10 @@
 import time
 import uuid
 
+from google.auth.exceptions import RefreshError
 import googleapiclient.discovery
 import requests
 
-
-# Global variables
 SERVICE_ACCOUNT_METADATA_URL = (
     'http://metadata.google.internal/computeMetadata/v1/instance/'
     'service-accounts/default/email')
@@ -76,7 +75,19 @@ def create_ssh_key(oslogin, account, private_key_file=None, expire_time=300):
         'key': public_key,
         'expirationTimeUsec': expiration,
     }
-    oslogin.users().importSshPublicKey(parent=account, body=body).execute()
+    print(f'Creating key {account} and {body}')
+    for attempt_no in range(1, 4):
+        try:
+            # This method sometimes failed to work causing issues like #7277
+            # Maybe retrying it with some delay will make things better
+            oslogin.users().importSshPublicKey(parent=account, body=body).execute()
+        except RefreshError:
+            if attempt_no == 3:
+                break
+            time.sleep(attempt_no)
+        else:
+            break
+
     return private_key_file
 # [END create_key]
 
