aws-sdk-backup 1.13.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2621dc37ee836d01bb676a18f7fdac7542c42639da076c581449731c671607
-  data.tar.gz: d0f43a42fc3043f41d60b4fe308023a2973d86f44989868e2d7b2ab674991a0a
+  metadata.gz: 5f9fba0576ad1b2d98d4a204fbe89644842a72907bb431851aa136cf8a9ba83d
+  data.tar.gz: 3a1bdf4222f008c765b1b14bf96d597df63f551a7e20ed6efc04a788a4bbbe2a
 SHA512:
-  metadata.gz: dcff27425a0e2dad9659413eb47da82f680ed062f537e49148486873af5bf7235e3f5cc83ef0b148691dc1c336b58fdb5dd38d80b33c62342884b7dc8eb8a925
-  data.tar.gz: f924e07500f689e020e1623e1f508428b05717d025c2afc3cd5bb06547f8f320c6b3ebacab3649ad8c81fd1e9abebe1a45cb5b88accf52ae4b11959381566dcf
+  metadata.gz: e75c7df74bf4247f950cb273a810d6662f99fa2f3c66d83f5f22aae50eda855fe58b69d672529a86affcf091924e0fdf9aa329e3942e0279f75cf8340fe76920
+  data.tar.gz: 5aacac9b9dcd055f5c20174fbf6a15790c7758ecf5e4a20a737b1ec23a7be9b83f15399abc8f50bfb0a81f71d6692fef623a544be7a29b5456cd5810539ffb15

data/lib/aws-sdk-backup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -45,6 +47,6 @@ require_relative 'aws-sdk-backup/customizations'
 # @service
 module Aws::Backup
 
-  GEM_VERSION = '1.13.0'
+  GEM_VERSION = '1.18.0'
 
 end

data/lib/aws-sdk-backup/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -24,6 +26,7 @@ require 'aws-sdk-core/plugins/jsonvalue_converter.rb'
 require 'aws-sdk-core/plugins/client_metrics_plugin.rb'
 require 'aws-sdk-core/plugins/client_metrics_send_plugin.rb'
 require 'aws-sdk-core/plugins/transfer_encoding.rb'
+require 'aws-sdk-core/plugins/http_checksum.rb'
 require 'aws-sdk-core/plugins/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/rest_json.rb'
 
@@ -69,6 +72,7 @@ module Aws::Backup
     add_plugin(Aws::Plugins::ClientMetricsPlugin)
     add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
     add_plugin(Aws::Plugins::TransferEncoding)
+    add_plugin(Aws::Plugins::HttpChecksum)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::RestJson)
 
@@ -161,7 +165,7 @@ module Aws::Backup
     #   @option options [String] :endpoint
     #     The client endpoint is normally constructed from the `:region`
     #     option. You should only configure an `:endpoint` when connecting
-    #     to test endpoints. This should be a valid HTTP(S) URI.
+    #     to test or custom endpoints. This should be a valid HTTP(S) URI.
     #
     #   @option options [Integer] :endpoint_cache_max_entries (1000)
     #     Used for the maximum size limit of the LRU cache storing endpoints data
@@ -176,7 +180,7 @@ module Aws::Backup
     #     requests fetching endpoints information. Defaults to 60 sec.
     #
     #   @option options [Boolean] :endpoint_discovery (false)
-    #     When set to `true`, endpoint discovery will be enabled for operations when available. Defaults to `false`.
+    #     When set to `true`, endpoint discovery will be enabled for operations when available.
     #
     #   @option options [Aws::Log::Formatter] :log_formatter (Aws::Log::Formatter.default)
     #     The log formatter.
@@ -603,7 +607,7 @@ module Aws::Backup
     # @option params [required, String] :backup_vault_name
     #   The name of a logical container where backups are stored. Backup
     #   vaults are identified by names that are unique to the account used to
-    #   create them and theAWS Region where they are created. They consist of
+    #   create them and the AWS Region where they are created. They consist of
     #   lowercase letters, numbers, and hyphens.
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
@@ -712,6 +716,7 @@ module Aws::Backup
     #
     # @return [Types::DescribeBackupJobOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
