google-api-client 0.32.1 → 0.36.0

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

@@ -20,19 +20,20 @@ require 'google/apis/errors'
 
 module Google
   module Apis
-    module SqladminV1beta4
+    module SqlV1beta4
       
       # An entry for an Access Control list.
       class AclEntry
         include Google::Apis::Core::Hashable
       
-        # The time when this access control entry expires in RFC 3339 format, for
-        # example 2012-11-15T16:19:00.094Z.
+        # The time when this access control entry expires in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `expirationTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :expiration_time
       
-        # This is always sql#aclEntry.
+        # This is always <code>sql#aclEntry</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -89,8 +90,8 @@ module Google
       class BackupConfiguration
         include Google::Apis::Core::Hashable
       
-        # Whether binary log is enabled. If backup configuration is disabled, binary log
-        # must be disabled as well.
+        # Whether binary log is enabled. If backup configuration is disabled, binary
+        # log must be disabled as well.
         # Corresponds to the JSON property `binaryLogEnabled`
         # @return [Boolean]
         attr_accessor :binary_log_enabled
@@ -102,12 +103,12 @@ module Google
         attr_accessor :enabled
         alias_method :enabled?, :enabled
       
-        # This is always sql#backupConfiguration.
+        # This is always <code>sql#backupConfiguration</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The location of the backup.
+        # Location of the backup
         # Corresponds to the JSON property `location`
         # @return [String]
         attr_accessor :location
@@ -118,8 +119,8 @@ module Google
         attr_accessor :replication_log_archiving_enabled
         alias_method :replication_log_archiving_enabled?, :replication_log_archiving_enabled
       
-        # Start time for the daily backup configuration in UTC timezone in the 24 hour
-        # format - HH:MM.
+        # Start time for the daily backup configuration in UTC timezone in the 24
+        # hour format - <code>HH:MM</code>.
         # Corresponds to the JSON property `startTime`
         # @return [String]
         attr_accessor :start_time
@@ -148,31 +149,33 @@ module Google
         # @return [String]
         attr_accessor :description
       
-        # Disk encryption configuration.
+        # Disk encryption configuration for an instance.
         # Corresponds to the JSON property `diskEncryptionConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionConfiguration]
+        # @return [Google::Apis::SqlV1beta4::DiskEncryptionConfiguration]
         attr_accessor :disk_encryption_configuration
       
-        # Disk encryption status.
+        # Disk encryption status for an instance.
         # Corresponds to the JSON property `diskEncryptionStatus`
-        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionStatus]
+        # @return [Google::Apis::SqlV1beta4::DiskEncryptionStatus]
         attr_accessor :disk_encryption_status
       
-        # The time the backup operation completed in UTC timezone in RFC 3339 format,
-        # for example 2012-11-15T16:19:00.094Z.
+        # The time the backup operation completed in UTC timezone in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `endTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :end_time
       
-        # The time the run was enqueued in UTC timezone in RFC 3339 format, for example
-        # 2012-11-15T16:19:00.094Z.
+        # The time the run was enqueued in UTC timezone in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `enqueuedTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :enqueued_time
       
         # Database instance operation error.
         # Corresponds to the JSON property `error`
-        # @return [Google::Apis::SqladminV1beta4::OperationError]
+        # @return [Google::Apis::SqlV1beta4::OperationError]
         attr_accessor :error
       
         # The identifier for this backup run. Unique only for a specific Cloud SQL
@@ -186,12 +189,12 @@ module Google
         # @return [String]
         attr_accessor :instance
       
-        # This is always sql#backupRun.
+        # This is always <code>sql#backupRun</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The location of the backup.
+        # Location of the backups.
         # Corresponds to the JSON property `location`
         # @return [String]
         attr_accessor :location
@@ -201,10 +204,11 @@ module Google
         # @return [String]
         attr_accessor :self_link
       
-        # The time the backup operation actually started in UTC timezone in RFC 3339
-        # format, for example 2012-11-15T16:19:00.094Z.
+        # The time the backup operation actually started in UTC timezone in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `startTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :start_time
       
         # The status of this run.
@@ -217,10 +221,11 @@ module Google
         # @return [String]
         attr_accessor :type
       
-        # The start time of the backup window during which this the backup was attempted
-        # in RFC 3339 format, for example 2012-11-15T16:19:00.094Z.
+        # The start time of the backup window during which this the backup was
+        # attempted in <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a>
+        # format, for example <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `windowStartTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :window_start_time
       
         def initialize(**args)
@@ -248,21 +253,21 @@ module Google
       end
       
       # Backup run list results.
-      class ListBackupRunsResponse
+      class BackupRunsListResponse
         include Google::Apis::Core::Hashable
       
         # A list of backup runs in reverse chronological order of the enqueued time.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::BackupRun>]
+        # @return [Array<Google::Apis::SqlV1beta4::BackupRun>]
         attr_accessor :items
       
-        # This is always sql#backupRunsList.
+        # This is always <code>sql#backupRunsList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The continuation token, used to page through large result sets. Provide this
-        # value in a subsequent request to return the next page of results.
+        # The continuation token, used to page through large result sets. Provide
+        # this value in a subsequent request to return the next page of results.
         # Corresponds to the JSON property `nextPageToken`
         # @return [String]
         attr_accessor :next_page_token
@@ -293,7 +298,7 @@ module Google
         # @return [Fixnum]
         attr_accessor :bin_log_position
       
-        # This is always sql#binLogCoordinates.
+        # This is always <code>sql#binLogCoordinates</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -316,7 +321,7 @@ module Google
       
         # Binary log coordinates.
         # Corresponds to the JSON property `binLogCoordinates`
-        # @return [Google::Apis::SqladminV1beta4::BinLogCoordinates]
+        # @return [Google::Apis::SqlV1beta4::BinLogCoordinates]
         attr_accessor :bin_log_coordinates
       
         # Name of the Cloud SQL instance to be created as a clone.
@@ -324,7 +329,7 @@ module Google
         # @return [String]
         attr_accessor :destination_instance_name
       
-        # This is always sql#cloneContext.
+        # This is always <code>sql#cloneContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -361,7 +366,8 @@ module Google
         # @return [String]
         attr_accessor :collation
       
-        # This field is deprecated and will be removed from a future version of the API.
+        # This field is deprecated and will be removed from a future version of the
+        # API.
         # Corresponds to the JSON property `etag`
         # @return [String]
         attr_accessor :etag
@@ -371,13 +377,13 @@ module Google
         # @return [String]
         attr_accessor :instance
       
-        # This is always sql#database.
+        # This is always <code>sql#database</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The name of the database in the Cloud SQL instance. This does not include the
-        # project ID or instance name.
+        # The name of the database in the Cloud SQL instance. This does not include
+        # the project ID or instance name.
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
@@ -393,6 +399,11 @@ module Google
         # @return [String]
         attr_accessor :self_link
       
+        # Represents a Sql Server database on the Cloud SQL instance.
+        # Corresponds to the JSON property `sqlserverDatabaseDetails`
+        # @return [Google::Apis::SqlV1beta4::SqlServerDatabaseDetails]
+        attr_accessor :sqlserver_database_details
+      
         def initialize(**args)
            update!(**args)
         end
@@ -407,6 +418,7 @@ module Google
           @name = args[:name] if args.key?(:name)
           @project = args[:project] if args.key?(:project)
           @self_link = args[:self_link] if args.key?(:self_link)
+          @sqlserver_database_details = args[:sqlserver_database_details] if args.key?(:sqlserver_database_details)
         end
       end
       
@@ -414,16 +426,18 @@ module Google
       class DatabaseFlags
         include Google::Apis::Core::Hashable
       
-        # The name of the flag. These flags are passed at instance startup, so include
-        # both server options and system variables for MySQL. Flags should be specified
-        # with underscores, not hyphens. For more information, see Configuring Database
-        # Flags in the Cloud SQL documentation.
+        # The name of the flag. These flags are passed at instance startup, so
+        # include both server options and system variables for MySQL. Flags should be
+        # specified with underscores, not hyphens. For more information, see <a
+        # href="/sql/docs/mysql/flags">Configuring Database Flags</a> in the Cloud
+        # SQL documentation.
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
       
-        # The value of the flag. Booleans should be set to on for true and off for false.
-        # This field must be omitted if the flag doesn't take a value.
+        # The value of the flag. Booleans should be set to <code>on</code> for true
+        # and <code>off</code> for false. This field must be omitted if the flag
+        # doesn't take a value.
         # Corresponds to the JSON property `value`
         # @return [String]
         attr_accessor :value
@@ -440,14 +454,16 @@ module Google
       end
       
       # A Cloud SQL instance resource.
+      # If you change this, also change SqlDatabaseInstance
       class DatabaseInstance
         include Google::Apis::Core::Hashable
       
-        # FIRST_GEN: First Generation instance. MySQL only.
-        # SECOND_GEN: Second Generation instance or PostgreSQL instance.
-        # EXTERNAL: A database server that is not managed by Google.
-        # This property is read-only; use the tier property in the settings object to
-        # determine the database type and Second or First Generation.
+        # <code>FIRST_GEN</code>: First Generation instance. MySQL only. <br
+        # /><code>SECOND_GEN</code>: Second Generation instance or PostgreSQL
+        # instance. <br /><code>EXTERNAL</code>: A database server that is not
+        # managed by Google. <br>This property is read-only; use the
+        # <code>tier</code> property in the <code>settings</code> object to determine
+        # the database type and Second or First Generation.
         # Corresponds to the JSON property `backendType`
         # @return [String]
         attr_accessor :backend_type
