google-api-client 0.44.1 → 0.46.1

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

@@ -49,8 +49,7 @@ module Google
         
         # Returns the Cloud Source Repositories configuration of the project.
         # @param [String] name
-        #   The name of the requested project. Values are of the form
-        #   `projects/<project>`.
+        #   The name of the requested project. Values are of the form `projects/`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -80,8 +79,7 @@ module Google
         
         # Updates the Cloud Source Repositories configuration of the project.
         # @param [String] name
-        #   The name of the requested project. Values are of the form
-        #   `projects/<project>`.
+        #   The name of the requested project. Values are of the form `projects/`.
         # @param [Google::Apis::SourcerepoV1::UpdateProjectConfigRequest] update_project_config_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -112,12 +110,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a repo in the given project with the given name.
-        # If the named repository already exists, `CreateRepo` returns
-        # `ALREADY_EXISTS`.
+        # Creates a repo in the given project with the given name. If the named
+        # repository already exists, `CreateRepo` returns `ALREADY_EXISTS`.
         # @param [String] parent
-        #   The project in which to create the repo. Values are of the form
-        #   `projects/<project>`.
+        #   The project in which to create the repo. Values are of the form `projects/`.
         # @param [Google::Apis::SourcerepoV1::Repo] repo_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -150,8 +146,7 @@ module Google
         
         # Deletes a repo.
         # @param [String] name
-        #   The name of the repo to delete. Values are of the form
-        #   `projects/<project>/repos/<repo>`.
+        #   The name of the repo to delete. Values are of the form `projects//repos/`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -181,8 +176,8 @@ module Google
         
         # Returns information about a repo.
         # @param [String] name
-        #   The name of the requested repository. Values are of the form
-        #   `projects/<project>/repos/<repo>`.
+        #   The name of the requested repository. Values are of the form `projects//repos/`
+        #   .
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -210,22 +205,19 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Gets the access control policy for a resource.
-        # Returns an empty policy if the resource exists and does not have a policy
-        # set.
+        # Gets the access control policy for a resource. Returns an empty policy if the
+        # resource exists and does not have a policy set.
         # @param [String] resource
-        #   REQUIRED: The resource for which the policy is being requested.
-        #   See the operation documentation for the appropriate value for this field.
+        #   REQUIRED: The resource for which the policy is being requested. See the
+        #   operation documentation for the appropriate value for this field.
         # @param [Fixnum] options_requested_policy_version
-        #   Optional. The policy format version to be returned.
-        #   Valid values are 0, 1, and 3. Requests specifying an invalid value will be
-        #   rejected.
-        #   Requests for policies with any conditional bindings must specify version 3.
-        #   Policies without any conditional bindings may specify any valid value or
-        #   leave the field unset.
-        #   To learn which resources support conditions in their IAM policies, see the
-        #   [IAM
-        #   documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
+        #   Optional. The policy format version to be returned. Valid values are 0, 1, and
+        #   3. Requests specifying an invalid value will be rejected. Requests for
+        #   policies with any conditional bindings must specify version 3. Policies
+        #   without any conditional bindings may specify any valid value or leave the
+        #   field unset. To learn which resources support conditions in their IAM policies,
+        #   see the [IAM documentation](https://cloud.google.com/iam/help/conditions/
+        #   resource-policies).
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -254,18 +246,18 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Returns all repos belonging to a project. The sizes of the repos are
-        # not set by ListRepos.  To get the size of a repo, use GetRepo.
+        # Returns all repos belonging to a project. The sizes of the repos are not set
+        # by ListRepos. To get the size of a repo, use GetRepo.
         # @param [String] name
-        #   The project ID whose repos should be listed. Values are of the form
-        #   `projects/<project>`.
+        #   The project ID whose repos should be listed. Values are of the form `projects/`
+        #   .
         # @param [Fixnum] page_size
-        #   Maximum number of repositories to return; between 1 and 500.
-        #   If not set or zero, defaults to 100 at the server.
+        #   Maximum number of repositories to return; between 1 and 500. If not set or
+        #   zero, defaults to 100 at the server.
         # @param [String] page_token
