Skip to content

Commit

Permalink
[Feat.] RDS: PITR for existing rds instance (#2778)
Browse files Browse the repository at this point in the history 
[Feat.] RDS: PITR for existing rds instance

Summary of the Pull Request

Updated restore_point argument of opentelekomcloud_rds_instance_v3 resource allowing to
restore RDS instance backup to existing RDS instance
Parameter restore_from_backup is deprecated in favor of restore_point for resource/opentelekomcloud_rds_instance_v3

PR Checklist

 Refers to: #2776
 Tests added/passed.
 Documentation updated.
 Schema updated.
 Release notes added.

Acceptance Steps Performed
=== RUN   TestAccRdsInstanceV3RestoreToPITR_NewInstance
--- PASS: TestAccRdsInstanceV3RestoreToPITR_NewInstance (950.46s)
PASS

Process finished with the exit code 0

Reviewed-by: Muneeb H. Jan <muneebhafeezjan@gmail.com>
Reviewed-by: Anton Sidelnikov
  • Loading branch information
@artem-lifshits
artem-lifshits authored Jan 10, 2025
1 parent 7aedb98 commit e8f4078
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 125 deletions.
7 changes: 4 additions & 3 deletions docs/resources/rds_instance_v3.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,12 @@ The following arguments are supported:

* `tags` - (Optional) Tags key/value pairs to associate with the instance.

* `restore_point` - (Optional, ForceNew) Specifies the restoration information. By selecting this option a new RDS
instance will be created from separate instance backup. Structure is documented below.
* `restore_point` - (Optional, ForceNew) Specifies the restoration information. By selecting this option you can either
create a new RDS instance or restore backup from existing one. Structure is documented below.

* `restore_from_backup` - (Optional) Specifies whether to restore database to an instance described in current resource.
* `restore_from_backup` **DEPRECATED** - (Optional) Specifies whether to restore database to an instance described in current resource.
Structure is documented below.
Please use alternative parameter `restore_point`.

* `ssl_enable` - (Optional) Specifies whether SSL should be enabled for MySql instances.

Expand Down
95 changes: 23 additions & 72 deletions opentelekomcloud/acceptance/rds/resource_opentelekomcloud_rds_instance_v3_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package acceptance
import (
"fmt"
"os"
"regexp"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
Expand Down Expand Up @@ -146,14 +145,14 @@ func TestAccRdsInstanceV3ElasticIP(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckRdsInstanceV3Exists(instanceV3ResourceName, &rdsInstance),
resource.TestCheckResourceAttr(instanceV3ResourceName, "name", "tf_rds_instance_"+postfix),
resource.TestCheckResourceAttr(instanceV3ResourceName, "db.0.version", "10"),
resource.TestCheckResourceAttr(instanceV3ResourceName, "db.0.version", "15"),
resource.TestCheckResourceAttr(instanceV3ResourceName, "public_ips.#", "1"),
),
},
{
Config: testAccRdsInstanceV3Basic(postfix),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(instanceV3ResourceName, "db.0.version", "10"),
resource.TestCheckResourceAttr(instanceV3ResourceName, "db.0.version", "15"),
resource.TestCheckResourceAttr(instanceV3ResourceName, "public_ips.#", "0"),
),
},
Expand Down Expand Up @@ -258,23 +257,6 @@ func TestAccRdsInstanceV3TemplateConfig(t *testing.T) {
})
}

func TestAccRdsInstanceV3InvalidFlavor(t *testing.T) {
postfix := acctest.RandString(3)

resource.Test(t, resource.TestCase{
PreCheck: func() { common.TestAccPreCheck(t) },
ProviderFactories: common.TestAccProviderFactories,
CheckDestroy: testAccCheckRdsInstanceV3Destroy,
Steps: []resource.TestStep{
{
Config: testAccRdsInstanceV3InvalidFlavor(postfix),
PlanOnly: true,
ExpectError: regexp.MustCompile(`can't find flavor.+`),
},
},
})
}

func TestAccRdsInstanceV3_configurationParameters(t *testing.T) {
postfix := acctest.RandString(3)
var rdsInstance instances.InstanceResponse
Expand All @@ -296,9 +278,6 @@ func TestAccRdsInstanceV3_configurationParameters(t *testing.T) {
}

func TestAccRdsInstanceV3TimeZoneAndSSL(t *testing.T) {
// Test is failing on deletion because RDSv3 SSL switchover doesn't change instance `action` status / doesn't
// return job_id but still blocks the instance from performing other actions like port_change/instance_deletion
// https://jira.tsi-dev.otc-service.com/browse/OTCDB-3026
postfix := acctest.RandString(3)
var rdsInstance instances.InstanceResponse

Expand Down Expand Up @@ -350,7 +329,7 @@ func TestAccRdsInstanceV3AutoScaling(t *testing.T) {
})
}