@@ -458,42 +474,46 @@ module Google
         attr_accessor :connection_name
       
         # The current disk usage of the instance in bytes. This property has been
-        # deprecated. Users should use the "cloudsql.googleapis.com/database/disk/
-        # bytes_used" metric in Cloud Monitoring API instead. Please see this
-        # announcement for details.
+        # deprecated. Users should use the
+        # "cloudsql.googleapis.com/database/disk/bytes_used" metric in Cloud
+        # Monitoring API instead. Please see <a
+        # href="https://groups.google.com/d/msg/google-cloud-sql-announce/I_7-F9EBhT0/
+        # BtvFtdFeAgAJ">this
+        # announcement</a> for details.
         # Corresponds to the JSON property `currentDiskSize`
         # @return [Fixnum]
         attr_accessor :current_disk_size
       
-        # The database engine type and version. The databaseVersion field can not be
-        # changed after instance creation. MySQL Second Generation instances: MYSQL_5_7 (
-        # default) or MYSQL_5_6. PostgreSQL instances: POSTGRES_9_6 (default) or
-        # POSTGRES_11 Beta. MySQL First Generation instances: MYSQL_5_6 (default) or
-        # MYSQL_5_5
+        # The database engine type and version. The <code>databaseVersion</code>
+        # field can not be changed after instance creation.  MySQL Second Generation
+        # instances: <code>MYSQL_5_7</code> (default) or <code>MYSQL_5_6</code>.
+        # PostgreSQL instances: <code>POSTGRES_9_6</code> (default) or
+        # <code>POSTGRES_11 Beta</code> MySQL First Generation
+        # instances: <code>MYSQL_5_6</code> (default) or <code>MYSQL_5_5</code>
         # Corresponds to the JSON property `databaseVersion`
         # @return [String]
         attr_accessor :database_version
       
-        # Disk encryption configuration.
+        # Disk encryption configuration for an instance.
         # Corresponds to the JSON property `diskEncryptionConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionConfiguration]
+        # @return [Google::Apis::SqlV1beta4::DiskEncryptionConfiguration]
         attr_accessor :disk_encryption_configuration
       
-        # Disk encryption status.
+        # Disk encryption status for an instance.
         # Corresponds to the JSON property `diskEncryptionStatus`
-        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionStatus]
+        # @return [Google::Apis::SqlV1beta4::DiskEncryptionStatus]
         attr_accessor :disk_encryption_status
       
-        # This field is deprecated and will be removed from a future version of the API.
-        # Use the settings.settingsVersion field instead.
+        # This field is deprecated and will be removed from a future version of the
+        # API. Use the <code>settings.settingsVersion</code> field instead.
         # Corresponds to the JSON property `etag`
         # @return [String]
         attr_accessor :etag
       
-        # The name and status of the failover replica. This property is applicable only
-        # to Second Generation instances.
+        # The name and status of the failover replica. This property is applicable
+        # only to Second Generation instances.
         # Corresponds to the JSON property `failoverReplica`
-        # @return [Google::Apis::SqladminV1beta4::DatabaseInstance::FailoverReplica]
+        # @return [Google::Apis::SqlV1beta4::DatabaseInstance::FailoverReplica]
         attr_accessor :failover_replica
       
         # The Compute Engine zone that the instance is currently serving from. This
@@ -504,25 +524,27 @@ module Google
         attr_accessor :gce_zone
       
         # The instance type. This can be one of the following.
-        # CLOUD_SQL_INSTANCE: A Cloud SQL instance that is not replicating from a master.
-        # ON_PREMISES_INSTANCE: An instance running on the customer's premises.
-        # READ_REPLICA_INSTANCE: A Cloud SQL instance configured as a read-replica.
+        # <br><code>CLOUD_SQL_INSTANCE</code>: A Cloud SQL instance that is not
+        # replicating from a master. <br><code>ON_PREMISES_INSTANCE</code>: An
+        # instance running on the
+        # customer's premises. <br><code>READ_REPLICA_INSTANCE</code>: A Cloud SQL
+        # instance configured as a read-replica.
         # Corresponds to the JSON property `instanceType`
         # @return [String]
         attr_accessor :instance_type
       
         # The assigned IP addresses for the instance.
         # Corresponds to the JSON property `ipAddresses`
-        # @return [Array<Google::Apis::SqladminV1beta4::IpMapping>]
+        # @return [Array<Google::Apis::SqlV1beta4::IpMapping>]
         attr_accessor :ip_addresses
       
-        # The IPv6 address assigned to the instance. This property is applicable only to
-        # First Generation instances.
+        # The IPv6 address assigned to the instance. This property is applicable only
+        # to First Generation instances.
         # Corresponds to the JSON property `ipv6Address`
         # @return [String]
         attr_accessor :ipv6_address
       
-        # This is always sql#instance.
+        # This is always <code>sql#instance</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -544,7 +566,7 @@ module Google
       
         # On-premises instance configuration.
         # Corresponds to the JSON property `onPremisesConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::OnPremisesConfiguration]
+        # @return [Google::Apis::SqlV1beta4::OnPremisesConfiguration]
         attr_accessor :on_premises_configuration
       
         # The project ID of the project containing the Cloud SQL instance. The Google
@@ -553,17 +575,20 @@ module Google
         # @return [String]
         attr_accessor :project
       
-        # The geographical region. Can be us-central (FIRST_GEN instances only), us-
-        # central1 (SECOND_GEN instances only), asia-east1 or europe-west1. Defaults to
-        # us-central or us-central1 depending on the instance type (First Generation or
-        # Second Generation). The region can not be changed after instance creation.
+        # The geographical region. Can be <code>us-central</code>
+        # (<code>FIRST_GEN</code> instances only), <code>us-central1</code>
+        # (<code>SECOND_GEN</code> instances only), <code>asia-east1</code> or
+        # <code>europe-west1</code>. Defaults to <code>us-central</code> or
+        # <code>us-central1</code> depending on the instance type (First Generation
+        # or Second Generation). The region can not be changed after instance
+        # creation.
         # Corresponds to the JSON property `region`
         # @return [String]
         attr_accessor :region
       
         # Read-replica configuration for connecting to the master.
         # Corresponds to the JSON property `replicaConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::ReplicaConfiguration]
+        # @return [Google::Apis::SqlV1beta4::ReplicaConfiguration]
         attr_accessor :replica_configuration
       
         # The replicas of the instance.
@@ -576,6 +601,11 @@ module Google
         # @return [String]
         attr_accessor :root_password
       
+        # Any scheduled maintenancce for this instance.
+        # Corresponds to the JSON property `scheduledMaintenance`
+        # @return [Google::Apis::SqlV1beta4::SqlScheduledMaintenance]
+        attr_accessor :scheduled_maintenance
+      
         # The URI of this resource.
         # Corresponds to the JSON property `selfLink`
         # @return [String]
@@ -583,29 +613,28 @@ module Google
       
         # SslCerts Resource
         # Corresponds to the JSON property `serverCaCert`
-        # @return [Google::Apis::SqladminV1beta4::SslCert]
+        # @return [Google::Apis::SqlV1beta4::SslCert]
         attr_accessor :server_ca_cert
       
-        # The service account email address assigned to the instance. This property is
-        # applicable only to Second Generation instances.
+        # The service account email address assigned to the instance. This property
+        # is applicable only to Second Generation instances.
         # Corresponds to the JSON property `serviceAccountEmailAddress`
         # @return [String]
         attr_accessor :service_account_email_address
       
         # Database instance settings.
         # Corresponds to the JSON property `settings`
-        # @return [Google::Apis::SqladminV1beta4::Settings]
+        # @return [Google::Apis::SqlV1beta4::Settings]
         attr_accessor :settings
       
         # The current serving state of the Cloud SQL instance. This can be one of the
-        # following.
-        # RUNNABLE: The instance is running, or is ready to run when accessed.
-        # SUSPENDED: The instance is not available, for example due to problems with
-        # billing.
-        # PENDING_CREATE: The instance is being created.
-        # MAINTENANCE: The instance is down for maintenance.
-        # FAILED: The instance creation failed.
-        # UNKNOWN_STATE: The state of the instance is unknown.
+        # following. <br><code>RUNNABLE</code>: The instance is running, or is ready
+        # to run when accessed. <br><code>SUSPENDED</code>: The instance is not
+        # available, for example due to problems with billing.
+        # <br><code>PENDING_CREATE</code>: The instance is being created.
+        # <br><code>MAINTENANCE</code>: The instance is down for maintenance.
+        # <br><code>FAILED</code>: The instance creation failed.
+        # <br><code>UNKNOWN_STATE</code>: The state of the instance is unknown.
         # Corresponds to the JSON property `state`
         # @return [String]
         attr_accessor :state
@@ -643,6 +672,7 @@ module Google
           @replica_configuration = args[:replica_configuration] if args.key?(:replica_configuration)
           @replica_names = args[:replica_names] if args.key?(:replica_names)
           @root_password = args[:root_password] if args.key?(:root_password)
