google-api-client 0.32.1 → 0.40.0

data/generated/google/apis/{sqladmin_v1beta4 → sql_v1beta4}/service.rb

@@ -19,19 +19,18 @@ require 'google/apis/errors'
 
 module Google
   module Apis
-    module SqladminV1beta4
+    module SqlV1beta4
       # Cloud SQL Admin API
       #
-      # Creates and manages Cloud SQL instances, which provide fully managed MySQL or
-      #  PostgreSQL databases.
+      # API for Cloud SQL database instance management
       #
       # @example
-      #    require 'google/apis/sqladmin_v1beta4'
+      #    require 'google/apis/sql_v1beta4'
       #
-      #    Sqladmin = Google::Apis::SqladminV1beta4 # Alias the module
-      #    service = Sqladmin::SQLAdminService.new
+      #    Sql = Google::Apis::SqlV1beta4 # Alias the module
+      #    service = Sql::SQLAdminService.new
       #
-      # @see https://cloud.google.com/sql/docs/reference/latest
+      # @see https://developers.google.com/cloud-sql/
       class SQLAdminService < Google::Apis::Core::BaseService
         # @return [String]
         #  API key. Your API key identifies your project and provides you with API access,
@@ -39,17 +38,13 @@ module Google
         attr_accessor :key
 
         # @return [String]
-        #  An opaque string that represents a user for quota purposes. Must not exceed 40
-        #  characters.
+        #  Available to use for quota purposes for server-side applications. Can be any
+        #  arbitrary string assigned to a user, but should not exceed 40 characters.
         attr_accessor :quota_user
 
-        # @return [String]
-        #  Deprecated. Please use quotaUser instead.
-        attr_accessor :user_ip
-
         def initialize
-          super('https://www.googleapis.com/', 'sql/v1beta4/')
-          @batch_path = 'batch/sqladmin/v1beta4'
+          super('https://sqladmin.googleapis.com/', '')
+          @batch_path = 'batch'
         end
         
         # Deletes the backup taken by a backup run.
@@ -58,37 +53,35 @@ module Google
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
         # @param [Fixnum] id
-        #   The ID of the Backup Run to delete. To find a Backup Run ID, use the list
+        #   The ID of the Backup Run to delete. To find a Backup Run ID, use the <a
+        #   href="/sql/docs/db_path/admin-api/rest/v1beta4/backupRuns/list">list</a>
         #   method.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_backup_run(project, instance, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'projects/{project}/instances/{instance}/backupRuns/{id}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def delete_backup_run(project, instance, id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'sql/v1beta4/projects/{project}/instances/{instance}/backupRuns/{id}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -102,72 +95,66 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::BackupRun] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::BackupRun] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::BackupRun]
