Skip to content

Commit 1a5cd9b

Browse files
MeharwadeDivyasagarp337
authored andcommitted
Added - Support for BackupPolicy to the DBSystemSummary
1 parent d61a82c commit 1a5cd9b

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

examples/mysql/analytics_cluster/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
4444
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains[0].name
4545
compartment_id = var.compartment_ocid
4646
configuration_id = data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations[0].id
47-
shape_name = "VM.Standard.E2.2"
47+
shape_name = "MySQL.VM.Standard.E3.1.8GB"
4848
subnet_id = oci_core_subnet.test_subnet.id
4949
data_storage_size_in_gb = "50"
5050

@@ -75,16 +75,16 @@ resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
7575
resource "oci_mysql_analytics_cluster" "test_analytics_cluster" {
7676
db_system_id = oci_mysql_mysql_db_system.test_mysql_db_system.id
7777
cluster_size = "2"
78-
shape_name = "VM.Standard.E2.2"
78+
shape_name = "MySQL.VM.Standard.E3.1.8GB"
7979
}
8080

8181
data "oci_mysql_mysql_configurations" "test_mysql_configurations" {
8282
compartment_id = var.compartment_ocid
8383

8484
#Optional
8585
state = "ACTIVE"
86-
display_name = "VM.Standard.E2.2.Built-in"
87-
shape_name = "VM.Standard.E2.2"
86+
display_name = "MySQL.VM.Standard.E3.1.8GB.Built-in"
87+
shape_name = "MySQL.VM.Standard.E3.1.8GB"
8888
}
8989

9090
data "oci_mysql_shapes" "test_shapes" {

examples/mysql/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resource "oci_mysql_mysql_db_system" "test_mysql_backup_db_system" {
4848
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains[0].name
4949
compartment_id = var.compartment_ocid
5050
configuration_id = data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations[0].id
51-
shape_name = "VM.Standard.E2.2"
51+
shape_name = "MySQL.VM.Standard.E3.1.8GB"
5252
subnet_id = oci_core_subnet.test_subnet.id
5353

5454
#Optional
@@ -62,7 +62,7 @@ resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
6262
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains[0].name
6363
compartment_id = var.compartment_ocid
6464
configuration_id = data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations[0].id
65-
shape_name = "VM.Standard.E2.2"
65+
shape_name = "MySQL.VM.Standard.E3.1.8GB"
6666
subnet_id = oci_core_subnet.test_subnet.id
6767

6868
#Optional
@@ -110,7 +110,7 @@ data "oci_mysql_mysql_configurations" "test_mysql_configurations" {
110110

111111
#Optional
112112
state = "ACTIVE"
113-
shape_name = "VM.Standard.E2.2"
113+
shape_name = "MySQL.VM.Standard.E3.1.8GB"
114114
}
115115

116116
data "oci_mysql_shapes" "test_shapes" {

internal/integrationtest/mysql_mysql_db_system_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ func TestMysqlMysqlDbSystemResource_basic(t *testing.T) {
286286
resource.TestCheckResourceAttr(datasourceName, "db_systems.#", "1"),
287287
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.analytics_cluster.#", "1"),
288288
resource.TestCheckResourceAttrSet(datasourceName, "db_systems.0.availability_domain"),
289+
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.backup_policy.#", "1"),
290+
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.backup_policy.0.freeform_tags.%", "1"),
291+
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.backup_policy.0.is_enabled", "true"),
292+
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.backup_policy.0.retention_in_days", "11"),
293+
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.backup_policy.0.window_start_time", "02:00-00:00"),
289294
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.compartment_id", compartmentId),
290295
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.crash_recovery", "ENABLED"),
291296
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.current_placement.#", "1"),
@@ -303,6 +308,7 @@ func TestMysqlMysqlDbSystemResource_basic(t *testing.T) {
303308
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.is_analytics_cluster_attached", "true"),
304309
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.is_heat_wave_cluster_attached", "true"),
305310
resource.TestCheckResourceAttr(datasourceName, "db_systems.0.is_highly_available", "false"),
311+
resource.TestCheckResourceAttrSet(datasourceName, "db_systems.0.shape_name"),
306312
resource.TestCheckResourceAttrSet(datasourceName, "db_systems.0.state"),
307313
resource.TestCheckResourceAttrSet(datasourceName, "db_systems.0.time_created"),
308314
resource.TestCheckResourceAttrSet(datasourceName, "db_systems.0.time_updated"),

internal/service/mysql/mysql_mysql_db_systems_data_source.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@ func (s *MysqlMysqlDbSystemsDataSourceCrud) SetData() error {
165165
mysqlDbSystem["availability_domain"] = *r.AvailabilityDomain
166166
}
167167

168+
if r.BackupPolicy != nil {
169+
mysqlDbSystem["backup_policy"] = []interface{}{BackupPolicyToMap(r.BackupPolicy)}
170+
} else {
171+
mysqlDbSystem["backup_policy"] = nil
172+
}
173+
168174
mysqlDbSystem["crash_recovery"] = r.CrashRecovery
169175

170176
if r.CurrentPlacement != nil {
@@ -229,6 +235,10 @@ func (s *MysqlMysqlDbSystemsDataSourceCrud) SetData() error {
229235
mysqlDbSystem["mysql_version"] = *r.MysqlVersion
230236
}
231237

238+
if r.ShapeName != nil {
239+
mysqlDbSystem["shape_name"] = *r.ShapeName
240+
}
241+
232242
mysqlDbSystem["state"] = r.LifecycleState
233243

234244
if r.TimeCreated != nil {

0 commit comments

Comments
 (0)