+          @scheduled_maintenance = args[:scheduled_maintenance] if args.key?(:scheduled_maintenance)
           @self_link = args[:self_link] if args.key?(:self_link)
           @server_ca_cert = args[:server_ca_cert] if args.key?(:server_ca_cert)
           @service_account_email_address = args[:service_account_email_address] if args.key?(:service_account_email_address)
@@ -651,22 +681,23 @@ module Google
           @suspension_reason = args[:suspension_reason] if args.key?(:suspension_reason)
         end
         
-        # The name and status of the failover replica. This property is applicable only
-        # to Second Generation instances.
+        # The name and status of the failover replica. This property is applicable
+        # only to Second Generation instances.
         class FailoverReplica
           include Google::Apis::Core::Hashable
         
-          # The availability status of the failover replica. A false status indicates that
-          # the failover replica is out of sync. The master can only failover to the
-          # falover replica when the status is true.
+          # The availability status of the failover replica. A false status indicates
+          # that the failover replica is out of sync. The master can only failover to
+          # the failover replica when the status is true.
           # Corresponds to the JSON property `available`
           # @return [Boolean]
           attr_accessor :available
           alias_method :available?, :available
         
           # The name of the failover replica. If specified at instance creation, a
-          # failover replica is created for the instance. The name doesn't include the
-          # project ID. This property is applicable only to Second Generation instances.
+          # failover replica is created for the instance. The name
+          # doesn't include the project ID. This property is applicable only to
+          # Second Generation instances.
           # Corresponds to the JSON property `name`
           # @return [String]
           attr_accessor :name
@@ -684,15 +715,15 @@ module Google
       end
       
       # Database list response.
-      class ListDatabasesResponse
+      class DatabasesListResponse
         include Google::Apis::Core::Hashable
       
         # List of database resources in the instance.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::Database>]
+        # @return [Array<Google::Apis::SqlV1beta4::Database>]
         attr_accessor :items
       
-        # This is always sql#databasesList.
+        # This is always <code>sql#databasesList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -712,14 +743,14 @@ module Google
       class DemoteMasterConfiguration
         include Google::Apis::Core::Hashable
       
-        # This is always sql#demoteMasterConfiguration.
+        # This is always <code>sql#demoteMasterConfiguration</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
         # Read-replica configuration specific to MySQL databases.
         # Corresponds to the JSON property `mysqlReplicaConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::DemoteMasterMySqlReplicaConfiguration]
+        # @return [Google::Apis::SqlV1beta4::DemoteMasterMySqlReplicaConfiguration]
         attr_accessor :mysql_replica_configuration
       
         def initialize(**args)
@@ -737,7 +768,7 @@ module Google
       class DemoteMasterContext
         include Google::Apis::Core::Hashable
       
-        # This is always sql#demoteMasterContext.
+        # This is always <code>sql#demoteMasterContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -750,16 +781,16 @@ module Google
       
         # Read-replica configuration for connecting to the on-premises master.
         # Corresponds to the JSON property `replicaConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::DemoteMasterConfiguration]
+        # @return [Google::Apis::SqlV1beta4::DemoteMasterConfiguration]
         attr_accessor :replica_configuration
       
-        # Verify GTID consistency for demote operation. Default value: True. Second
-        # Generation instances only. Setting this flag to false enables you to bypass
-        # GTID consistency check between on-premises master and Cloud SQL instance
-        # during the demotion operation but also exposes you to the risk of future
-        # replication failures. Change the value only if you know the reason for the
-        # GTID divergence and are confident that doing so will not cause any replication
-        # issues.
+        # Verify GTID consistency for demote operation. Default value:
+        # <code>True</code>. Second Generation instances only.  Setting this flag to
+        # false enables you to bypass GTID consistency check between on-premises
+        # master and Cloud SQL instance during the demotion operation but also
+        # exposes you to the risk of future replication failures. Change the value
+        # only if you know the reason for the GTID divergence and are confident that
+        # doing so will not cause any replication issues.
         # Corresponds to the JSON property `verifyGtidConsistency`
         # @return [Boolean]
         attr_accessor :verify_gtid_consistency
@@ -792,14 +823,14 @@ module Google
         # @return [String]
         attr_accessor :client_certificate
       
-        # PEM representation of the slave's private key. The corresponsing public key is
-        # encoded in the client's certificate. The format of the slave's private key can
-        # be either PKCS #1 or PKCS #8.
+        # PEM representation of the slave's private key. The corresponsing public key
+        # is encoded in the client's certificate. The format of the slave's private
+        # key can be either PKCS #1 or PKCS #8.
         # Corresponds to the JSON property `clientKey`
         # @return [String]
         attr_accessor :client_key
       
-        # This is always sql#demoteMasterMysqlReplicaConfiguration.
+        # This is always <code>sql#demoteMasterMysqlReplicaConfiguration</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -829,16 +860,16 @@ module Google
         end
       end
       
-      # Disk encryption configuration.
+      # Disk encryption configuration for an instance.
       class DiskEncryptionConfiguration
         include Google::Apis::Core::Hashable
       
-        # This is always sql#diskEncryptionConfiguration.
+        # This is always <code>sql#diskEncryptionConfiguration</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # KMS key resource name
+        # Resource name of KMS key for disk encryption
         # Corresponds to the JSON property `kmsKeyName`
         # @return [String]
         attr_accessor :kms_key_name
@@ -854,16 +885,16 @@ module Google
         end
       end
       
-      # Disk encryption status.
+      # Disk encryption status for an instance.
       class DiskEncryptionStatus
         include Google::Apis::Core::Hashable
       
-        # This is always sql#diskEncryptionStatus.
+        # This is always <code>sql#diskEncryptionStatus</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # KMS key version used to encrypt the Cloud SQL instance disk
+        # KMS key version used to encrypt the Cloud SQL instance resource
         # Corresponds to the JSON property `kmsKeyVersionName`
         # @return [String]
         attr_accessor :kms_key_version_name
@@ -885,43 +916,45 @@ module Google
       
         # Options for exporting data as CSV.
         # Corresponds to the JSON property `csvExportOptions`
-        # @return [Google::Apis::SqladminV1beta4::ExportContext::CsvExportOptions]
+        # @return [Google::Apis::SqlV1beta4::ExportContext::CsvExportOptions]
         attr_accessor :csv_export_options
       
-        # Databases to be exported.
-        # MySQL instances: If fileType is SQL and no database is specified, all
-        # databases are exported, except for the mysql system database. If fileType is
-        # CSV, you can specify one database, either by using this property or by using
-        # the csvExportOptions.selectQuery property, which takes precedence over this
-        # property.
-        # PostgreSQL instances: Specify exactly one database to be exported. If fileType
-        # is CSV, this database must match the database used in the csvExportOptions.
-        # selectQuery property.
+        # Databases to be exported. <br /> <b>MySQL instances:</b> If
+        # <code>fileType</code> is <code>SQL</code> and no database is specified, all
+        # databases are exported, except for the <code>mysql</code> system database.
+        # If <code>fileType</code> is <code>CSV</code>, you can specify one database,
+        # either by using this property or by using the
+        # <code>csvExportOptions.selectQuery</code> property, which takes precedence
+        # over this property. <br /> <b>PostgreSQL instances:</b> You must specify
+        # one database to be exported. If <code>fileType</code> is <code>CSV</code>,
+        # this database must match the one specified in the
+        # <code>csvExportOptions.selectQuery</code> property.
         # Corresponds to the JSON property `databases`
         # @return [Array<String>]
         attr_accessor :databases
       
-        # The file type for the specified uri.
-        # SQL: The file contains SQL statements.
-        # CSV: The file contains CSV data.
+        # The file type for the specified uri. <br><code>SQL</code>: The file
+        # contains SQL statements. <br><code>CSV</code>: The file contains CSV data.
         # Corresponds to the JSON property `fileType`
         # @return [String]
         attr_accessor :file_type
       
-        # This is always sql#exportContext.
+        # This is always <code>sql#exportContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
         # Options for exporting data as SQL statements.
         # Corresponds to the JSON property `sqlExportOptions`
-        # @return [Google::Apis::SqladminV1beta4::ExportContext::SqlExportOptions]
+        # @return [Google::Apis::SqlV1beta4::ExportContext::SqlExportOptions]
         attr_accessor :sql_export_options
       
-        # The path to the file in Google Cloud Storage where the export will be stored.
-        # The URI is in the form gs://bucketName/fileName. If the file already exists,
-        # the requests succeeds, but the operation fails. If fileType is SQL and the
-        # filename ends with .gz, the contents are compressed.
+        # The path to the file in Google Cloud Storage where the export will be
+        # stored. The URI is in the form <code>gs:
+        # //bucketName/fileName</code>. If the file already exists, the requests
+        # // succeeds, but the operation fails. If <code>fileType</code> is
+        # // <code>SQL</code> and the filename ends with .gz, the contents are
+        # // compressed.
         # Corresponds to the JSON property `uri`
         # @return [String]
         attr_accessor :uri
@@ -965,7 +998,7 @@ module Google
         
           # Options for exporting from MySQL.
           # Corresponds to the JSON property `mysqlExportOptions`