+        # @return [Google::Apis::SqlV1beta4::BackupRun]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_backup_run(project, instance, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/backupRuns/{id}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::BackupRun::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::BackupRun
+        def get_backup_run(project, instance, id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/backupRuns/{id}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::BackupRun::Representation
+          command.response_class = Google::Apis::SqlV1beta4::BackupRun
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a new backup run on demand. This method is applicable only to Second
-        # Generation instances.
+        # Creates a new backup run on demand. This method is applicable only to
+        # Second Generation instances.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::BackupRun] backup_run_object
+        # @param [Google::Apis::SqlV1beta4::BackupRun] backup_run_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_backup_run(project, instance, backup_run_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/backupRuns', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::BackupRun::Representation
+        def insert_backup_run(project, instance, backup_run_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/backupRuns', options)
+          command.request_representation = Google::Apis::SqlV1beta4::BackupRun::Representation
           command.request_object = backup_run_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -185,33 +172,30 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListBackupRunsResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::BackupRunsListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListBackupRunsResponse]
+        # @return [Google::Apis::SqlV1beta4::BackupRunsListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_backup_runs(project, instance, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/backupRuns', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListBackupRunsResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListBackupRunsResponse
+        def list_backup_runs(project, instance, max_results: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/backupRuns', options)
+          command.response_representation = Google::Apis::SqlV1beta4::BackupRunsListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::BackupRunsListResponse
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['maxResults'] = max_results unless max_results.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -225,32 +209,29 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_database(project, instance, database, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'projects/{project}/instances/{instance}/databases/{database}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def delete_database(project, instance, database, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'sql/v1beta4/projects/{project}/instances/{instance}/databases/{database}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['database'] = database unless database.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -265,72 +246,66 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Database] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Database] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Database]
+        # @return [Google::Apis::SqlV1beta4::Database]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_database(project, instance, database, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/databases/{database}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Database::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Database
+        def get_database(project, instance, database, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/databases/{database}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Database::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Database
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['database'] = database unless database.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Inserts a resource containing information about a database inside a Cloud SQL
-        # instance.
+        # Inserts a resource containing information about a database inside a Cloud
+        # SQL instance.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Database instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::Database] database_object
+        # @param [Google::Apis::SqlV1beta4::Database] database_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_database(project, instance, database_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/databases', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::Database::Representation
+        def insert_database(project, instance, database_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/databases', options)
+          command.request_representation = Google::Apis::SqlV1beta4::Database::Representation
           command.request_object = database_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -342,117 +317,108 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListDatabasesResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::DatabasesListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListDatabasesResponse]
+        # @return [Google::Apis::SqlV1beta4::DatabasesListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_databases(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/databases', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListDatabasesResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListDatabasesResponse
+        def list_databases(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/databases', options)
+          command.response_representation = Google::Apis::SqlV1beta4::DatabasesListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::DatabasesListResponse
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a resource containing information about a database inside a Cloud SQL
-        # instance. This method supports patch semantics.
+        # Partially updates a resource containing information about a database inside
+        # a Cloud SQL instance. This method supports patch semantics.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Database instance ID. This does not include the project ID.
         # @param [String] database
         #   Name of the database to be updated in the instance.
-        # @param [Google::Apis::SqladminV1beta4::Database] database_object
+        # @param [Google::Apis::SqlV1beta4::Database] database_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_database(project, instance, database, database_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:patch, 'projects/{project}/instances/{instance}/databases/{database}', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::Database::Representation
+        def patch_database(project, instance, database, database_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:patch, 'sql/v1beta4/projects/{project}/instances/{instance}/databases/{database}', options)
+          command.request_representation = Google::Apis::SqlV1beta4::Database::Representation
           command.request_object = database_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['database'] = database unless database.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a resource containing information about a database inside a Cloud SQL
-        # instance.
+        # Updates a resource containing information about a database inside a Cloud
+        # SQL instance.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Database instance ID. This does not include the project ID.
         # @param [String] database
         #   Name of the database to be updated in the instance.
-        # @param [Google::Apis::SqladminV1beta4::Database] database_object
+        # @param [Google::Apis::SqlV1beta4::Database] database_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_database(project, instance, database, database_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'projects/{project}/instances/{instance}/databases/{database}', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::Database::Representation
+        def update_database(project, instance, database, database_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'sql/v1beta4/projects/{project}/instances/{instance}/databases/{database}', options)
+          command.request_representation = Google::Apis::SqlV1beta4::Database::Representation
           command.request_object = database_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['database'] = database unless database.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -463,38 +429,35 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListFlagsResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::FlagsListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListFlagsResponse]
+        # @return [Google::Apis::SqlV1beta4::FlagsListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_flags(database_version: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'flags', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListFlagsResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListFlagsResponse
+        def list_flags(database_version: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/flags', options)
+          command.response_representation = Google::Apis::SqlV1beta4::FlagsListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::FlagsListResponse
           command.query['databaseVersion'] = database_version unless database_version.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Add a new trusted Certificate Authority (CA) version for the specified
-        # instance. Required to prepare for a certificate rotation. If a CA version was
-        # previously added but never used in a certificate rotation, this operation
-        # replaces that version. There cannot be more than one CA version waiting to be
-        # rotated in.
+        # instance. Required to prepare for a certificate rotation. If a CA version
+        # was previously added but never used in a certificate rotation, this
+        # operation replaces that version. There cannot be more than one CA version
+        # waiting to be rotated in.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
@@ -502,71 +465,66 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def add_instance_server_ca(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/addServerCa', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def add_instance_server_ca(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/addServerCa', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a Cloud SQL instance as a clone of the source instance.
+        # Creates a Cloud SQL instance as a clone of the source instance. Using this
+        # operation might cause your instance to restart.
         # @param [String] project
         #   Project ID of the source as well as the clone Cloud SQL instance.
         # @param [String] instance
-        #   The ID of the Cloud SQL instance to be cloned (source). This does not include
-        #   the project ID.
-        # @param [Google::Apis::SqladminV1beta4::CloneInstancesRequest] clone_instances_request_object
+        #   The ID of the Cloud SQL instance to be cloned (source). This does not
+        #   include the project ID.
+        # @param [Google::Apis::SqlV1beta4::InstancesCloneRequest] instances_clone_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def clone_instance(project, instance, clone_instances_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/clone', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::CloneInstancesRequest::Representation
-          command.request_object = clone_instances_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def clone_instance(project, instance, instances_clone_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/clone', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesCloneRequest::Representation
+          command.request_object = instances_clone_request_object
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -578,31 +536,28 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_instance(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'projects/{project}/instances/{instance}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def delete_instance(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'sql/v1beta4/projects/{project}/instances/{instance}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -612,116 +567,108 @@ module Google
         #   ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance name.
-        # @param [Google::Apis::SqladminV1beta4::InstancesDemoteMasterRequest] instances_demote_master_request_object
+        # @param [Google::Apis::SqlV1beta4::InstancesDemoteMasterRequest] instances_demote_master_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def demote_instance_master(project, instance, instances_demote_master_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/demoteMaster', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::InstancesDemoteMasterRequest::Representation
+        def demote_instance_master(project, instance, instances_demote_master_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/demoteMaster', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesDemoteMasterRequest::Representation
           command.request_object = instances_demote_master_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Exports data from a Cloud SQL instance to a Cloud Storage bucket as a SQL dump
-        # or CSV file.
+        # Exports data from a Cloud SQL instance to a Cloud Storage bucket as a SQL
+        # dump or CSV file.
         # @param [String] project
         #   Project ID of the project that contains the instance to be exported.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::ExportInstancesRequest] export_instances_request_object
+        # @param [Google::Apis::SqlV1beta4::InstancesExportRequest] instances_export_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def export_instance(project, instance, export_instances_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/export', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::ExportInstancesRequest::Representation
-          command.request_object = export_instances_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def export_instance(project, instance, instances_export_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/export', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesExportRequest::Representation
+          command.request_object = instances_export_request_object
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Failover the instance to its failover replica instance.
+        # Failover the instance to its failover replica instance. Using this
+        # operation might cause your instance to restart.
         # @param [String] project
         #   ID of the project that contains the read replica.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::InstancesFailoverRequest] instances_failover_request_object
+        # @param [Google::Apis::SqlV1beta4::InstancesFailoverRequest] instances_failover_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def failover_instance(project, instance, instances_failover_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/failover', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::InstancesFailoverRequest::Representation
+        def failover_instance(project, instance, instances_failover_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/failover', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesFailoverRequest::Representation
           command.request_object = instances_failover_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -733,71 +680,65 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::DatabaseInstance] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::DatabaseInstance] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::DatabaseInstance]
+        # @return [Google::Apis::SqlV1beta4::DatabaseInstance]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_instance(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::DatabaseInstance::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::DatabaseInstance
+        def get_instance(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::DatabaseInstance::Representation
+          command.response_class = Google::Apis::SqlV1beta4::DatabaseInstance
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Imports data into a Cloud SQL instance from a SQL dump or CSV file in Cloud
-        # Storage.
+        # Imports data into a Cloud SQL instance from a SQL dump  or CSV file in
+        # Cloud Storage.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::ImportInstancesRequest] import_instances_request_object
+        # @param [Google::Apis::SqlV1beta4::InstancesImportRequest] instances_import_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def import_instance(project, instance, import_instances_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/import', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::ImportInstancesRequest::Representation
-          command.request_object = import_instances_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def import_instance(project, instance, instances_import_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/import', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesImportRequest::Representation
+          command.request_object = instances_import_request_object
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -805,46 +746,48 @@ module Google
         # @param [String] project
         #   Project ID of the project to which the newly created Cloud SQL instances
         #   should belong.
-        # @param [Google::Apis::SqladminV1beta4::DatabaseInstance] database_instance_object
+        # @param [Google::Apis::SqlV1beta4::DatabaseInstance] database_instance_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_instance(project, database_instance_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::DatabaseInstance::Representation
+        def insert_instance(project, database_instance_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances', options)
+          command.request_representation = Google::Apis::SqlV1beta4::DatabaseInstance::Representation
           command.request_object = database_instance_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists instances under a given project in the alphabetical order of the
-        # instance name.
+        # Lists instances under a given project.
         # @param [String] project
         #   Project ID of the project for which to list Cloud SQL instances.
         # @param [String] filter
-        #   An expression for filtering the results of the request, such as by name or
-        #   label.
+        #   A filter expression that filters resources listed in the response.
+        #   The expression is in the form of field:value. For example,
+        #   'instanceType:CLOUD_SQL_INSTANCE'. Fields can be nested as needed as per
+        #   their JSON representation, such as 'settings.userLabels.auto_start:true'.
+        #   Multiple filter queries are space-separated. For example.
+        #   'state:RUNNABLE instanceType:CLOUD_SQL_INSTANCE'. By default, each
+        #   expression is an AND expression. However, you can include AND and OR
+        #   expressions explicitly.
         # @param [Fixnum] max_results
         #   The maximum number of results to return per response.
         # @param [String] page_token
@@ -853,41 +796,38 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListInstancesResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::InstancesListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListInstancesResponse]
+        # @return [Google::Apis::SqlV1beta4::InstancesListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_instances(project, filter: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListInstancesResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListInstancesResponse
+        def list_instances(project, filter: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances', options)
+          command.response_representation = Google::Apis::SqlV1beta4::InstancesListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::InstancesListResponse
           command.params['project'] = project unless project.nil?
           command.query['filter'] = filter unless filter.nil?
           command.query['maxResults'] = max_results unless max_results.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists all of the trusted Certificate Authorities (CAs) for the specified
         # instance. There can be up to three CAs listed: the CA that was used to sign
-        # the certificate that is currently in use, a CA that has been added but not yet
-        # used to sign a certificate, and a CA used to sign a certificate that has
-        # previously rotated out.
+        # the certificate that is currently in use, a CA that has been added but not
+        # yet used to sign a certificate, and a CA used to sign a certificate that
+        # has previously rotated out.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
@@ -895,76 +835,70 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::InstancesListServerCasResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::InstancesListServerCasResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::InstancesListServerCasResponse]
+        # @return [Google::Apis::SqlV1beta4::InstancesListServerCasResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_instance_server_cas(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/listServerCas', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::InstancesListServerCasResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::InstancesListServerCasResponse
+        def list_instance_server_cas(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/listServerCas', options)
+          command.response_representation = Google::Apis::SqlV1beta4::InstancesListServerCasResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::InstancesListServerCasResponse
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates settings of a Cloud SQL instance. Caution: This is not a partial
-        # update, so you must include values for all the settings that you want to
-        # retain. For partial updates, use patch.. This method supports patch semantics.
+        # Updates settings of a Cloud SQL instance.
+        # This method supports patch semantics.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::DatabaseInstance] database_instance_object
+        # @param [Google::Apis::SqlV1beta4::DatabaseInstance] database_instance_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_instance(project, instance, database_instance_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:patch, 'projects/{project}/instances/{instance}', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::DatabaseInstance::Representation
+        def patch_instance(project, instance, database_instance_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:patch, 'sql/v1beta4/projects/{project}/instances/{instance}', options)
+          command.request_representation = Google::Apis::SqlV1beta4::DatabaseInstance::Representation
           command.request_object = database_instance_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Promotes the read replica instance to be a stand-alone Cloud SQL instance.
+        # Using this operation might cause your instance to restart.
         # @param [String] project
         #   ID of the project that contains the read replica.
         # @param [String] instance
@@ -972,36 +906,33 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def promote_instance_replica(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/promoteReplica', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def promote_instance_replica(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/promoteReplica', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes all client certificates and generates a new server SSL certificate for
-        # the instance.
+        # Deletes all client certificates and generates a new server SSL certificate
+        # for the instance.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
@@ -1009,31 +940,28 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def reset_instance_ssl_config(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/resetSslConfig', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def reset_instance_ssl_config(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/resetSslConfig', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1045,110 +973,102 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def restart_instance(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/restart', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def restart_instance(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/restart', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Restores a backup of a Cloud SQL instance.
+        # Restores a backup of a Cloud SQL instance. Using this operation might cause
+        # your instance to restart.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::RestoreInstancesBackupRequest] restore_instances_backup_request_object
+        # @param [Google::Apis::SqlV1beta4::InstancesRestoreBackupRequest] instances_restore_backup_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def restore_instance_backup(project, instance, restore_instances_backup_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/restoreBackup', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::RestoreInstancesBackupRequest::Representation
-          command.request_object = restore_instances_backup_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def restore_instance_backup(project, instance, instances_restore_backup_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/restoreBackup', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesRestoreBackupRequest::Representation
+          command.request_object = instances_restore_backup_request_object
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Rotates the server certificate to one signed by the Certificate Authority (CA)
-        # version previously added with the addServerCA method.
+        # Rotates the server certificate to one signed by the Certificate Authority
+        # (CA) version previously added with the addServerCA method.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::InstancesRotateServerCaRequest] instances_rotate_server_ca_request_object
+        # @param [Google::Apis::SqlV1beta4::InstancesRotateServerCaRequest] instances_rotate_server_ca_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def rotate_instance_server_ca(project, instance, instances_rotate_server_ca_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/rotateServerCa', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::InstancesRotateServerCaRequest::Representation
+        def rotate_instance_server_ca(project, instance, instances_rotate_server_ca_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/rotateServerCa', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesRotateServerCaRequest::Representation
           command.request_object = instances_rotate_server_ca_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1160,31 +1080,28 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def start_instance_replica(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/startReplica', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def start_instance_replica(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/startReplica', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1196,31 +1113,28 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def stop_instance_replica(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/stopReplica', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def stop_instance_replica(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/stopReplica', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1229,78 +1143,71 @@ module Google
         #   Project ID of the Cloud SQL project.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::InstancesTruncateLogRequest] instances_truncate_log_request_object
+        # @param [Google::Apis::SqlV1beta4::InstancesTruncateLogRequest] instances_truncate_log_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def truncate_instance_log(project, instance, instances_truncate_log_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/truncateLog', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::InstancesTruncateLogRequest::Representation
+        def truncate_instance_log(project, instance, instances_truncate_log_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/truncateLog', options)
+          command.request_representation = Google::Apis::SqlV1beta4::InstancesTruncateLogRequest::Representation
           command.request_object = instances_truncate_log_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates settings of a Cloud SQL instance. Caution: This is not a partial
-        # update, so you must include values for all the settings that you want to
-        # retain. For partial updates, use patch.
+        # Updates settings of a Cloud SQL instance. Using this operation might cause
+        # your instance to restart.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::DatabaseInstance] database_instance_object
+        # @param [Google::Apis::SqlV1beta4::DatabaseInstance] database_instance_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_instance(project, instance, database_instance_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'projects/{project}/instances/{instance}', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::DatabaseInstance::Representation
+        def update_instance(project, instance, database_instance_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'sql/v1beta4/projects/{project}/instances/{instance}', options)
+          command.request_representation = Google::Apis::SqlV1beta4::DatabaseInstance::Representation
           command.request_object = database_instance_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1312,36 +1219,33 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_operation(project, operation, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/operations/{operation}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def get_operation(project, operation, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/operations/{operation}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['operation'] = operation unless operation.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists all instance operations that have been performed on the given Cloud SQL
-        # instance in the reverse chronological order of the start time.
+        # Lists all instance operations that have been performed on the given Cloud
+        # SQL instance in the reverse chronological order of the start time.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
@@ -1354,79 +1258,185 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListOperationsResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::OperationsListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListOperationsResponse]
+        # @return [Google::Apis::SqlV1beta4::OperationsListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_operations(project, instance, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/operations', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListOperationsResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListOperationsResponse
+        def list_operations(project, instance: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/operations', options)
+          command.response_representation = Google::Apis::SqlV1beta4::OperationsListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::OperationsListResponse
           command.params['project'] = project unless project.nil?
           command.query['instance'] = instance unless instance.nil?
           command.query['maxResults'] = max_results unless max_results.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Reschedules the maintenance on the given instance.
+        # @param [String] project
+        #   ID of the project that contains the instance.
+        # @param [String] instance
+        #   Cloud SQL instance ID. This does not include the project ID.
+        # @param [Google::Apis::SqlV1beta4::SqlInstancesRescheduleMaintenanceRequestBody] sql_instances_reschedule_maintenance_request_body_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::SqlV1beta4::Operation]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def reschedule_project_instance_maintenance(project, instance, sql_instances_reschedule_maintenance_request_body_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/rescheduleMaintenance', options)
+          command.request_representation = Google::Apis::SqlV1beta4::SqlInstancesRescheduleMaintenanceRequestBody::Representation
+          command.request_object = sql_instances_reschedule_maintenance_request_body_object
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
+          command.params['project'] = project unless project.nil?
+          command.params['instance'] = instance unless instance.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Start External master migration.
+        # @param [String] project
+        #   ID of the project that contains the first generation instance.
+        # @param [String] instance
+        #   Cloud SQL instance ID. This does not include the project ID.
+        # @param [String] sync_mode
+        #   External sync mode
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::SqlV1beta4::Operation]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def start_project_instance_external_sync(project, instance, sync_mode: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/startExternalSync', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
+          command.params['project'] = project unless project.nil?
+          command.params['instance'] = instance unless instance.nil?
+          command.query['syncMode'] = sync_mode unless sync_mode.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Verify External master external sync settings.
+        # @param [String] project
+        #   Project ID of the project that contains the instance.
+        # @param [String] instance
+        #   Cloud SQL instance ID. This does not include the project ID.
+        # @param [String] sync_mode
+        #   External sync mode
+        # @param [Boolean] verify_connection_only
+        #   Flag to enable verifying connection only
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::SqlV1beta4::SqlInstancesVerifyExternalSyncSettingsResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::SqlV1beta4::SqlInstancesVerifyExternalSyncSettingsResponse]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def verify_project_instance_external_sync_settings(project, instance, sync_mode: nil, verify_connection_only: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/verifyExternalSyncSettings', options)
+          command.response_representation = Google::Apis::SqlV1beta4::SqlInstancesVerifyExternalSyncSettingsResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::SqlInstancesVerifyExternalSyncSettingsResponse
+          command.params['project'] = project unless project.nil?
+          command.params['instance'] = instance unless instance.nil?
+          command.query['syncMode'] = sync_mode unless sync_mode.nil?
+          command.query['verifyConnectionOnly'] = verify_connection_only unless verify_connection_only.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Generates a short-lived X509 certificate containing the provided public key
-        # and signed by a private key specific to the target instance. Users may use the
-        # certificate to authenticate as themselves when connecting to the database.
+        # and signed by a private key specific to the target instance. Users may use
+        # the certificate to authenticate as themselves when connecting to the
+        # database.
         # @param [String] project
         #   Project ID of the Cloud SQL project.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::SslCertsCreateEphemeralRequest] ssl_certs_create_ephemeral_request_object
+        # @param [Google::Apis::SqlV1beta4::SslCertsCreateEphemeralRequest] ssl_certs_create_ephemeral_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::SslCert] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::SslCert] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::SslCert]
+        # @return [Google::Apis::SqlV1beta4::SslCert]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_ssl_cert_ephemeral(project, instance, ssl_certs_create_ephemeral_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/createEphemeral', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::SslCertsCreateEphemeralRequest::Representation
+        def create_ssl_cert_ephemeral(project, instance, ssl_certs_create_ephemeral_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/createEphemeral', options)
+          command.request_representation = Google::Apis::SqlV1beta4::SslCertsCreateEphemeralRequest::Representation
           command.request_object = ssl_certs_create_ephemeral_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::SslCert::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::SslCert
+          command.response_representation = Google::Apis::SqlV1beta4::SslCert::Representation
+          command.response_class = Google::Apis::SqlV1beta4::SslCert
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes the SSL certificate. For First Generation instances, the certificate
-        # remains valid until the instance is restarted.
+        # Deletes the SSL certificate. For First Generation instances, the
+        # certificate remains valid until the instance is restarted.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
@@ -1436,37 +1446,34 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_ssl_cert(project, instance, sha1_fingerprint, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'projects/{project}/instances/{instance}/sslCerts/{sha1Fingerprint}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def delete_ssl_cert(project, instance, sha1_fingerprint, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'sql/v1beta4/projects/{project}/instances/{instance}/sslCerts/{sha1Fingerprint}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['sha1Fingerprint'] = sha1_fingerprint unless sha1_fingerprint.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves a particular SSL certificate. Does not include the private key (
-        # required for usage). The private key must be saved from the response to
+        # Retrieves a particular SSL certificate.  Does not include the private key
+        # (required for usage).  The private key must be saved from the response to
         # initial creation.
         # @param [String] project
         #   Project ID of the project that contains the instance.
@@ -1477,73 +1484,67 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::SslCert] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::SslCert] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::SslCert]
+        # @return [Google::Apis::SqlV1beta4::SslCert]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_ssl_cert(project, instance, sha1_fingerprint, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/sslCerts/{sha1Fingerprint}', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::SslCert::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::SslCert
+        def get_ssl_cert(project, instance, sha1_fingerprint, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/sslCerts/{sha1Fingerprint}', options)
+          command.response_representation = Google::Apis::SqlV1beta4::SslCert::Representation
+          command.response_class = Google::Apis::SqlV1beta4::SslCert
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.params['sha1Fingerprint'] = sha1_fingerprint unless sha1_fingerprint.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Creates an SSL certificate and returns it along with the private key and
-        # server certificate authority. The new certificate will not be usable until the
-        # instance is restarted.
+        # server certificate authority.  The new certificate will not be usable until
+        # the instance is restarted.
         # @param [String] project
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Cloud SQL instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::InsertSslCertsRequest] insert_ssl_certs_request_object
+        # @param [Google::Apis::SqlV1beta4::SslCertsInsertRequest] ssl_certs_insert_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::InsertSslCertsResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::SslCertsInsertResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::InsertSslCertsResponse]
+        # @return [Google::Apis::SqlV1beta4::SslCertsInsertResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_ssl_cert(project, instance, insert_ssl_certs_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/sslCerts', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::InsertSslCertsRequest::Representation
-          command.request_object = insert_ssl_certs_request_object
-          command.response_representation = Google::Apis::SqladminV1beta4::InsertSslCertsResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::InsertSslCertsResponse
+        def insert_ssl_cert(project, instance, ssl_certs_insert_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/sslCerts', options)
+          command.request_representation = Google::Apis::SqlV1beta4::SslCertsInsertRequest::Representation
+          command.request_object = ssl_certs_insert_request_object
+          command.response_representation = Google::Apis::SqlV1beta4::SslCertsInsertResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::SslCertsInsertResponse
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1555,65 +1556,60 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListSslCertsResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::SslCertsListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListSslCertsResponse]
+        # @return [Google::Apis::SqlV1beta4::SslCertsListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_ssl_certs(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/sslCerts', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListSslCertsResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListSslCertsResponse
+        def list_ssl_certs(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/sslCerts', options)
+          command.response_representation = Google::Apis::SqlV1beta4::SslCertsListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::SslCertsListResponse
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists all available machine types (tiers) for Cloud SQL, for example, db-n1-
-        # standard-1. For related information, see Pricing.
+        # Lists all available machine types (tiers) for Cloud SQL, for example,
+        # db-n1-standard-1. For related information, see <a
+        # href="/sql/pricing">Pricing</a>.
         # @param [String] project
         #   Project ID of the project for which to list tiers.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListTiersResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::TiersListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListTiersResponse]
+        # @return [Google::Apis::SqlV1beta4::TiersListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_tiers(project, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/tiers', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListTiersResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListTiersResponse
+        def list_tiers(project, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/tiers', options)
+          command.response_representation = Google::Apis::SqlV1beta4::TiersListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::TiersListResponse
           command.params['project'] = project unless project.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1629,33 +1625,30 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user(project, instance, host, name, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'projects/{project}/instances/{instance}/users', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+        def delete_user(project, instance, host: nil, name: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'sql/v1beta4/projects/{project}/instances/{instance}/users', options)
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['host'] = host unless host.nil?
           command.query['name'] = name unless name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1664,37 +1657,34 @@ module Google
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Database instance ID. This does not include the project ID.
-        # @param [Google::Apis::SqladminV1beta4::User] user_object
+        # @param [Google::Apis::SqlV1beta4::User] user_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_user(project, instance, user_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'projects/{project}/instances/{instance}/users', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::User::Representation
+        def insert_user(project, instance, user_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'sql/v1beta4/projects/{project}/instances/{instance}/users', options)
+          command.request_representation = Google::Apis::SqlV1beta4::User::Representation
           command.request_object = user_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1706,31 +1696,28 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::ListUsersResponse] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::UsersListResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::ListUsersResponse]
+        # @return [Google::Apis::SqlV1beta4::UsersListResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_users(project, instance, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'projects/{project}/instances/{instance}/users', options)
-          command.response_representation = Google::Apis::SqladminV1beta4::ListUsersResponse::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::ListUsersResponse
+        def list_users(project, instance, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'sql/v1beta4/projects/{project}/instances/{instance}/users', options)
+          command.response_representation = Google::Apis::SqlV1beta4::UsersListResponse::Representation
+          command.response_class = Google::Apis::SqlV1beta4::UsersListResponse
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1739,44 +1726,40 @@ module Google
         #   Project ID of the project that contains the instance.
         # @param [String] instance
         #   Database instance ID. This does not include the project ID.
+        # @param [Google::Apis::SqlV1beta4::User] user_object
+        # @param [String] host
+        #   Optional. Host of the user in the instance.
         # @param [String] name
         #   Name of the user in the instance.
-        # @param [Google::Apis::SqladminV1beta4::User] user_object
-        # @param [String] host
-        #   Host of the user in the instance. For a MySQL instance, it's required; For a
-        #   PostgreSQL instance, it's optional.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::SqladminV1beta4::Operation] parsed result object
+        # @yieldparam result [Google::Apis::SqlV1beta4::Operation] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user(project, instance, name, user_object = nil, host: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'projects/{project}/instances/{instance}/users', options)
-          command.request_representation = Google::Apis::SqladminV1beta4::User::Representation
+        def update_user(project, instance, user_object = nil, host: nil, name: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'sql/v1beta4/projects/{project}/instances/{instance}/users', options)
+          command.request_representation = Google::Apis::SqlV1beta4::User::Representation
           command.request_object = user_object
-          command.response_representation = Google::Apis::SqladminV1beta4::Operation::Representation
-          command.response_class = Google::Apis::SqladminV1beta4::Operation
+          command.response_representation = Google::Apis::SqlV1beta4::Operation::Representation
+          command.response_class = Google::Apis::SqlV1beta4::Operation
           command.params['project'] = project unless project.nil?
           command.params['instance'] = instance unless instance.nil?
           command.query['host'] = host unless host.nil?
           command.query['name'] = name unless name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
 
@@ -1785,7 +1768,6 @@ module Google
         def apply_command_defaults(command)
           command.query['key'] = key unless key.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
         end
       end
     end