ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-07-27 07:01:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Converting names from short-name to partial URIs (#277)

Browse source 
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
The Magician 2019-06-12 13:54:28 -07:00 • committed by Alex Stephen
commit 71accbf571
11 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/modules/gcp_sourcerepo_repository.py
View file

@ -62,7 +62,7 @@ notes:
EXAMPLES = '''
- name: create a repository
gcp_sourcerepo_repository:
name: projects/test_project/repos/test_object
name: test_object
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
@ -95,6 +95,7 @@ size:
from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest, replace_resource_dict
import json
import re
################################################################################
# Main
@ -152,7 +153,7 @@ def delete(module, link):
def resource_to_request(module):
request = {u'name': module.params.get('name')}
request = {u'name': name_partial_to_full(module.params.get('name'), module.params)}
return_vals = {}
for k, v in request.items():
if v or v is False:
@ -167,7 +168,7 @@ def fetch_resource(module, link, allow_not_found=True):
def self_link(module):
return "https://sourcerepo.googleapis.com/v1/{name}".format(**module.params)
return "https://sourcerepo.googleapis.com/v1/projects/{project}/repos/{name}".format(**module.params)
def collection(module):
@ -216,7 +217,19 @@ def is_different(module, response):
# Remove unnecessary properties from the response.
# This is for doing comparisons with Ansible's current parameters.
def response_to_hash(module, response):
return {u'name': module.params.get('name'), u'url': response.get(u'url'), u'size': response.get(u'size')}
return {u'name': name_partial_to_full(module.params.get('name'), module.params), u'url': response.get(u'url'), u'size': response.get(u'size')}
def name_partial_to_full(name, params):
if name is None:
return
url = r"projects/.*/repos/.*"
if not re.match(url, name):
name = "projects/{project}/repos/{name}".format(**params)
return name
if __name__ == '__main__':