-        #   Resume listing repositories where a prior ListReposResponse
-        #   left off. This is an opaque token that must be obtained from
-        #   a recent, prior ListReposResponse's next_page_token field.
+        #   Resume listing repositories where a prior ListReposResponse left off. This is
+        #   an opaque token that must be obtained from a recent, prior ListReposResponse's
+        #   next_page_token field.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -297,8 +289,8 @@ module Google
         
         # Updates information about a repo.
         # @param [String] name
-        #   The name of the requested repository. Values are of the form
-        #   `projects/<project>/repos/<repo>`.
+        #   The name of the requested repository. Values are of the form `projects//repos/`
+        #   .
         # @param [Google::Apis::SourcerepoV1::UpdateRepoRequest] update_repo_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -332,8 +324,8 @@ module Google
         # Sets the access control policy on the specified resource. Replaces any
         # existing policy.
         # @param [String] resource
-        #   REQUIRED: The resource for which the policy is being specified.
-        #   See the operation documentation for the appropriate value for this field.
+        #   REQUIRED: The resource for which the policy is being specified. See the
+        #   operation documentation for the appropriate value for this field.
         # @param [Google::Apis::SourcerepoV1::SetIamPolicyRequest] set_iam_policy_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -364,11 +356,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Synchronize a connected repo.
-        # The response contains SyncRepoMetadata in the metadata field.
+        # Synchronize a connected repo. The response contains SyncRepoMetadata in the
+        # metadata field.
         # @param [String] name
-        #   The name of the repo to synchronize. Values are of the form
-        #   `projects/<project>/repos/<repo>`.
+        #   The name of the repo to synchronize. Values are of the form `projects//repos/`.
         # @param [Google::Apis::SourcerepoV1::SyncRepoRequest] sync_repo_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -399,12 +390,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Returns permissions that a caller has on the specified resource.
-        # If the resource does not exist, this will return an empty set of
-        # permissions, not a NOT_FOUND error.
+        # Returns permissions that a caller has on the specified resource. If the
+        # resource does not exist, this will return an empty set of permissions, not a
+        # NOT_FOUND error.
         # @param [String] resource
-        #   REQUIRED: The resource for which the policy detail is being requested.
-        #   See the operation documentation for the appropriate value for this field.
+        #   REQUIRED: The resource for which the policy detail is being requested. See the
+        #   operation documentation for the appropriate value for this field.
         # @param [Google::Apis::SourcerepoV1::TestIamPermissionsRequest] test_iam_permissions_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.

data/generated/google/apis/spanner_v1.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://cloud.google.com/spanner/
     module SpannerV1
       VERSION = 'V1'
-      REVISION = '20200807'
+      REVISION = '20200905'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

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

@@ -356,6 +356,12 @@ module Google
       class Binding
         include Google::Apis::Core::Hashable
       
+        # A client-specified ID for this binding. Expected to be globally unique to
+        # support the internal bindings-by-ID API.
+        # Corresponds to the JSON property `bindingId`
+        # @return [String]
+        attr_accessor :binding_id
+      
         # Represents a textual expression in the Common Expression Language (CEL) syntax.
         # CEL is a C-like expression language. The syntax and semantics of CEL are
         # documented at https://github.com/google/cel-spec. Example (Comparison): title:
@@ -417,6 +423,7 @@ module Google
       
         # Update properties of this object
         def update!(**args)
+          @binding_id = args[:binding_id] if args.key?(:binding_id)
           @condition = args[:condition] if args.key?(:condition)
           @members = args[:members] if args.key?(:members)
           @role = args[:role] if args.key?(:role)

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

@@ -558,6 +558,7 @@ module Google
       class Binding
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :binding_id, as: 'bindingId'
           property :condition, as: 'condition', class: Google::Apis::SpannerV1::Expr, decorator: Google::Apis::SpannerV1::Expr::Representation
       
           collection :members, as: 'members'

data/generated/google/apis/speech_v1p1beta1.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/speech-to-text/docs/quickstart-protocol
     module SpeechV1p1beta1
       VERSION = 'V1p1beta1'
