purge remaining mentions of removed attributes in tests

Author: Mia-Cross

internal/services/instance/server_test.go

@@ -783,9 +783,6 @@ func TestAccServer_Ipv6(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_instance_server.server01"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.server01", "ipv6_address", ""),
-					resource.TestCheckResourceAttr("scaleway_instance_server.server01", "ipv6_gateway", ""),
-					resource.TestCheckResourceAttr("scaleway_instance_server.server01", "ipv6_prefix_length", "0"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.server01", "public_ips.#", "0"),
 				),
 			},
@@ -845,7 +842,7 @@ func TestAccServer_WithReservedIP(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_instance_server.base"),
-					resource.TestCheckResourceAttrPair("scaleway_instance_ip.first", "address", "scaleway_instance_server.base", "public_ip"), // public_ip is deprecated
+					resource.TestCheckResourceAttrPair("scaleway_instance_ip.first", "address", "scaleway_instance_server.base", "public_ips.0.address"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_ip.first", "id", "scaleway_instance_server.base", "ip_id"),
 				),
 			},
@@ -863,7 +860,7 @@ func TestAccServer_WithReservedIP(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_instance_server.base"),
 					isIPAttachedToServer(tt, "scaleway_instance_ip.second", "scaleway_instance_server.base"),
-					resource.TestCheckResourceAttrPair("scaleway_instance_ip.second", "address", "scaleway_instance_server.base", "public_ip"),
+					resource.TestCheckResourceAttrPair("scaleway_instance_ip.second", "address", "scaleway_instance_server.base", "public_ips.0.address"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_ip.second", "id", "scaleway_instance_server.base", "ip_id"),
 				),
 			},
@@ -880,7 +877,7 @@ func TestAccServer_WithReservedIP(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_instance_server.base"),
 					serverHasNoIPAssigned(tt, "scaleway_instance_server.base"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "public_ip", ""),
+					resource.TestCheckResourceAttr("scaleway_instance_server.base", "public_ips.#", "0"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.base", "ip_id", ""),
 				),
 			},
@@ -898,7 +895,7 @@ func TestAccServer_WithReservedIP(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_instance_server.base"),
 					serverHasNoIPAssigned(tt, "scaleway_instance_server.base"),
-					acctest.CheckResourceAttrIPv4("scaleway_instance_server.base", "public_ip"),
+					acctest.CheckResourceAttrIPv4("scaleway_instance_server.base", "public_ips.0.address"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.base", "ip_id", ""),
 				),
 			},
@@ -980,7 +977,7 @@ func serverHasNewVolume(_ *acctest.TestTools, n string) resource.TestCheckFunc {
 
 		rootVolumeName, ok := rs.Primary.Attributes["root_volume.0.name"]
 		if !ok {
-			return errors.New("instanceSDK root_volume has no name")
+			return errors.New("instance root_volume has no name")
 		}
 
 		if strings.HasPrefix(rootVolumeName, "tf") {
@@ -1651,7 +1648,6 @@ func TestAccServer_IPRemoved(t *testing.T) {
 					arePrivateNICsPresent(tt, "scaleway_instance_server.main"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "public_ips.#", "1"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.0.id", "scaleway_instance_ip.main", "id"),
-					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "public_ips.0.address", "scaleway_instance_server.main", "public_ip"),
 				),
 			},
 			{