google-api-client 0.43.0 → 0.48.0

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

@@ -20,20 +20,19 @@ require 'google/apis/errors'
 
 module Google
   module Apis
-    module SqlV1beta4
+    module SqladminV1beta4
       
       # An entry for an Access Control list.
       class AclEntry
         include Google::Apis::Core::Hashable
       
-        # The time when this access control entry expires in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time when this access control entry expires in RFC 3339 format, for
+        # example *2012-11-15T16:19:00.094Z*.
         # Corresponds to the JSON property `expirationTime`
         # @return [String]
         attr_accessor :expiration_time
       
-        # This is always <b>sql#aclEntry</b>.
+        # This is always *sql#aclEntry*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -43,7 +42,7 @@ module Google
         # @return [String]
         attr_accessor :name
       
-        # The whitelisted value for the access control list.
+        # The allowlisted value for the access control list.
         # Corresponds to the JSON property `value`
         # @return [String]
         attr_accessor :value
@@ -90,6 +89,12 @@ module Google
       class BackupConfiguration
         include Google::Apis::Core::Hashable
       
+        # We currently only support backup retention by specifying the number of backups
+        # we will retain.
+        # Corresponds to the JSON property `backupRetentionSettings`
+        # @return [Google::Apis::SqladminV1beta4::BackupRetentionSettings]
+        attr_accessor :backup_retention_settings
+      
         # (MySQL only) Whether binary log is enabled. If backup configuration is
         # disabled, binarylog must be disabled as well.
         # Corresponds to the JSON property `binaryLogEnabled`
@@ -103,7 +108,7 @@ module Google
         attr_accessor :enabled
         alias_method :enabled?, :enabled
       
-        # This is always <b>sql#backupConfiguration</b>.
+        # This is always *sql#backupConfiguration*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -125,18 +130,25 @@ 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 - <b>HH:MM</b>.
+        # Start time for the daily backup configuration in UTC timezone in the 24 hour
+        # format - *HH:MM*.
         # Corresponds to the JSON property `startTime`
         # @return [String]
         attr_accessor :start_time
       
+        # The number of days of transaction logs we retain for point in time restore,
+        # from 1-7.
+        # Corresponds to the JSON property `transactionLogRetentionDays`
+        # @return [Fixnum]
+        attr_accessor :transaction_log_retention_days
+      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
+          @backup_retention_settings = args[:backup_retention_settings] if args.key?(:backup_retention_settings)
           @binary_log_enabled = args[:binary_log_enabled] if args.key?(:binary_log_enabled)
           @enabled = args[:enabled] if args.key?(:enabled)
           @kind = args[:kind] if args.key?(:kind)
@@ -144,6 +156,35 @@ module Google
           @point_in_time_recovery_enabled = args[:point_in_time_recovery_enabled] if args.key?(:point_in_time_recovery_enabled)
           @replication_log_archiving_enabled = args[:replication_log_archiving_enabled] if args.key?(:replication_log_archiving_enabled)
           @start_time = args[:start_time] if args.key?(:start_time)
+          @transaction_log_retention_days = args[:transaction_log_retention_days] if args.key?(:transaction_log_retention_days)
+        end
+      end
+      
+      # We currently only support backup retention by specifying the number of backups
+      # we will retain.
+      class BackupRetentionSettings
+        include Google::Apis::Core::Hashable
+      
+        # Depending on the value of retention_unit, this is used to determine if a
+        # backup needs to be deleted. If retention_unit is 'COUNT', we will retain this
+        # many backups.
+        # Corresponds to the JSON property `retainedBackups`
+        # @return [Fixnum]
+        attr_accessor :retained_backups
+      
+        # The unit that 'retained_backups' represents.
+        # Corresponds to the JSON property `retentionUnit`
+        # @return [String]
+        attr_accessor :retention_unit
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @retained_backups = args[:retained_backups] if args.key?(:retained_backups)
+          @retention_unit = args[:retention_unit] if args.key?(:retention_unit)
         end
       end
       
@@ -163,31 +204,29 @@ module Google
       
         # Disk encryption configuration for an instance.
         # Corresponds to the JSON property `diskEncryptionConfiguration`
-        # @return [Google::Apis::SqlV1beta4::DiskEncryptionConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionConfiguration]
         attr_accessor :disk_encryption_configuration
       
         # Disk encryption status for an instance.
         # Corresponds to the JSON property `diskEncryptionStatus`
-        # @return [Google::Apis::SqlV1beta4::DiskEncryptionStatus]
+        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionStatus]
         attr_accessor :disk_encryption_status
       
-        # The time the backup operation completed in UTC timezone in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time the backup operation completed in UTC timezone in RFC 3339 format,
+        # for example *2012-11-15T16:19:00.094Z*.
         # Corresponds to the JSON property `endTime`
         # @return [String]
         attr_accessor :end_time
       
-        # The time the run was enqueued in UTC timezone in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time the run was enqueued in UTC timezone in RFC 3339 format, for example *
+        # 2012-11-15T16:19:00.094Z*.
         # Corresponds to the JSON property `enqueuedTime`
         # @return [String]
         attr_accessor :enqueued_time
       
         # Database instance operation error.
         # Corresponds to the JSON property `error`
-        # @return [Google::Apis::SqlV1beta4::OperationError]
+        # @return [Google::Apis::SqladminV1beta4::OperationError]
         attr_accessor :error
       
         # The identifier for this backup run. Unique only for a specific Cloud SQL
@@ -201,7 +240,7 @@ module Google
         # @return [String]
         attr_accessor :instance
       
-        # This is always <b>sql#backupRun</b>.
+        # This is always *sql#backupRun*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -216,9 +255,8 @@ module Google
         # @return [String]
         attr_accessor :self_link
       
-        # 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
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time the backup operation actually started in UTC timezone in RFC 3339
+        # format, for example *2012-11-15T16:19:00.094Z*.
         # Corresponds to the JSON property `startTime`
         # @return [String]
         attr_accessor :start_time
@@ -233,9 +271,8 @@ module Google
         # @return [String]
         attr_accessor :type
       
-        # 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 <b>2012-11-15T16:19:00.094Z</b>.
+        # 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*.
         # Corresponds to the JSON property `windowStartTime`
         # @return [String]
         attr_accessor :window_start_time
@@ -266,21 +303,21 @@ module Google
       end
       
       # Backup run list results.
-      class BackupRunsListResponse
+      class ListBackupRunsResponse
         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::SqlV1beta4::BackupRun>]
+        # @return [Array<Google::Apis::SqladminV1beta4::BackupRun>]
         attr_accessor :items
       
-        # This is always <b>sql#backupRunsList</b>.
+        # This is always *sql#backupRunsList*.
         # 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
@@ -311,7 +348,7 @@ module Google
         # @return [Fixnum]
         attr_accessor :bin_log_position
       
-        # This is always <b>sql#binLogCoordinates</b>.
+        # This is always *sql#binLogCoordinates*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -334,7 +371,7 @@ module Google
       
         # Binary log coordinates.
         # Corresponds to the JSON property `binLogCoordinates`
-        # @return [Google::Apis::SqlV1beta4::BinLogCoordinates]
+        # @return [Google::Apis::SqladminV1beta4::BinLogCoordinates]
         attr_accessor :bin_log_coordinates
       
         # Name of the Cloud SQL instance to be created as a clone.
@@ -342,7 +379,7 @@ module Google
         # @return [String]
         attr_accessor :destination_instance_name
       
-        # This is always <b>sql#cloneContext</b>.
+        # This is always *sql#cloneContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -385,8 +422,7 @@ 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
@@ -396,13 +432,13 @@ module Google
         # @return [String]
         attr_accessor :instance
       
-        # This is always <b>sql#database</b>.
+        # This is always *sql#database*.
         # 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
@@ -420,7 +456,7 @@ module Google
       
         # Represents a Sql Server database on the Cloud SQL instance.
         # Corresponds to the JSON property `sqlserverDatabaseDetails`
-        # @return [Google::Apis::SqlV1beta4::SqlServerDatabaseDetails]
+        # @return [Google::Apis::SqladminV1beta4::SqlServerDatabaseDetails]
         attr_accessor :sqlserver_database_details
       
         def initialize(**args)
