diff --git a/plugins/modules/gcp_sql_database.py b/plugins/modules/gcp_sql_database.py index 8e5df57..7242890 100644 --- a/plugins/modules/gcp_sql_database.py +++ b/plugins/modules/gcp_sql_database.py @@ -265,11 +265,11 @@ def fetch_resource(module, link, kind, allow_not_found=True): 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): - 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): @@ -323,7 +323,7 @@ def response_to_hash(module, response): def async_op_url(module, extra_data=None): if extra_data is None: 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.update(module.params) return url.format(**combined) diff --git a/plugins/modules/gcp_sql_database_info.py b/plugins/modules/gcp_sql_database_info.py index d3922b2..a3a54cf 100644 --- a/plugins/modules/gcp_sql_database_info.py +++ b/plugins/modules/gcp_sql_database_info.py @@ -161,7 +161,7 @@ def main(): 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): diff --git a/plugins/modules/gcp_sql_instance.py b/plugins/modules/gcp_sql_instance.py index 5185cc6..2cc838a 100644 --- a/plugins/modules/gcp_sql_instance.py +++ b/plugins/modules/gcp_sql_instance.py @@ -856,11 +856,11 @@ def fetch_resource(module, link, kind, allow_not_found=True): 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): - 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): @@ -930,7 +930,7 @@ def response_to_hash(module, response): def async_op_url(module, extra_data=None): if extra_data is None: 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.update(module.params) return url.format(**combined) diff --git a/plugins/modules/gcp_sql_instance_info.py b/plugins/modules/gcp_sql_instance_info.py index b6605e2..bfb6d0b 100644 --- a/plugins/modules/gcp_sql_instance_info.py +++ b/plugins/modules/gcp_sql_instance_info.py @@ -450,7 +450,7 @@ def main(): 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): diff --git a/plugins/modules/gcp_sql_user.py b/plugins/modules/gcp_sql_user.py index 374f802..d6fd728 100644 --- a/plugins/modules/gcp_sql_user.py +++ b/plugins/modules/gcp_sql_user.py @@ -297,12 +297,12 @@ def self_link(module): 'name': module.params['name'], '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): 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): @@ -356,7 +356,7 @@ def response_to_hash(module, response): def async_op_url(module, extra_data=None): if extra_data is None: 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.update(module.params) return url.format(**combined) diff --git a/plugins/modules/gcp_sql_user_info.py b/plugins/modules/gcp_sql_user_info.py index 18092ce..f2ddc6c 100644 --- a/plugins/modules/gcp_sql_user_info.py +++ b/plugins/modules/gcp_sql_user_info.py @@ -162,7 +162,7 @@ def main(): def collection(module): 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):