Skip to content

Commit badf107

Browse files
lornakellyLorna-Kelly
andauthored
fix(Cloud Databases): Remove outdated notification (IBM-Cloud#6294)
* Revert "Add version validation (IBM-Cloud#5791)" This reverts commit f542550. * Remove notification --------- Co-authored-by: Lorna-Kelly <[email protected]>
1 parent f4bbeeb commit badf107

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

ibm/service/database/resource_ibm_database.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,11 +1762,6 @@ func resourceIBMDatabaseInstanceRead(context context.Context, d *schema.Resource
17621762
}
17631763
}
17641764

1765-
// This can be removed any time after August once all old multitenant instances are switched over to the new multitenant
1766-
if groupList.Groups[0].HostFlavor == nil && (groupList.Groups[0].CPU != nil && *groupList.Groups[0].CPU.AllocationCount == 0) {
1767-
return appendSwitchoverWarning()
1768-
}
1769-
17701765
endpoint, _ := instance.Parameters["service-endpoints"]
17711766
if endpoint == "public" || endpoint == "public-and-private" {
17721767
return publicServiceEndpointsWarning()
@@ -2859,20 +2854,6 @@ func validateMultitenantMemoryCpu(resourceDefaults *Group, group *Group, cpuEnfo
28592854
}
28602855
}
28612856

2862-
// This can be removed any time after August once all old multitenant instances are switched over to the new multitenant
2863-
func appendSwitchoverWarning() diag.Diagnostics {
2864-
var diags diag.Diagnostics
2865-
2866-
warning := diag.Diagnostic{
2867-
Severity: diag.Warning,
2868-
Summary: "Note: IBM Cloud Databases released new Hosting Models on May 1. All existing multi-tenant instances will have their resources adjusted to Shared Compute allocations during August 2024. To monitor your current resource needs, and learn about how the transition to Shared Compute will impact your instance, see our documentation https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models",
2869-
}
2870-
2871-
diags = append(diags, warning)
2872-
2873-
return diags
2874-
}
2875-
28762857
func upgradeInProgressWarning(task *clouddatabasesv5.Task) diag.Diagnostics {
28772858
var diags diag.Diagnostics
28782859

ibm/service/database/resource_ibm_database_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,6 @@ func TestValidateRBACRole(t *testing.T) {
200200
}
201201
}
202202

203-
func TestAppendSwitchoverWarning(t *testing.T) {
204-
diags := appendSwitchoverWarning()
205-
warningNote := "Note: IBM Cloud Databases released new Hosting Models on May 1. All existing multi-tenant instances will have their resources adjusted to Shared Compute allocations during August 2024. To monitor your current resource needs, and learn about how the transition to Shared Compute will impact your instance, see our documentation https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models"
206-
207-
if len(diags) != 1 {
208-
t.Fatalf("expected 1 diagnostic, got %d", len(diags))
209-
}
210-
211-
if diags[0].Severity != diag.Warning {
212-
t.Errorf("expected severity %v, got %v", diag.Warning, diags[0].Severity)
213-
}
214-
215-
if diags[0].Summary != warningNote {
216-
t.Errorf("expected summary %v, got %v", warningNote, diags[0].Summary)
217-
}
218-
}
219-
220203
func TestPublicServiceEndpointsWarning(t *testing.T) {
221204
diags := publicServiceEndpointsWarning()
222205
warningNote := "IBM recommends using private endpoints only to improve security by restricting access to your database to the IBM Cloud private network. For more information, please refer to our security best practices, https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-manage-security-compliance."

0 commit comments

Comments
 (0)