@@ -445,18 +481,16 @@ 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 <a
-        # href="/sql/docs/mysql/flags">Configuring Database Flags</a> 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 are specified with
+        # underscores, not hyphens. For more information, see Configuring Database Flags
+        # 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 <b>on</b> for true
-        # and <b>off</b> for false. This field must be omitted if the flag
-        # doesn't take a value.
+        # The value of the flag. Booleans are set to *on* for true and *off* 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
@@ -472,16 +506,13 @@ module Google
         end
       end
       
-      # A Cloud SQL instance resource.
-      # Next field: 34
+      # A Cloud SQL instance resource. Next field: 36
       class DatabaseInstance
         include Google::Apis::Core::Hashable
       
-        # <br><b>SECOND_GEN</b>: Cloud SQL database instance.
-        # <br><b>EXTERNAL</b>: A database server that is not
-        # managed by Google. <br>This property is read-only; use the
-        # <b>tier</b> property in the <b>settings</b> object to determine
-        # the database type.
+        # *SECOND_GEN*: Cloud SQL database 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.
         # Corresponds to the JSON property `backendType`
         # @return [String]
         attr_accessor :backend_type
@@ -492,48 +523,42 @@ 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 <a
-        # href="https://groups.google.com/d/msg/google-cloud-sql-announce/I_7-F9EBhT0/
-        # BtvFtdFeAgAJ">this
-        # announcement</a> for details.
+        # deprecated. Use the "cloudsql.googleapis.com/database/disk/bytes_used" metric
+        # in Cloud Monitoring API instead. Please see this announcement for details.
         # Corresponds to the JSON property `currentDiskSize`
         # @return [Fixnum]
         attr_accessor :current_disk_size
       
-        # The database engine type and version. The <b>databaseVersion</b>
-        # field cannot be changed after instance creation.
-        # <br>MySQL instances: <b>MYSQL_5_7</b> (default), or <b>MYSQL_5_6</b>.
-        # <br>PostgreSQL instances: <b>POSTGRES_9_6</b> (default), or
-        # <b>POSTGRES_10</b>, or <b>POSTGRES_11 Beta</b>, or <b>POSTGRES_12</b>.
-        # <br>SQL Server instances: <b>SQLSERVER_2017_STANDARD</b> (default),
-        # <b>SQLSERVER_2017_ENTERPRISE</b>, <b>SQLSERVER_2017_EXPRESS</b>, or
-        # <b>SQLSERVER_2017_WEB</b>.
+        # The database engine type and version. The *databaseVersion* field cannot be
+        # changed after instance creation. MySQL instances: *MYSQL_8_0*, *MYSQL_5_7* (
+        # default), or *MYSQL_5_6*. PostgreSQL instances: *POSTGRES_9_6*, *POSTGRES_10*,
+        # *POSTGRES_11* or *POSTGRES_12* (default). SQL Server instances: *
+        # SQLSERVER_2017_STANDARD* (default), *SQLSERVER_2017_ENTERPRISE*, *
+        # SQLSERVER_2017_EXPRESS*, or *SQLSERVER_2017_WEB*.
         # Corresponds to the JSON property `databaseVersion`
         # @return [String]
         attr_accessor :database_version
       
         # Disk encryption configuration for an instance.
         # Corresponds to the JSON property `diskEncryptionConfiguration`
-        # @return [Google::Apis::SqlV1beta4::DiskEncryptionConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionConfiguration]
         attr_accessor :disk_encryption_configuration
       
         # Disk encryption status for an instance.
         # Corresponds to the JSON property `diskEncryptionStatus`
-        # @return [Google::Apis::SqlV1beta4::DiskEncryptionStatus]
+        # @return [Google::Apis::SqladminV1beta4::DiskEncryptionStatus]
         attr_accessor :disk_encryption_status
       
-        # This field is deprecated and will be removed from a future version of the
-        # API. Use the <b>settings.settingsVersion</b> field instead.
+        # This field is deprecated and will be removed from a future version of the API.
+        # Use the *settings.settingsVersion* 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::SqlV1beta4::DatabaseInstance::FailoverReplica]
+        # @return [Google::Apis::SqladminV1beta4::DatabaseInstance::FailoverReplica]
         attr_accessor :failover_replica
       
         # The Compute Engine zone that the instance is currently serving from. This
@@ -543,33 +568,31 @@ module Google
         # @return [String]
         attr_accessor :gce_zone
       
-        # The instance type. This can be one of the following.
-        # <br><b>CLOUD_SQL_INSTANCE</b>: A Cloud SQL instance that is not replicating
-        # from a master. <br><b>ON_PREMISES_INSTANCE</b>: An instance running on the
-        # customer's premises. <br><b>READ_REPLICA_INSTANCE</b>: A Cloud SQL instance
-        # configured as a read-replica.
+        # The instance type. This can be one of the following. *CLOUD_SQL_INSTANCE*: A
+        # Cloud SQL instance that is not replicating from a primary instance. *
+        # ON_PREMISES_INSTANCE*: An instance running on the customer's premises. *
+        # READ_REPLICA_INSTANCE*: 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::SqlV1beta4::IpMapping>]
+        # @return [Array<Google::Apis::SqladminV1beta4::IpMapping>]
         attr_accessor :ip_addresses
       
-        # The IPv6 address assigned to the instance.
-        # (Deprecated) This property was applicable only
-        # to First Generation instances.
+        # The IPv6 address assigned to the instance. (Deprecated) This property was
+        # applicable only to First Generation instances.
         # Corresponds to the JSON property `ipv6Address`
         # @return [String]
         attr_accessor :ipv6_address
       
-        # This is always <b>sql#instance</b>.
+        # This is always *sql#instance*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The name of the instance which will act as master in the replication setup.
+        # The name of the instance which will act as primary in the replication setup.
         # Corresponds to the JSON property `masterInstanceName`
         # @return [String]
         attr_accessor :master_instance_name
@@ -586,7 +609,7 @@ module Google
       
         # On-premises instance configuration.
         # Corresponds to the JSON property `onPremisesConfiguration`
-        # @return [Google::Apis::SqlV1beta4::OnPremisesConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::OnPremisesConfiguration]
         attr_accessor :on_premises_configuration
       
         # The project ID of the project containing the Cloud SQL instance. The Google
@@ -595,20 +618,17 @@ module Google
         # @return [String]
         attr_accessor :project
       
-        # The geographical region. Can be
-        # <br><b>us-central</b> (<b>FIRST_GEN</b> instances only)
-        # <br><b>us-central1</b> (<b>SECOND_GEN</b> instances only)
-        # <br><b>asia-east1</b> or <b>europe-west1</b>.
-        # <br>Defaults to <b>us-central</b> or
-        # <b>us-central1</b> depending on the instance type.
-        # The region cannot be changed after instance creation.
+        # 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. The
+        # region cannot be changed after instance creation.
         # Corresponds to the JSON property `region`
         # @return [String]
         attr_accessor :region
       
-        # Read-replica configuration for connecting to the master.
+        # Read-replica configuration for connecting to the primary instance.
         # Corresponds to the JSON property `replicaConfiguration`
-        # @return [Google::Apis::SqlV1beta4::ReplicaConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::ReplicaConfiguration]
         attr_accessor :replica_configuration
       
         # The replicas of the instance.
@@ -621,11 +641,26 @@ module Google
         # @return [String]
         attr_accessor :root_password
       
+        # The status indicating if instance satisfies physical zone separation. Reserved
+        # for future use.
+        # Corresponds to the JSON property `satisfiesPzs`
+        # @return [Boolean]
+        attr_accessor :satisfies_pzs
+        alias_method :satisfies_pzs?, :satisfies_pzs
+      
         # Any scheduled maintenancce for this instance.
         # Corresponds to the JSON property `scheduledMaintenance`
-        # @return [Google::Apis::SqlV1beta4::SqlScheduledMaintenance]
+        # @return [Google::Apis::SqladminV1beta4::SqlScheduledMaintenance]
         attr_accessor :scheduled_maintenance
       
+        # The Compute Engine zone that the failover instance is currently serving from
+        # for a regional instance. This value could be different from the zone that was
+        # specified when the instance was created if the instance has failed over to its
+        # secondary/failover zone. Reserved for future use.
+        # Corresponds to the JSON property `secondaryGceZone`
+        # @return [String]
+        attr_accessor :secondary_gce_zone
+      
         # The URI of this resource.
         # Corresponds to the JSON property `selfLink`
         # @return [String]
