Skip to content

Commit ae8aad6

Browse files
Abhishek Gunesagarp337
Abhishek Gune
authored and
sagarp337
committed
Bug Fix - Adding checks for ocpu_count and storage_size_in_gbs
1 parent f974545 commit ae8aad6

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

‎examples/database/atp-d/exadata.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ resource "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cl
8181
lifecycle {
8282
ignore_changes = [
8383
autonomous_data_storage_size_in_tbs,
84+
db_servers,
8485
]
8586
}
8687
}

‎examples/database/atp-d/main.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
1515
display_name = "example-container-database"
1616
patch_model = "RELEASE_UPDATES"
1717
db_version = "19.18.0.1.0"
18-
db_name = "acdname"
18+
db_name = "ACDNAME"
1919

2020
#Optional
2121
backup_config {
@@ -56,7 +56,6 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
5656
}
5757
rotate_key_trigger = "true"
5858
version_preference = "LATEST_RELEASE_UPDATE"
59-
db_version = "19.18.0.1.0"
6059
}
6160

6261
variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {

‎internal/integrationtest/database_autonomous_database_resource_test.go‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ var (
235235
"compute_model": acctest.Representation{RepType: acctest.Required, Create: `ECPU`},
236236
}
237237

238+
ATPDAutonomousContainerDatabaseResourceDependenciesDbaas = DatabaseCloudAutonomousVmClusterRequiredOnlyResource + KeyResourceDependencyConfigDbaas
239+
238240
autonomousDatabaseExaccRequiredOnlyResource = ExaccADBDatabaseResourceDependencies +
239241
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Required, acctest.Create, autonomousDatabaseExaccRepresentation)
240242

@@ -280,7 +282,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
280282
DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsRepresentation), []string{"lead_time_in_weeks"})
281283

