ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-06-02 15:09:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changing name_pattern -> pattern (#290)

Browse source 
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
The Magician 2019-07-11 12:24:00 -07:00 • committed by Alex Stephen
parent da912bcb6c
commit baafbbe715
3 changed files with 43 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/modules/gcp_sourcerepo_repository.py
View file

@ -153,7 +153,7 @@ def delete(module, link):
def resource_to_request(module):
request = {u'name': name_partial_to_full(module.params.get('name'), module.params)}
request = {u'name': name_pattern(module.params.get('name'), module)}
return_vals = {}
for k, v in request.items():
if v or v is False:
@ -217,17 +217,17 @@ 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': name_partial_to_full(module.params.get('name'), module.params), u'url': response.get(u'url'), u'size': response.get(u'size')}
return {u'name': name_pattern(module.params.get('name'), module), u'url': response.get(u'url'), u'size': response.get(u'size')}
def name_partial_to_full(name, params):
def name_pattern(name, module):
if name is None:
return
url = r"projects/.*/repos/.*"
regex = r"projects/.*/repos/.*"
if not re.match(url, name):
name = "projects/{project}/repos/{name}".format(**params)
if not re.match(regex, name):
name = "projects/{project}/repos/{name}".format(**module.params)
return name