-      REVISION = '20200824'
+      REVISION = '20200827'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

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

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'google/apis/sql_v1beta4/service.rb'
-require 'google/apis/sql_v1beta4/classes.rb'
-require 'google/apis/sql_v1beta4/representations.rb'
+require 'google/apis/sqladmin_v1beta4/service.rb'
+require 'google/apis/sqladmin_v1beta4/classes.rb'
+require 'google/apis/sqladmin_v1beta4/representations.rb'
 
 module Google
   module Apis
@@ -23,9 +23,9 @@ module Google
     # API for Cloud SQL database instance management
     #
     # @see https://developers.google.com/cloud-sql/
-    module SqlV1beta4
+    module SqladminV1beta4
       VERSION = 'V1beta4'
-      REVISION = '20200820'
+      REVISION = '20201007'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

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

@@ -20,7 +20,7 @@ require 'google/apis/errors'
 
 module Google
   module Apis
-    module SqlV1beta4
+    module SqladminV1beta4
       
       # An entry for an Access Control list.
       class AclEntry
@@ -89,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`
@@ -130,12 +136,19 @@ module Google
         # @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)
@@ -143,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
       
@@ -162,12 +204,12 @@ 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 RFC 3339 format,
@@ -184,7 +226,7 @@ module Google
       
         # 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
@@ -261,12 +303,12 @@ 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 *sql#backupRunsList*.
@@ -329,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.
@@ -414,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)
@@ -464,7 +506,7 @@ module Google
         end
       end
       
-      # A Cloud SQL instance resource. Next field: 35
+      # A Cloud SQL instance resource. Next field: 36
       class DatabaseInstance
         include Google::Apis::Core::Hashable
       
@@ -488,23 +530,23 @@ module Google
         attr_accessor :current_disk_size
       
         # The database engine type and version. The *databaseVersion* field cannot be
-        # changed after instance creation. MySQL instances: *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*.
+        # 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.
@@ -516,7 +558,7 @@ module Google
         # 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
@@ -527,7 +569,7 @@ module Google
         attr_accessor :gce_zone
       
         # The instance type. This can be one of the following. *CLOUD_SQL_INSTANCE*: A
-        # Cloud SQL instance that is not replicating from a master. *
+        # 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`
@@ -536,7 +578,7 @@ module Google
       
         # 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
@@ -550,7 +592,7 @@ module Google
         # @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
@@ -567,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
@@ -584,9 +626,9 @@ module Google
         # @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.
@@ -601,7 +643,7 @@ module Google
       
         # 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 URI of this resource.
@@ -611,7 +653,7 @@ 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
@@ -622,15 +664,17 @@ module Google
       
         # 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. *RUNNABLE*: The instance is running, or is ready to run when
-        # accessed. *SUSPENDED*: The instance is not available, for example due to
-        # problems with billing. *PENDING_CREATE*: The instance is being created. *
-        # MAINTENANCE*: The instance is down for maintenance. *FAILED*: The instance
-        # creation failed. *UNKNOWN_STATE*: The state of the instance is unknown.
+        # following. *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
@@ -683,8 +727,8 @@ module Google
           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
-          # failover replica when the status is true.
+          # 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]
           attr_accessor :available
@@ -710,12 +754,12 @@ 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 *sql#databasesList*.
@@ -734,7 +778,7 @@ 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
       
@@ -745,7 +789,7 @@ module Google
       
         # 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)
@@ -759,7 +803,7 @@ module Google
         end
       end
       
-      # Database instance demote master context.
+      # Database instance demote primary instance context.
       class DemoteMasterContext
         include Google::Apis::Core::Hashable
       
@@ -768,24 +812,24 @@ module Google
         # @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: *True*. Second
         # Generation instances only. Setting this flag to false enables you to bypass
-        # GTID consistency check between on-premises master and Cloud SQL instance
-        # during the demotion operation but also exposes you to the risk of future
-        # replication failures. Change the value only if you know the reason for the
-        # GTID divergence and are confident that doing so will not cause any replication
-        # issues.
+        # 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
@@ -855,6 +899,45 @@ 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
@@ -911,7 +994,7 @@ 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. *MySQL instances:* If *fileType* is *SQL* and no
@@ -944,7 +1027,7 @@ module Google
       
         # 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.
@@ -995,7 +1078,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.
@@ -1087,8 +1170,8 @@ module Google
         # @return [Array<String>]
         attr_accessor :allowed_string_values
       