-          # @return [Google::Apis::SqladminV1beta4::ExportContext::SqlExportOptions::MysqlExportOptions]
+          # @return [Google::Apis::SqlV1beta4::ExportContext::SqlExportOptions::MysqlExportOptions]
           attr_accessor :mysql_export_options
         
           # Export only schemas.
@@ -974,9 +1007,9 @@ module Google
           attr_accessor :schema_only
           alias_method :schema_only?, :schema_only
         
-          # Tables to export, or that were exported, from the specified database. If you
-          # specify tables, specify one and only one database. For PostgreSQL instances,
-          # you can specify only one table.
+          # Tables to export, or that were exported, from the specified database. If
+          # you specify tables, specify one and only one database. For PostgreSQL
+          # instances, you can specify only one table.
           # Corresponds to the JSON property `tables`
           # @return [Array<String>]
           attr_accessor :tables
@@ -996,10 +1029,12 @@ module Google
           class MysqlExportOptions
             include Google::Apis::Core::Hashable
           
-            # Option to include SQL statement required to set up replication. If set to 1,
-            # the dump file includes a CHANGE MASTER TO statement with the binary log
-            # coordinates. If set to 2, the CHANGE MASTER TO statement is written as a SQL
-            # comment, and has no effect. All other values are ignored.
+            # Option to include SQL statement required to set up replication.
+            # If set to <code>1</code>, the dump file includes
+            # a CHANGE MASTER TO statement with the binary log coordinates.
+            # If set to <code>2</code>, the CHANGE MASTER TO statement is written as
+            # a SQL comment, and has no effect.
+            # All other values are ignored.
             # Corresponds to the JSON property `masterData`
             # @return [Fixnum]
             attr_accessor :master_data
@@ -1020,7 +1055,7 @@ module Google
       class FailoverContext
         include Google::Apis::Core::Hashable
       
-        # This is always sql#failoverContext.
+        # This is always <code>sql#failoverContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1046,40 +1081,42 @@ module Google
       class Flag
         include Google::Apis::Core::Hashable
       
-        # For STRING flags, a list of strings that the value can be set to.
+        # For <code>STRING</code> flags, a list of strings that the value can be set
+        # to.
         # Corresponds to the JSON property `allowedStringValues`
         # @return [Array<String>]
         attr_accessor :allowed_string_values
       
-        # The database version this flag applies to. Can be MYSQL_5_5, MYSQL_5_6, or
-        # MYSQL_5_7. MYSQL_5_7 is applicable only to Second Generation instances.
+        # The database version this flag applies to. Can be <code>MYSQL_5_5</code>,
+        # <code>MYSQL_5_6</code>, or <code>MYSQL_5_7</code>. <code>MYSQL_5_7</code>
+        # is applicable only to Second Generation instances.
         # Corresponds to the JSON property `appliesTo`
         # @return [Array<String>]
         attr_accessor :applies_to
       
-        # True if the flag is only released in Beta.
+        # Whether or not the flag is considered in beta.
         # Corresponds to the JSON property `inBeta`
         # @return [Boolean]
         attr_accessor :in_beta
         alias_method :in_beta?, :in_beta
       
-        # This is always sql#flag.
+        # This is always <code>sql#flag</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # For INTEGER flags, the maximum allowed value.
+        # For <code>INTEGER</code> flags, the maximum allowed value.
         # Corresponds to the JSON property `maxValue`
         # @return [Fixnum]
         attr_accessor :max_value
       
-        # For INTEGER flags, the minimum allowed value.
+        # For <code>INTEGER</code> flags, the minimum allowed value.
         # Corresponds to the JSON property `minValue`
         # @return [Fixnum]
         attr_accessor :min_value
       
-        # This is the name of the flag. Flag names always use underscores, not hyphens,
-        # e.g. max_allowed_packet
+        # This is the name of the flag. Flag names always use underscores, not
+        # hyphens, e.g. <code>max_allowed_packet</code>
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
@@ -1091,9 +1128,10 @@ module Google
         attr_accessor :requires_restart
         alias_method :requires_restart?, :requires_restart
       
-        # The type of the flag. Flags are typed to being BOOLEAN, STRING, INTEGER or
-        # NONE. NONE is used for flags which do not take a value, such as
-        # skip_grant_tables.
+        # The type of the flag. Flags are typed to being <code>BOOLEAN</code>,
+        # <code>STRING</code>, <code>INTEGER</code> or <code>NONE</code>.
+        # <code>NONE</code> is used for flags which do not take a value, such as
+        # <code>skip_grant_tables</code>.
         # Corresponds to the JSON property `type`
         # @return [String]
         attr_accessor :type
@@ -1117,15 +1155,15 @@ module Google
       end
       
       # Flags list response.
-      class ListFlagsResponse
+      class FlagsListResponse
         include Google::Apis::Core::Hashable
       
         # List of flags.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::Flag>]
+        # @return [Array<Google::Apis::SqlV1beta4::Flag>]
         attr_accessor :items
       
-        # This is always sql#flagsList.
+        # This is always <code>sql#flagsList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1147,25 +1185,25 @@ module Google
       
         # Import parameters specific to SQL Server .BAK files
         # Corresponds to the JSON property `bakImportOptions`
-        # @return [Google::Apis::SqladminV1beta4::ImportContext::BakImportOptions]
+        # @return [Google::Apis::SqlV1beta4::ImportContext::BakImportOptions]
         attr_accessor :bak_import_options
       
         # Options for importing data as CSV.
         # Corresponds to the JSON property `csvImportOptions`
-        # @return [Google::Apis::SqladminV1beta4::ImportContext::CsvImportOptions]
+        # @return [Google::Apis::SqlV1beta4::ImportContext::CsvImportOptions]
         attr_accessor :csv_import_options
       
-        # The target database for the import. If fileType is SQL, this field is required
-        # only if the import file does not specify a database, and is overridden by any
-        # database specification in the import file. If fileType is CSV, one database
+        # The target database for the import. If <code>fileType</code> is
+        # <code>SQL</code>, this field is required only if the import file does not
+        # specify a database, and is overridden by any database specification in the
+        # import file. If <code>fileType</code> is <code>CSV</code>, one database
         # must be specified.
         # Corresponds to the JSON property `database`
         # @return [String]
         attr_accessor :database
       
-        # The file type for the specified uri.
-        # SQL: The file contains SQL statements.
-        # CSV: The file contains CSV data.
+        # The file type for the specified uri. <br><code>SQL</code>: The file
+        # contains SQL statements. <br><code>CSV</code>: The file contains CSV data.
         # Corresponds to the JSON property `fileType`
         # @return [String]
         attr_accessor :file_type
@@ -1175,14 +1213,16 @@ module Google
         # @return [String]
         attr_accessor :import_user
       
-        # This is always sql#importContext.
+        # This is always <code>sql#importContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # Path to the import file in Cloud Storage, in the form gs://bucketName/fileName.
-        # Compressed gzip files (.gz) are supported when fileType is SQL. The instance
-        # must have write permissions to the bucket and read access to the file.
+        # Path to the import file in Cloud Storage, in the form
+        # <code>gs:
+        # //bucketName/fileName</code>. Compressed gzip files (.gz) are supported
+        # // when <code>fileType</code> is <code>SQL</code>. The instance must have
+        # // write permissions to the bucket and read access to the file.
         # Corresponds to the JSON property `uri`
         # @return [String]
         attr_accessor :uri
@@ -1208,7 +1248,7 @@ module Google
         
           # 
           # Corresponds to the JSON property `encryptionOptions`
-          # @return [Google::Apis::SqladminV1beta4::ImportContext::BakImportOptions::EncryptionOptions]
+          # @return [Google::Apis::SqlV1beta4::ImportContext::BakImportOptions::EncryptionOptions]
           attr_accessor :encryption_options
         
           def initialize(**args)
@@ -1224,9 +1264,9 @@ module Google
           class EncryptionOptions
             include Google::Apis::Core::Hashable
           
-            # Path to the Certificate (.cer) in Cloud Storage, in the form gs://bucketName/
-            # fileName. The instance must have write permissions to the bucket and read
-            # access to the file.
+            # Path to the Certificate (.cer) in Cloud Storage, in the form
+            # <code>gs://bucketName/fileName</code>. The instance must have
+            # write permissions to the bucket and read access to the file.
             # Corresponds to the JSON property `certPath`
             # @return [String]
             attr_accessor :cert_path
@@ -1236,9 +1276,9 @@ module Google
             # @return [String]
             attr_accessor :pvk_password
           
-            # Path to the Certificate Private Key (.pvk) in Cloud Storage, in the form gs://
-            # bucketName/fileName. The instance must have write permissions to the bucket
-            # and read access to the file.
+            # Path to the Certificate Private Key (.pvk)  in Cloud Storage, in the
+            # form <code>gs://bucketName/fileName</code>. The instance must have
+            # write permissions to the bucket and read access to the file.
             # Corresponds to the JSON property `pvkPath`
             # @return [String]
             attr_accessor :pvk_path
@@ -1260,8 +1300,8 @@ module Google
         class CsvImportOptions
           include Google::Apis::Core::Hashable
         
-          # The columns to which CSV data is imported. If not specified, all columns of
-          # the database table are loaded with CSV data.
+          # The columns to which CSV data is imported. If not specified, all columns
+          # of the database table are loaded with CSV data.
           # Corresponds to the JSON property `columns`
           # @return [Array<String>]
           attr_accessor :columns
@@ -1284,12 +1324,12 @@ module Google
       end
       
       # Database instance clone request.
-      class CloneInstancesRequest
+      class InstancesCloneRequest
         include Google::Apis::Core::Hashable
       
         # Database instance clone context.
         # Corresponds to the JSON property `cloneContext`
-        # @return [Google::Apis::SqladminV1beta4::CloneContext]
+        # @return [Google::Apis::SqlV1beta4::CloneContext]
         attr_accessor :clone_context
       
         def initialize(**args)
@@ -1308,7 +1348,7 @@ module Google
       
         # Database instance demote master context.
         # Corresponds to the JSON property `demoteMasterContext`
-        # @return [Google::Apis::SqladminV1beta4::DemoteMasterContext]
+        # @return [Google::Apis::SqlV1beta4::DemoteMasterContext]
         attr_accessor :demote_master_context
       
         def initialize(**args)
@@ -1322,12 +1362,12 @@ module Google
       end
       
       # Database instance export request.
-      class ExportInstancesRequest
+      class InstancesExportRequest
         include Google::Apis::Core::Hashable
       
         # Database instance export context.
         # Corresponds to the JSON property `exportContext`
-        # @return [Google::Apis::SqladminV1beta4::ExportContext]
+        # @return [Google::Apis::SqlV1beta4::ExportContext]
         attr_accessor :export_context
       
         def initialize(**args)
@@ -1346,7 +1386,7 @@ module Google
       
         # Database instance failover context.
         # Corresponds to the JSON property `failoverContext`
-        # @return [Google::Apis::SqladminV1beta4::FailoverContext]
+        # @return [Google::Apis::SqlV1beta4::FailoverContext]
         attr_accessor :failover_context
       
         def initialize(**args)
@@ -1360,12 +1400,12 @@ module Google
       end
       
       # Database instance import request.
-      class ImportInstancesRequest
+      class InstancesImportRequest
         include Google::Apis::Core::Hashable
       
         # Database instance import context.
         # Corresponds to the JSON property `importContext`
-        # @return [Google::Apis::SqladminV1beta4::ImportContext]
+        # @return [Google::Apis::SqlV1beta4::ImportContext]
         attr_accessor :import_context
       
         def initialize(**args)
@@ -1379,28 +1419,28 @@ module Google
       end
       
       # Database instances list response.
-      class ListInstancesResponse
+      class InstancesListResponse
         include Google::Apis::Core::Hashable
       
         # List of database instance resources.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::DatabaseInstance>]
+        # @return [Array<Google::Apis::SqlV1beta4::DatabaseInstance>]
         attr_accessor :items
       
-        # This is always sql#instancesList.
+        # This is always <code>sql#instancesList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The continuation token, used to page through large result sets. Provide this
-        # value in a subsequent request to return the next page of results.
+        # The continuation token, used to page through large result sets. Provide
+        # this value in a subsequent request to return the next page of results.
         # Corresponds to the JSON property `nextPageToken`
         # @return [String]
         attr_accessor :next_page_token
       
         # List of warnings that ocurred while handling the request.
         # Corresponds to the JSON property `warnings`
-        # @return [Array<Google::Apis::SqladminV1beta4::ApiWarning>]
+        # @return [Array<Google::Apis::SqlV1beta4::ApiWarning>]
         attr_accessor :warnings
       
         def initialize(**args)
@@ -1427,10 +1467,10 @@ module Google
       
         # List of server CA certificates for the instance.
         # Corresponds to the JSON property `certs`
-        # @return [Array<Google::Apis::SqladminV1beta4::SslCert>]
+        # @return [Array<Google::Apis::SqlV1beta4::SslCert>]
         attr_accessor :certs
       
-        # This is always sql#instancesListServerCas.
+        # This is always <code>sql#instancesListServerCas</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1448,12 +1488,13 @@ module Google
       end
       
       # Database instance restore backup request.
-      class RestoreInstancesBackupRequest
+      class InstancesRestoreBackupRequest
         include Google::Apis::Core::Hashable
       
         # Database instance restore from backup context.
+        # Backup context contains source instance id and project id.
         # Corresponds to the JSON property `restoreBackupContext`
-        # @return [Google::Apis::SqladminV1beta4::RestoreBackupContext]
+        # @return [Google::Apis::SqlV1beta4::RestoreBackupContext]
         attr_accessor :restore_backup_context
       
         def initialize(**args)
@@ -1472,7 +1513,7 @@ module Google
       
         # Instance rotate server CA context.
         # Corresponds to the JSON property `rotateServerCaContext`
-        # @return [Google::Apis::SqladminV1beta4::RotateServerCaContext]
+        # @return [Google::Apis::SqlV1beta4::RotateServerCaContext]
         attr_accessor :rotate_server_ca_context
       
         def initialize(**args)
@@ -1491,7 +1532,7 @@ module Google
       
         # Database Instance truncate log context.
         # Corresponds to the JSON property `truncateLogContext`
-        # @return [Google::Apis::SqladminV1beta4::TruncateLogContext]
+        # @return [Google::Apis::SqlV1beta4::TruncateLogContext]
         attr_accessor :truncate_log_context
       
         def initialize(**args)
@@ -1509,10 +1550,12 @@ module Google
         include Google::Apis::Core::Hashable
       
         # The list of external networks that are allowed to connect to the instance
-        # using the IP. In CIDR notation, also known as 'slash' notation (e.g. 192.168.
-        # 100.0/24).
+        # using the IP. In <a
+        # href="http://en.wikipedia.org/wiki/CIDR_notation#CIDR_notation">CIDR
+        # notation</a>, also known as 'slash' notation (e.g.
+        # <code>192.168.100.0/24</code>).
         # Corresponds to the JSON property `authorizedNetworks`
-        # @return [Array<Google::Apis::SqladminV1beta4::AclEntry>]
+        # @return [Array<Google::Apis::SqlV1beta4::AclEntry>]
         attr_accessor :authorized_networks
       
         # Whether the instance should be assigned an IP address or not.
@@ -1522,8 +1565,9 @@ module Google
         alias_method :ipv4_enabled?, :ipv4_enabled
       
         # The resource link for the VPC network from which the Cloud SQL instance is
-        # accessible for private IP. For example, /projects/myProject/global/networks/
-        # default. This setting can be updated, but it cannot be removed after it is set.
+        # accessible for private IP. For example,
+        # <code>/projects/myProject/global/networks/default</code>. This setting can
+        # be updated, but it cannot be removed after it is set.
         # Corresponds to the JSON property `privateNetwork`
         # @return [String]
         attr_accessor :private_network
@@ -1556,17 +1600,19 @@ module Google
         # @return [String]
         attr_accessor :ip_address
       
-        # The due time for this IP to be retired in RFC 3339 format, for example 2012-11-
-        # 15T16:19:00.094Z. This field is only available when the IP is scheduled to be
-        # retired.
+        # The due time for this IP to be retired in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>. This field is only available when
+        # the IP is scheduled to be retired.
         # Corresponds to the JSON property `timeToRetire`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :time_to_retire
       
-        # The type of this IP address. A PRIMARY address is a public address that can
-        # accept incoming connections. A PRIVATE address is a private address that can
-        # accept incoming connections. An OUTGOING address is the source address of
-        # connections originating from the instance, if supported.
+        # The type of this IP address. A <code>PRIMARY</code> address is a public
+        # address that can accept incoming connections. A <code>PRIVATE</code>
+        # address is a private address that can accept incoming connections. An
+        # <code>OUTGOING</code> address is the source address of connections
+        # originating from the instance, if supported.
         # Corresponds to the JSON property `type`
         # @return [String]
         attr_accessor :type
@@ -1584,10 +1630,10 @@ module Google
       end
       
       # Preferred location. This specifies where a Cloud SQL instance should
-      # preferably be located, either in a specific Compute Engine zone, or co-located
-      # with an App Engine application. Note that if the preferred location is not
-      # available, the instance will be located as close as possible within the region.
-      # Only one location may be specified.
+      # preferably be located, either in a specific Compute Engine zone, or
+      # co-located with an App Engine application. Note that if the preferred
+      # location is not available, the instance will be located as close as possible
+      # within the region. Only one location may be specified.
       class LocationPreference
         include Google::Apis::Core::Hashable
       
@@ -1597,12 +1643,13 @@ module Google
         # @return [String]
         attr_accessor :follow_gae_application
       
-        # This is always sql#locationPreference.
+        # This is always <code>sql#locationPreference</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The preferred Compute Engine zone (e.g. us-central1-a, us-central1-b, etc.).
+        # The preferred Compute Engine zone (e.g. us-central1-a, us-central1-b,
+        # etc.).
         # Corresponds to the JSON property `zone`
         # @return [String]
         attr_accessor :zone
@@ -1634,13 +1681,15 @@ module Google
         # @return [Fixnum]
         attr_accessor :hour
       
-        # This is always sql#maintenanceWindow.
+        # This is always <code>sql#maintenanceWindow</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # Maintenance timing setting: canary (Earlier) or stable (Later).
-        # Learn more.
+        # Maintenance timing setting: <code>canary</code> (Earlier) or
+        # <code>stable</code> (Later). <br /><a
+        # href="/sql/docs/db_path/instance-settings#maintenance-timing-2ndgen">
+        # Learn more</a>.
         # Corresponds to the JSON property `updateTrack`
         # @return [String]
         attr_accessor :update_track