+    #   * {Types::DescribeBackupJobOutput#account_id #account_id} => String
     #   * {Types::DescribeBackupJobOutput#backup_job_id #backup_job_id} => String
     #   * {Types::DescribeBackupJobOutput#backup_vault_name #backup_vault_name} => String
     #   * {Types::DescribeBackupJobOutput#backup_vault_arn #backup_vault_arn} => String
@@ -738,6 +743,7 @@ module Aws::Backup
     #
     # @example Response structure
     #
+    #   resp.account_id #=> String
     #   resp.backup_job_id #=> String
     #   resp.backup_vault_name #=> String
     #   resp.backup_vault_arn #=> String
@@ -812,7 +818,7 @@ module Aws::Backup
     # Returns metadata associated with creating a copy of a resource.
     #
     # @option params [required, String] :copy_job_id
-    #   Uniquely identifies a request to AWS Backup to copy a resource.
+    #   Uniquely identifies a copy job.
     #
     # @return [Types::DescribeCopyJobOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -826,6 +832,7 @@ module Aws::Backup
     #
     # @example Response structure
     #
+    #   resp.copy_job.account_id #=> String
     #   resp.copy_job.copy_job_id #=> String
     #   resp.copy_job.source_backup_vault_arn #=> String
     #   resp.copy_job.source_recovery_point_arn #=> String
@@ -854,7 +861,7 @@ module Aws::Backup
     end
 
     # Returns information about a saved resource, including the last time it
-    # was backed-up, its Amazon Resource Name (ARN), and the AWS service
+    # was backed up, its Amazon Resource Name (ARN), and the AWS service
     # type of the saved resource.
     #
     # @option params [required, String] :resource_arn
@@ -963,6 +970,31 @@ module Aws::Backup
       req.send_request(options)
     end
 
+    # Returns the current service opt-in settings for the Region. If the
+    # service has a value set to `true`, AWS Backup attempts to protect that
+    # service's resources in this Region, when included in an on-demand
+    # backup or scheduled backup plan. If the value is set to `false` for a
+    # service, AWS Backup does not attempt to protect that service's
+    # resources in this Region.
+    #
+    # @return [Types::DescribeRegionSettingsOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeRegionSettingsOutput#resource_type_opt_in_preference #resource_type_opt_in_preference} => Hash<String,Boolean>
+    #
+    # @example Response structure
+    #
+    #   resp.resource_type_opt_in_preference #=> Hash
+    #   resp.resource_type_opt_in_preference["ResourceType"] #=> Boolean
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/backup-2018-11-15/DescribeRegionSettings AWS API Documentation
+    #
+    # @overload describe_region_settings(params = {})
+    # @param [Hash] params ({})
+    def describe_region_settings(params = {}, options = {})
+      req = build_request(:describe_region_settings, params)
+      req.send_request(options)
+    end
+
     # Returns metadata associated with a restore job that is specified by a
     # job ID.
     #
@@ -971,6 +1003,7 @@ module Aws::Backup
     #
     # @return [Types::DescribeRestoreJobOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
+    #   * {Types::DescribeRestoreJobOutput#account_id #account_id} => String
     #   * {Types::DescribeRestoreJobOutput#restore_job_id #restore_job_id} => String
     #   * {Types::DescribeRestoreJobOutput#recovery_point_arn #recovery_point_arn} => String
     #   * {Types::DescribeRestoreJobOutput#creation_date #creation_date} => Time
@@ -982,6 +1015,7 @@ module Aws::Backup
     #   * {Types::DescribeRestoreJobOutput#iam_role_arn #iam_role_arn} => String
     #   * {Types::DescribeRestoreJobOutput#expected_completion_time_minutes #expected_completion_time_minutes} => Integer
     #   * {Types::DescribeRestoreJobOutput#created_resource_arn #created_resource_arn} => String
+    #   * {Types::DescribeRestoreJobOutput#resource_type #resource_type} => String
     #
     # @example Request syntax with placeholder values
     #
@@ -991,6 +1025,7 @@ module Aws::Backup
     #
     # @example Response structure
     #
+    #   resp.account_id #=> String
     #   resp.restore_job_id #=> String
     #   resp.recovery_point_arn #=> String
     #   resp.creation_date #=> Time
@@ -1002,6 +1037,7 @@ module Aws::Backup
     #   resp.iam_role_arn #=> String
     #   resp.expected_completion_time_minutes #=> Integer
     #   resp.created_resource_arn #=> String
