cherrypick

changelogs/fragments/gcp_fixes.yml

@@ -1,2 +1,2 @@
 bugfixes:
-  - Add no_log to credentials field to avoid disclosures, also switch type to jsonarg to avoid having users responsible for transformations.
+  - Add no_log to credentials field to avoid disclosures

lib/ansible/module_utils/gcp_utils.py

@@ -205,8 +205,8 @@ class GcpModule(AnsibleModule):
                 service_account_contents=dict(
                     required=False,
                     fallback=(env_fallback, ['GCP_SERVICE_ACCOUNT_CONTENTS']),
-                    no_log=True,
-                    type='jsonarg'),
+                    type='str',
+                    no_log=True),
                 scopes=dict(
                     required=False,
                     fallback=(env_fallback, ['GCP_SCOPES']),

lib/ansible/plugins/doc_fragments/gcp.py

@@ -21,7 +21,7 @@ options:
     service_account_contents:
         description:
             - The contents of a Service Account JSON file, either in a dictionary or as a JSON string that represents it.
-        type: jsonarg
+        type: str
     service_account_file:
         description:
             - The path of a Service Account JSON file if serviceaccount is selected as type.