diff --git a/clients/client-backup/src/commands/DescribeRecoveryPointCommand.ts b/clients/client-backup/src/commands/DescribeRecoveryPointCommand.ts index 246b43604f8a..ec47cce91380 100644 --- a/clients/client-backup/src/commands/DescribeRecoveryPointCommand.ts +++ b/clients/client-backup/src/commands/DescribeRecoveryPointCommand.ts @@ -88,6 +88,7 @@ export interface DescribeRecoveryPointCommandOutput extends DescribeRecoveryPoin * // CompositeMemberIdentifier: "STRING_VALUE", * // IsParent: true || false, * // ResourceName: "STRING_VALUE", + * // VaultType: "BACKUP_VAULT" || "LOGICALLY_AIR_GAPPED_BACKUP_VAULT", * // }; * * ``` diff --git a/clients/client-backup/src/commands/ListRecoveryPointsByBackupVaultCommand.ts b/clients/client-backup/src/commands/ListRecoveryPointsByBackupVaultCommand.ts index 1e2da0e76549..ad10d092f0df 100644 --- a/clients/client-backup/src/commands/ListRecoveryPointsByBackupVaultCommand.ts +++ b/clients/client-backup/src/commands/ListRecoveryPointsByBackupVaultCommand.ts @@ -101,6 +101,7 @@ export interface ListRecoveryPointsByBackupVaultCommandOutput * // CompositeMemberIdentifier: "STRING_VALUE", * // IsParent: true || false, * // ResourceName: "STRING_VALUE", + * // VaultType: "BACKUP_VAULT" || "LOGICALLY_AIR_GAPPED_BACKUP_VAULT", * // }, * // ], * // }; diff --git a/clients/client-backup/src/commands/ListRestoreJobsCommand.ts b/clients/client-backup/src/commands/ListRestoreJobsCommand.ts index 3771bd4e3bfa..1b885cbdaa83 100644 --- a/clients/client-backup/src/commands/ListRestoreJobsCommand.ts +++ b/clients/client-backup/src/commands/ListRestoreJobsCommand.ts @@ -49,6 +49,7 @@ export interface ListRestoreJobsCommandOutput extends ListRestoreJobsOutput, __M * NextToken: "STRING_VALUE", * MaxResults: Number("int"), * ByAccountId: "STRING_VALUE", + * ByResourceType: "STRING_VALUE", * ByCreatedBefore: new Date("TIMESTAMP"), * ByCreatedAfter: new Date("TIMESTAMP"), * ByStatus: "PENDING" || "RUNNING" || "COMPLETED" || "ABORTED" || "FAILED", diff --git a/clients/client-backup/src/commands/UpdateRegionSettingsCommand.ts b/clients/client-backup/src/commands/UpdateRegionSettingsCommand.ts index 404de2203dd4..65d1ae83d477 100644 --- a/clients/client-backup/src/commands/UpdateRegionSettingsCommand.ts +++ b/clients/client-backup/src/commands/UpdateRegionSettingsCommand.ts @@ -37,10 +37,8 @@ export interface UpdateRegionSettingsCommandOutput extends __MetadataBearer {} /** * @public - *

Updates the current service opt-in settings for the Region. If service-opt-in is enabled - * for a service, Backup tries to protect that service's resources in this Region, - * when the resource is included in an on-demand backup or scheduled backup plan. Otherwise, - * Backup does not try to protect that service's resources in this Region. Use + *

Updates the current service opt-in settings for the Region.

+ *

Use * the DescribeRegionSettings API to determine the resource types that are * supported.