+    #   resp.resource_type #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/backup-2018-11-15/DescribeRestoreJob AWS API Documentation
     #
@@ -1413,12 +1449,18 @@ module Aws::Backup
     #
     #   * `EBS` for Amazon Elastic Block Store
     #
+    #   * `EC2` for Amazon Elastic Compute Cloud
+    #
     #   * `EFS` for Amazon Elastic File System
     #
     #   * `RDS` for Amazon Relational Database Service
     #
     #   * `Storage Gateway` for AWS Storage Gateway
     #
+    # @option params [String] :by_account_id
+    #   The account ID to list the jobs from. Returns only backup jobs
+    #   associated with the specified account ID.
+    #
     # @return [Types::ListBackupJobsOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::ListBackupJobsOutput#backup_jobs #backup_jobs} => Array<Types::BackupJob>
@@ -1437,11 +1479,13 @@ module Aws::Backup
     #     by_created_before: Time.now,
     #     by_created_after: Time.now,
     #     by_resource_type: "ResourceType",
+    #     by_account_id: "AccountId",
     #   })
     #
     # @example Response structure
     #
     #   resp.backup_jobs #=> Array
+    #   resp.backup_jobs[0].account_id #=> String
     #   resp.backup_jobs[0].backup_job_id #=> String
     #   resp.backup_jobs[0].backup_vault_name #=> String
     #   resp.backup_jobs[0].backup_vault_arn #=> String
@@ -1749,6 +1793,8 @@ module Aws::Backup
     #
     #   * `EBS` for Amazon Elastic Block Store
     #
+    #   * `EC2` for Amazon Elastic Compute Cloud
+    #
     #   * `EFS` for Amazon Elastic File System
     #
     #   * `RDS` for Amazon Relational Database Service
@@ -1758,7 +1804,11 @@ module Aws::Backup
     # @option params [String] :by_destination_vault_arn
     #   An Amazon Resource Name (ARN) that uniquely identifies a source backup
     #   vault to copy from; for example,
-    #   arn:aws:backup:us-east-1:123456789012:vault:aBackupVault.
+    #   `arn:aws:backup:us-east-1:123456789012:vault:aBackupVault`.
+    #
+    # @option params [String] :by_account_id
+    #   The account ID to list the jobs from. Returns only copy jobs
+    #   associated with the specified account ID.
     #
     # @return [Types::ListCopyJobsOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -1778,11 +1828,13 @@ module Aws::Backup
     #     by_created_after: Time.now,
     #     by_resource_type: "ResourceType",
     #     by_destination_vault_arn: "string",
+    #     by_account_id: "AccountId",
     #   })
     #
     # @example Response structure
     #
     #   resp.copy_jobs #=> Array
+    #   resp.copy_jobs[0].account_id #=> String
     #   resp.copy_jobs[0].copy_job_id #=> String
     #   resp.copy_jobs[0].source_backup_vault_arn #=> String
     #   resp.copy_jobs[0].source_recovery_point_arn #=> String
@@ -2009,6 +2061,19 @@ module Aws::Backup
     # @option params [Integer] :max_results
     #   The maximum number of items to be returned.
     #
+    # @option params [String] :by_account_id
+    #   The account ID to list the jobs from. Returns only restore jobs
+    #   associated with the specified account ID.
+    #
+    # @option params [Time,DateTime,Date,Integer,String] :by_created_before
+    #   Returns only restore jobs that were created before the specified date.
+    #
+    # @option params [Time,DateTime,Date,Integer,String] :by_created_after
+    #   Returns only restore jobs that were created after the specified date.
+    #
+    # @option params [String] :by_status
+    #   Returns only restore jobs associated with the specified job status.
+    #
     # @return [Types::ListRestoreJobsOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::ListRestoreJobsOutput#restore_jobs #restore_jobs} => Array<Types::RestoreJobsListMember>
@@ -2021,11 +2086,16 @@ module Aws::Backup
     #   resp = client.list_restore_jobs({
     #     next_token: "string",
     #     max_results: 1,
