Skip to content

Commit

Permalink
[DBInstance] Add support for the Dedicated Log Volume (#476)
Browse files Browse the repository at this point in the history
Co-authored-by: Valentin Shirshov <vshir@amazon.com>
  • Loading branch information
khebul and Valentin Shirshov authored Nov 3, 2023
1 parent 82e98c7 commit f1a0c9f
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 14 deletions.
4 changes: 2 additions & 2 deletions aws-rds-cfn-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>utils</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<dependency>
<groupId>software.amazon.cloudformation</groupId>
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-customdbengineversion/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<dependency>
<groupId>software.amazon.rds.common</groupId>
Expand Down
4 changes: 2 additions & 2 deletions aws-rds-dbcluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ec2</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-dbclusterendpoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-dbclusterparametergroup/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions aws-rds-dbinstance/aws-rds-dbinstance.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@
"type": "string",
"description": "The Oracle system ID (Oracle SID) for a container database (CDB). The Oracle SID is also the name of the CDB. This setting is valid for RDS Custom only."
},
"DedicatedLogVolume": {
"type": "boolean",
"description": "Indicates whether the DB instance has a dedicated log volume (DLV) enabled."
},
"DeleteAutomatedBackups": {
"type": "boolean",
"description": "A value that indicates whether to remove automated backups immediately after the DB instance is deleted. This parameter isn't case-sensitive. The default is to remove automated backups immediately after the DB instance is deleted."
Expand Down
12 changes: 12 additions & 0 deletions aws-rds-dbinstance/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ To declare this entity in your AWS CloudFormation template, use the following sy
"<a href="#dbsecuritygroups" title="DBSecurityGroups">DBSecurityGroups</a>" : <i>[ String, ... ]</i>,
"<a href="#dbsnapshotidentifier" title="DBSnapshotIdentifier">DBSnapshotIdentifier</a>" : <i>String</i>,
"<a href="#dbsubnetgroupname" title="DBSubnetGroupName">DBSubnetGroupName</a>" : <i>String</i>,
"<a href="#dedicatedlogvolume" title="DedicatedLogVolume">DedicatedLogVolume</a>" : <i>Boolean</i>,
"<a href="#deleteautomatedbackups" title="DeleteAutomatedBackups">DeleteAutomatedBackups</a>" : <i>Boolean</i>,
"<a href="#deletionprotection" title="DeletionProtection">DeletionProtection</a>" : <i>Boolean</i>,
"<a href="#domain" title="Domain">Domain</a>" : <i>String</i>,
Expand Down Expand Up @@ -120,6 +121,7 @@ Properties:
- String</i>
<a href="#dbsnapshotidentifier" title="DBSnapshotIdentifier">DBSnapshotIdentifier</a>: <i>String</i>
<a href="#dbsubnetgroupname" title="DBSubnetGroupName">DBSubnetGroupName</a>: <i>String</i>
<a href="#dedicatedlogvolume" title="DedicatedLogVolume">DedicatedLogVolume</a>: <i>Boolean</i>
<a href="#deleteautomatedbackups" title="DeleteAutomatedBackups">DeleteAutomatedBackups</a>: <i>Boolean</i>
<a href="#deletionprotection" title="DeletionProtection">DeletionProtection</a>: <i>Boolean</i>
<a href="#domain" title="Domain">Domain</a>: <i>String</i>
Expand Down Expand Up @@ -427,6 +429,16 @@ _Type_: String

_Update requires_: [Replacement](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-replacement)

#### DedicatedLogVolume

Indicates whether the DB instance has a dedicated log volume (DLV) enabled.

_Required_: No

_Type_: Boolean

_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)

#### DeleteAutomatedBackups

