chore(ci): fix port update timeout test so that it can pass (#979)

The update timeout test for the metal_port resource was incapable of
passing as written, because it did not make any changes to the port
resource that would require an update.

This fixes the test in question by:

1. Changing the VLAN attached to the port so that an API update is
needed
2. Shortening the update timeout so that it is less likely the API will
finish the update before the timeout is reached

Author: ctreatma

go.mod

@@ -21,7 +21,6 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
 	github.com/hashicorp/terraform-plugin-testing v1.13.3
 	github.com/packethost/packngo v0.31.0
-	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/oauth2 v0.26.0
 )

go.sum

@@ -188,8 +188,6 @@ github.com/packethost/packngo v0.31.0 h1:LLH90ardhULWbagBIc3I3nl2uU75io0a7AwY6hy
 github.com/packethost/packngo v0.31.0/go.mod h1:Io6VJqzkiqmIEQbpOjeIw9v8q9PfcTEq8TEY/tMQsfw=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
 github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=

internal/resources/metal/port/resource_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 var (
-	matchErrPortReadyTimeout = regexp.MustCompile(".* timeout while waiting for state to become 'completed'.*")
+	matchErrPortReadyTimeout = regexp.MustCompile(".*(timeout while waiting for state|context deadline exceeded).*")
 )
 
 func confAccMetalPort_base(name string) string {
@@ -205,7 +205,7 @@ resource "equinix_metal_vlan" "test2" {
 `, confAccMetalPort_base(name))
 }
 
-func confAccMetalPort_HybridBonded_timeout(rInt int, name, createTimeout, updateTimeout string) string {
+func confAccMetalPort_HybridBonded_timeout(rInt int, name, attachedVlanResource, createTimeout, updateTimeout string) string {
 	if createTimeout == "" {
 		createTimeout = "20m"
 	}
@@ -221,20 +221,29 @@ resource "equinix_metal_port" "bond0" {
   layer2   = false
   bonded   = true
   reset_on_delete = true
-  vlan_ids = [equinix_metal_vlan.test.id]
+  vlan_ids = [%s.id]
   timeouts {
     create = "%s"
 	update = "%s"
   }
-  depends_on = [equinix_metal_vlan.test]
+  depends_on = [
+    equinix_metal_vlan.test,
+    equinix_metal_vlan.test2,
+]
 }
 
 resource "equinix_metal_vlan" "test" {
   description = "tfacc-vlan test-%d"
   metro       = equinix_metal_device.test.metro
   project_id  = equinix_metal_project.test.id
 }
-`, confAccMetalPort_base(name), createTimeout, updateTimeout, rInt)
+
+resource "equinix_metal_vlan" "test2" {
+  description = "tfacc-vlan test2-%d"
+  metro       = equinix_metal_device.test.metro
+  project_id  = equinix_metal_project.test.id
+}
+`, confAccMetalPort_base(name), attachedVlanResource, createTimeout, updateTimeout, rInt, rInt)
 }
 
 func TestAccMetalPort_hybridBondedVxlan(t *testing.T) {
@@ -432,7 +441,7 @@ func TestAccMetalPortCreate_hybridBonded_timeout(t *testing.T) {
 		CheckDestroy:             testAccMetalPortDestroyed,
 		Steps: []resource.TestStep{
 			{
-				Config:      confAccMetalPort_HybridBonded_timeout(rInt, rs, "5s", ""),
+				Config:      confAccMetalPort_HybridBonded_timeout(rInt, rs, "equinix_metal_vlan.test", "5s", ""),
 				ExpectError: matchErrPortReadyTimeout,
 			},
 			{
@@ -452,10 +461,10 @@ func TestAccMetalPortCreate_hybridBonded_timeout(t *testing.T) {
 				),
 			},
 			{
-				Config: confAccMetalPort_HybridBonded_timeout(rInt, rs, "5s", ""),
+				Config: confAccMetalPort_HybridBonded_timeout(rInt, rs, "equinix_metal_vlan.test", "5s", ""),
 			},
 			{
-				Config:  confAccMetalPort_HybridBonded_timeout(rInt, rs, "5s", ""),
+				Config:  confAccMetalPort_HybridBonded_timeout(rInt, rs, "equinix_metal_vlan.test", "5s", ""),
 				Destroy: true,
 			},
 		},
@@ -473,7 +482,7 @@ func TestAccMetalPortUpdate_hybridBonded_timeout(t *testing.T) {
 		CheckDestroy:             testAccMetalPortDestroyed,
 		Steps: []resource.TestStep{
 			{
-				Config: confAccMetalPort_HybridBonded_timeout(rInt, rs, "", "5s"),
+				Config: confAccMetalPort_HybridBonded_timeout(rInt, rs, "equinix_metal_vlan.test", "", "1s"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("equinix_metal_port.bond0", "name", "bond0"),
 					resource.TestCheckResourceAttr("equinix_metal_port.bond0", "type", "NetworkBondPort"),
@@ -484,7 +493,7 @@ func TestAccMetalPortUpdate_hybridBonded_timeout(t *testing.T) {
 				),
 			},
 			{
-				Config:      confAccMetalPort_HybridBonded_timeout(rInt+1, rs, "", "5s"),
+				Config:      confAccMetalPort_HybridBonded_timeout(rInt, rs, "equinix_metal_vlan.test2", "", "1s"),
 				ExpectError: matchErrPortReadyTimeout,
 			},
 			{
@@ -495,10 +504,7 @@ func TestAccMetalPortUpdate_hybridBonded_timeout(t *testing.T) {
 				),
 			},
 			{
-				Config: confAccMetalPort_HybridBonded_timeout(rInt+1, rs, "", ""),
-			},
-			{
-				Config:  confAccMetalPort_HybridBonded_timeout(rInt+1, rs, "", ""),
+				Config:  confAccMetalPort_HybridBonded_timeout(rInt, rs, "equinix_metal_vlan.test2", "", ""),
 				Destroy: true,
 			},
 		},