@@ -633,28 +668,28 @@ module Google
       
         # SslCerts Resource
         # Corresponds to the JSON property `serverCaCert`
-        # @return [Google::Apis::SqlV1beta4::SslCert]
+        # @return [Google::Apis::SqladminV1beta4::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::SqlV1beta4::Settings]
+        # @return [Google::Apis::SqladminV1beta4::Settings]
         attr_accessor :settings
       
         # The current serving state of the Cloud SQL instance. This can be one of the
-        # following. <br><b>RUNNABLE</b>: The instance is running, or is ready
-        # to run when accessed. <br><b>SUSPENDED</b>: The instance is not
-        # available, for example due to problems with billing.
-        # <br><b>PENDING_CREATE</b>: The instance is being created.
-        # <br><b>MAINTENANCE</b>: The instance is down for maintenance.
-        # <br><b>FAILED</b>: The instance creation failed.
-        # <br><b>UNKNOWN_STATE</b>: The state of the instance is unknown.
+        # following. *SQL_INSTANCE_STATE_UNSPECIFIED*: The state of the instance is
+        # unknown. *RUNNABLE*: The instance has been stopped by owner. It is not
+        # currently running, but it's ready to be restarted. *SUSPENDED*: The instance
+        # is not available, for example due to problems with billing. for example due to
+        # problems with billing. *PENDING_DELETE*: The instance is being deleted. *
+        # PENDING_CREATE*: The instance is being created. *MAINTENANCE*: The instance is
+        # down for maintenance. *FAILED*: The instance creation failed.
         # Corresponds to the JSON property `state`
         # @return [String]
         attr_accessor :state
@@ -692,7 +727,9 @@ 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)
+          @satisfies_pzs = args[:satisfies_pzs] if args.key?(:satisfies_pzs)
           @scheduled_maintenance = args[:scheduled_maintenance] if args.key?(:scheduled_maintenance)
+          @secondary_gce_zone = args[:secondary_gce_zone] if args.key?(:secondary_gce_zone)
           @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)
@@ -701,13 +738,13 @@ 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 availability status of the failover replica. A false status indicates that
+          # the failover replica is out of sync. The primary instance can only failover to
           # the failover replica when the status is true.
           # Corresponds to the JSON property `available`
           # @return [Boolean]
@@ -715,9 +752,8 @@ module Google
           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
@@ -735,15 +771,15 @@ module Google
       end
       
       # Database list response.
-      class DatabasesListResponse
+      class ListDatabasesResponse
         include Google::Apis::Core::Hashable
       
         # List of database resources in the instance.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqlV1beta4::Database>]
+        # @return [Array<Google::Apis::SqladminV1beta4::Database>]
         attr_accessor :items
       
-        # This is always <b>sql#databasesList</b>.
+        # This is always *sql#databasesList*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -759,18 +795,18 @@ module Google
         end
       end
       
-      # Read-replica configuration for connecting to the on-premises master.
+      # Read-replica configuration for connecting to the on-premises primary instance.
       class DemoteMasterConfiguration
         include Google::Apis::Core::Hashable
       
-        # This is always <b>sql#demoteMasterConfiguration</b>.
+        # This is always *sql#demoteMasterConfiguration*.
         # 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::SqlV1beta4::DemoteMasterMySqlReplicaConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::DemoteMasterMySqlReplicaConfiguration]
         attr_accessor :mysql_replica_configuration
       
         def initialize(**args)
@@ -784,33 +820,33 @@ module Google
         end
       end
       
-      # Database instance demote master context.
+      # Database instance demote primary instance context.
       class DemoteMasterContext
         include Google::Apis::Core::Hashable
       
-        # This is always <b>sql#demoteMasterContext</b>.
+        # This is always *sql#demoteMasterContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The name of the instance which will act as on-premises master in the
+        # The name of the instance which will act as on-premises primary instance in the
         # replication setup.
         # Corresponds to the JSON property `masterInstanceName`
         # @return [String]
         attr_accessor :master_instance_name
       
-        # Read-replica configuration for connecting to the on-premises master.
+        # Read-replica configuration for connecting to the on-premises primary instance.
         # Corresponds to the JSON property `replicaConfiguration`
-        # @return [Google::Apis::SqlV1beta4::DemoteMasterConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::DemoteMasterConfiguration]
         attr_accessor :replica_configuration
       
-        # Verify GTID consistency for demote operation. Default value:
-        # <b>True</b>. 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: *True*. Second
+        # Generation instances only. Setting this flag to false enables you to bypass
+        # GTID consistency check between on-premises primary instance 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
@@ -838,19 +874,19 @@ module Google
         # @return [String]
         attr_accessor :ca_certificate
       
-        # PEM representation of the slave's x509 certificate.
+        # PEM representation of the replica's x509 certificate.
         # Corresponds to the JSON property `clientCertificate`
         # @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
+        # PEM representation of the replica's private key. The corresponsing public key
+        # is encoded in the client's certificate. The format of the replica'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 <b>sql#demoteMasterMysqlReplicaConfiguration</b>.
+        # This is always *sql#demoteMasterMysqlReplicaConfiguration*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -880,11 +916,50 @@ module Google
         end
       end
       
+      # Deny Maintenance Periods. This specifies a date range during when all CSA
+      # rollout will be denied.
+      class DenyMaintenancePeriod
+        include Google::Apis::Core::Hashable
+      
+        # "deny maintenance period" end date. If the year of the end date is empty, the
+        # year of the start date also must be empty. In this case, it means the deny
+        # maintenance period recurs every year. The date is in format yyyy-mm-dd i.e.,
+        # 2020-11-01, or mm-dd, i.e., 11-01
+        # Corresponds to the JSON property `endDate`
+        # @return [String]
+        attr_accessor :end_date
+      
+        # "deny maintenance period" start date. If the year of the start date is empty,
+        # the year of the end date also must be empty. In this case, it means the deny
+        # maintenance period recurs every year. The date is in format yyyy-mm-dd i.e.,
+        # 2020-11-01, or mm-dd, i.e., 11-01
+        # Corresponds to the JSON property `startDate`
+        # @return [String]
+        attr_accessor :start_date
+      
+        # Time in UTC when the "deny maintenance period" starts on start_date and ends
+        # on end_date. The time is in format: HH:mm:SS, i.e., 00:00:00
+        # Corresponds to the JSON property `time`
+        # @return [String]
+        attr_accessor :time
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @end_date = args[:end_date] if args.key?(:end_date)
+          @start_date = args[:start_date] if args.key?(:start_date)
+          @time = args[:time] if args.key?(:time)
+        end
+      end
+      
       # Disk encryption configuration for an instance.
       class DiskEncryptionConfiguration
         include Google::Apis::Core::Hashable
       
-        # This is always <b>sql#diskEncryptionConfiguration</b>.
+        # This is always *sql#diskEncryptionConfiguration*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -909,7 +984,7 @@ module Google
       class DiskEncryptionStatus
         include Google::Apis::Core::Hashable
       
-        # This is always <b>sql#diskEncryptionStatus</b>.
+        # This is always *sql#diskEncryptionStatus*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -936,45 +1011,46 @@ module Google
       
         # Options for exporting data as CSV.
         # Corresponds to the JSON property `csvExportOptions`
-        # @return [Google::Apis::SqlV1beta4::ExportContext::CsvExportOptions]
+        # @return [Google::Apis::SqladminV1beta4::ExportContext::CsvExportOptions]
         attr_accessor :csv_export_options
       
-        # Databases to be exported. <br /> <b>MySQL instances:</b> If
-        # <b>fileType</b> is <b>SQL</b> and no database is specified, all
-        # databases are exported, except for the <b>mysql</b> system database.
-        # If <b>fileType</b> is <b>CSV</b>, you can specify one database,
-        # either by using this property or by using the
-        # <b>csvExportOptions.selectQuery</b> property, which takes precedence
-        # over this property. <br /> <b>PostgreSQL instances:</b> You must specify
-        # one database to be exported. If <b>fileType</b> is <b>CSV</b>,
-        # this database must match the one specified in the
-        # <b>csvExportOptions.selectQuery</b> property.
+        # 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:* You must
+        # specify one database to be exported. If *fileType* is *CSV*, this database
+        # must match the one specified in the *csvExportOptions.selectQuery* property.
         # Corresponds to the JSON property `databases`
         # @return [Array<String>]
         attr_accessor :databases
       