A value that indicates whether to remove automated backups immediately after the DB instance is deleted. This parameter isn't case-sensitive. The default is to remove automated backups immediately after the DB instance is deleted.
Expand Down
4 changes: 2 additions & 2 deletions aws-rds-dbinstance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ec2</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ public static CreateDbInstanceReadReplicaRequest createDbInstanceReadReplicaRequ
.dbInstanceIdentifier(model.getDBInstanceIdentifier())
.dbSubnetGroupName(model.getDBSubnetGroupName())
.deletionProtection(model.getDeletionProtection())
.dedicatedLogVolume(model.getDedicatedLogVolume())
.domain(model.getDomain())
.domainAuthSecretArn(model.getDomainAuthSecretArn())
.domainDnsIps(model.getDomainDnsIps())
Expand Down Expand Up @@ -200,6 +201,7 @@ public static RestoreDbInstanceFromDbSnapshotRequest restoreDbInstanceFromSnapsh
.dbSnapshotIdentifier(model.getDBSnapshotIdentifier())
.dbSubnetGroupName(model.getDBSubnetGroupName())
.deletionProtection(model.getDeletionProtection())
.dedicatedLogVolume(model.getDedicatedLogVolume())
.domain(model.getDomain())
.domainAuthSecretArn(model.getDomainAuthSecretArn())
.domainDnsIps(model.getDomainDnsIps())
Expand Down Expand Up @@ -282,6 +284,7 @@ public static CreateDbInstanceRequest createDbInstanceRequest(
.dbName(model.getDBName())
.dbParameterGroupName(model.getDBParameterGroupName())
.dbSubnetGroupName(model.getDBSubnetGroupName())
.dedicatedLogVolume(model.getDedicatedLogVolume())
.deletionProtection(model.getDeletionProtection())
.domain(model.getDomain())
.domainAuthSecretArn(model.getDomainAuthSecretArn())
Expand Down Expand Up @@ -349,6 +352,7 @@ static RestoreDbInstanceToPointInTimeRequest restoreDbInstanceToPointInTimeReque
.dbName(model.getDBName())
.dbParameterGroupName(model.getDBParameterGroupName())
.dbSubnetGroupName(model.getDBSubnetGroupName())
.dedicatedLogVolume(model.getDedicatedLogVolume())
.deletionProtection(model.getDeletionProtection())
.domain(model.getDomain())
.domainAuthSecretArn(model.getDomainAuthSecretArn())
Expand Down Expand Up @@ -440,6 +444,7 @@ public static ModifyDbInstanceRequest modifyDbInstanceRequest(
.dbInstanceIdentifier(desiredModel.getDBInstanceIdentifier())
.dbParameterGroupName(diff(previousModel.getDBParameterGroupName(), desiredModel.getDBParameterGroupName()))
.dbPortNumber(translatePortToSdk(diff(previousModel.getPort(), desiredModel.getPort())))
.dedicatedLogVolume(diff(previousModel.getDeletionProtection(), desiredModel.getDeletionProtection()))
.deletionProtection(diff(previousModel.getDeletionProtection(), desiredModel.getDeletionProtection()))
.domain(diff(previousModel.getDomain(), desiredModel.getDomain()))
.domainAuthSecretArn(desiredModel.getDomainAuthSecretArn())
Expand Down Expand Up @@ -817,6 +822,7 @@ public static ResourceModel.ResourceModelBuilder translateDbInstanceFromSdkBuild
.dBSubnetGroupName(translateDbSubnetGroupFromSdk(dbInstance.dbSubnetGroup()))
.dBSystemId(dbInstance.dbSystemId())
.dbiResourceId(dbInstance.dbiResourceId())
.dedicatedLogVolume(dbInstance.dedicatedLogVolume())
.deletionProtection(dbInstance.deletionProtection())
.domain(domain)
.domainAuthSecretArn(domainAuthSecretArn)
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-dbparametergroup/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-dbsubnetgroup/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-eventsubscription/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-globalcluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-optiongroup/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>rds</artifactId>
<version>2.20.98</version>
<version>2.21.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
<dependency>
Expand Down

0 comments on commit f1a0c9f

Please sign in to comment.