ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-07-28 07:31:29 -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
commit baafbbe715
3 changed files with 43 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

28
plugins/modules/gcp_pubsub_topic.py
View file

@ -107,6 +107,7 @@ labels:
from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest, replace_resource_dict
import json
import re
################################################################################
# Main
@ -181,8 +182,11 @@ def delete(module, link):
def resource_to_request(module):
request = {u'name': module.params.get('name'), u'kmsKeyName': module.params.get('kms_key_name'), u'labels': module.params.get('labels')}
request = encode_request(request, module)
request = {
u'name': name_pattern(module.params.get('name'), module),
u'kmsKeyName': module.params.get('kms_key_name'),
u'labels': module.params.get('labels'),
}
return_vals = {}
for k, v in request.items():
if v or v is False:
@ -219,8 +223,6 @@ def return_if_object(module, response, allow_not_found=False):
except getattr(json.decoder, 'JSONDecodeError', ValueError):
module.fail_json(msg="Invalid JSON response with error: %s" % response.text)
result = decode_request(result, module)
if navigate_hash(result, ['error', 'errors']):
module.fail_json(msg=navigate_hash(result, ['error', 'errors']))
@ -230,7 +232,6 @@ def return_if_object(module, response, allow_not_found=False):
def is_different(module, response):
request = resource_to_request(module)
response = response_to_hash(module, response)
request = decode_request(request, module)
# Remove all output-only from response.
response_vals = {}
@ -249,18 +250,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'kmsKeyName': module.params.get('kms_key_name'), u'labels': response.get(u'labels')}
return {u'name': name_pattern(module.params.get('name'), module), u'kmsKeyName': module.params.get('kms_key_name'), u'labels': response.get(u'labels')}
def decode_request(response, module):
if 'name' in response:
response['name'] = response['name'].split('/')[-1]
return response
def name_pattern(name, module):
if name is None:
return
regex = r"projects/.*/topics/.*"
def encode_request(request, module):
request['name'] = '/'.join(['projects', module.params['project'], 'topics', module.params['name']])
return request
if not re.match(regex, name):
name = "projects/{project}/topics/{name}".format(**module.params)
return name
if __name__ == '__main__':