-        # The database version this flag applies to. Can be *MYSQL_5_5*, *MYSQL_5_6*, or
-        # *MYSQL_5_7*. *MYSQL_5_7* is applicable only to Second Generation instances.
+        # The database version this flag applies to. Can be *MYSQL_8_0*, *MYSQL_5_6*, or
+        # *MYSQL_5_7*.
         # Corresponds to the JSON property `appliesTo`
         # @return [Array<String>]
         attr_accessor :applies_to
@@ -1154,12 +1237,12 @@ 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 *sql#flagsList*.
@@ -1184,12 +1267,12 @@ 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 *fileType* is *SQL*, this field is
@@ -1245,7 +1328,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)
@@ -1321,12 +1404,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)
@@ -1339,13 +1422,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)
@@ -1359,12 +1442,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)
@@ -1383,7 +1466,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)
@@ -1397,12 +1480,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)
@@ -1416,12 +1499,12 @@ 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 *sql#instancesList*.
@@ -1437,7 +1520,7 @@ module Google
       
         # 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)
@@ -1464,7 +1547,7 @@ 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 *sql#instancesListServerCas*.
@@ -1485,13 +1568,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.
         # Corresponds to the JSON property `restoreBackupContext`
-        # @return [Google::Apis::SqlV1beta4::RestoreBackupContext]
+        # @return [Google::Apis::SqladminV1beta4::RestoreBackupContext]
         attr_accessor :restore_backup_context
       
         def initialize(**args)
@@ -1510,7 +1593,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)
@@ -1529,7 +1612,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)
@@ -1550,7 +1633,7 @@ module Google
         # 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 is assigned a public IP address or not.
@@ -1756,8 +1839,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
@@ -1859,17 +1942,17 @@ module Google
       
         # 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 RFC 3339 format, for
@@ -1995,7 +2078,7 @@ 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 *sql#operationErrors*.
@@ -2015,12 +2098,12 @@ 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 *sql#operationsList*.
@@ -2046,15 +2129,15 @@ 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 *true*
-        # the replica will be designated as a failover replica. In case the master
-        # instance fails, the replica instance will be promoted as the new master
+        # 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 master instance.
+        # replica has to be in different zone with the primary instance.
         # Corresponds to the JSON property `failoverTarget`
         # @return [Boolean]
         attr_accessor :failover_target
@@ -2067,7 +2150,7 @@ module Google
       
         # 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)
@@ -2186,6 +2269,11 @@ module Google
         # @return [String]
         attr_accessor :activation_policy
       
+        # Active Directory configuration, for now relevant only 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`
@@ -2203,7 +2291,7 @@ module Google
       
         # 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.
@@ -2232,7 +2320,7 @@ module Google
       
         # 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
@@ -2242,9 +2330,14 @@ 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 *sql#settings*.
@@ -2258,13 +2351,13 @@ module Google
         # 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 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 *PER_USE* or *PACKAGE*.
@@ -2320,6 +2413,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)
@@ -2329,6 +2423,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)
@@ -2343,7 +2438,32 @@ module Google
         end
       end
       
-      # External master migration setting error.
+      # Active Directory configuration, for now relevant only for SQL Server
+      class SqlActiveDirectoryConfig
+        include Google::Apis::Core::Hashable
+      
+        # Domain name
+        # Corresponds to the JSON property `domain`
+        # @return [String]
+        attr_accessor :domain
+      
+        # This will be 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
       
@@ -2380,7 +2500,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)
@@ -2399,7 +2519,7 @@ 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 *sql#migrationSettingErrorList*.
@@ -2577,7 +2697,7 @@ 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
@@ -2617,7 +2737,7 @@ 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
@@ -2637,12 +2757,12 @@ 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 *sql#sslCertsInsert*.
@@ -2654,12 +2774,12 @@ module Google
         # 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)
@@ -2676,12 +2796,12 @@ 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 *sql#sslCertsList*.
@@ -2745,12 +2865,12 @@ 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 *sql#tiersList*.
@@ -2842,7 +2962,7 @@ module Google
       
         # 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.
@@ -2870,12 +2990,12 @@ module Google
       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 *sql#usersList*.