* @example diff --git a/clients/client-backup/src/models/models_0.ts b/clients/client-backup/src/models/models_0.ts index 8b5ec4d28421..2884c7e6f8bf 100644 --- a/clients/client-backup/src/models/models_0.ts +++ b/clients/client-backup/src/models/models_0.ts @@ -4192,6 +4192,12 @@ export interface DescribeRecoveryPointOutput { * belongs to the specified backup.

*/ ResourceName?: string; + + /** + * @public + *

This is the type of vault in which the described recovery point is stored.

+ */ + VaultType?: VaultType; } /** @@ -5579,6 +5585,10 @@ export interface ListBackupJobsInput { * *
  • *

    + * CloudFormation for CloudFormation

    + *
    • + *
  • + *

    * DocumentDB for Amazon DocumentDB (with MongoDB compatibility)

    *
    • *
  • @@ -5607,10 +5617,18 @@ export interface ListBackupJobsInput { *
    • *
  • *

    + * Redshift for Amazon Redshift

    + *
    • + *
  • + *

    * RDS for Amazon Relational Database Service

    *
    • *
  • *

    + * SAP HANA on Amazon EC2 for SAP HANA databases

    + *
    • + *
  • + *

    * Storage Gateway for Storage Gateway

    *
    • *
  • @@ -5619,6 +5637,10 @@ export interface ListBackupJobsInput { *
    • *
  • *

    + * Timestream for Amazon Timestream

    + *
    • + *
  • + *

    * VirtualMachine for virtual machines

    *
    • * @@ -6130,6 +6152,10 @@ export interface ListCopyJobsInput { * *
  • *

    + * CloudFormation for CloudFormation

    + *
    • + *
  • + *

    * DocumentDB for Amazon DocumentDB (with MongoDB compatibility)

    *
    • *
  • @@ -6158,10 +6184,18 @@ export interface ListCopyJobsInput { *
    • *
  • *

    + * Redshift for Amazon Redshift

    + *
    • + *
  • + *

    * RDS for Amazon Relational Database Service

    *
    • *
  • *

    + * SAP HANA on Amazon EC2 for SAP HANA databases

    + *
    • + *
  • + *

    * Storage Gateway for Storage Gateway

    *
    • *
  • @@ -6170,6 +6204,10 @@ export interface ListCopyJobsInput { *
    • *
  • *

    + * Timestream for Amazon Timestream

    + *
    • + *
  • + *

    * VirtualMachine for virtual machines

    *
    • * @@ -6780,7 +6818,73 @@ export interface ListRecoveryPointsByBackupVaultInput { /** * @public - *

    Returns only recovery points that match the specified resource type.

    + *

    Returns only recovery points that match the specified resource type(s):

    + * */ ByResourceType?: string; @@ -6987,6 +7091,12 @@ export interface RecoveryPointByBackupVault { * belongs to the specified backup.

    */ ResourceName?: string; + + /** + * @public + *

    This is the type of vault in which the described recovery point is stored.

    + */ + VaultType?: VaultType; } /** @@ -7357,6 +7467,79 @@ export interface ListRestoreJobsInput { */ ByAccountId?: string; + /** + * @public + *

    Include this parameter to return only restore jobs for the + * specified resources:

    + * + */ + ByResourceType?: string; + /** * @public *

    Returns only restore jobs that were created before the specified date.

    @@ -8964,6 +9147,13 @@ export interface UpdateRegionSettingsInput { /** * @public *

    Updates the list of services along with the opt-in preferences for the Region.

    + *

    If resource assignments are only based on tags, then service opt-in settings are applied. + * If a resource type is explicitly assigned to a backup plan, such as Amazon S3, + * Amazon EC2, or Amazon RDS, it will be included in the + * backup even if the opt-in is not enabled for that particular service. + * If both a resource type and tags are specified in a resource assignment, + * the resource type specified in the backup plan takes priority over the + * tag condition. Service opt-in settings are disregarded in this situation.

    */ ResourceTypeOptInPreference?: Record; diff --git a/clients/client-backup/src/protocols/Aws_restJson1.ts b/clients/client-backup/src/protocols/Aws_restJson1.ts index e930d57cfdbb..638ab5f22fe8 100644 --- a/clients/client-backup/src/protocols/Aws_restJson1.ts +++ b/clients/client-backup/src/protocols/Aws_restJson1.ts @@ -2524,6 +2524,7 @@ export const se_ListRestoreJobsCommand = async ( nextToken: [, input.NextToken!], maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults!.toString()], accountId: [, input.ByAccountId!], + resourceType: [, input.ByResourceType!], createdBefore: [ () => input.ByCreatedBefore !== void 0, () => (input.ByCreatedBefore!.toISOString().split(".")[0] + "Z").toString(), @@ -5043,6 +5044,7 @@ export const de_DescribeRecoveryPointCommand = async ( Status: __expectString, StatusMessage: __expectString, StorageClass: __expectString, + VaultType: __expectString, }); Object.assign(contents, doc); return contents; @@ -9396,6 +9398,7 @@ const de_RecoveryPointByBackupVault = (output: any, context: __SerdeContext): Re SourceBackupVaultArn: __expectString, Status: __expectString, StatusMessage: __expectString, + VaultType: __expectString, }) as any; }; diff --git a/codegen/sdk-codegen/aws-models/backup.json b/codegen/sdk-codegen/aws-models/backup.json index 71708d8344e3..f65f177610a9 100644 --- a/codegen/sdk-codegen/aws-models/backup.json +++ b/codegen/sdk-codegen/aws-models/backup.json @@ -5451,6 +5451,12 @@ "traits": { "smithy.api#documentation": "

    This is the non-unique name of the resource that \n belongs to the specified backup.

    " } + }, + "VaultType": { + "target": "com.amazonaws.backup#VaultType", + "traits": { + "smithy.api#documentation": "

    This is the type of vault in which the described recovery point is stored.

    " + } } }, "traits": { @@ -7562,7 +7568,7 @@ "ByResourceType": { "target": "com.amazonaws.backup#ResourceType", "traits": { - "smithy.api#documentation": "

    Returns only backup jobs for the specified resources:

    \n ", + "smithy.api#documentation": "

    Returns only backup jobs for the specified resources:

    \n ", "smithy.api#httpQuery": "resourceType" } }, @@ -8255,7 +8261,7 @@ "ByResourceType": { "target": "com.amazonaws.backup#ResourceType", "traits": { - "smithy.api#documentation": "

    Returns only backup jobs for the specified resources:

    \n ", + "smithy.api#documentation": "

    Returns only backup jobs for the specified resources:

    \n ", "smithy.api#httpQuery": "resourceType" } }, @@ -8723,7 +8729,7 @@ "ByResourceType": { "target": "com.amazonaws.backup#ResourceType", "traits": { - "smithy.api#documentation": "

    Returns only recovery points that match the specified resource type.

    ", + "smithy.api#documentation": "

    Returns only recovery points that match the specified resource type(s):

    \n ", "smithy.api#httpQuery": "resourceType" } }, @@ -9404,6 +9410,13 @@ "smithy.api#httpQuery": "accountId" } }, + "ByResourceType": { + "target": "com.amazonaws.backup#ResourceType", + "traits": { + "smithy.api#documentation": "

    Include this parameter to return only restore jobs for the \n specified resources:

    \n ", + "smithy.api#httpQuery": "resourceType" + } + }, "ByCreatedBefore": { "target": "com.amazonaws.backup#timestamp", "traits": { @@ -10271,6 +10284,12 @@ "traits": { "smithy.api#documentation": "

    This is the non-unique name of the resource that \n belongs to the specified backup.

    " } + }, + "VaultType": { + "target": "com.amazonaws.backup#VaultType", + "traits": { + "smithy.api#documentation": "

    This is the type of vault in which the described recovery point is stored.

    " + } } }, "traits": { @@ -12687,7 +12706,7 @@ } ], "traits": { - "smithy.api#documentation": "

    Updates the current service opt-in settings for the Region. If service-opt-in is enabled\n for a service, Backup tries to protect that service's resources in this Region,\n when the resource is included in an on-demand backup or scheduled backup plan. Otherwise,\n Backup does not try to protect that service's resources in this Region. Use\n the DescribeRegionSettings API to determine the resource types that are\n supported.

    ", + "smithy.api#documentation": "

    Updates the current service opt-in settings for the Region.

    \n

    Use\n the DescribeRegionSettings API to determine the resource types that are\n supported.

    ", "smithy.api#http": { "method": "PUT", "uri": "/account-settings", @@ -12701,7 +12720,7 @@ "ResourceTypeOptInPreference": { "target": "com.amazonaws.backup#ResourceTypeOptInPreference", "traits": { - "smithy.api#documentation": "

    Updates the list of services along with the opt-in preferences for the Region.

    " + "smithy.api#documentation": "

    Updates the list of services along with the opt-in preferences for the Region.

    \n

    If resource assignments are only based on tags, then service opt-in settings are applied. \n If a resource type is explicitly assigned to a backup plan, such as Amazon S3, \n Amazon EC2, or Amazon RDS, it will be included in the \n backup even if the opt-in is not enabled for that particular service. \n If both a resource type and tags are specified in a resource assignment, \n the resource type specified in the backup plan takes priority over the \n tag condition. Service opt-in settings are disregarded in this situation.

    " } }, "ResourceTypeManagementPreference": {