-        # The file type for the specified uri. <br><b>SQL</b>: The file
-        # contains SQL statements. <br><b>CSV</b>: The file contains CSV data.
+        # The file type for the specified uri. *SQL*: The file contains SQL statements. *
+        # CSV*: The file contains CSV data.
         # Corresponds to the JSON property `fileType`
         # @return [String]
         attr_accessor :file_type
       
-        # This is always <b>sql#exportContext</b>.
+        # This is always *sql#exportContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
+        # Option for export offload.
+        # Corresponds to the JSON property `offload`
+        # @return [Boolean]
+        attr_accessor :offload
+        alias_method :offload?, :offload
+      
         # Options for exporting data as SQL statements.
         # Corresponds to the JSON property `sqlExportOptions`
-        # @return [Google::Apis::SqlV1beta4::ExportContext::SqlExportOptions]
+        # @return [Google::Apis::SqladminV1beta4::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 <b>gs:
-        # //bucketName/fileName</b>. If the file already exists, the requests
-        # // succeeds, but the operation fails. If <b>fileType</b> is
-        # // <b>SQL</b> 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 *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.
         # Corresponds to the JSON property `uri`
         # @return [String]
         attr_accessor :uri
@@ -989,6 +1065,7 @@ module Google
           @databases = args[:databases] if args.key?(:databases)
           @file_type = args[:file_type] if args.key?(:file_type)
           @kind = args[:kind] if args.key?(:kind)
+          @offload = args[:offload] if args.key?(:offload)
           @sql_export_options = args[:sql_export_options] if args.key?(:sql_export_options)
           @uri = args[:uri] if args.key?(:uri)
         end
@@ -1018,7 +1095,7 @@ module Google
         
           # Options for exporting from MySQL.
           # Corresponds to the JSON property `mysqlExportOptions`
-          # @return [Google::Apis::SqlV1beta4::ExportContext::SqlExportOptions::MysqlExportOptions]
+          # @return [Google::Apis::SqladminV1beta4::ExportContext::SqlExportOptions::MysqlExportOptions]
           attr_accessor :mysql_export_options
         
           # Export only schemas.
@@ -1027,9 +1104,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
@@ -1049,12 +1126,10 @@ module Google
           class MysqlExportOptions
             include Google::Apis::Core::Hashable
           
-            # Option to include SQL statement required to set up replication.
-            # <br>If set to <b>1</b>, the dump file includes
-            # a CHANGE MASTER TO statement with the binary log coordinates.
-            # <br>If set to <b>2</b>, 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 *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.
             # Corresponds to the JSON property `masterData`
             # @return [Fixnum]
             attr_accessor :master_data
@@ -1075,7 +1150,7 @@ module Google
       class FailoverContext
         include Google::Apis::Core::Hashable
       
-        # This is always <b>sql#failoverContext</b>.
+        # This is always *sql#failoverContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1101,21 +1176,19 @@ module Google
       class Flag
         include Google::Apis::Core::Hashable
       
-        # Use this field if only certain integers are accepted. Can be combined
-        # with min_value and max_value to add additional values.
+        # Use this field if only certain integers are accepted. Can be combined with
+        # min_value and max_value to add additional values.
         # Corresponds to the JSON property `allowedIntValues`
         # @return [Array<Fixnum>]
         attr_accessor :allowed_int_values
       
-        # For <b>STRING</b> flags, a list of strings that the value can be set
-        # to.
+        # For *STRING* 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 <b>MYSQL_5_5</b>,
-        # <b>MYSQL_5_6</b>, or <b>MYSQL_5_7</b>. <b>MYSQL_5_7</b>
-        # is applicable only to Second Generation instances.
+        # The database version this flag applies to. Can be *MYSQL_8_0*, *MYSQL_5_6*, or
+        # *MYSQL_5_7*.
         # Corresponds to the JSON property `appliesTo`
         # @return [Array<String>]
         attr_accessor :applies_to
@@ -1126,23 +1199,23 @@ module Google
         attr_accessor :in_beta
         alias_method :in_beta?, :in_beta
       
-        # This is always <b>sql#flag</b>.
+        # This is always *sql#flag*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # For <b>INTEGER</b> flags, the maximum allowed value.
+        # For *INTEGER* flags, the maximum allowed value.
         # Corresponds to the JSON property `maxValue`
         # @return [Fixnum]
         attr_accessor :max_value
       
-        # For <b>INTEGER</b> flags, the minimum allowed value.
+        # For *INTEGER* 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. <b>max_allowed_packet</b>
+        # This is the name of the flag. Flag names always use underscores, not hyphens,
+        # for example: *max_allowed_packet*
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
@@ -1154,10 +1227,9 @@ module Google
         attr_accessor :requires_restart
         alias_method :requires_restart?, :requires_restart
       
-        # The type of the flag. Flags are typed to being <b>BOOLEAN</b>,
-        # <b>STRING</b>, <b>INTEGER</b> or <b>NONE</b>.
-        # <b>NONE</b> is used for flags which do not take a value, such as
-        # <b>skip_grant_tables</b>.
+        # 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*.
         # Corresponds to the JSON property `type`
         # @return [String]
         attr_accessor :type
@@ -1182,15 +1254,15 @@ module Google
       end
       
       # Flags list response.
-      class FlagsListResponse
+      class ListFlagsResponse
         include Google::Apis::Core::Hashable
       
         # List of flags.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqlV1beta4::Flag>]
+        # @return [Array<Google::Apis::SqladminV1beta4::Flag>]
         attr_accessor :items
       
-        # This is always <b>sql#flagsList</b>.
+        # This is always *sql#flagsList*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1212,25 +1284,24 @@ module Google
       
         # Import parameters specific to SQL Server .BAK files
         # Corresponds to the JSON property `bakImportOptions`
-        # @return [Google::Apis::SqlV1beta4::ImportContext::BakImportOptions]
+        # @return [Google::Apis::SqladminV1beta4::ImportContext::BakImportOptions]
         attr_accessor :bak_import_options
       
         # Options for importing data as CSV.
         # Corresponds to the JSON property `csvImportOptions`
-        # @return [Google::Apis::SqlV1beta4::ImportContext::CsvImportOptions]
+        # @return [Google::Apis::SqladminV1beta4::ImportContext::CsvImportOptions]
         attr_accessor :csv_import_options
       
-        # The target database for the import. If <b>fileType</b> is
-        # <b>SQL</b>, 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 <b>fileType</b> is <b>CSV</b>, one database
-        # must be specified.
+        # 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 must be specified.
         # Corresponds to the JSON property `database`
         # @return [String]
         attr_accessor :database
       
-        # The file type for the specified uri. <br><b>SQL</b>: The file
-        # contains SQL statements. <br><b>CSV</b>: The file contains CSV data.
+        # The file type for the specified uri. *SQL*: The file contains SQL statements. *
+        # CSV*: The file contains CSV data.
         # Corresponds to the JSON property `fileType`
         # @return [String]
         attr_accessor :file_type
@@ -1240,16 +1311,15 @@ module Google
         # @return [String]
         attr_accessor :import_user
       
-        # This is always <b>sql#importContext</b>.
+        # This is always *sql#importContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # Path to the import file in Cloud Storage, in the form
-        # <b>gs:
-        # //bucketName/fileName</b>. Compressed gzip files (.gz) are supported
-        # // when <b>fileType</b> is <b>SQL</b>. 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 *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.
         # Corresponds to the JSON property `uri`
         # @return [String]
         attr_accessor :uri
@@ -1275,7 +1345,7 @@ module Google
         
           # 
           # Corresponds to the JSON property `encryptionOptions`
-          # @return [Google::Apis::SqlV1beta4::ImportContext::BakImportOptions::EncryptionOptions]
+          # @return [Google::Apis::SqladminV1beta4::ImportContext::BakImportOptions::EncryptionOptions]
           attr_accessor :encryption_options
         
           def initialize(**args)
@@ -1291,9 +1361,9 @@ module Google
           class EncryptionOptions
             include Google::Apis::Core::Hashable
           
-            # Path to the Certificate (.cer) in Cloud Storage, in the form
-            # <b>gs://bucketName/fileName</b>. 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 *gs://bucketName/
+            # fileName*. 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
@@ -1303,9 +1373,9 @@ module Google
             # @return [String]
             attr_accessor :pvk_password
           