+    #     by_account_id: "AccountId",
+    #     by_created_before: Time.now,
+    #     by_created_after: Time.now,
+    #     by_status: "PENDING", # accepts PENDING, RUNNING, COMPLETED, ABORTED, FAILED
     #   })
     #
     # @example Response structure
     #
     #   resp.restore_jobs #=> Array
+    #   resp.restore_jobs[0].account_id #=> String
     #   resp.restore_jobs[0].restore_job_id #=> String
     #   resp.restore_jobs[0].recovery_point_arn #=> String
     #   resp.restore_jobs[0].creation_date #=> Time
@@ -2037,6 +2107,7 @@ module Aws::Backup
     #   resp.restore_jobs[0].iam_role_arn #=> String
     #   resp.restore_jobs[0].expected_completion_time_minutes #=> Integer
     #   resp.restore_jobs[0].created_resource_arn #=> String
+    #   resp.restore_jobs[0].resource_type #=> String
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/backup-2018-11-15/ListRestoreJobs AWS API Documentation
@@ -2051,6 +2122,10 @@ module Aws::Backup
     # Returns a list of key-value pairs assigned to a target recovery point,
     # backup plan, or backup vault.
     #
+    # <note markdown="1"> `ListTags` are currently only supported with Amazon EFS backups.
+    #
+    #  </note>
+    #
     # @option params [required, String] :resource_arn
     #   An Amazon Resource Name (ARN) that uniquely identifies a resource. The
     #   format of the ARN depends on the type of resource. Valid targets for
@@ -2184,11 +2259,13 @@ module Aws::Backup
     #   to `StartBackupJob`.
     #
     # @option params [Integer] :start_window_minutes
-    #   The amount of time in minutes before beginning a backup.
+    #   A value in minutes after a backup is scheduled before a job will be
+    #   canceled if it doesn't start successfully. This value is optional.
     #
     # @option params [Integer] :complete_window_minutes
-    #   The amount of time AWS Backup attempts a backup before canceling the
-    #   job and returning an error.
+    #   A value in minutes after a backup job is successfully started before
+    #   it must be completed or it will be canceled by AWS Backup. This value
+    #   is optional.
     #
     # @option params [Types::Lifecycle] :lifecycle
     #   The lifecycle defines when a protected resource is transitioned to
@@ -2256,7 +2333,7 @@ module Aws::Backup
     #   The name of a logical source container where backups are stored.
     #   Backup vaults are identified by names that are unique to the account
     #   used to create them and the AWS Region where they are created. They
-    #   consist of lowercase letters, numbers, and hyphens. &gt;
+    #   consist of lowercase letters, numbers, and hyphens.
     #
     # @option params [required, String] :destination_backup_vault_arn
     #   An Amazon Resource Name (ARN) that uniquely identifies a destination
@@ -2265,7 +2342,7 @@ module Aws::Backup
     #
     # @option params [required, String] :iam_role_arn
     #   Specifies the IAM role ARN used to copy the target recovery point; for
-    #   example, arn:aws:iam::123456789012:role/S3Access.
+    #   example, `arn:aws:iam::123456789012:role/S3Access`.
     #
     # @option params [String] :idempotency_token
     #   A customer chosen string that can be used to distinguish between calls
@@ -2330,7 +2407,7 @@ module Aws::Backup
     #   resource name, required to restore a recovery point.
     #
     #   You can get configuration metadata about a resource at the time it was
-    #   backed-up by calling `GetRecoveryPointRestoreMetadata`. However,
+    #   backed up by calling `GetRecoveryPointRestoreMetadata`. However,
     #   values in addition to those provided by
     #   `GetRecoveryPointRestoreMetadata` might be required to restore a
     #   resource. For example, you might need to provide a new resource name
@@ -2371,15 +2448,17 @@ module Aws::Backup
     #   Starts a job to restore a recovery point for one of the following
     #   resources:
     #
+    #   * `DynamoDB` for Amazon DynamoDB
+    #
     #   * `EBS` for Amazon Elastic Block Store
     #
-    #   * `Storage Gateway` for AWS Storage Gateway
+    #   * `EC2` for Amazon Elastic Compute Cloud
     #
-    #   * `RDS` for Amazon Relational Database Service
+    #   * `EFS` for Amazon Elastic File System
     #
-    #   * `DDB` for Amazon DynamoDB
+    #   * `RDS` for Amazon Relational Database Service
     #