@@ -1672,8 +1721,8 @@ module Google
         # @return [String]
         attr_accessor :client_certificate
       
-        # PEM representation of the slave's private key. The corresponsing public key is
-        # encoded in the client's certificate.
+        # PEM representation of the slave's private key. The corresponsing public key
+        # is encoded in the client's certificate.
         # Corresponds to the JSON property `clientKey`
         # @return [String]
         attr_accessor :client_key
@@ -1683,16 +1732,17 @@ module Google
         # @return [Fixnum]
         attr_accessor :connect_retry_interval
       
-        # Path to a SQL dump file in Google Cloud Storage from which the slave instance
-        # is to be created. The URI is in the form gs://bucketName/fileName. Compressed
-        # gzip files (.gz) are also supported. Dumps should have the binlog co-ordinates
-        # from which replication should begin. This can be accomplished by setting --
-        # master-data to 1 when using mysqldump.
+        # Path to a SQL dump file in Google Cloud Storage from which the slave
+        # instance is to be created. The URI is in the form gs:
+        # //bucketName/fileName. Compressed gzip files (.gz) are also supported.
+        # // Dumps should have the binlog co-ordinates from which replication should
+        # // begin. This can be accomplished by setting --master-data to 1 when using
+        # // mysqldump.
         # Corresponds to the JSON property `dumpFilePath`
         # @return [String]
         attr_accessor :dump_file_path
       
-        # This is always sql#mysqlReplicaConfiguration.
+        # This is always <code>sql#mysqlReplicaConfiguration</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1717,8 +1767,8 @@ module Google
         # @return [String]
         attr_accessor :username
       
-        # Whether or not to check the master's Common Name value in the certificate that
-        # it sends during the SSL handshake.
+        # Whether or not to check the master's Common Name value in the certificate
+        # that it sends during the SSL handshake.
         # Corresponds to the JSON property `verifyServerCertificate`
         # @return [Boolean]
         attr_accessor :verify_server_certificate
@@ -1753,7 +1803,7 @@ module Google
         # @return [String]
         attr_accessor :host_port
       
-        # This is always sql#onPremisesConfiguration.
+        # This is always <code>sql#onPremisesConfiguration</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1769,54 +1819,59 @@ module Google
         end
       end
       
-      # An Operation resource. For successful operations that return an Operation
-      # resource, only the fields relevant to the operation are populated in the
-      # resource.
+      # An Operation resource.&nbsp;For successful operations that return an
+      # Operation resource, only the fields relevant to the operation are populated
+      # in the resource.
       class Operation
         include Google::Apis::Core::Hashable
       
-        # The time this operation finished in UTC timezone in RFC 3339 format, for
-        # example 2012-11-15T16:19:00.094Z.
+        # The time this operation finished in UTC timezone in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `endTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :end_time
       
         # Database instance operation errors list wrapper.
         # Corresponds to the JSON property `error`
-        # @return [Google::Apis::SqladminV1beta4::OperationErrors]
+        # @return [Google::Apis::SqlV1beta4::OperationErrors]
         attr_accessor :error
       
         # Database instance export context.
         # Corresponds to the JSON property `exportContext`
-        # @return [Google::Apis::SqladminV1beta4::ExportContext]
+        # @return [Google::Apis::SqlV1beta4::ExportContext]
         attr_accessor :export_context
       
         # Database instance import context.
         # Corresponds to the JSON property `importContext`
-        # @return [Google::Apis::SqladminV1beta4::ImportContext]
+        # @return [Google::Apis::SqlV1beta4::ImportContext]
         attr_accessor :import_context
       
-        # The time this operation was enqueued in UTC timezone in RFC 3339 format, for
-        # example 2012-11-15T16:19:00.094Z.
+        # The time this operation was enqueued in UTC timezone in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `insertTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :insert_time
       
-        # This is always sql#operation.
+        # This is always <code>sql#operation</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
         # An identifier that uniquely identifies the operation. You can use this
-        # identifier to retrieve the Operations resource that has information about the
-        # operation.
+        # identifier to retrieve the Operations resource that has information about
+        # the operation.
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
       
-        # The type of the operation. Valid values are CREATE, DELETE, UPDATE, RESTART,
-        # IMPORT, EXPORT, BACKUP_VOLUME, RESTORE_VOLUME, CREATE_USER, DELETE_USER,
-        # CREATE_DATABASE, DELETE_DATABASE .
+        # The type of the operation. Valid values are <code>CREATE</code>,
+        # <code>DELETE</code>, <code>UPDATE</code>, <code>RESTART</code>,
+        # <code>IMPORT</code>, <code>EXPORT</code>, <code>BACKUP_VOLUME</code>,
+        # <code>RESTORE_VOLUME</code>, <code>CREATE_USER</code>,
+        # <code>DELETE_USER</code>, <code>CREATE_DATABASE</code>,
+        # <code>DELETE_DATABASE</code> .
         # Corresponds to the JSON property `operationType`
         # @return [String]
         attr_accessor :operation_type
@@ -1826,13 +1881,15 @@ module Google
         # @return [String]
         attr_accessor :self_link
       
-        # The time this operation actually started in UTC timezone in RFC 3339 format,
-        # for example 2012-11-15T16:19:00.094Z.
+        # The time this operation actually started in UTC timezone in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `startTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :start_time
       
-        # The status of an operation. Valid values are PENDING, RUNNING, DONE, UNKNOWN.
+        # The status of an operation. Valid values are <code>PENDING</code>,
+        # <code>RUNNING</code>, <code>DONE</code>, <code>UNKNOWN</code>.
         # Corresponds to the JSON property `status`
         # @return [String]
         attr_accessor :status
@@ -1890,7 +1947,7 @@ module Google
         # @return [String]
         attr_accessor :code
       
-        # This is always sql#operationError.
+        # This is always <code>sql#operationError</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1918,10 +1975,10 @@ module Google
       
         # The list of errors encountered while processing this operation.
         # Corresponds to the JSON property `errors`
-        # @return [Array<Google::Apis::SqladminV1beta4::OperationError>]
+        # @return [Array<Google::Apis::SqlV1beta4::OperationError>]
         attr_accessor :errors
       
-        # This is always sql#operationErrors.
+        # This is always <code>sql#operationErrors</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1938,21 +1995,21 @@ module Google
       end
       
       # Database instance list operations response.
-      class ListOperationsResponse
+      class OperationsListResponse
         include Google::Apis::Core::Hashable
       
         # List of operation resources.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::Operation>]
+        # @return [Array<Google::Apis::SqlV1beta4::Operation>]
         attr_accessor :items
       
-        # This is always sql#operationsList.
+        # This is always <code>sql#operationsList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The continuation token, used to page through large result sets. Provide this
-        # value in a subsequent request to return the next page of results.
+        # The continuation token, used to page through large result sets. Provide
+        # this value in a subsequent request to return the next page of results.
         # Corresponds to the JSON property `nextPageToken`
         # @return [String]
         attr_accessor :next_page_token
@@ -1973,25 +2030,25 @@ module Google
       class ReplicaConfiguration
         include Google::Apis::Core::Hashable
       
-        # Specifies if the replica is the failover target. If the field is set to true
-        # the replica will be designated as a failover replica. In case the master
-        # instance fails, the replica instance will be promoted as the new master
+        # Specifies if the replica is the failover target. If the field is set to
+        # <code>true</code> the replica will be designated as a failover replica. In
+        # case the master instance fails, the replica instance will be promoted as
+        # the new master instance.  <p>Only one replica can be specified as failover
+        # target, and the replica has to be in different zone with the master
         # instance.
-        # Only one replica can be specified as failover target, and the replica has to
-        # be in different zone with the master instance.
         # Corresponds to the JSON property `failoverTarget`
         # @return [Boolean]
         attr_accessor :failover_target
         alias_method :failover_target?, :failover_target
       
-        # This is always sql#replicaConfiguration.
+        # This is always <code>sql#replicaConfiguration</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
         # Read-replica configuration specific to MySQL databases.
         # Corresponds to the JSON property `mysqlReplicaConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::MySqlReplicaConfiguration]
+        # @return [Google::Apis::SqlV1beta4::MySqlReplicaConfiguration]
         attr_accessor :mysql_replica_configuration
       
         def initialize(**args)
@@ -2007,6 +2064,7 @@ module Google
       end
       
       # Database instance restore from backup context.
+      # Backup context contains source instance id and project id.
       class RestoreBackupContext
         include Google::Apis::Core::Hashable
       
@@ -2020,7 +2078,7 @@ module Google
         # @return [String]
         attr_accessor :instance_id
       
-        # This is always sql#restoreBackupContext.
+        # This is always <code>sql#restoreBackupContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2047,7 +2105,7 @@ module Google
       class RotateServerCaContext
         include Google::Apis::Core::Hashable
       
-        # This is always sql#rotateServerCaContext.
+        # This is always <code>sql#rotateServerCaContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2074,15 +2132,15 @@ module Google
         include Google::Apis::Core::Hashable
       
         # The activation policy specifies when the instance is activated; it is
