Skip to content

Commit c748bfe

Browse files
committed
refactor: replace interface{} with any and remove unnecessary comments
1 parent 3d2525a commit c748bfe

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

internal/services/rdb/instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,9 +699,9 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m any)
699699
_ = d.Set("encryption_at_rest", res.Encryption.Enabled)
700700
}
701701

702-
upgradableVersions := make([]map[string]interface{}, len(res.UpgradableVersion))
702+
upgradableVersions := make([]map[string]any, len(res.UpgradableVersion))
703703
for i, version := range res.UpgradableVersion {
704-
upgradableVersions[i] = map[string]interface{}{
704+
upgradableVersions[i] = map[string]any{
705705
"id": version.ID,
706706
"name": version.Name,
707707
"version": version.Version,

internal/services/rdb/instance_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,28 +1585,24 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
15851585
isInstancePresent(tt, "scaleway_rdb_instance.main"),
15861586
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "engine", oldVersion),
15871587
resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "upgradable_versions.#"),
1588-
// Capture old instance ID and verify upgradable_versions fields
15891588
func(s *terraform.State) error {
15901589
rs, ok := s.RootModule().Resources["scaleway_rdb_instance.main"]
15911590
if !ok {
15921591
return errors.New("resource not found: scaleway_rdb_instance.main")
15931592
}
15941593

1595-
// Capture the old instance ID
15961594
_, _, ID, err := rdb.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
15971595
if err != nil {
15981596
return err
15991597
}
16001598

16011599
oldInstanceID = ID
16021600

1603-
// Verify upgradable_versions is populated
16041601
upgradableVersionsCount := rs.Primary.Attributes["upgradable_versions.#"]
16051602
if upgradableVersionsCount == "" || upgradableVersionsCount == "0" {
16061603
return fmt.Errorf("expected at least one upgradable version, got %s", upgradableVersionsCount)
16071604
}
16081605

1609-
// Check that each version has the required fields
16101606
for i := 0; ; i++ {
16111607
idKey := fmt.Sprintf("upgradable_versions.%d.id", i)
16121608
if _, ok := rs.Primary.Attributes[idKey]; !ok {
@@ -1672,9 +1668,7 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
16721668
isInstancePresent(tt, "scaleway_rdb_instance.main"),
16731669
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "engine", newVersion),
16741670
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "name", "test-rdb-engine-upgrade"),
1675-
// Verify endpoints are preserved
16761671
resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "load_balancer.0.ip"),
1677-
// Verify instance ID changed and old instance is destroyed
16781672
func(s *terraform.State) error {
16791673
rs, ok := s.RootModule().Resources["scaleway_rdb_instance.main"]
16801674
if !ok {
@@ -1686,12 +1680,10 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
16861680
return err
16871681
}
16881682

1689-
// Verify the instance ID has changed
16901683
if newInstanceID == oldInstanceID {
16911684
return fmt.Errorf("expected new instance ID after upgrade, but got same ID: %s", newInstanceID)
16921685
}
16931686

1694-
// Verify the old instance is destroyed (should return 404)
16951687
_, err = rdbAPI.GetInstance(&rdbSDK.GetInstanceRequest{
16961688
Region: region,
16971689
InstanceID: oldInstanceID,
@@ -1700,7 +1692,6 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
17001692
return fmt.Errorf("expected old instance %s to be destroyed, but it still exists", oldInstanceID)
17011693
}
17021694

1703-
// Check that the error is a 404
17041695
if !httperrors.Is404(err) {
17051696
return fmt.Errorf("expected 404 error for old instance %s, got: %w", oldInstanceID, err)
17061697
}

0 commit comments

Comments
 (0)