-    #   * `EFS` for Amazon Elastic File System
+    #   * `Storage Gateway` for AWS Storage Gateway
     #
     # @return [Types::StartRestoreJobOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -2630,6 +2709,36 @@ module Aws::Backup
       req.send_request(options)
     end
 
+    # Updates the current service opt-in settings for the Region. If the
+    # service has a value set to `true`, AWS Backup attempts to protect that
+    # service's resources in this Region, when included in an on-demand
+    # backup or scheduled backup plan. If the value is set to `false` for a
+    # service, AWS Backup does not attempt to protect that service's
+    # resources in this Region.
+    #
+    # @option params [Hash<String,Boolean>] :resource_type_opt_in_preference
+    #   Updates the list of services along with the opt-in preferences for the
+    #   region.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.update_region_settings({
+    #     resource_type_opt_in_preference: {
+    #       "ResourceType" => false,
+    #     },
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/backup-2018-11-15/UpdateRegionSettings AWS API Documentation
+    #
+    # @overload update_region_settings(params = {})
+    # @param [Hash] params ({})
+    def update_region_settings(params = {}, options = {})
+      req = build_request(:update_region_settings, params)
+      req.send_request(options)
+    end
+
     # @!endgroup
 
     # @param params ({})
@@ -2643,7 +2752,7 @@ module Aws::Backup
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-backup'
-      context[:gem_version] = '1.13.0'
+      context[:gem_version] = '1.18.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-backup/client_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -12,6 +14,7 @@ module Aws::Backup
     include Seahorse::Model
 
     ARN = Shapes::StringShape.new(name: 'ARN')
+    AccountId = Shapes::StringShape.new(name: 'AccountId')
     AlreadyExistsException = Shapes::StructureShape.new(name: 'AlreadyExistsException')
     BackupJob = Shapes::StructureShape.new(name: 'BackupJob')
     BackupJobState = Shapes::StringShape.new(name: 'BackupJobState')
@@ -74,6 +77,8 @@ module Aws::Backup
     DescribeProtectedResourceOutput = Shapes::StructureShape.new(name: 'DescribeProtectedResourceOutput')
     DescribeRecoveryPointInput = Shapes::StructureShape.new(name: 'DescribeRecoveryPointInput')
     DescribeRecoveryPointOutput = Shapes::StructureShape.new(name: 'DescribeRecoveryPointOutput')
+    DescribeRegionSettingsInput = Shapes::StructureShape.new(name: 'DescribeRegionSettingsInput')
+    DescribeRegionSettingsOutput = Shapes::StructureShape.new(name: 'DescribeRegionSettingsOutput')
     DescribeRestoreJobInput = Shapes::StructureShape.new(name: 'DescribeRestoreJobInput')
     DescribeRestoreJobOutput = Shapes::StructureShape.new(name: 'DescribeRestoreJobOutput')
     ExportBackupPlanTemplateInput = Shapes::StructureShape.new(name: 'ExportBackupPlanTemplateInput')
@@ -97,6 +102,7 @@ module Aws::Backup
     IAMRoleArn = Shapes::StringShape.new(name: 'IAMRoleArn')
     InvalidParameterValueException = Shapes::StructureShape.new(name: 'InvalidParameterValueException')
     InvalidRequestException = Shapes::StructureShape.new(name: 'InvalidRequestException')
+    IsEnabled = Shapes::BooleanShape.new(name: 'IsEnabled')
     Lifecycle = Shapes::StructureShape.new(name: 'Lifecycle')
     LimitExceededException = Shapes::StructureShape.new(name: 'LimitExceededException')
     ListBackupJobsInput = Shapes::StructureShape.new(name: 'ListBackupJobsInput')
@@ -143,6 +149,7 @@ module Aws::Backup
     ResourceArns = Shapes::ListShape.new(name: 'ResourceArns')
     ResourceNotFoundException = Shapes::StructureShape.new(name: 'ResourceNotFoundException')
     ResourceType = Shapes::StringShape.new(name: 'ResourceType')
+    ResourceTypeOptInPreference = Shapes::MapShape.new(name: 'ResourceTypeOptInPreference')
     ResourceTypes = Shapes::ListShape.new(name: 'ResourceTypes')
     RestoreJobId = Shapes::StringShape.new(name: 'RestoreJobId')
     RestoreJobStatus = Shapes::StringShape.new(name: 'RestoreJobStatus')
