From 30a4e6636325a68a9946054eea95b0eb6bfd20de Mon Sep 17 00:00:00 2001 From: Yusuke Tsutsumi Date: Sat, 10 Jun 2023 11:39:44 -0700 Subject: [PATCH] fix: use default service account if unset (#572) `service_account_email` defaults to None if one is not set. For gcp_compute_instance_info, this results in an invalid request as the service account is populated directly in the path. Populating `default` when a value is not set fixes the error. fixes #568 --- plugins/module_utils/gcp_utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/module_utils/gcp_utils.py b/plugins/module_utils/gcp_utils.py index 2023362..bff15f8 100644 --- a/plugins/module_utils/gcp_utils.py +++ b/plugins/module_utils/gcp_utils.py @@ -251,8 +251,9 @@ class GcpSession(object): return svc_acct_creds.with_scopes(self.module.params['scopes']) if cred_type == 'machineaccount': - return google.auth.compute_engine.Credentials( - self.module.params['service_account_email']) + email = self.module.params['service_account_email'] + email = email if email is not None else "default" + return google.auth.compute_engine.Credentials(email) if cred_type == 'accesstoken': access_token = self.module.params['access_token']