-        # applicable only when the instance state is RUNNABLE. Valid values:
-        # ALWAYS: The instance is on, and remains so even in the absence of connection
-        # requests.
-        # NEVER: The instance is off; it is not activated, even if a connection request
-        # arrives.
-        # ON_DEMAND: First Generation instances only. The instance responds to incoming
-        # requests, and turns itself off when not in use. Instances with PER_USE pricing
-        # turn off after 15 minutes of inactivity. Instances with PER_PACKAGE pricing
-        # turn off after 12 hours of inactivity.
+        # applicable only when the instance state is <code>RUNNABLE</code>. Valid
+        # values: <br><code>ALWAYS</code>: The instance is on, and remains so even in
+        # the absence of connection requests. <br><code>NEVER</code>: The instance is
+        # off; it is not activated, even if a connection request arrives.
+        # <br><code>ON_DEMAND</code>: First Generation instances only. The instance
+        # responds to incoming requests, and turns itself off when not in use.
+        # Instances with <code>PER_USE</code> pricing turn off after 15 minutes of
+        # inactivity. Instances with <code>PER_PACKAGE</code> pricing turn off after
+        # 12 hours of inactivity.
         # Corresponds to the JSON property `activationPolicy`
         # @return [String]
         attr_accessor :activation_policy
@@ -2094,43 +2152,44 @@ module Google
         attr_accessor :authorized_gae_applications
       
         # Availability type (PostgreSQL instances only). Potential values:
-        # ZONAL: The instance serves data from only one zone. Outages in that zone
-        # affect data accessibility.
-        # REGIONAL: The instance can serve data from more than one zone in a region (it
-        # is highly available).
-        # For more information, see Overview of the High Availability Configuration.
+        # <br><code>ZONAL</code>: The instance serves data from only one zone.
+        # Outages in that zone affect data accessibility. <br><code>REGIONAL</code>:
+        # The instance can serve data from more than one zone in a region (it is
+        # highly available). <br>For more information, see <a
+        # href="https://cloud.google.com/sql/docs/postgres/high-availability">Overview
+        # of the High Availability Configuration</a>.
         # Corresponds to the JSON property `availabilityType`
         # @return [String]
         attr_accessor :availability_type
       
         # Database instance backup configuration.
         # Corresponds to the JSON property `backupConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::BackupConfiguration]
+        # @return [Google::Apis::SqlV1beta4::BackupConfiguration]
         attr_accessor :backup_configuration
       
-        # Configuration specific to read replica instances. Indicates whether database
-        # flags for crash-safe replication are enabled. This property is only applicable
-        # to First Generation instances.
+        # Configuration specific to read replica instances. Indicates whether
+        # database flags for crash-safe replication are enabled. This property is
+        # only applicable to First Generation instances.
         # Corresponds to the JSON property `crashSafeReplicationEnabled`
         # @return [Boolean]
         attr_accessor :crash_safe_replication_enabled
         alias_method :crash_safe_replication_enabled?, :crash_safe_replication_enabled
       
-        # The size of data disk, in GB. The data disk size minimum is 10GB. Not used for
-        # First Generation instances.
+        # The size of data disk, in GB. The data disk size minimum is 10GB. Not used
+        # for First Generation instances.
         # Corresponds to the JSON property `dataDiskSizeGb`
         # @return [Fixnum]
         attr_accessor :data_disk_size_gb
       
-        # The type of data disk: PD_SSD (default) or PD_HDD. Not used for First
-        # Generation instances.
+        # The type of data disk: <code>PD_SSD</code> (default) or
+        # <code>PD_HDD</code>. Not used for First Generation instances.
         # Corresponds to the JSON property `dataDiskType`
         # @return [String]
         attr_accessor :data_disk_type
       
         # The database flags passed to the instance at startup.
         # Corresponds to the JSON property `databaseFlags`
-        # @return [Array<Google::Apis::SqladminV1beta4::DatabaseFlags>]
+        # @return [Array<Google::Apis::SqlV1beta4::DatabaseFlags>]
         attr_accessor :database_flags
       
         # Configuration specific to read replica instances. Indicates whether
@@ -2142,45 +2201,47 @@ module Google
       
         # IP Management configuration.
         # Corresponds to the JSON property `ipConfiguration`
-        # @return [Google::Apis::SqladminV1beta4::IpConfiguration]
+        # @return [Google::Apis::SqlV1beta4::IpConfiguration]
         attr_accessor :ip_configuration
       
-        # This is always sql#settings.
+        # This is always <code>sql#settings</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
         # Preferred location. This specifies where a Cloud SQL instance should
-        # preferably be located, either in a specific Compute Engine zone, or co-located
-        # with an App Engine application. Note that if the preferred location is not
-        # available, the instance will be located as close as possible within the region.
-        # Only one location may be specified.
+        # preferably be located, either in a specific Compute Engine zone, or
+        # co-located with an App Engine application. Note that if the preferred
+        # location is not available, the instance will be located as close as possible
+        # within the region. Only one location may be specified.
         # Corresponds to the JSON property `locationPreference`
-        # @return [Google::Apis::SqladminV1beta4::LocationPreference]
+        # @return [Google::Apis::SqlV1beta4::LocationPreference]
         attr_accessor :location_preference
       
         # Maintenance window. This specifies when a v2 Cloud SQL instance should
         # preferably be restarted for system maintenance purposes.
         # Corresponds to the JSON property `maintenanceWindow`
-        # @return [Google::Apis::SqladminV1beta4::MaintenanceWindow]
+        # @return [Google::Apis::SqlV1beta4::MaintenanceWindow]
         attr_accessor :maintenance_window
       
-        # The pricing plan for this instance. This can be either PER_USE or PACKAGE.
-        # Only PER_USE is supported for Second Generation instances.
+        # The pricing plan for this instance. This can be either <code>PER_USE</code>
+        # or <code>PACKAGE</code>. Only <code>PER_USE</code> is supported for Second
+        # Generation instances.
         # Corresponds to the JSON property `pricingPlan`
         # @return [String]
         attr_accessor :pricing_plan
       
-        # The type of replication this instance uses. This can be either ASYNCHRONOUS or
-        # SYNCHRONOUS. This property is only applicable to First Generation instances.
+        # The type of replication this instance uses. This can be either
+        # <code>ASYNCHRONOUS</code> or <code>SYNCHRONOUS</code>. This property is
+        # only applicable to First Generation instances.
         # Corresponds to the JSON property `replicationType`
         # @return [String]
         attr_accessor :replication_type
       
-        # The version of instance settings. This is a required field for update method
-        # to make sure concurrent updates are handled properly. During update, use the
-        # most recent settingsVersion value for this instance and do not try to update
-        # this value.
+        # The version of instance settings. This is a required field for update
+        # method to make sure concurrent updates are handled properly. During update,
+        # use the most recent settingsVersion value for this instance and do not try
+        # to update this value.
         # Corresponds to the JSON property `settingsVersion`
         # @return [Fixnum]
         attr_accessor :settings_version
@@ -2192,23 +2253,25 @@ module Google
         attr_accessor :storage_auto_resize
         alias_method :storage_auto_resize?, :storage_auto_resize
       
-        # The maximum size to which storage capacity can be automatically increased. The
-        # default value is 0, which specifies that there is no limit. Not used for First
-        # Generation instances.
+        # The maximum size to which storage capacity can be automatically increased.
+        # The default value is 0, which specifies that there is no limit. Not used
+        # for First Generation instances.
         # Corresponds to the JSON property `storageAutoResizeLimit`
         # @return [Fixnum]
         attr_accessor :storage_auto_resize_limit
       
-        # The tier (or machine type) for this instance, for example db-n1-standard-1 (
-        # MySQL instances) or db-custom-1-3840 (PostgreSQL instances). For MySQL
-        # instances, this property determines whether the instance is First or Second
-        # Generation. For more information, see Instance Settings.
+        # The tier (or machine type) for this instance, for example
+        # <code>db-n1-standard-1</code> (MySQL instances) or
+        # <code>db-custom-1-3840</code> (PostgreSQL instances). For MySQL instances,
+        # this property determines whether the instance is First or Second
+        # Generation. For more information, see <a
+        # href="/sql/docs/db_path/instance-settings">Instance Settings</a>.
         # Corresponds to the JSON property `tier`
         # @return [String]
         attr_accessor :tier
       
-        # User-provided labels, represented as a dictionary where each label is a single
-        # key value pair.
+        # User-provided labels, represented as a dictionary where each label is a
+        # single key value pair.
         # Corresponds to the JSON property `userLabels`
         # @return [Hash<String,String>]
         attr_accessor :user_labels
@@ -2242,6 +2305,57 @@ module Google
         end
       end
       
