google-api-client 0.20.1 → 0.21.2

data/generated/google/apis/sqladmin_v1beta4.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://cloud.google.com/sql/docs/reference/latest
     module SqladminV1beta4
       VERSION = 'V1beta4'
-      REVISION = '20180314'
+      REVISION = '20180507'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/sqladmin_v1beta4/classes.rb

@@ -1191,6 +1191,37 @@ module Google
         end
       end
       
+      # Instances ListServerCas response.
+      class InstancesListServerCasResponse
+        include Google::Apis::Core::Hashable
+      
+        # 
+        # Corresponds to the JSON property `activeVersion`
+        # @return [String]
+        attr_accessor :active_version
+      
+        # List of server CA certificates for the instance.
+        # Corresponds to the JSON property `certs`
+        # @return [Array<Google::Apis::SqladminV1beta4::SslCert>]
+        attr_accessor :certs
+      
+        # This is always sql#instancesListServerCas.
+        # Corresponds to the JSON property `kind`
+        # @return [String]
+        attr_accessor :kind
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @active_version = args[:active_version] if args.key?(:active_version)
+          @certs = args[:certs] if args.key?(:certs)
+          @kind = args[:kind] if args.key?(:kind)
+        end
+      end
+      
       # Database instance restore backup request.
       class RestoreInstancesBackupRequest
         include Google::Apis::Core::Hashable
@@ -1210,6 +1241,25 @@ module Google
         end
       end
       
+      # Rotate Server CA request.
+      class InstancesRotateServerCaRequest
+        include Google::Apis::Core::Hashable
+      
+        # Instance rotate server CA context.
+        # Corresponds to the JSON property `rotateServerCaContext`
+        # @return [Google::Apis::SqladminV1beta4::RotateServerCaContext]
+        attr_accessor :rotate_server_ca_context
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @rotate_server_ca_context = args[:rotate_server_ca_context] if args.key?(:rotate_server_ca_context)
+        end
+      end
+      
       # Instance truncate log request.
       class InstancesTruncateLogRequest
         include Google::Apis::Core::Hashable
@@ -1753,6 +1803,32 @@ module Google
         end
       end
       
+      # Instance rotate server CA context.
+      class RotateServerCaContext
+        include Google::Apis::Core::Hashable
+      
+        # This is always sql#rotateServerCaContext.
+        # Corresponds to the JSON property `kind`
+        # @return [String]
+        attr_accessor :kind
+      
+        # The fingerprint of the next version to be rotated to. If left unspecified,
+        # will be rotated to the most recently added server CA version.
+        # Corresponds to the JSON property `nextVersion`
+        # @return [String]
+        attr_accessor :next_version
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @kind = args[:kind] if args.key?(:kind)
+          @next_version = args[:next_version] if args.key?(:next_version)
+        end
+      end
+      
       # Database instance settings.
       class Settings
         include Google::Apis::Core::Hashable

data/generated/google/apis/sqladmin_v1beta4/representations.rb

@@ -190,12 +190,24 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class InstancesListServerCasResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class RestoreInstancesBackupRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class InstancesRotateServerCaRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class InstancesTruncateLogRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -274,6 +286,12 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class RotateServerCaContext
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class Settings
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -660,6 +678,16 @@ module Google
         end
       end
       
+      class InstancesListServerCasResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :active_version, as: 'activeVersion'
+          collection :certs, as: 'certs', class: Google::Apis::SqladminV1beta4::SslCert, decorator: Google::Apis::SqladminV1beta4::SslCert::Representation
+      
+          property :kind, as: 'kind'
+        end
+      end
+      
       class RestoreInstancesBackupRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -668,6 +696,14 @@ module Google
         end
       end
       
+      class InstancesRotateServerCaRequest
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :rotate_server_ca_context, as: 'rotateServerCaContext', class: Google::Apis::SqladminV1beta4::RotateServerCaContext, decorator: Google::Apis::SqladminV1beta4::RotateServerCaContext::Representation
+      
+        end
+      end
+      
       class InstancesTruncateLogRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -814,6 +850,14 @@ module Google
         end
       end
       
+      class RotateServerCaContext
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :kind, as: 'kind'
+          property :next_version, as: 'nextVersion'
+        end
+      end
+      
       class Settings
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation

data/generated/google/apis/sqladmin_v1beta4/service.rb

@@ -39,14 +39,12 @@ module Google
         attr_accessor :key
 
         # @return [String]
-        #  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.
-        #  Overrides userIp if both are provided.
+        #  An opaque string that represents a user for quota purposes. Must not exceed 40
+        #  characters.
         attr_accessor :quota_user
 
         # @return [String]
-        #  IP address of the site where the request originates. Use this if you want to
-        #  enforce per-user limits.
+        #  Deprecated. Please use quotaUser instead.
         attr_accessor :user_ip
 
         def initialize
@@ -65,12 +63,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -106,12 +102,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -147,12 +141,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -193,12 +185,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -235,12 +225,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -277,12 +265,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -318,12 +304,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -358,12 +342,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -400,12 +382,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -445,12 +425,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -485,12 +463,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -514,6 +490,46 @@ module Google
           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 can not 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
+        #   Cloud SQL instance ID. This does not include the project ID.
+        # @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.
+        # @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 err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::SqladminV1beta4::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
+          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. The API is not
         # ready for Second Generation instances yet.
         # @param [String] project
@@ -525,12 +541,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -565,12 +579,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -604,12 +616,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -646,12 +656,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -687,12 +695,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -727,12 +733,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -767,12 +771,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -807,12 +809,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -853,12 +853,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -885,6 +883,46 @@ module Google
           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.
+        # @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] 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.
+        # @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 err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::SqladminV1beta4::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
+          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.
@@ -896,12 +934,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -936,12 +972,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -977,12 +1011,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1015,12 +1047,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1054,12 +1084,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1086,6 +1114,46 @@ module Google
           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.
+        # @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 [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.
+        # @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 err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::SqladminV1beta4::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
+          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.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
+        
         # Starts the replication in the read replica instance.
         # @param [String] project
         #   ID of the project that contains the read replica.
@@ -1094,12 +1162,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1132,12 +1198,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1171,12 +1235,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1214,12 +1276,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1254,12 +1314,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1298,12 +1356,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1341,12 +1397,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1384,12 +1438,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1427,12 +1479,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1470,12 +1520,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1510,12 +1558,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1547,12 +1593,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1588,12 +1632,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1629,12 +1671,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1669,12 +1709,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1712,12 +1750,10 @@ module Google
         # @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.
-        #   Overrides userIp if both are provided.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
         # @param [String] user_ip
-        #   IP address of the site where the request originates. Use this if you want to
-        #   enforce per-user limits.
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #