Skip to content

Commit aaf25ce

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Add support for feature integration with AWS Backup.
1 parent d46ef3c commit aaf25ce

20 files changed

+194
-4
lines changed

‎generator/ServiceModels/rds/rds-2014-10-31.api.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2158,6 +2158,7 @@
21582158
{"shape":"InvalidDBClusterSnapshotStateFault"},
21592159
{"shape":"StorageQuotaExceededFault"},
21602160
{"shape":"InvalidVPCNetworkStateFault"},
2161+
{"shape":"DBSubnetGroupDoesNotCoverEnoughAZs"},
21612162
{"shape":"InvalidRestoreFault"},
21622163
{"shape":"DBSubnetGroupNotFoundFault"},
21632164
{"shape":"InvalidSubnet"},
@@ -3761,7 +3762,8 @@
37613762
"DBSystemId":{"shape":"String"},
37623763
"MasterUserSecret":{"shape":"MasterUserSecret"},
37633764
"IOOptimizedNextAllowedModificationTime":{"shape":"TStamp"},
3764-
"LocalWriteForwardingStatus":{"shape":"LocalWriteForwardingStatus"}
3765+
"LocalWriteForwardingStatus":{"shape":"LocalWriteForwardingStatus"},
3766+
"AwsBackupRecoveryPointArn":{"shape":"String"}
37653767
},
37663768
"wrapper":true
37673769
},
@@ -3801,7 +3803,8 @@
38013803
"Port":{"shape":"Integer"},
38023804
"KmsKeyId":{"shape":"String"},
38033805
"StorageType":{"shape":"String"},
3804-
"Iops":{"shape":"IntegerOptional"}
3806+
"Iops":{"shape":"IntegerOptional"},
3807+
"AwsBackupRecoveryPointArn":{"shape":"String"}
38053808
},
38063809
"wrapper":true
38073810
},
@@ -4387,7 +4390,8 @@
43874390
"DBInstanceAutomatedBackupsArn":{"shape":"String"},
43884391
"DBInstanceAutomatedBackupsReplications":{"shape":"DBInstanceAutomatedBackupsReplicationList"},
43894392
"BackupTarget":{"shape":"String"},
4390-
"StorageThroughput":{"shape":"IntegerOptional"}
4393+
"StorageThroughput":{"shape":"IntegerOptional"},
4394+
"AwsBackupRecoveryPointArn":{"shape":"String"}
43914395
},
43924396
"wrapper":true
43934397
},
@@ -6899,7 +6903,8 @@
68996903
"MasterUserSecretKmsKeyId":{"shape":"String"},
69006904
"EngineMode":{"shape":"String"},
69016905
"AllowEngineModeChange":{"shape":"Boolean"},
6902-
"EnableLocalWriteForwarding":{"shape":"BooleanOptional"}
6906+
"EnableLocalWriteForwarding":{"shape":"BooleanOptional"},
6907+
"AwsBackupRecoveryPointArn":{"shape":"AwsBackupRecoveryPointArn"}
69036908
}
69046909
},
69056910
"ModifyDBClusterParameterGroupMessage":{

‎generator/ServiceModels/rds/rds-2014-10-31.docs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@
336336
"AwsBackupRecoveryPointArn": {
337337
"base": null,
338338
"refs": {
339+
"ModifyDBClusterMessage$AwsBackupRecoveryPointArn": "<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>",
339340
"ModifyDBInstanceMessage$AwsBackupRecoveryPointArn": "<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p> <p>This setting doesn't apply to RDS Custom DB instances.</p>"
340341
}
341342
},
@@ -4225,6 +4226,7 @@
42254226
"DBCluster$PerformanceInsightsKMSKeyId": "<p>The Amazon Web Services KMS key identifier for encryption of Performance Insights data.</p> <p>The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key.</p> <p>This setting is only for non-Aurora Multi-AZ DB clusters.</p>",
42264227
"DBCluster$NetworkType": "<p>The network type of the DB instance.</p> <p>The network type is determined by the <code>DBSubnetGroup</code> specified for the DB cluster. A <code>DBSubnetGroup</code> can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (<code>DUAL</code>).</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html\"> Working with a DB instance in a VPC</a> in the <i>Amazon Aurora User Guide.</i> </p> <p>This setting is only for Aurora DB clusters.</p> <p>Valid Values: <code>IPV4 | DUAL</code> </p>",
42274228
"DBCluster$DBSystemId": "<p>Reserved for future use.</p>",
4229+
"DBCluster$AwsBackupRecoveryPointArn": "<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>",
42284230
"DBClusterAutomatedBackup$Engine": "<p>The name of the database engine for this automated backup.</p>",
42294231
"DBClusterAutomatedBackup$VpcId": "<p>The VPC ID associated with the DB cluster.</p>",
42304232
"DBClusterAutomatedBackup$DBClusterAutomatedBackupsArn": "<p>The Amazon Resource Name (ARN) for the automated backups.</p>",
@@ -4239,6 +4241,7 @@
42394241
"DBClusterAutomatedBackup$EngineMode": "<p>The engine mode of the database engine for the automated backup.</p>",
42404242
"DBClusterAutomatedBackup$KmsKeyId": "<p>The Amazon Web Services KMS key ID for an automated backup.</p> <p>The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key.</p>",
42414243
"DBClusterAutomatedBackup$StorageType": "<p>The storage type associated with the DB cluster.</p> <p>This setting is only for non-Aurora Multi-AZ DB clusters.</p>",
4244+
"DBClusterAutomatedBackup$AwsBackupRecoveryPointArn": "<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>",
42424245
"DBClusterAutomatedBackupMessage$Marker": "<p>The pagination token provided in the previous request. If this parameter is specified the response includes only records beyond the marker, up to <code>MaxRecords</code>.</p>",
42434246
"DBClusterBacktrack$DBClusterIdentifier": "<p>Contains a user-supplied DB cluster identifier. This identifier is the unique key that identifies a DB cluster.</p>",
42444247
"DBClusterBacktrack$BacktrackIdentifier": "<p>Contains the backtrack identifier.</p>",
@@ -4355,6 +4358,7 @@
43554358
"DBInstanceAutomatedBackup$Timezone": "<p>The time zone of the automated backup. In most cases, the <code>Timezone</code> element is empty. <code>Timezone</code> content appears only for Microsoft SQL Server DB instances that were created with a time zone specified.</p>",
43564359
"DBInstanceAutomatedBackup$DBInstanceAutomatedBackupsArn": "<p>The Amazon Resource Name (ARN) for the replicated automated backups.</p>",
43574360
"DBInstanceAutomatedBackup$BackupTarget": "<p>Specifies where automated backups are stored: Amazon Web Services Outposts or the Amazon Web Services Region.</p>",
4361+
"DBInstanceAutomatedBackup$AwsBackupRecoveryPointArn": "<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>",
43584362
"DBInstanceAutomatedBackupMessage$Marker": "<p>An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>.</p>",
43594363
"DBInstanceAutomatedBackupsReplication$DBInstanceAutomatedBackupsArn": "<p>The Amazon Resource Name (ARN) of the replicated automated backups.</p>",
43604364
"DBInstanceMessage$Marker": "<p>An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code> .</p>",

‎generator/ServiceModels/rds/rds-2014-10-31.normal.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2284,6 +2284,7 @@
22842284
{"shape":"InvalidDBClusterSnapshotStateFault"},
22852285
{"shape":"StorageQuotaExceededFault"},
22862286
{"shape":"InvalidVPCNetworkStateFault"},
2287+
{"shape":"DBSubnetGroupDoesNotCoverEnoughAZs"},
22872288
{"shape":"InvalidRestoreFault"},
22882289
{"shape":"DBSubnetGroupNotFoundFault"},
22892290
{"shape":"InvalidSubnet"},
@@ -5144,6 +5145,10 @@
51445145
"LocalWriteForwardingStatus":{
51455146
"shape":"LocalWriteForwardingStatus",
51465147
"documentation":"<p>Specifies whether an Aurora DB cluster has in-cluster write forwarding enabled, not enabled, requested, or is in the process of enabling it.</p>"
5148+
},
5149+
"AwsBackupRecoveryPointArn":{
5150+
"shape":"String",
5151+
"documentation":"<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>"
51475152
}
51485153
},
51495154
"documentation":"<p>Contains the details of an Amazon Aurora DB cluster or Multi-AZ DB cluster.</p> <p>For an Amazon Aurora DB cluster, this data type is used as a response element in the operations <code>CreateDBCluster</code>, <code>DeleteDBCluster</code>, <code>DescribeDBClusters</code>, <code>FailoverDBCluster</code>, <code>ModifyDBCluster</code>, <code>PromoteReadReplicaDBCluster</code>, <code>RestoreDBClusterFromS3</code>, <code>RestoreDBClusterFromSnapshot</code>, <code>RestoreDBClusterToPointInTime</code>, <code>StartDBCluster</code>, and <code>StopDBCluster</code>.</p> <p>For a Multi-AZ DB cluster, this data type is used as a response element in the operations <code>CreateDBCluster</code>, <code>DeleteDBCluster</code>, <code>DescribeDBClusters</code>, <code>FailoverDBCluster</code>, <code>ModifyDBCluster</code>, <code>RebootDBCluster</code>, <code>RestoreDBClusterFromSnapshot</code>, and <code>RestoreDBClusterToPointInTime</code>.</p> <p>For more information on Amazon Aurora DB clusters, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <p>For more information on Multi-AZ DB clusters, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html\"> Multi-AZ deployments with two readable standby DB instances</a> in the <i>Amazon RDS User Guide.</i> </p>",
@@ -5252,6 +5257,10 @@
52525257
"Iops":{
52535258
"shape":"IntegerOptional",
52545259
"documentation":"<p>The IOPS (I/O operations per second) value for the automated backup.</p> <p>This setting is only for non-Aurora Multi-AZ DB clusters.</p>"
5260+
},
5261+
"AwsBackupRecoveryPointArn":{
5262+
"shape":"String",
5263+
"documentation":"<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>"
52555264
}
52565265
},
52575266
"documentation":"<p>An automated backup of a DB cluster. It consists of system backups, transaction logs, and the database cluster properties that existed at the time you deleted the source cluster.</p>",
@@ -6529,6 +6538,10 @@
65296538
"StorageThroughput":{
65306539
"shape":"IntegerOptional",
65316540
"documentation":"<p>Specifies the storage throughput for the automated backup.</p>"
6541+
},
6542+
"AwsBackupRecoveryPointArn":{
6543+
"shape":"String",
6544+
"documentation":"<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>"
65326545
}
65336546
},
65346547
"documentation":"<p>An automated backup of a DB instance. It consists of system backups, transaction logs, and the database instance properties that existed at the time you deleted the source instance.</p>",
@@ -10834,6 +10847,10 @@
1083410847
"EnableLocalWriteForwarding":{
1083510848
"shape":"BooleanOptional",
1083610849
"documentation":"<p>Specifies whether read replicas can forward write operations to the writer DB instance in the DB cluster. By default, write operations aren't allowed on reader DB instances.</p> <p>Valid for: Aurora DB clusters only</p>"
10850+
},
10851+
"AwsBackupRecoveryPointArn":{
10852+
"shape":"AwsBackupRecoveryPointArn",
10853+
"documentation":"<p>The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.</p>"
1083710854
}
1083810855
},
1083910856
"documentation":"<p/>"

‎sdk/code-analysis/ServiceAnalysis/RDS/Generated/PropertyValueRules.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,12 @@
216216
<max>51000</max>
217217
<pattern>[\s\S]*</pattern>
218218
</property-value-rule>
219+
<property-value-rule>
220+
<property>Amazon.RDS.Model.ModifyDBClusterRequest.AwsBackupRecoveryPointArn</property>
221+
<min>43</min>
222+
<max>350</max>
223+
<pattern>^arn:aws[a-z-]*:backup:[-a-z0-9]+:[0-9]{12}:[-a-z]+:([a-z0-9\-]+:)?[a-z][a-z0-9\-]{0,255}$</pattern>
224+
</property-value-rule>
219225
<property-value-rule>
220226
<property>Amazon.RDS.Model.ModifyDBInstanceRequest.AwsBackupRecoveryPointArn</property>
221227
<min>43</min>

‎sdk/src/Services/RDS/Generated/Model/DBCluster.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public partial class DBCluster
6969
private DateTime? _automaticRestartTime;
7070
private bool? _autoMinorVersionUpgrade;
7171
private List<string> _availabilityZones = new List<string>();
72+
private string _awsBackupRecoveryPointArn;
7273
private long? _backtrackConsumedChangeRecords;
7374
private long? _backtrackWindow;
7475
private int? _backupRetentionPeriod;
@@ -313,6 +314,24 @@ internal bool IsSetAvailabilityZones()
313314
return this._availabilityZones != null && this._availabilityZones.Count > 0;
314315
}
315316

317+
/// <summary>
318+
/// Gets and sets the property AwsBackupRecoveryPointArn.
319+
/// <para>
320+
/// The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.
321+
/// </para>
322+
/// </summary>
323+
public string AwsBackupRecoveryPointArn
324+
{
325+
get { return this._awsBackupRecoveryPointArn; }
326+
set { this._awsBackupRecoveryPointArn = value; }
327+
}
328+
329+
// Check to see if AwsBackupRecoveryPointArn property is set
330+
internal bool IsSetAwsBackupRecoveryPointArn()
331+
{
332+
return this._awsBackupRecoveryPointArn != null;
333+
}
334+
316335
/// <summary>
317336
/// Gets and sets the property BacktrackConsumedChangeRecords.
318337
/// <para>

‎sdk/src/Services/RDS/Generated/Model/DBClusterAutomatedBackup.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public partial class DBClusterAutomatedBackup
3737
{
3838
private int? _allocatedStorage;
3939
private List<string> _availabilityZones = new List<string>();
40+
private string _awsBackupRecoveryPointArn;
4041
private int? _backupRetentionPeriod;
4142
private DateTime? _clusterCreateTime;
4243
private string _dbClusterArn;
@@ -100,6 +101,24 @@ internal bool IsSetAvailabilityZones()
100101
return this._availabilityZones != null && this._availabilityZones.Count > 0;
101102
}
102103

104+
/// <summary>
105+
/// Gets and sets the property AwsBackupRecoveryPointArn.
106+
/// <para>
107+
/// The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.
108+
/// </para>
109+
/// </summary>
110+
public string AwsBackupRecoveryPointArn
111+
{
112+
get { return this._awsBackupRecoveryPointArn; }
113+
set { this._awsBackupRecoveryPointArn = value; }
114+
}
115+
116+
// Check to see if AwsBackupRecoveryPointArn property is set
117+
internal bool IsSetAwsBackupRecoveryPointArn()
118+
{
119+
return this._awsBackupRecoveryPointArn != null;
120+
}
121+
103122
/// <summary>
104123
/// Gets and sets the property BackupRetentionPeriod.
105124
/// <para>

‎sdk/src/Services/RDS/Generated/Model/DBInstanceAutomatedBackup.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public partial class DBInstanceAutomatedBackup
3737
{
3838
private int? _allocatedStorage;
3939
private string _availabilityZone;
40+
private string _awsBackupRecoveryPointArn;
4041
private int? _backupRetentionPeriod;
4142
private string _backupTarget;
4243
private string _dbInstanceArn;
@@ -102,6 +103,24 @@ internal bool IsSetAvailabilityZone()
102103
return this._availabilityZone != null;
103104
}
104105

106+
/// <summary>
107+
/// Gets and sets the property AwsBackupRecoveryPointArn.
108+
/// <para>
109+
/// The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.
110+
/// </para>
111+
/// </summary>
112+
public string AwsBackupRecoveryPointArn
113+
{
114+
get { return this._awsBackupRecoveryPointArn; }
115+
set { this._awsBackupRecoveryPointArn = value; }
116+
}
117+
118+
// Check to see if AwsBackupRecoveryPointArn property is set
119+
internal bool IsSetAwsBackupRecoveryPointArn()
120+
{
121+
return this._awsBackupRecoveryPointArn != null;
122+
}
123+
105124
/// <summary>
106125
/// Gets and sets the property BackupRetentionPeriod.
107126
/// <para>

‎sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/DBClusterAutomatedBackupUnmarshaller.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ public DBClusterAutomatedBackup Unmarshall(XmlUnmarshallerContext context)
6767
unmarshalledObject.AvailabilityZones.Add(item);
6868
continue;
6969
}
70+
if (context.TestExpression("AwsBackupRecoveryPointArn", targetDepth))
71+
{
72+
var unmarshaller = StringUnmarshaller.Instance;
73+
unmarshalledObject.AwsBackupRecoveryPointArn = unmarshaller.Unmarshall(context);
74+
continue;
75+
}
7076
if (context.TestExpression("BackupRetentionPeriod", targetDepth))
7177
{
7278
var unmarshaller = IntUnmarshaller.Instance;

‎sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/DBClusterUnmarshaller.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@ public DBCluster Unmarshall(XmlUnmarshallerContext context)
110110
unmarshalledObject.AvailabilityZones.Add(item);
111111
continue;
112112
}
113+
if (context.TestExpression("AwsBackupRecoveryPointArn", targetDepth))
114+
{
115+
var unmarshaller = StringUnmarshaller.Instance;
116+
unmarshalledObject.AwsBackupRecoveryPointArn = unmarshaller.Unmarshall(context);
117+
continue;
118+
}
113119
if (context.TestExpression("BacktrackConsumedChangeRecords", targetDepth))
114120
{
115121
var unmarshaller = LongUnmarshaller.Instance;

‎sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/DBInstanceAutomatedBackupUnmarshaller.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ public DBInstanceAutomatedBackup Unmarshall(XmlUnmarshallerContext context)
6666
unmarshalledObject.AvailabilityZone = unmarshaller.Unmarshall(context);
6767
continue;
6868
}
69+
if (context.TestExpression("AwsBackupRecoveryPointArn", targetDepth))
70+
{
71+
var unmarshaller = StringUnmarshaller.Instance;
72+
unmarshalledObject.AwsBackupRecoveryPointArn = unmarshaller.Unmarshall(context);
73+
continue;
74+
}
6975
if (context.TestExpression("BackupRetentionPeriod", targetDepth))
7076
{
7177
var unmarshaller = IntUnmarshaller.Instance;

0 commit comments

Comments
 (0)