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

Fix the SQL API URL in MM (#3111) (#156)

Browse source 
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
The Magician 2020-02-11 12:35:42 -08:00 • committed by GitHub
parent caae08275f
commit e17ffe42fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/modules/gcp_sql_database.py
View file

@ -265,11 +265,11 @@ def fetch_resource(module, link, kind, allow_not_found=True):
def self_link(module): def self_link(module):
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances/{instance}/databases/{name}".format(**module.params) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances/{instance}/databases/{name}".format(**module.params)
def collection(module): def collection(module):
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances/{instance}/databases".format(**module.params) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances/{instance}/databases".format(**module.params)
def return_if_object(module, response, kind, allow_not_found=False): def return_if_object(module, response, kind, allow_not_found=False):
@ -323,7 +323,7 @@ def response_to_hash(module, response):
def async_op_url(module, extra_data=None): def async_op_url(module, extra_data=None):
if extra_data is None: if extra_data is None:
extra_data = {} extra_data = {}
url = "https://sqladmin.googleapis.com/v1beta4/projects/{project}/operations/{op_id}" url = "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/operations/{op_id}"
combined = extra_data.copy() combined = extra_data.copy()
combined.update(module.params) combined.update(module.params)
return url.format(**combined) return url.format(**combined)

2
plugins/modules/gcp_sql_database_info.py
View file

@ -161,7 +161,7 @@ def main():
def collection(module): def collection(module):
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances/{instance}/databases".format(**module.params) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances/{instance}/databases".format(**module.params)
def fetch_list(module, link): def fetch_list(module, link):

6
plugins/modules/gcp_sql_instance.py
View file

@ -856,11 +856,11 @@ def fetch_resource(module, link, kind, allow_not_found=True):
def self_link(module): def self_link(module):
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances/{name}".format(**module.params) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances/{name}".format(**module.params)
def collection(module): def collection(module):
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances".format(**module.params) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances".format(**module.params)
def return_if_object(module, response, kind, allow_not_found=False): def return_if_object(module, response, kind, allow_not_found=False):
@ -930,7 +930,7 @@ def response_to_hash(module, response):
def async_op_url(module, extra_data=None): def async_op_url(module, extra_data=None):
if extra_data is None: if extra_data is None:
extra_data = {} extra_data = {}
url = "https://sqladmin.googleapis.com/v1beta4/projects/{project}/operations/{op_id}" url = "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/operations/{op_id}"
combined = extra_data.copy() combined = extra_data.copy()
combined.update(module.params) combined.update(module.params)
return url.format(**combined) return url.format(**combined)

2
plugins/modules/gcp_sql_instance_info.py
View file

@ -450,7 +450,7 @@ def main():
def collection(module): def collection(module):
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances".format(**module.params) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances".format(**module.params)
def fetch_list(module, link): def fetch_list(module, link):

6
plugins/modules/gcp_sql_user.py
View file

@ -297,12 +297,12 @@ def self_link(module):
'name': module.params['name'], 'name': module.params['name'],
'host': module.params['host'], 'host': module.params['host'],
} }
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances/{instance}/users?name={name}&host={host}".format(**res) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances/{instance}/users?name={name}&host={host}".format(**res)
def collection(module): def collection(module):
res = {'project': module.params['project'], 'instance': replace_resource_dict(module.params['instance'], 'name')} res = {'project': module.params['project'], 'instance': replace_resource_dict(module.params['instance'], 'name')}
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances/{instance}/users".format(**res) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances/{instance}/users".format(**res)
def return_if_object(module, response, kind, allow_not_found=False): def return_if_object(module, response, kind, allow_not_found=False):
@ -356,7 +356,7 @@ def response_to_hash(module, response):
def async_op_url(module, extra_data=None): def async_op_url(module, extra_data=None):
if extra_data is None: if extra_data is None:
extra_data = {} extra_data = {}
url = "https://sqladmin.googleapis.com/v1beta4/projects/{project}/operations/{op_id}" url = "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/operations/{op_id}"
combined = extra_data.copy() combined = extra_data.copy()
combined.update(module.params) combined.update(module.params)
return url.format(**combined) return url.format(**combined)

2
plugins/modules/gcp_sql_user_info.py
View file

@ -162,7 +162,7 @@ def main():
def collection(module): def collection(module):
res = {'project': module.params['project'], 'instance': replace_resource_dict(module.params['instance'], 'name')} res = {'project': module.params['project'], 'instance': replace_resource_dict(module.params['instance'], 'name')}
return "https://sqladmin.googleapis.com/v1beta4/projects/{project}/instances/{instance}/users".format(**res) return "https://sqladmin.googleapis.com/sql/v1beta4/projects/{project}/instances/{instance}/users".format(**res)
def fetch_list(module, link): def fetch_list(module, link):