Skip to content

Commit b199ee2

Browse files
NagendraNigadeNagendraNigade
committed
Exempted - Adding Breaking Change Fix for the Database Service
1 parent c947b73 commit b199ee2

8 files changed

+10
-75
lines changed

‎CHANGELOG.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
- Support for Add Standby ACDs / Enable AuDG | ADB-C@C
99
- Support for Support for Project Indigo and Cluster Placement Groups- phase II
1010

11-
## 5.31.0 (Unreleased)
12-
13-
### Added
14-
- Support for Database Management: Platform Bar - Tagging
15-
- Support for Queue Source for OCH
16-
- Support for KMS Automatic Key Rotation
17-
- Support for Operator Access Control Enhancements
18-
- Support for Add Standby ACDs / Enable AuDG | ADB-C@C
19-
- Support for Support for Project Indigo and Cluster Placement Groups- phase II
20-
2111
## 5.30.0 (February 21, 2024)
2212

2313
### Added

‎internal/service/database/database_autonomous_database_data_source.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,18 +302,10 @@ func (s *DatabaseAutonomousDatabaseDataSourceCrud) SetData() error {
302302
s.D.Set("long_term_backup_schedule", nil)
303303
}
304304

305-
if s.Res.MaxCpuCoreCount != nil {
306-
s.D.Set("max_cpu_core_count", *s.Res.MaxCpuCoreCount)
307-
}
308-
309305
if s.Res.MemoryPerOracleComputeUnitInGBs != nil {
310306
s.D.Set("memory_per_oracle_compute_unit_in_gbs", *s.Res.MemoryPerOracleComputeUnitInGBs)
311307
}
312308

313-
if s.Res.MaxCpuCoreCount != nil {
314-
s.D.Set("max_cpu_core_count", *s.Res.MaxCpuCoreCount)
315-
}
316-
317309
if s.Res.NcharacterSet != nil {
318310
s.D.Set("ncharacter_set", *s.Res.NcharacterSet)
319311
}

‎internal/service/database/database_autonomous_database_resource.go

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,11 +1654,6 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) Update() error {
16541654
}
16551655
}
16561656

1657-
if maxCpuCoreCount, ok := s.D.GetOkExists("max_cpu_core_count"); ok && s.D.HasChange("max_cpu_core_count") {
1658-
tmp := maxCpuCoreCount.(int)
1659-
request.MaxCpuCoreCount = &tmp
1660-
}
1661-
16621657
var updateNewtworkAccessFlag = false
16631658
if _, ok := s.D.GetOkExists("nsg_ids"); ok && s.D.HasChange("nsg_ids") {
16641659
updateNewtworkAccessFlag = true
@@ -2092,18 +2087,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) SetData() error {
20922087
s.D.Set("long_term_backup_schedule", nil)
20932088
}
20942089

2095-
if s.Res.MaxCpuCoreCount != nil {
2096-
s.D.Set("max_cpu_core_count", *s.Res.MaxCpuCoreCount)
2097-
}
2098-
20992090
if s.Res.MemoryPerOracleComputeUnitInGBs != nil {
21002091
s.D.Set("memory_per_oracle_compute_unit_in_gbs", *s.Res.MemoryPerOracleComputeUnitInGBs)
21012092
}
21022093