-            # Path to the Certificate Private Key (.pvk)  in Cloud Storage, in the
-            # form <b>gs://bucketName/fileName</b>. 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 *gs://
+            # bucketName/fileName*. 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
@@ -1327,8 +1397,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
@@ -1351,12 +1421,12 @@ module Google
       end
       
       # Database instance clone request.
-      class InstancesCloneRequest
+      class CloneInstancesRequest
         include Google::Apis::Core::Hashable
       
         # Database instance clone context.
         # Corresponds to the JSON property `cloneContext`
-        # @return [Google::Apis::SqlV1beta4::CloneContext]
+        # @return [Google::Apis::SqladminV1beta4::CloneContext]
         attr_accessor :clone_context
       
         def initialize(**args)
@@ -1369,13 +1439,13 @@ module Google
         end
       end
       
-      # Database demote master request.
+      # Database demote primary instance request.
       class InstancesDemoteMasterRequest
         include Google::Apis::Core::Hashable
       
-        # Database instance demote master context.
+        # Database instance demote primary instance context.
         # Corresponds to the JSON property `demoteMasterContext`
-        # @return [Google::Apis::SqlV1beta4::DemoteMasterContext]
+        # @return [Google::Apis::SqladminV1beta4::DemoteMasterContext]
         attr_accessor :demote_master_context
       
         def initialize(**args)
@@ -1389,12 +1459,12 @@ module Google
       end
       
       # Database instance export request.
-      class InstancesExportRequest
+      class ExportInstancesRequest
         include Google::Apis::Core::Hashable
       
         # Database instance export context.
         # Corresponds to the JSON property `exportContext`
-        # @return [Google::Apis::SqlV1beta4::ExportContext]
+        # @return [Google::Apis::SqladminV1beta4::ExportContext]
         attr_accessor :export_context
       
         def initialize(**args)
@@ -1413,7 +1483,7 @@ module Google
       
         # Database instance failover context.
         # Corresponds to the JSON property `failoverContext`
-        # @return [Google::Apis::SqlV1beta4::FailoverContext]
+        # @return [Google::Apis::SqladminV1beta4::FailoverContext]
         attr_accessor :failover_context
       
         def initialize(**args)
@@ -1427,12 +1497,12 @@ module Google
       end
       
       # Database instance import request.
-      class InstancesImportRequest
+      class ImportInstancesRequest
         include Google::Apis::Core::Hashable
       
         # Database instance import context.
         # Corresponds to the JSON property `importContext`
-        # @return [Google::Apis::SqlV1beta4::ImportContext]
+        # @return [Google::Apis::SqladminV1beta4::ImportContext]
         attr_accessor :import_context
       
         def initialize(**args)
@@ -1446,28 +1516,28 @@ module Google
       end
       
       # Database instances list response.
-      class InstancesListResponse
+      class ListInstancesResponse
         include Google::Apis::Core::Hashable
       
         # List of database instance resources.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqlV1beta4::DatabaseInstance>]
+        # @return [Array<Google::Apis::SqladminV1beta4::DatabaseInstance>]
         attr_accessor :items
       
-        # This is always <b>sql#instancesList</b>.
+        # This is always *sql#instancesList*.
         # 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 occurred while handling the request.
         # Corresponds to the JSON property `warnings`
-        # @return [Array<Google::Apis::SqlV1beta4::ApiWarning>]
+        # @return [Array<Google::Apis::SqladminV1beta4::ApiWarning>]
         attr_accessor :warnings
       
         def initialize(**args)
@@ -1494,10 +1564,10 @@ module Google
       
         # List of server CA certificates for the instance.
         # Corresponds to the JSON property `certs`
-        # @return [Array<Google::Apis::SqlV1beta4::SslCert>]
+        # @return [Array<Google::Apis::SqladminV1beta4::SslCert>]
         attr_accessor :certs
       
-        # This is always <b>sql#instancesListServerCas</b>.
+        # This is always *sql#instancesListServerCas*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1515,13 +1585,13 @@ module Google
       end
       
       # Database instance restore backup request.
-      class InstancesRestoreBackupRequest
+      class RestoreInstancesBackupRequest
         include Google::Apis::Core::Hashable
       
-        # Database instance restore from backup context.
-        # Backup context contains source instance id and project id.
+        # Database instance restore from backup context. Backup context contains source
+        # instance id and project id.
         # Corresponds to the JSON property `restoreBackupContext`
-        # @return [Google::Apis::SqlV1beta4::RestoreBackupContext]
+        # @return [Google::Apis::SqladminV1beta4::RestoreBackupContext]
         attr_accessor :restore_backup_context
       
         def initialize(**args)
@@ -1540,7 +1610,7 @@ module Google
       
         # Instance rotate server CA context.
         # Corresponds to the JSON property `rotateServerCaContext`
-        # @return [Google::Apis::SqlV1beta4::RotateServerCaContext]
+        # @return [Google::Apis::SqladminV1beta4::RotateServerCaContext]
         attr_accessor :rotate_server_ca_context
       
         def initialize(**args)
@@ -1559,7 +1629,7 @@ module Google
       
         # Database Instance truncate log context.
         # Corresponds to the JSON property `truncateLogContext`
-        # @return [Google::Apis::SqlV1beta4::TruncateLogContext]
+        # @return [Google::Apis::SqladminV1beta4::TruncateLogContext]
         attr_accessor :truncate_log_context
       
         def initialize(**args)
@@ -1577,27 +1647,27 @@ 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.
-        # <b>192.168.100.0/24</b>).
+        # using the IP. In 'CIDR' notation, also known as 'slash' notation (for example:
+        # *192.168.100.0/24*).
         # Corresponds to the JSON property `authorizedNetworks`
-        # @return [Array<Google::Apis::SqlV1beta4::AclEntry>]
+        # @return [Array<Google::Apis::SqladminV1beta4::AclEntry>]
         attr_accessor :authorized_networks
       
-        # Whether the instance should be assigned an IP address or not.
+        # Whether the instance is assigned a public IP address or not.
         # Corresponds to the JSON property `ipv4Enabled`
         # @return [Boolean]
         attr_accessor :ipv4_enabled
         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,
-        # <b>/projects/myProject/global/networks/default</b>. This setting can
-        # be updated, but it cannot be removed after it is set.
+        # 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.
         # Corresponds to the JSON property `privateNetwork`
         # @return [String]
         attr_accessor :private_network
       
-        # Whether SSL connections over IP should be enforced or not.
+        # Whether SSL connections over IP are enforced or not.
         # Corresponds to the JSON property `requireSsl`
         # @return [Boolean]
         attr_accessor :require_ssl
@@ -1625,19 +1695,17 @@ module Google
         # @return [String]
         attr_accessor :ip_address
       
-        # The due time for this IP to be retired in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>. This field is only available when
-        # the IP is scheduled to be retired.
+        # 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.
         # Corresponds to the JSON property `timeToRetire`
         # @return [String]
         attr_accessor :time_to_retire
       
-        # The type of this IP address. A <b>PRIMARY</b> address is a public
-        # address that can accept incoming connections. A <b>PRIVATE</b>
-        # address is a private address that can accept incoming connections. An
-        # <b>OUTGOING</b> address is the source address of connections
-        # originating from the instance, if supported.
+        # 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.
         # Corresponds to the JSON property `type`
         # @return [String]
         attr_accessor :type
@@ -1654,11 +1722,11 @@ module Google
         end
       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.
+      # Preferred location. This specifies where a Cloud SQL instance is 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
       
@@ -1668,12 +1736,18 @@ module Google
         # @return [String]
         attr_accessor :follow_gae_application
       
-        # This is always <b>sql#locationPreference</b>.
+        # This is always *sql#locationPreference*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The preferred Compute Engine zone (e.g. us-central1-a, us-central1-b,
+        # The preferred Compute Engine zone for the secondary/failover (for example: us-
+        # central1-a, us-central1-b, etc.). Reserved for future use.
+        # Corresponds to the JSON property `secondaryZone`
+        # @return [String]
+        attr_accessor :secondary_zone
+      
+        # The preferred Compute Engine zone (for example: us-central1-a, us-central1-b,
         # etc.).
         # Corresponds to the JSON property `zone`
         # @return [String]
@@ -1687,12 +1761,13 @@ module Google
         def update!(**args)
           @follow_gae_application = args[:follow_gae_application] if args.key?(:follow_gae_application)
           @kind = args[:kind] if args.key?(:kind)