@@ -167,6 +174,7 @@ module Aws::Backup
     UpdateBackupPlanOutput = Shapes::StructureShape.new(name: 'UpdateBackupPlanOutput')
     UpdateRecoveryPointLifecycleInput = Shapes::StructureShape.new(name: 'UpdateRecoveryPointLifecycleInput')
     UpdateRecoveryPointLifecycleOutput = Shapes::StructureShape.new(name: 'UpdateRecoveryPointLifecycleOutput')
+    UpdateRegionSettingsInput = Shapes::StructureShape.new(name: 'UpdateRegionSettingsInput')
     WindowMinutes = Shapes::IntegerShape.new(name: 'WindowMinutes')
     boolean = Shapes::BooleanShape.new(name: 'boolean')
     long = Shapes::IntegerShape.new(name: 'long')
@@ -181,6 +189,7 @@ module Aws::Backup
     AlreadyExistsException.add_member(:context, Shapes::ShapeRef.new(shape: string, location_name: "Context"))
     AlreadyExistsException.struct_class = Types::AlreadyExistsException
 
+    BackupJob.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "AccountId"))
     BackupJob.add_member(:backup_job_id, Shapes::ShapeRef.new(shape: string, location_name: "BackupJobId"))
     BackupJob.add_member(:backup_vault_name, Shapes::ShapeRef.new(shape: BackupVaultName, location_name: "BackupVaultName"))
     BackupJob.add_member(:backup_vault_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "BackupVaultArn"))
@@ -298,6 +307,7 @@ module Aws::Backup
 
     CopyActions.member = Shapes::ShapeRef.new(shape: CopyAction)
 
+    CopyJob.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "AccountId"))
     CopyJob.add_member(:copy_job_id, Shapes::ShapeRef.new(shape: string, location_name: "CopyJobId"))
     CopyJob.add_member(:source_backup_vault_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "SourceBackupVaultArn"))
     CopyJob.add_member(:source_recovery_point_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "SourceRecoveryPointArn"))
@@ -383,6 +393,7 @@ module Aws::Backup
     DescribeBackupJobInput.add_member(:backup_job_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "backupJobId"))
     DescribeBackupJobInput.struct_class = Types::DescribeBackupJobInput
 
+    DescribeBackupJobOutput.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "AccountId"))
     DescribeBackupJobOutput.add_member(:backup_job_id, Shapes::ShapeRef.new(shape: string, location_name: "BackupJobId"))
     DescribeBackupJobOutput.add_member(:backup_vault_name, Shapes::ShapeRef.new(shape: BackupVaultName, location_name: "BackupVaultName"))
     DescribeBackupJobOutput.add_member(:backup_vault_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "BackupVaultArn"))
@@ -450,9 +461,15 @@ module Aws::Backup
     DescribeRecoveryPointOutput.add_member(:last_restore_time, Shapes::ShapeRef.new(shape: timestamp, location_name: "LastRestoreTime"))
     DescribeRecoveryPointOutput.struct_class = Types::DescribeRecoveryPointOutput
 
+    DescribeRegionSettingsInput.struct_class = Types::DescribeRegionSettingsInput
+
+    DescribeRegionSettingsOutput.add_member(:resource_type_opt_in_preference, Shapes::ShapeRef.new(shape: ResourceTypeOptInPreference, location_name: "ResourceTypeOptInPreference"))
+    DescribeRegionSettingsOutput.struct_class = Types::DescribeRegionSettingsOutput
+
     DescribeRestoreJobInput.add_member(:restore_job_id, Shapes::ShapeRef.new(shape: RestoreJobId, required: true, location: "uri", location_name: "restoreJobId"))
     DescribeRestoreJobInput.struct_class = Types::DescribeRestoreJobInput
 
+    DescribeRestoreJobOutput.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "AccountId"))
     DescribeRestoreJobOutput.add_member(:restore_job_id, Shapes::ShapeRef.new(shape: string, location_name: "RestoreJobId"))
     DescribeRestoreJobOutput.add_member(:recovery_point_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "RecoveryPointArn"))
     DescribeRestoreJobOutput.add_member(:creation_date, Shapes::ShapeRef.new(shape: timestamp, location_name: "CreationDate"))