2103-
if s.Res.MaxCpuCoreCount != nil {
2104-
s.D.Set("max_cpu_core_count", *s.Res.MaxCpuCoreCount)
2105-
}
2106-
21072094
if s.Res.NcharacterSet != nil {
21082095
s.D.Set("ncharacter_set", *s.Res.NcharacterSet)
21092096
}
@@ -2836,10 +2823,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
28362823
if licenseModel, ok := s.D.GetOkExists("license_model"); ok {
28372824
details.LicenseModel = oci_database.CreateAutonomousDatabaseBaseLicenseModelEnum(licenseModel.(string))
28382825
}
2839-
if maxCpuCoreCount, ok := s.D.GetOkExists("max_cpu_core_count"); ok {
2840-
tmp := maxCpuCoreCount.(int)
2841-
details.MaxCpuCoreCount = &tmp
2842-
}
2826+
28432827
if ncharacterSet, ok := s.D.GetOkExists("ncharacter_set"); ok {
28442828
tmp := ncharacterSet.(string)
28452829
details.NcharacterSet = &tmp
@@ -3113,10 +3097,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
31133097
if licenseModel, ok := s.D.GetOkExists("license_model"); ok {
31143098
details.LicenseModel = oci_database.CreateAutonomousDatabaseBaseLicenseModelEnum(licenseModel.(string))
31153099
}
3116-
if maxCpuCoreCount, ok := s.D.GetOkExists("max_cpu_core_count"); ok {
3117-
tmp := maxCpuCoreCount.(int)
3118-
details.MaxCpuCoreCount = &tmp
3119-
}
3100+
31203101
if ncharacterSet, ok := s.D.GetOkExists("ncharacter_set"); ok {
31213102
tmp := ncharacterSet.(string)
31223103
details.NcharacterSet = &tmp
@@ -3377,10 +3358,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
33773358
if licenseModel, ok := s.D.GetOkExists("license_model"); ok {
33783359
details.LicenseModel = oci_database.CreateAutonomousDatabaseBaseLicenseModelEnum(licenseModel.(string))
33793360
}
3380-
if maxCpuCoreCount, ok := s.D.GetOkExists("max_cpu_core_count"); ok {
3381-
tmp := maxCpuCoreCount.(int)
3382-
details.MaxCpuCoreCount = &tmp
3383-
}
3361+
33843362
if ncharacterSet, ok := s.D.GetOkExists("ncharacter_set"); ok {
33853363
tmp := ncharacterSet.(string)
33863364
details.NcharacterSet = &tmp
@@ -3887,10 +3865,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
38873865
if licenseModel, ok := s.D.GetOkExists("license_model"); ok {
38883866
details.LicenseModel = oci_database.CreateAutonomousDatabaseBaseLicenseModelEnum(licenseModel.(string))
38893867
}
3890-
if maxCpuCoreCount, ok := s.D.GetOkExists("max_cpu_core_count"); ok {
3891-
tmp := maxCpuCoreCount.(int)
3892-
details.MaxCpuCoreCount = &tmp
3893-
}
3868+
38943869
if ncharacterSet, ok := s.D.GetOkExists("ncharacter_set"); ok {
38953870
tmp := ncharacterSet.(string)
38963871
details.NcharacterSet = &tmp
@@ -4143,10 +4118,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
41434118
if licenseModel, ok := s.D.GetOkExists("license_model"); ok {
41444119
details.LicenseModel = oci_database.CreateAutonomousDatabaseBaseLicenseModelEnum(licenseModel.(string))
41454120
}
4146-
if maxCpuCoreCount, ok := s.D.GetOkExists("max_cpu_core_count"); ok {
4147-
tmp := maxCpuCoreCount.(int)
4148-
details.MaxCpuCoreCount = &tmp
4149-
}
4121+
41504122
if ncharacterSet, ok := s.D.GetOkExists("ncharacter_set"); ok {
41514123
tmp := ncharacterSet.(string)
41524124
details.NcharacterSet = &tmp
@@ -4402,10 +4374,7 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
44024374
if licenseModel, ok := s.D.GetOkExists("license_model"); ok {
44034375
details.LicenseModel = oci_database.CreateAutonomousDatabaseBaseLicenseModelEnum(licenseModel.(string))
44044376
}
4405-
if maxCpuCoreCount, ok := s.D.GetOkExists("max_cpu_core_count"); ok {
4406-
tmp := maxCpuCoreCount.(int)
4407-
details.MaxCpuCoreCount = &tmp
4408-
}
4377+
44094378
if ncharacterSet, ok := s.D.GetOkExists("ncharacter_set"); ok {
44104379
tmp := ncharacterSet.(string)
44114380
details.NcharacterSet = &tmp

‎internal/service/database/database_autonomous_databases_clones_data_source.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,18 +1192,10 @@ func (s *DatabaseAutonomousDatabasesClonesDataSourceCrud) SetData() error {
11921192
autonomousDatabasesClone["long_term_backup_schedule"] = nil
11931193
}
11941194

1195-
if r.MaxCpuCoreCount != nil {
1196-
autonomousDatabasesClone["max_cpu_core_count"] = *r.MaxCpuCoreCount
1197-
}
1198-
11991195
if r.MemoryPerOracleComputeUnitInGBs != nil {
12001196
autonomousDatabasesClone["memory_per_oracle_compute_unit_in_gbs"] = *r.MemoryPerOracleComputeUnitInGBs
12011197
}
12021198

1203-
if r.MaxCpuCoreCount != nil {
1204-
autonomousDatabasesClone["max_cpu_core_count"] = *r.MaxCpuCoreCount
1205-
}
1206-
12071199
if r.NcharacterSet != nil {
12081200
autonomousDatabasesClone["ncharacter_set"] = *r.NcharacterSet
12091201
}

‎internal/service/database/database_autonomous_databases_data_source.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -416,18 +416,10 @@ func (s *DatabaseAutonomousDatabasesDataSourceCrud) SetData() error {
416416
autonomousDatabase["long_term_backup_schedule"] = nil
417417
}
418418

419-
if r.MaxCpuCoreCount != nil {
420-
autonomousDatabase["max_cpu_core_count"] = *r.MaxCpuCoreCount
421-
}
422-
423419
if r.MemoryPerOracleComputeUnitInGBs != nil {
424420
autonomousDatabase["memory_per_oracle_compute_unit_in_gbs"] = *r.MemoryPerOracleComputeUnitInGBs
425421
}
426422

427-
if r.MaxCpuCoreCount != nil {
428-
autonomousDatabase["max_cpu_core_count"] = *r.MaxCpuCoreCount
429-
}
430-
431423
if r.NcharacterSet != nil {
432424
autonomousDatabase["ncharacter_set"] = *r.NcharacterSet
433425
}

‎internal/service/database/database_external_database_connector_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (s *DatabaseExternalDatabaseConnectorDataSourceCrud) DatabaseConnectionCred
152152
if username, ok := s.D.GetOkExists("connection_credentials.0.username"); ok && username != nil {
153153
result["username"] = username.(string)
154154
}
155-
case oci_database.DatabaseConnectionCredentailsByName:
155+
case oci_database.DatabaseConnectionCredentialsByName:
156156
result["credential_type"] = "NAME_REFERENCE"
157157

158158
if v.CredentialName != nil {

‎internal/service/database/database_external_database_connector_resource.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ func (s *DatabaseExternalDatabaseConnectorResourceCrud) mapToDatabaseConnectionC
451451
}
452452
baseObject = details
453453
case strings.ToLower("NAME_REFERENCE"):
454-
details := oci_database.DatabaseConnectionCredentailsByName{}
454+
details := oci_database.DatabaseConnectionCredentialsByName{}
455455
if credentialName, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "credential_name")); ok {
456456
tmp := credentialName.(string)
457457
details.CredentialName = &tmp
@@ -504,7 +504,7 @@ func (s *DatabaseExternalDatabaseConnectorResourceCrud) DatabaseConnectionCreden
504504
if username, ok := s.D.GetOkExists("connection_credentials.0.username"); ok && username != nil {
505505
result["username"] = username.(string)
506506
}
507-
case oci_database.DatabaseConnectionCredentailsByName:
507+
case oci_database.DatabaseConnectionCredentialsByName:
508508
result["credential_type"] = "NAME_REFERENCE"
509509

510510
if v.CredentialName != nil {

‎internal/service/database/database_external_database_connectors_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func (s *DatabaseExternalDatabaseConnectorsDataSourceCrud) DatabaseConnectionCre
214214
if username, ok := s.D.GetOkExists("connection_credentials.0.username"); ok && username != nil {
215215
result["username"] = username.(string)
216216
}
217-
case oci_database.DatabaseConnectionCredentailsByName:
217+
case oci_database.DatabaseConnectionCredentialsByName:
218218
result["credential_type"] = "NAME_REFERENCE"
219219

220220
if v.CredentialName != nil {

0 commit comments

Comments
 (0)