func TestAccRdsInstanceV3RestoreToPITR(t *testing.T) {
func TestAccRdsInstanceV3RestoreToPITR_NewInstance(t *testing.T) {
postfix := acctest.RandString(3)
var rdsInstance instances.InstanceResponse

Expand All @@ -369,14 +348,12 @@ func TestAccRdsInstanceV3RestoreToPITR(t *testing.T) {
Config: testAccRdsInstanceV3RestorePITRUpdate(postfix),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(instanceV3ResourceName, "flavor", "rds.pg.c2.large"),
resource.TestCheckResourceAttrSet(instanceV3ResourceName, "restored_backup_id"),
),
},
{
Config: testAccRdsInstanceV3RestorePITRBasic(postfix),
Check: resource.ComposeTestCheckFunc(
testAccCheckRdsInstanceV3Exists(instanceV3ResourceName, &rdsInstance),
resource.TestCheckResourceAttrSet(instanceV3ResourceName, "restored_backup_id"),
),
},
},
Expand Down Expand Up @@ -539,7 +516,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
Expand Down Expand Up @@ -602,7 +579,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
subnet_id = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.network_id
Expand All @@ -627,7 +604,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
subnet_id = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.network_id
Expand Down Expand Up @@ -658,7 +635,7 @@ resource "opentelekomcloud_rds_parametergroup_v3" "pg" {
}
datastore {
type = "postgresql"
version = "12"
version = "15"
}
}
Expand All @@ -670,7 +647,7 @@ resource "opentelekomcloud_rds_parametergroup_v3" "pg2" {
}
datastore {
type = "postgresql"
version = "12"
version = "15"
}
}
Expand All @@ -680,7 +657,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "12"
version = "15"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
subnet_id = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.network_id
Expand Down Expand Up @@ -708,7 +685,7 @@ resource "opentelekomcloud_rds_parametergroup_v3" "pg" {
}
datastore {
type = "postgresql"
version = "10"
version = "15"
}
}
Expand All @@ -720,7 +697,7 @@ resource "opentelekomcloud_rds_parametergroup_v3" "pg2" {
}
datastore {
type = "postgresql"
version = "12"
version = "15"
}
}
Expand All @@ -730,7 +707,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "12"
version = "15"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
subnet_id = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.network_id
Expand All @@ -757,7 +734,7 @@ resource "opentelekomcloud_rds_parametergroup_v3" "pg" {
}
datastore {
type = "postgresql"
version = "10"
version = "15"
}
}
Expand All @@ -768,7 +745,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
Expand All @@ -788,31 +765,6 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
`, common.DataSourceSecGroupDefault, common.DataSourceSubnet, postfix, env.OS_AVAILABILITY_ZONE)
}

func testAccRdsInstanceV3InvalidFlavor(postfix string) string {
return fmt.Sprintf(`
%s
%s
resource "opentelekomcloud_rds_instance_v3" "instance" {
name = "tf_rds_instance_%s"
availability_zone = ["%s"]
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
subnet_id = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.network_id
vpc_id = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.vpc_id
volume {
type = "ULTRAHIGH"
size = 40
}
flavor = "bla.bla.rds"
}
`, common.DataSourceSecGroupDefault, common.DataSourceSubnet, postfix, env.OS_AVAILABILITY_ZONE)
}

func testAccRdsInstanceV3Restored(postfix string) string {
return fmt.Sprintf(`
%s
Expand All @@ -824,7 +776,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
Expand Down Expand Up @@ -863,7 +815,7 @@ resource "opentelekomcloud_rds_instance_v3" "from_backup" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
Expand Down Expand Up @@ -1020,7 +972,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
Expand All @@ -1039,7 +991,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance_2" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
Expand Down Expand Up @@ -1071,7 +1023,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
Expand All @@ -1082,10 +1034,9 @@ resource "opentelekomcloud_rds_instance_v3" "instance" {
size = 40
}
flavor = "rds.pg.c2.large"
restore_from_backup {
source_instance_id = opentelekomcloud_rds_backup_v3.test.instance_id
backup_id = opentelekomcloud_rds_backup_v3.test.id
type = "backup"
restore_point {
instance_id = opentelekomcloud_rds_backup_v3.test.instance_id
backup_id = opentelekomcloud_rds_backup_v3.test.id
}
Expand All @@ -1097,7 +1048,7 @@ resource "opentelekomcloud_rds_instance_v3" "instance_2" {
db {
password = "Postgres!120521"
type = "PostgreSQL"
version = "10"
version = "15"
port = "8635"
}
security_group_id = data.opentelekomcloud_networking_secgroup_v2.default_secgroup.id
Expand Down
Loading

0 comments on commit e8f4078

Please sign in to comment.