+      # Any scheduled maintenancce for this instance.
+      class SqlScheduledMaintenance
+        include Google::Apis::Core::Hashable
+      
+        # If the scheduled maintenance can be deferred.
+        # Corresponds to the JSON property `canDefer`
+        # @return [Boolean]
+        attr_accessor :can_defer
+        alias_method :can_defer?, :can_defer
+      
+        # The start time of any upcoming scheduled maintenance for this instance.
+        # Corresponds to the JSON property `startTime`
+        # @return [String]
+        attr_accessor :start_time
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @can_defer = args[:can_defer] if args.key?(:can_defer)
+          @start_time = args[:start_time] if args.key?(:start_time)
+        end
+      end
+      
+      # Represents a Sql Server database on the Cloud SQL instance.
+      class SqlServerDatabaseDetails
+        include Google::Apis::Core::Hashable
+      
+        # The version of SQL Server with which the database is to be made compatible
+        # Corresponds to the JSON property `compatibilityLevel`
+        # @return [Fixnum]
+        attr_accessor :compatibility_level
+      
+        # The recovery model of a SQL Server database
+        # Corresponds to the JSON property `recoveryModel`
+        # @return [String]
+        attr_accessor :recovery_model
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @compatibility_level = args[:compatibility_level] if args.key?(:compatibility_level)
+          @recovery_model = args[:recovery_model] if args.key?(:recovery_model)
+        end
+      end
+      
       # SslCerts Resource
       class SslCert
         include Google::Apis::Core::Hashable
@@ -2256,21 +2370,23 @@ module Google
         # @return [String]
         attr_accessor :cert_serial_number
       
-        # User supplied name. Constrained to [a-zA-Z.-_ ]+.
+        # User supplied name.  Constrained to [a-zA-Z.-_ ]+.
         # Corresponds to the JSON property `commonName`
         # @return [String]
         attr_accessor :common_name
       
-        # The time when the certificate was created in RFC 3339 format, for example 2012-
-        # 11-15T16:19:00.094Z
+        # The time when the certificate was created in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>
         # Corresponds to the JSON property `createTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :create_time
       
-        # The time when the certificate expires in RFC 3339 format, for example 2012-11-
-        # 15T16:19:00.094Z.
+        # The time when the certificate expires in <a
+        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
+        # <code>2012-11-15T16:19:00.094Z</code>.
         # Corresponds to the JSON property `expirationTime`
-        # @return [DateTime]
+        # @return [String]
         attr_accessor :expiration_time
       
         # Name of the database instance.
@@ -2278,7 +2394,7 @@ module Google
         # @return [String]
         attr_accessor :instance
       
-        # This is always sql#sslCert.
+        # This is always <code>sql#sslCert</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2317,11 +2433,11 @@ module Google
       
         # SslCerts Resource
         # Corresponds to the JSON property `certInfo`
-        # @return [Google::Apis::SqladminV1beta4::SslCert]
+        # @return [Google::Apis::SqlV1beta4::SslCert]
         attr_accessor :cert_info
       
-        # The private key for the client cert, in pem format. Keep private in order to
-        # protect your security.
+        # The private key for the client cert, in pem format.  Keep private in order
+        # to protect your security.
         # Corresponds to the JSON property `certPrivateKey`
         # @return [String]
         attr_accessor :cert_private_key
@@ -2357,11 +2473,11 @@ module Google
       end
       
       # SslCerts insert request.
-      class InsertSslCertsRequest
+      class SslCertsInsertRequest
         include Google::Apis::Core::Hashable
       
-        # User supplied name. Must be a distinct name from the other certificates for
-        # this instance.
+        # User supplied name.  Must be a distinct name from the other certificates
+        # for this instance.
         # Corresponds to the JSON property `commonName`
         # @return [String]
         attr_accessor :common_name
@@ -2377,29 +2493,29 @@ module Google
       end
       
       # SslCert insert response.
-      class InsertSslCertsResponse
+      class SslCertsInsertResponse
         include Google::Apis::Core::Hashable
       
         # SslCertDetail.
         # Corresponds to the JSON property `clientCert`
-        # @return [Google::Apis::SqladminV1beta4::SslCertDetail]
+        # @return [Google::Apis::SqlV1beta4::SslCertDetail]
         attr_accessor :client_cert
       
-        # This is always sql#sslCertsInsert.
+        # This is always <code>sql#sslCertsInsert</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # An Operation resource. For successful operations that return an Operation
-        # resource, only the fields relevant to the operation are populated in the
-        # resource.
+        # An Operation resource.&nbsp;For successful operations that return an
+        # Operation resource, only the fields relevant to the operation are populated
+        # in the resource.
         # Corresponds to the JSON property `operation`
-        # @return [Google::Apis::SqladminV1beta4::Operation]
+        # @return [Google::Apis::SqlV1beta4::Operation]
         attr_accessor :operation
       
         # SslCerts Resource
         # Corresponds to the JSON property `serverCaCert`
-        # @return [Google::Apis::SqladminV1beta4::SslCert]
+        # @return [Google::Apis::SqlV1beta4::SslCert]
         attr_accessor :server_ca_cert
       
         def initialize(**args)
@@ -2416,15 +2532,15 @@ module Google
       end
       
       # SslCerts list response.
-      class ListSslCertsResponse
+      class SslCertsListResponse
         include Google::Apis::Core::Hashable
       
         # List of client certificates for the instance.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::SslCert>]
+        # @return [Array<Google::Apis::SqlV1beta4::SslCert>]
         attr_accessor :items
       
-        # This is always sql#sslCertsList.
+        # This is always <code>sql#sslCertsList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2454,7 +2570,7 @@ module Google
         # @return [Fixnum]
         attr_accessor :ram
       
-        # This is always sql#tier.
+        # This is always <code>sql#tier</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2464,8 +2580,8 @@ module Google
         # @return [Array<String>]
         attr_accessor :region
       
-        # An identifier for the machine type, for example, db-n1-standard-1. For related
-        # information, see Pricing.
+        # An identifier for the machine type, for example, db-n1-standard-1. For
+        # related information, see <a href="/sql/pricing">Pricing</a>.
         # Corresponds to the JSON property `tier`
         # @return [String]
         attr_accessor :tier
@@ -2485,15 +2601,15 @@ module Google
       end
       
       # Tiers list response.
-      class ListTiersResponse
+      class TiersListResponse
         include Google::Apis::Core::Hashable
       
         # List of tiers.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::Tier>]
+        # @return [Array<Google::Apis::SqlV1beta4::Tier>]
         attr_accessor :items
       
-        # This is always sql#tiersList.
+        # This is always <code>sql#tiersList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2513,13 +2629,13 @@ module Google
       class TruncateLogContext
         include Google::Apis::Core::Hashable
       
-        # This is always sql#truncateLogContext.
+        # This is always <code>sql#truncateLogContext</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The type of log to truncate. Valid values are MYSQL_GENERAL_TABLE and
-        # MYSQL_SLOW_TABLE.
+        # The type of log to truncate. Valid values are
+        # <code>MYSQL_GENERAL_TABLE</code> and <code>MYSQL_SLOW_TABLE</code>.
         # Corresponds to the JSON property `logType`
         # @return [String]
         attr_accessor :log_type
@@ -2539,31 +2655,34 @@ module Google
       class User
         include Google::Apis::Core::Hashable
       
-        # This field is deprecated and will be removed from a future version of the API.
+        # This field is deprecated and will be removed from a future version of the
+        # API.
         # Corresponds to the JSON property `etag`
         # @return [String]
         attr_accessor :etag
       
-        # The host name from which the user can connect. For insert operations, host
-        # defaults to an empty string. For update operations, host is specified as part
-        # of the request URL. The host name cannot be updated after insertion.
+        # The host name from which the user can connect. For <code>insert</code>
+        # operations, host defaults to an empty string. For <code>update</code>
+        # operations, host is specified as part of the request URL. The host name
+        # cannot be updated after insertion.
         # Corresponds to the JSON property `host`
         # @return [String]
         attr_accessor :host
       
-        # The name of the Cloud SQL instance. This does not include the project ID. Can
-        # be omitted for update since it is already specified on the URL.
+        # The name of the Cloud SQL instance. This does not include the project ID.
+        # Can be omitted for <code>update</code> since it is already specified on the
+        # URL.
         # Corresponds to the JSON property `instance`
         # @return [String]
         attr_accessor :instance
       
-        # This is always sql#user.
+        # This is always <code>sql#user</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The name of the user in the Cloud SQL instance. Can be omitted for update
-        # since it is already specified in the URL.
+        # The name of the user in the Cloud SQL instance. Can be omitted for
+        # <code>update</code> since it is already specified in the URL.
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
@@ -2574,8 +2693,8 @@ module Google
         attr_accessor :password
       
         # The project ID of the project containing the Cloud SQL database. The Google
-        # apps domain is prefixed if applicable. Can be omitted for update since it is
-        # already specified on the URL.
+        # apps domain is prefixed if applicable. Can be omitted for
+        # <code>update</code> since it is already specified on the URL.
         # Corresponds to the JSON property `project`
         # @return [String]
         attr_accessor :project
@@ -2597,22 +2716,22 @@ module Google
       end
       
       # User list response.
-      class ListUsersResponse
+      class UsersListResponse
         include Google::Apis::Core::Hashable
       
         # List of user resources in the instance.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqladminV1beta4::User>]
+        # @return [Array<Google::Apis::SqlV1beta4::User>]
         attr_accessor :items
       
-        # This is always sql#usersList.
+        # This is always <code>sql#usersList</code>.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
         # An identifier that uniquely identifies the operation. You can use this
-        # identifier to retrieve the Operations resource that has information about the
-        # operation.
+        # identifier to retrieve the Operations resource that has information about
+        # the operation.
         # Corresponds to the JSON property `nextPageToken`
         # @return [String]
         attr_accessor :next_page_token