+          @secondary_zone = args[:secondary_zone] if args.key?(:secondary_zone)
           @zone = args[:zone] if args.key?(:zone)
         end
       end
       
-      # Maintenance window. This specifies when a v2 Cloud SQL instance should
-      # preferably be restarted for system maintenance purposes.
+      # Maintenance window. This specifies when a Cloud SQL instance is restarted for
+      # system maintenance purposes.
       class MaintenanceWindow
         include Google::Apis::Core::Hashable
       
@@ -1706,15 +1781,12 @@ module Google
         # @return [Fixnum]
         attr_accessor :hour
       
-        # This is always <b>sql#maintenanceWindow</b>.
+        # This is always *sql#maintenanceWindow*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # Maintenance timing setting: <b>canary</b> (Earlier) or
-        # <b>stable</b> (Later). <br /><a
-        # href="/sql/docs/db_path/instance-settings#maintenance-timing-2ndgen">
-        # Learn more</a>.
+        # Maintenance timing setting: *canary* (Earlier) or *stable* (Later). Learn more.
         # Corresponds to the JSON property `updateTrack`
         # @return [String]
         attr_accessor :update_track
@@ -1741,12 +1813,12 @@ module Google
         # @return [String]
         attr_accessor :ca_certificate
       
-        # PEM representation of the slave's x509 certificate.
+        # PEM representation of the replica's x509 certificate.
         # Corresponds to the JSON property `clientCertificate`
         # @return [String]
         attr_accessor :client_certificate
       
-        # PEM representation of the slave's private key. The corresponsing public key
+        # PEM representation of the replica's private key. The corresponsing public key
         # is encoded in the client's certificate.
         # Corresponds to the JSON property `clientKey`
         # @return [String]
@@ -1757,17 +1829,16 @@ module Google
         # @return [Fixnum]
         attr_accessor :connect_retry_interval
       
-        # Path to a SQL dump file in Google Cloud Storage from which the slave
+        # Path to a SQL dump file in Google Cloud Storage from which the replica
         # 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.
+        # Compressed gzip files (.gz) are also supported. Dumps have the binlog co-
+        # ordinates from which replication begins. 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 <b>sql#mysqlReplicaConfiguration</b>.
+        # This is always *sql#mysqlReplicaConfiguration*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1792,8 +1863,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 primary instance'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
@@ -1828,12 +1899,12 @@ module Google
         # @return [String]
         attr_accessor :ca_certificate
       
-        # PEM representation of the slave's x509 certificate.
+        # PEM representation of the replica's x509 certificate.
         # Corresponds to the JSON property `clientCertificate`
         # @return [String]
         attr_accessor :client_certificate
       
-        # PEM representation of the slave's private key. The corresponsing public key
+        # PEM representation of the replica's private key. The corresponsing public key
         # is encoded in the client's certificate.
         # Corresponds to the JSON property `clientKey`
         # @return [String]
@@ -1849,7 +1920,7 @@ module Google
         # @return [String]
         attr_accessor :host_port
       
-        # This is always <b>sql#onPremisesConfiguration</b>.
+        # This is always *sql#onPremisesConfiguration*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -1881,66 +1952,54 @@ module Google
         end
       end
       
-      # An Operation resource.&nbsp;For successful operations that return an
-      # Operation resource, only the fields relevant to the operation are populated
-      # in the resource.
+      # An Operation resource. 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 <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time this operation finished in UTC timezone in RFC 3339 format, for
+        # example *2012-11-15T16:19:00.094Z*.
         # Corresponds to the JSON property `endTime`
         # @return [String]
         attr_accessor :end_time
       
         # Database instance operation errors list wrapper.
         # Corresponds to the JSON property `error`
-        # @return [Google::Apis::SqlV1beta4::OperationErrors]
+        # @return [Google::Apis::SqladminV1beta4::OperationErrors]
         attr_accessor :error
       
         # Database instance export context.
         # Corresponds to the JSON property `exportContext`
-        # @return [Google::Apis::SqlV1beta4::ExportContext]
+        # @return [Google::Apis::SqladminV1beta4::ExportContext]
         attr_accessor :export_context
       
         # Database instance import context.
         # Corresponds to the JSON property `importContext`
-        # @return [Google::Apis::SqlV1beta4::ImportContext]
+        # @return [Google::Apis::SqladminV1beta4::ImportContext]
         attr_accessor :import_context
       
-        # The time this operation was enqueued in UTC timezone in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time this operation was enqueued in UTC timezone in RFC 3339 format, for
+        # example *2012-11-15T16:19:00.094Z*.
         # Corresponds to the JSON property `insertTime`
         # @return [String]
         attr_accessor :insert_time
       
-        # This is always <b>sql#operation</b>.
+        # This is always *sql#operation*.
         # 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:
-        # <br><b>CREATE</b>
-        # <br><b>DELETE</b>
-        # <br><b>UPDATE</b>
-        # <br><b>RESTART</b>
-        # <br><b>IMPORT</b>
-        # <br><b>EXPORT</b>
-        # <br><b>BACKUP_VOLUME</b>
-        # <br><b>RESTORE_VOLUME</b>
-        # <br><b>CREATE_USER</b>
-        # <br><b>DELETE_USER</b>
-        # <br><b>CREATE_DATABASE</b>
-        # <br><b>DELETE_DATABASE</b>
+        # 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*
         # Corresponds to the JSON property `operationType`
         # @return [String]
         attr_accessor :operation_type
@@ -1950,18 +2009,14 @@ module Google
         # @return [String]
         attr_accessor :self_link
       
-        # The time this operation actually started in UTC timezone in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time this operation actually started in UTC timezone in RFC 3339 format,
+        # for example *2012-11-15T16:19:00.094Z*.
         # Corresponds to the JSON property `startTime`
         # @return [String]
         attr_accessor :start_time
       
-        # The status of an operation. Valid values are:
-        # <br><b>PENDING</b>
-        # <br><b>RUNNING</b>
-        # <br><b>DONE</b>
-        # <br><b>SQL_OPERATION_STATUS_UNSPECIFIED</b>
+        # The status of an operation. Valid values are: *PENDING* *RUNNING* *DONE* *
+        # SQL_OPERATION_STATUS_UNSPECIFIED*
         # Corresponds to the JSON property `status`
         # @return [String]
         attr_accessor :status
@@ -2019,7 +2074,7 @@ module Google
         # @return [String]
         attr_accessor :code
       
-        # This is always <b>sql#operationError</b>.
+        # This is always *sql#operationError*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2047,10 +2102,10 @@ module Google
       
         # The list of errors encountered while processing this operation.
         # Corresponds to the JSON property `errors`
-        # @return [Array<Google::Apis::SqlV1beta4::OperationError>]
+        # @return [Array<Google::Apis::SqladminV1beta4::OperationError>]
         attr_accessor :errors
       
-        # This is always <b>sql#operationErrors</b>.
+        # This is always *sql#operationErrors*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2067,21 +2122,21 @@ module Google
       end
       
       # Database instance list operations response.
-      class OperationsListResponse
+      class ListOperationsResponse
         include Google::Apis::Core::Hashable
       
         # List of operation resources.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqlV1beta4::Operation>]
+        # @return [Array<Google::Apis::SqladminV1beta4::Operation>]
         attr_accessor :items
       
-        # This is always <b>sql#operationsList</b>.
+        # This is always *sql#operationsList*.
         # 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
@@ -2098,29 +2153,28 @@ module Google
         end
       end
       
-      # Read-replica configuration for connecting to the master.
+      # Read-replica configuration for connecting to the primary instance.
       class ReplicaConfiguration
         include Google::Apis::Core::Hashable
       
-        # Specifies if the replica is the failover target. If the field is set to
-        # <b>true</b> 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.
+        # 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 primary
+        # instance fails, the replica instance will be promoted as the new primary
+        # instance. Only one replica can be specified as failover target, and the
+        # replica has to be in different zone with the primary instance.
         # Corresponds to the JSON property `failoverTarget`
         # @return [Boolean]
         attr_accessor :failover_target
         alias_method :failover_target?, :failover_target
       
-        # This is always <b>sql#replicaConfiguration</b>.
+        # This is always *sql#replicaConfiguration*.
         # 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::SqlV1beta4::MySqlReplicaConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::MySqlReplicaConfiguration]
         attr_accessor :mysql_replica_configuration
       
         def initialize(**args)
