mirror of
https://github.com/ansible-collections/google.cloud.git
synced 2025-09-30 05:23:29 -07:00
Merge pull request #703 from ZuperSero/issue-697-wrongly-named-input
Some checks failed
Run integration tests for the cloud.google collection / integration (stable-2.16) (push) Has been cancelled
Run integration tests for the cloud.google collection / integration (stable-2.17) (push) Has been cancelled
Run integration tests for the cloud.google collection / integration (stable-2.18) (push) Has been cancelled
Run integration tests for the cloud.google collection / integration (stable-2.19) (push) Has been cancelled
Some checks failed
Run integration tests for the cloud.google collection / integration (stable-2.16) (push) Has been cancelled
Run integration tests for the cloud.google collection / integration (stable-2.17) (push) Has been cancelled
Run integration tests for the cloud.google collection / integration (stable-2.18) (push) Has been cancelled
Run integration tests for the cloud.google collection / integration (stable-2.19) (push) Has been cancelled
Fix improper names for service_account_contents
This commit is contained in:
commit
3fe0212960
1 changed files with 9 additions and 3 deletions
|
@ -16,6 +16,10 @@ DOCUMENTATION = '''
|
||||||
to maintain secrecy of this value once returned.
|
to maintain secrecy of this value once returned.
|
||||||
- if location option is defined, then it deals with the regional secrets of the
|
- if location option is defined, then it deals with the regional secrets of the
|
||||||
location
|
location
|
||||||
|
requirements:
|
||||||
|
- python >= 2.6
|
||||||
|
- requests >= 2.18.4
|
||||||
|
- google-auth >= 1.3.0
|
||||||
|
|
||||||
options:
|
options:
|
||||||
key:
|
key:
|
||||||
|
@ -60,10 +64,12 @@ DOCUMENTATION = '''
|
||||||
- see https://cloud.google.com/iam/docs/service-account-creds for details
|
- see https://cloud.google.com/iam/docs/service-account-creds for details
|
||||||
type: str
|
type: str
|
||||||
required: False
|
required: False
|
||||||
service_account_info:
|
service_account_contents:
|
||||||
description:
|
description:
|
||||||
- JSON Object representing the contents of a service_account_file obtained from Google Cloud
|
- JSON Object representing the contents of a service_account_file obtained from Google Cloud
|
||||||
- defaults to OS env variable GCP_SERVICE_ACCOUNT_INFO if not present
|
- defaults to OS env variable GCP_SERVICE_ACCOUNT_CONTENTS if not present
|
||||||
|
aliases:
|
||||||
|
- service_account_info
|
||||||
type: str
|
type: str
|
||||||
required: False
|
required: False
|
||||||
access_token:
|
access_token:
|
||||||
|
@ -201,7 +207,7 @@ class LookupModule(LookupBase):
|
||||||
params['name'] = params['key']
|
params['name'] = params['key']
|
||||||
|
|
||||||
# support GCP_* env variables for some parameters
|
# support GCP_* env variables for some parameters
|
||||||
for param in ["project", "auth_kind", "service_account_file", "service_account_info", "service_account_email", "access_token"]:
|
for param in ["project", "auth_kind", "service_account_file", "service_account_contents", "service_account_email", "access_token"]:
|
||||||
params[param] = self.fallback_from_env(param)
|
params[param] = self.fallback_from_env(param)
|
||||||
|
|
||||||
self._display.vvv(msg=f"Module Parameters: {params}")
|
self._display.vvv(msg=f"Module Parameters: {params}")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue