diff --git a/plugins/doc_fragment/gcp.py b/plugins/doc_fragment/gcp.py index 60a98d0..a733899 100644 --- a/plugins/doc_fragment/gcp.py +++ b/plugins/doc_fragment/gcp.py @@ -20,10 +20,8 @@ options: choices: [ application, machineaccount, serviceaccount ] service_account_contents: description: - - A string representing the contents of a Service Account JSON file. - - This should not be passed in as a dictionary, but a string - that has the exact contents of a service account json file (valid JSON) - type: str + - The contents of a Service Account JSON file, either in a dictionary or as a JSON string that represents it. + type: jsonarg service_account_file: description: - The path of a Service Account JSON file if serviceaccount is selected as type. diff --git a/plugins/module_utils/gcp_utils.py b/plugins/module_utils/gcp_utils.py index ec8c73e..1ef97c4 100644 --- a/plugins/module_utils/gcp_utils.py +++ b/plugins/module_utils/gcp_utils.py @@ -214,7 +214,8 @@ class GcpModule(AnsibleModule): service_account_contents=dict( required=False, fallback=(env_fallback, ['GCP_SERVICE_ACCOUNT_CONTENTS']), - type='str'), + no_log=True, + type='jsonarg'), scopes=dict( required=False, fallback=(env_fallback, ['GCP_SCOPES']),