282284
AutonomousContainerDatabaseDedicatedRepresentation := acctest.GetUpdatedRepresentationCopy("maintenance_window_details", acctest.RepresentationGroup{RepType: acctest.Optional, Group: AutonomousContainerDatabaseDedicatedMaintenanceWindowDetailsRepresentation}, DatabaseAutonomousContainerDatabaseRepresentation)
283-
AutonomousContainerDatabaseDedicatedResourceConfig := ATPDAutonomousContainerDatabaseResourceDependencies +
285+
AutonomousContainerDatabaseDedicatedResourceConfig := ATPDAutonomousContainerDatabaseResourceDependenciesDbaas +
284286
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_container_database", "test_autonomous_container_database", acctest.Optional, acctest.Update, AutonomousContainerDatabaseDedicatedRepresentation)
285287
AutonomousDatabaseDedicatedResourceDependencies := AutonomousContainerDatabaseDedicatedResourceConfig
286288
AutonomousDatabaseDedicatedResourceConfig := AutonomousDatabaseDedicatedResourceDependencies +
@@ -300,7 +302,6 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
300302
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
301303
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_id"),
302304
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
303-
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "0"),
304305
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
305306
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedName),
306307
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
@@ -331,7 +332,6 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
331332
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
332333
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_id"),
333334
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
334-
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "1"),
335335
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
336336
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedName),
337337
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
@@ -362,7 +362,6 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
362362
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
363363
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_id"),
364364
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
365-
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "0"),
366365
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
367366
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedName),
368367
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
@@ -393,7 +392,6 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
393392
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
394393
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_id"),
395394
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
396-
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "0"),
397395
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
398396
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedName),
399397
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
@@ -432,7 +430,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
432430
// resource.TestCheckResourceAttrSet(resourceName, "state"),
433431
// ),
434432
// },
435-
// verify datasource
433+
// verify datasource , fractional ocpu and gb storage
436434
{
437435
Config: config +
438436
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_databases", "test_autonomous_databases", acctest.Optional, acctest.Update, autonomousDatabaseDedicatedDataSourceRepresentation) +
@@ -450,7 +448,6 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
450448
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.compartment_id", compartmentId),
451449
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.connection_strings.#", "1"),
452450
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.connection_urls.#", "1"),
453-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.cpu_core_count", "0"),
454451
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.data_storage_size_in_tbs", "1"),
455452
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.db_name", adbDedicatedName),
456453
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.db_version"),
@@ -459,7 +456,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
459456
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.freeform_tags.%", "1"),
460457
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.id"),
461458
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.is_dedicated", "true"),
462-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.provisionable_cpus.#", "103"),
459+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.provisionable_cpus.#"),
463460
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.state"),
464461
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.time_created"),
465462
),
@@ -476,7 +473,6 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
476473
resource.TestCheckResourceAttr(singularDatasourceName, "connection_strings.#", "1"),
477474
resource.TestCheckResourceAttr(singularDatasourceName, "connection_strings.0.all_connection_strings.%", "3"),
478475
resource.TestCheckResourceAttr(singularDatasourceName, "connection_urls.#", "1"),
479-
resource.TestCheckResourceAttr(singularDatasourceName, "cpu_core_count", "0"),
480476
resource.TestCheckResourceAttr(singularDatasourceName, "data_storage_size_in_tbs", "1"),
481477
resource.TestCheckResourceAttr(singularDatasourceName, "db_name", adbDedicatedName),
482478
resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
@@ -526,7 +522,6 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
526522
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
527523
resource.TestCheckResourceAttr(resourceName, "clone_type", "FULL"),
528524
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
529-
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "0"),
530525
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
531526
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedCloneName),
532527
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
@@ -1877,6 +1872,12 @@ func TestResourceDatabaseAutonomousDatabaseResource_dataGuard(t *testing.T) {
18771872

18781873
// issue-routing-tag: database/ExaCC
18791874
func TestResourceDatabaseExaccAutonomousDatabaseResource_dataGuard(t *testing.T) {
1875+
shouldSkipEXACCtest := utils.GetEnvSettingWithDefault("TF_VAR_should_skip_exacc_test", "false")
1876+
1877+
if shouldSkipEXACCtest == "true" {
1878+
t.Skip("Skipping TestResourceDatabaseExaccAutonomousDatabaseResource_dataGuard test.\n" + "Current TF_VAR_should_skip_exacc_test=" + shouldSkipEXACCtest)
1879+
}
1880+
18801881
httpreplay.SetScenario("TestResourceDatabaseExaccAutonomousDatabaseResource_dataGuard")
18811882
defer httpreplay.SaveScenario()
18821883

@@ -1960,6 +1961,12 @@ func TestResourceDatabaseExaccAutonomousDatabaseResource_dataGuard(t *testing.T)
19601961

19611962
// issue-routing-tag: database/ExaCC
19621963
func TestResourceDatabaseExaccAutonomousDatabaseResource(t *testing.T) {
1964+
shouldSkipEXACCtest := utils.GetEnvSettingWithDefault("TF_VAR_should_skip_exacc_test", "false")
1965+
1966+
if shouldSkipEXACCtest == "true" {
1967+
t.Skip("Skipping TestResourceDatabaseExaccAutonomousDatabaseResource_dataGuard test.\n" + "Current TF_VAR_should_skip_exacc_test=" + shouldSkipEXACCtest)
1968+
}
1969+
19631970
httpreplay.SetScenario("TestResourceDatabaseExaccAutonomousDatabaseResource")
19641971
defer httpreplay.SaveScenario()
19651972

‎internal/service/database/database_autonomous_database_resource.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) Update() error {
14971497
}
14981498
}
14991499

1500-
if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok {
1500+
if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok && s.D.HasChange("ocpu_count") {
15011501
tmp := float32(ocpuCount.(float64))
15021502
request.OcpuCount = &tmp
15031503
}
@@ -2341,7 +2341,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
23412341
details.CustomerContacts = tmp
23422342
}
23432343
}
2344-
if dataStorageSizeInGB, ok := s.D.GetOkExists("data_storage_size_in_gb"); ok {
2344+
if dataStorageSizeInGB, ok := s.D.GetOkExists("data_storage_size_in_gb"); ok && s.D.HasChange("data_storage_size_in_gb") {
23452345
tmp := dataStorageSizeInGB.(int)
23462346
details.DataStorageSizeInGBs = &tmp
23472347
}

0 commit comments

Comments
 (0)