@@ -2145,9 +2199,8 @@ module Google
         attr_accessor :reschedule_type
       
         # Optional. Timestamp when the maintenance shall be rescheduled to if
-        # reschedule_type=SPECIFIC_TIME, in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for
-        # example <b>2012-11-15T16:19:00.094Z</b>.
+        # reschedule_type=SPECIFIC_TIME, in RFC 3339 format, for example *2012-11-15T16:
+        # 19:00.094Z*.
         # Corresponds to the JSON property `scheduleTime`
         # @return [String]
         attr_accessor :schedule_time
@@ -2163,8 +2216,8 @@ module Google
         end
       end
       
-      # Database instance restore from backup context.
-      # Backup context contains source instance id and project id.
+      # Database instance restore from backup context. Backup context contains source
+      # instance id and project id.
       class RestoreBackupContext
         include Google::Apis::Core::Hashable
       
@@ -2178,7 +2231,7 @@ module Google
         # @return [String]
         attr_accessor :instance_id
       
-        # This is always <b>sql#restoreBackupContext</b>.
+        # This is always *sql#restoreBackupContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2205,7 +2258,7 @@ module Google
       class RotateServerCaContext
         include Google::Apis::Core::Hashable
       
-        # This is always <b>sql#rotateServerCaContext</b>.
+        # This is always *sql#rotateServerCaContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2232,36 +2285,37 @@ 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:
-        # <br><b>ALWAYS</b>: The instance is on, and remains so even in
-        # the absence of connection requests.
-        # <br><b>NEVER</b>: The instance is off; it is not activated, even if a
-        # connection request arrives.
+        # 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.
         # Corresponds to the JSON property `activationPolicy`
         # @return [String]
         attr_accessor :activation_policy
       
-        # The App Engine app IDs that can access this instance.
-        # (Deprecated) Applied to First Generation instances only.
+        # Active Directory configuration, relevant only for Cloud SQL for SQL Server.
+        # Corresponds to the JSON property `activeDirectoryConfig`
+        # @return [Google::Apis::SqladminV1beta4::SqlActiveDirectoryConfig]
+        attr_accessor :active_directory_config
+      
+        # The App Engine app IDs that can access this instance. (Deprecated) Applied to
+        # First Generation instances only.
         # Corresponds to the JSON property `authorizedGaeApplications`
         # @return [Array<String>]
         attr_accessor :authorized_gae_applications
       
-        # Availability type. Potential values:
-        # <br><b>ZONAL</b>: The instance serves data from only one zone.
-        # Outages in that zone affect data accessibility.
-        # <br><b>REGIONAL</b>: The instance can serve data from more than one zone
-        # in a region
-        # (it is highly available). <br>For more information, see
-        # <a href="/sql/docs/postgres/high-availability">
-        # Overview of the High Availability Configuration</a>.
+        # Availability type. 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.
         # 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::SqlV1beta4::BackupConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::BackupConfiguration]
         attr_accessor :backup_configuration
       
         # The name of server Instance collation.
@@ -2269,9 +2323,9 @@ module Google
         # @return [String]
         attr_accessor :collation
       
-        # Configuration specific to read replica instances. Indicates whether
-        # database flags for crash-safe replication are enabled. This property was
-        # only applicable to First Generation instances.
+        # Configuration specific to read replica instances. Indicates whether database
+        # flags for crash-safe replication are enabled. This property was only
+        # applicable to First Generation instances.
         # Corresponds to the JSON property `crashSafeReplicationEnabled`
         # @return [Boolean]
         attr_accessor :crash_safe_replication_enabled
@@ -2282,15 +2336,15 @@ module Google
         # @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: PD_SSD (default) or PD_HDD. 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::SqlV1beta4::DatabaseFlags>]
+        # @return [Array<Google::Apis::SqladminV1beta4::DatabaseFlags>]
         attr_accessor :database_flags
       
         # Configuration specific to read replica instances. Indicates whether
@@ -2300,50 +2354,53 @@ module Google
         attr_accessor :database_replication_enabled
         alias_method :database_replication_enabled?, :database_replication_enabled
       
+        # Deny maintenance periods
+        # Corresponds to the JSON property `denyMaintenancePeriods`
+        # @return [Array<Google::Apis::SqladminV1beta4::DenyMaintenancePeriod>]
+        attr_accessor :deny_maintenance_periods
+      
         # IP Management configuration.
         # Corresponds to the JSON property `ipConfiguration`
-        # @return [Google::Apis::SqlV1beta4::IpConfiguration]
+        # @return [Google::Apis::SqladminV1beta4::IpConfiguration]
         attr_accessor :ip_configuration
       
-        # This is always <b>sql#settings</b>.
+        # This is always *sql#settings*.
         # 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.
+        # Preferred location. This specifies where a Cloud SQL instance is 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::SqlV1beta4::LocationPreference]
+        # @return [Google::Apis::SqladminV1beta4::LocationPreference]
         attr_accessor :location_preference
       
-        # Maintenance window. This specifies when a v2 Cloud SQL instance should
-        # preferably be restarted for system maintenance purposes.
+        # Maintenance window. This specifies when a Cloud SQL instance is restarted for
+        # system maintenance purposes.
         # Corresponds to the JSON property `maintenanceWindow`
-        # @return [Google::Apis::SqlV1beta4::MaintenanceWindow]
+        # @return [Google::Apis::SqladminV1beta4::MaintenanceWindow]
         attr_accessor :maintenance_window
       
-        # The pricing plan for this instance. This can be either <b>PER_USE</b>
-        # or <b>PACKAGE</b>. Only <b>PER_USE</b> is supported for Second
-        # Generation instances.
+        # The pricing plan for this instance. This can be either *PER_USE* or *PACKAGE*.
+        # Only *PER_USE* 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
-        # <b>ASYNCHRONOUS</b> or <b>SYNCHRONOUS</b>.
-        # (Deprecated_ This property was only applicable to
-        # First Generation instances.
+        # The type of replication this instance uses. This can be either *ASYNCHRONOUS*
+        # or *SYNCHRONOUS*. (Deprecated_ This property was 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
@@ -2355,21 +2412,20 @@ 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.
+        # The maximum size to which storage capacity can be automatically increased. The
+        # default value is 0, which specifies that there is no limit.
         # Corresponds to the JSON property `storageAutoResizeLimit`
         # @return [Fixnum]
         attr_accessor :storage_auto_resize_limit
       
-        # The tier (or machine type) for this instance, for example
-        # <b>db-n1-standard-1</b> (MySQL instances) or
-        # <b>db-custom-1-3840</b> (PostgreSQL instances).
+        # The tier (or machine type) for this instance, for example *db-n1-standard-1* (
+        # MySQL instances) or *db-custom-1-3840* (PostgreSQL instances).
         # 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
@@ -2381,6 +2437,7 @@ module Google
         # Update properties of this object
         def update!(**args)
           @activation_policy = args[:activation_policy] if args.key?(:activation_policy)
+          @active_directory_config = args[:active_directory_config] if args.key?(:active_directory_config)
           @authorized_gae_applications = args[:authorized_gae_applications] if args.key?(:authorized_gae_applications)
           @availability_type = args[:availability_type] if args.key?(:availability_type)
           @backup_configuration = args[:backup_configuration] if args.key?(:backup_configuration)
@@ -2390,6 +2447,7 @@ module Google
           @data_disk_type = args[:data_disk_type] if args.key?(:data_disk_type)
           @database_flags = args[:database_flags] if args.key?(:database_flags)
           @database_replication_enabled = args[:database_replication_enabled] if args.key?(:database_replication_enabled)
+          @deny_maintenance_periods = args[:deny_maintenance_periods] if args.key?(:deny_maintenance_periods)
           @ip_configuration = args[:ip_configuration] if args.key?(:ip_configuration)
           @kind = args[:kind] if args.key?(:kind)
           @location_preference = args[:location_preference] if args.key?(:location_preference)
@@ -2404,7 +2462,32 @@ module Google
         end
       end
       