@@ -464,6 +481,7 @@ module Aws::Backup
     DescribeRestoreJobOutput.add_member(:iam_role_arn, Shapes::ShapeRef.new(shape: IAMRoleArn, location_name: "IamRoleArn"))
     DescribeRestoreJobOutput.add_member(:expected_completion_time_minutes, Shapes::ShapeRef.new(shape: Long, location_name: "ExpectedCompletionTimeMinutes"))
     DescribeRestoreJobOutput.add_member(:created_resource_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "CreatedResourceArn"))
+    DescribeRestoreJobOutput.add_member(:resource_type, Shapes::ShapeRef.new(shape: ResourceType, location_name: "ResourceType"))
     DescribeRestoreJobOutput.struct_class = Types::DescribeRestoreJobOutput
 
     ExportBackupPlanTemplateInput.add_member(:backup_plan_id, Shapes::ShapeRef.new(shape: string, required: true, location: "uri", location_name: "backupPlanId"))
@@ -568,6 +586,7 @@ module Aws::Backup
     ListBackupJobsInput.add_member(:by_created_before, Shapes::ShapeRef.new(shape: timestamp, location: "querystring", location_name: "createdBefore"))
     ListBackupJobsInput.add_member(:by_created_after, Shapes::ShapeRef.new(shape: timestamp, location: "querystring", location_name: "createdAfter"))
     ListBackupJobsInput.add_member(:by_resource_type, Shapes::ShapeRef.new(shape: ResourceType, location: "querystring", location_name: "resourceType"))
+    ListBackupJobsInput.add_member(:by_account_id, Shapes::ShapeRef.new(shape: AccountId, location: "querystring", location_name: "accountId"))
     ListBackupJobsInput.struct_class = Types::ListBackupJobsInput
 
     ListBackupJobsOutput.add_member(:backup_jobs, Shapes::ShapeRef.new(shape: BackupJobsList, location_name: "BackupJobs"))
@@ -625,6 +644,7 @@ module Aws::Backup
     ListCopyJobsInput.add_member(:by_created_after, Shapes::ShapeRef.new(shape: timestamp, location: "querystring", location_name: "createdAfter"))
     ListCopyJobsInput.add_member(:by_resource_type, Shapes::ShapeRef.new(shape: ResourceType, location: "querystring", location_name: "resourceType"))
     ListCopyJobsInput.add_member(:by_destination_vault_arn, Shapes::ShapeRef.new(shape: string, location: "querystring", location_name: "destinationVaultArn"))
+    ListCopyJobsInput.add_member(:by_account_id, Shapes::ShapeRef.new(shape: AccountId, location: "querystring", location_name: "accountId"))
     ListCopyJobsInput.struct_class = Types::ListCopyJobsInput
 
     ListCopyJobsOutput.add_member(:copy_jobs, Shapes::ShapeRef.new(shape: CopyJobsList, location_name: "CopyJobs"))
@@ -666,6 +686,10 @@ module Aws::Backup
 
     ListRestoreJobsInput.add_member(:next_token, Shapes::ShapeRef.new(shape: string, location: "querystring", location_name: "nextToken"))
     ListRestoreJobsInput.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
+    ListRestoreJobsInput.add_member(:by_account_id, Shapes::ShapeRef.new(shape: AccountId, location: "querystring", location_name: "accountId"))
+    ListRestoreJobsInput.add_member(:by_created_before, Shapes::ShapeRef.new(shape: timestamp, location: "querystring", location_name: "createdBefore"))
+    ListRestoreJobsInput.add_member(:by_created_after, Shapes::ShapeRef.new(shape: timestamp, location: "querystring", location_name: "createdAfter"))
+    ListRestoreJobsInput.add_member(:by_status, Shapes::ShapeRef.new(shape: RestoreJobStatus, location: "querystring", location_name: "status"))
     ListRestoreJobsInput.struct_class = Types::ListRestoreJobsInput
 
     ListRestoreJobsOutput.add_member(:restore_jobs, Shapes::ShapeRef.new(shape: RestoreJobsList, location_name: "RestoreJobs"))