-      # External master migration setting error.
+      # Active Directory configuration, relevant only for Cloud SQL for SQL Server.
+      class SqlActiveDirectoryConfig
+        include Google::Apis::Core::Hashable
+      
+        # The name of the domain (e.g., mydomain.com).
+        # Corresponds to the JSON property `domain`
+        # @return [String]
+        attr_accessor :domain
+      
+        # This is always sql#activeDirectoryConfig.
+        # Corresponds to the JSON property `kind`
+        # @return [String]
+        attr_accessor :kind
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @domain = args[:domain] if args.key?(:domain)
+          @kind = args[:kind] if args.key?(:kind)
+        end
+      end
+      
+      # External primary instance migration setting error.
       class SqlExternalSyncSettingError
         include Google::Apis::Core::Hashable
       
@@ -2413,7 +2496,7 @@ module Google
         # @return [String]
         attr_accessor :detail
       
-        # This is always <b>sql#migrationSettingError</b>.
+        # This is always *sql#migrationSettingError*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2441,7 +2524,7 @@ module Google
       
         # Required. The type of the reschedule the user wants.
         # Corresponds to the JSON property `reschedule`
-        # @return [Google::Apis::SqlV1beta4::Reschedule]
+        # @return [Google::Apis::SqladminV1beta4::Reschedule]
         attr_accessor :reschedule
       
         def initialize(**args)
@@ -2460,10 +2543,10 @@ module Google
       
         # List of migration violations.
         # Corresponds to the JSON property `errors`
-        # @return [Array<Google::Apis::SqlV1beta4::SqlExternalSyncSettingError>]
+        # @return [Array<Google::Apis::SqladminV1beta4::SqlExternalSyncSettingError>]
         attr_accessor :errors
       
-        # This is always <b>sql#migrationSettingErrorList</b>.
+        # This is always *sql#migrationSettingErrorList*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2577,21 +2660,19 @@ 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 <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>
+        # The time when the certificate was created in RFC 3339 format, for example *
+        # 2012-11-15T16:19:00.094Z*
         # Corresponds to the JSON property `createTime`
         # @return [String]
         attr_accessor :create_time
       
-        # The time when the certificate expires in <a
-        # href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> format, for example
-        # <b>2012-11-15T16:19:00.094Z</b>.
+        # The time when the certificate expires in RFC 3339 format, for example *2012-11-
+        # 15T16:19:00.094Z*.
         # Corresponds to the JSON property `expirationTime`
         # @return [String]
         attr_accessor :expiration_time
@@ -2601,7 +2682,7 @@ module Google
         # @return [String]
         attr_accessor :instance
       
-        # This is always <b>sql#sslCert</b>.
+        # This is always *sql#sslCert*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2640,11 +2721,11 @@ module Google
       
         # SslCerts Resource
         # Corresponds to the JSON property `certInfo`
-        # @return [Google::Apis::SqlV1beta4::SslCert]
+        # @return [Google::Apis::SqladminV1beta4::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
@@ -2680,11 +2761,11 @@ module Google
       end
       
       # SslCerts insert request.
-      class SslCertsInsertRequest
+      class InsertSslCertsRequest
         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
@@ -2700,29 +2781,29 @@ module Google
       end
       
       # SslCert insert response.
-      class SslCertsInsertResponse
+      class InsertSslCertsResponse
         include Google::Apis::Core::Hashable
       
         # SslCertDetail.
         # Corresponds to the JSON property `clientCert`
-        # @return [Google::Apis::SqlV1beta4::SslCertDetail]
+        # @return [Google::Apis::SqladminV1beta4::SslCertDetail]
         attr_accessor :client_cert
       
-        # This is always <b>sql#sslCertsInsert</b>.
+        # This is always *sql#sslCertsInsert*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # An Operation resource.&nbsp;For successful operations that return an
-        # Operation resource, only the fields relevant to the operation are populated
-        # in the resource.
+        # An Operation resource. 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::SqlV1beta4::Operation]
+        # @return [Google::Apis::SqladminV1beta4::Operation]
         attr_accessor :operation
       
         # SslCerts Resource
         # Corresponds to the JSON property `serverCaCert`
-        # @return [Google::Apis::SqlV1beta4::SslCert]
+        # @return [Google::Apis::SqladminV1beta4::SslCert]
         attr_accessor :server_ca_cert
       
         def initialize(**args)
@@ -2739,15 +2820,15 @@ module Google
       end
       
       # SslCerts list response.
-      class SslCertsListResponse
+      class ListSslCertsResponse
         include Google::Apis::Core::Hashable
       
         # List of client certificates for the instance.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqlV1beta4::SslCert>]
+        # @return [Array<Google::Apis::SqladminV1beta4::SslCert>]
         attr_accessor :items
       
-        # This is always <b>sql#sslCertsList</b>.
+        # This is always *sql#sslCertsList*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2777,7 +2858,7 @@ module Google
         # @return [Fixnum]
         attr_accessor :ram
       
-        # This is always <b>sql#tier</b>.
+        # This is always *sql#tier*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2787,8 +2868,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 <a href="/sql/pricing">Pricing</a>.
+        # An identifier for the machine type, for example, db-n1-standard-1. For related
+        # information, see Pricing.
         # Corresponds to the JSON property `tier`
         # @return [String]
         attr_accessor :tier
@@ -2808,15 +2889,15 @@ module Google
       end
       
       # Tiers list response.
-      class TiersListResponse
+      class ListTiersResponse
         include Google::Apis::Core::Hashable
       
         # List of tiers.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqlV1beta4::Tier>]
+        # @return [Array<Google::Apis::SqladminV1beta4::Tier>]
         attr_accessor :items
       
-        # This is always <b>sql#tiersList</b>.
+        # This is always *sql#tiersList*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
@@ -2836,13 +2917,13 @@ module Google
       class TruncateLogContext
         include Google::Apis::Core::Hashable
       
-        # This is always <b>sql#truncateLogContext</b>.
+        # This is always *sql#truncateLogContext*.
         # Corresponds to the JSON property `kind`
         # @return [String]
         attr_accessor :kind
       
-        # The type of log to truncate. Valid values are
-        # <b>MYSQL_GENERAL_TABLE</b> and <b>MYSQL_SLOW_TABLE</b>.
+        # The type of log to truncate. Valid values are *MYSQL_GENERAL_TABLE* and *
+        # MYSQL_SLOW_TABLE*.
         # Corresponds to the JSON property `logType`
         # @return [String]
         attr_accessor :log_type
@@ -2862,34 +2943,31 @@ 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 <b>insert</b>
-        # operations, host defaults to an empty string. For <b>update</b>
-        # 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 *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.
         # 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 <b>update</b> 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 *update* since it is already specified on the URL.
         # Corresponds to the JSON property `instance`
         # @return [String]
         attr_accessor :instance
       
-        # This is always <b>sql#user</b>.
+        # This is always *sql#user*.
         # 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
-        # <b>update</b> since it is already specified in the URL.
+        # The name of the user in the Cloud SQL instance. Can be omitted for *update*
+        # since it is already specified in the URL.
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
@@ -2900,17 +2978,23 @@ 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
-        # <b>update</b> since it is already specified on the URL.
+        # apps domain is prefixed if applicable. Can be omitted for *update* since it is
+        # already specified on the URL.
         # Corresponds to the JSON property `project`
         # @return [String]
         attr_accessor :project
       
         # Represents a Sql Server user on the Cloud SQL instance.
         # Corresponds to the JSON property `sqlserverUserDetails`
-        # @return [Google::Apis::SqlV1beta4::SqlServerUserDetails]
+        # @return [Google::Apis::SqladminV1beta4::SqlServerUserDetails]
         attr_accessor :sqlserver_user_details
       
+        # The user type. It determines the method to authenticate the user during login.
+        # The default is the database's built-in user type.
+        # Corresponds to the JSON property `type`
+        # @return [String]
+        attr_accessor :type
+      
         def initialize(**args)
            update!(**args)
         end
@@ -2925,26 +3009,27 @@ module Google
           @password = args[:password] if args.key?(:password)
           @project = args[:project] if args.key?(:project)
           @sqlserver_user_details = args[:sqlserver_user_details] if args.key?(:sqlserver_user_details)
+          @type = args[:type] if args.key?(:type)
         end
       end
       
       # User list response.
-      class UsersListResponse
+      class ListUsersResponse
         include Google::Apis::Core::Hashable
       
         # List of user resources in the instance.
         # Corresponds to the JSON property `items`
-        # @return [Array<Google::Apis::SqlV1beta4::User>]
+        # @return [Array<Google::Apis::SqladminV1beta4::User>]
         attr_accessor :items
       
-        # This is always <b>sql#usersList</b>.
+        # This is always *sql#usersList*.
         # 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