@@ -750,10 +774,14 @@ module Aws::Backup
     ResourceNotFoundException.add_member(:context, Shapes::ShapeRef.new(shape: string, location_name: "Context"))
     ResourceNotFoundException.struct_class = Types::ResourceNotFoundException
 
+    ResourceTypeOptInPreference.key = Shapes::ShapeRef.new(shape: ResourceType)
+    ResourceTypeOptInPreference.value = Shapes::ShapeRef.new(shape: IsEnabled)
+
     ResourceTypes.member = Shapes::ShapeRef.new(shape: ResourceType)
 
     RestoreJobsList.member = Shapes::ShapeRef.new(shape: RestoreJobsListMember)
 
+    RestoreJobsListMember.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "AccountId"))
     RestoreJobsListMember.add_member(:restore_job_id, Shapes::ShapeRef.new(shape: string, location_name: "RestoreJobId"))
     RestoreJobsListMember.add_member(:recovery_point_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "RecoveryPointArn"))
     RestoreJobsListMember.add_member(:creation_date, Shapes::ShapeRef.new(shape: timestamp, location_name: "CreationDate"))
@@ -765,6 +793,7 @@ module Aws::Backup
     RestoreJobsListMember.add_member(:iam_role_arn, Shapes::ShapeRef.new(shape: IAMRoleArn, location_name: "IamRoleArn"))
     RestoreJobsListMember.add_member(:expected_completion_time_minutes, Shapes::ShapeRef.new(shape: Long, location_name: "ExpectedCompletionTimeMinutes"))
     RestoreJobsListMember.add_member(:created_resource_arn, Shapes::ShapeRef.new(shape: ARN, location_name: "CreatedResourceArn"))
+    RestoreJobsListMember.add_member(:resource_type, Shapes::ShapeRef.new(shape: ResourceType, location_name: "ResourceType"))
     RestoreJobsListMember.struct_class = Types::RestoreJobsListMember
 
     ServiceUnavailableException.add_member(:code, Shapes::ShapeRef.new(shape: string, location_name: "Code"))
@@ -847,6 +876,9 @@ module Aws::Backup
     UpdateRecoveryPointLifecycleOutput.add_member(:calculated_lifecycle, Shapes::ShapeRef.new(shape: CalculatedLifecycle, location_name: "CalculatedLifecycle"))
     UpdateRecoveryPointLifecycleOutput.struct_class = Types::UpdateRecoveryPointLifecycleOutput
 
+    UpdateRegionSettingsInput.add_member(:resource_type_opt_in_preference, Shapes::ShapeRef.new(shape: ResourceTypeOptInPreference, location_name: "ResourceTypeOptInPreference"))
+    UpdateRegionSettingsInput.struct_class = Types::UpdateRegionSettingsInput
+
 
     # @api private
     API = Seahorse::Model::Api.new.tap do |api|
@@ -1039,6 +1071,15 @@ module Aws::Backup
         o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
       end)
 
+      api.add_operation(:describe_region_settings, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeRegionSettings"
+        o.http_method = "GET"
+        o.http_request_uri = "/account-settings"
+        o.input = Shapes::ShapeRef.new(shape: DescribeRegionSettingsInput)
+        o.output = Shapes::ShapeRef.new(shape: DescribeRegionSettingsOutput)
+        o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
+      end)
+
       api.add_operation(:describe_restore_job, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeRestoreJob"
         o.http_method = "GET"
@@ -1165,7 +1206,6 @@ module Aws::Backup
         o.input = Shapes::ShapeRef.new(shape: ListBackupJobsInput)
         o.output = Shapes::ShapeRef.new(shape: ListBackupJobsOutput)
         o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValueException)
-        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
         o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
         o[:pager] = Aws::Pager.new(
           limit_key: "max_results",
@@ -1492,6 +1532,17 @@ module Aws::Backup
         o.errors << Shapes::ShapeRef.new(shape: MissingParameterValueException)
         o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
       end)
+
+      api.add_operation(:update_region_settings, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UpdateRegionSettings"
+        o.http_method = "PUT"
+        o.http_request_uri = "/account-settings"
+        o.input = Shapes::ShapeRef.new(shape: UpdateRegionSettingsInput)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
+        o.errors << Shapes::ShapeRef.new(shape: MissingParameterValueException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValueException)
+      end)
     end
 
   end