Comparison with errors using equality operators fails on wrapped erro…

…rs (#581) Co-authored-by: Sahib Yar <[email protected]> Co-authored-by: Kevin P. Fleming <[email protected]>
fastly · Jan 24, 2025 · dadeeb5 · dadeeb5
1 parent 9c3560d
commit dadeeb5
Show file tree

Hide file tree

Showing 79 changed files with 899 additions and 818 deletions.
diff --git a/fastly/account_event_test.go b/fastly/account_event_test.go
@@ -2,6 +2,7 @@ package fastly
 
 import (
 	"bytes"
+	"errors"
 	"io"
 	"testing"
 )
@@ -43,7 +44,7 @@ func TestClient_GetAPIEvent_validation(t *testing.T) {
 	_, err = TestClient.GetAPIEvent(&GetAPIEventInput{
 		EventID: "",
 	})
-	if err != ErrMissingEventID {
+	if !errors.Is(err, ErrMissingEventID) {
 		t.Errorf("bad error: %s", err)
 	}
 }

diff --git a/fastly/acl_entry_test.go b/fastly/acl_entry_test.go
@@ -1,6 +1,7 @@
 package fastly
 
 import (
+	"errors"
 	"testing"
 )
 
@@ -171,14 +172,14 @@ func TestClient_ListACLEntries_validation(t *testing.T) {
 	var err error
 
 	_, err = TestClient.ListACLEntries(&ListACLEntriesInput{})
-	if err != ErrMissingACLID {
+	if !errors.Is(err, ErrMissingACLID) {
 		t.Errorf("bad ACL ID: %s", err)
 	}
 
 	_, err = TestClient.ListACLEntries(&ListACLEntriesInput{
 		ACLID: "123",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad Service ID: %s", err)
 	}
 }
@@ -187,14 +188,14 @@ func TestClient_CreateACLEntry_validation(t *testing.T) {
 	var err error
 
 	_, err = TestClient.CreateACLEntry(&CreateACLEntryInput{})
-	if err != ErrMissingACLID {
+	if !errors.Is(err, ErrMissingACLID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.CreateACLEntry(&CreateACLEntryInput{
 		ACLID: "123",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -203,22 +204,22 @@ func TestClient_GetACLEntry_validation(t *testing.T) {
 	var err error
 
 	_, err = TestClient.GetACLEntry(&GetACLEntryInput{})
-	if err != ErrMissingACLID {
+	if !errors.Is(err, ErrMissingACLID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.GetACLEntry(&GetACLEntryInput{
 		ACLID: "123",
 	})
-	if err != ErrMissingID {
+	if !errors.Is(err, ErrMissingID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.GetACLEntry(&GetACLEntryInput{
 		ACLID:   "123",
 		EntryID: "456",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -227,22 +228,22 @@ func TestClient_UpdateACLEntry_validation(t *testing.T) {
 	var err error
 
 	_, err = TestClient.UpdateACLEntry(&UpdateACLEntryInput{})
-	if err != ErrMissingACLID {
+	if !errors.Is(err, ErrMissingACLID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.UpdateACLEntry(&UpdateACLEntryInput{
 		ACLID: "123",
 	})
-	if err != ErrMissingID {
+	if !errors.Is(err, ErrMissingID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.UpdateACLEntry(&UpdateACLEntryInput{
 		ACLID:   "123",
 		EntryID: "456",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -251,22 +252,22 @@ func TestClient_DeleteACLEntry_validation(t *testing.T) {
 	var err error
 
 	err = TestClient.DeleteACLEntry(&DeleteACLEntryInput{})
-	if err != ErrMissingACLID {
+	if !errors.Is(err, ErrMissingACLID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	err = TestClient.DeleteACLEntry(&DeleteACLEntryInput{
 		ACLID: "123",
 	})
-	if err != ErrMissingEntryID {
+	if !errors.Is(err, ErrMissingEntryID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	err = TestClient.DeleteACLEntry(&DeleteACLEntryInput{
 		ACLID:   "123",
 		EntryID: "456",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -275,14 +276,14 @@ func TestClient_BatchModifyACLEntries_validation(t *testing.T) {
 	var err error
 
 	err = TestClient.BatchModifyACLEntries(&BatchModifyACLEntriesInput{})
-	if err != ErrMissingACLID {
+	if !errors.Is(err, ErrMissingACLID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	err = TestClient.BatchModifyACLEntries(&BatchModifyACLEntriesInput{
 		ACLID: "123",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 
@@ -292,7 +293,7 @@ func TestClient_BatchModifyACLEntries_validation(t *testing.T) {
 		ServiceID: "456",
 		Entries:   oversizedACLEntries,
 	})
-	if err != ErrMaxExceededEntries {
+	if !errors.Is(err, ErrMaxExceededEntries) {
 		t.Errorf("bad error: %s", err)
 	}
 }
diff --git a/fastly/acl_test.go b/fastly/acl_test.go
@@ -1,6 +1,7 @@
 package fastly
 
 import (
+	"errors"
 	"testing"
 )
 
@@ -128,15 +129,15 @@ func TestClient_ListACLs_validation(t *testing.T) {
 	_, err = TestClient.ListACLs(&ListACLsInput{
 		ServiceID: "",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.ListACLs(&ListACLsInput{
 		ServiceID:      "foo",
 		ServiceVersion: 0,
 	})
-	if err != ErrMissingServiceVersion {
+	if !errors.Is(err, ErrMissingServiceVersion) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -146,15 +147,15 @@ func TestClient_CreateACL_validation(t *testing.T) {
 	_, err = TestClient.CreateACL(&CreateACLInput{
 		ServiceID: "",
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.CreateACL(&CreateACLInput{
 		ServiceID:      "foo",
 		ServiceVersion: 0,
 	})
-	if err != ErrMissingServiceVersion {
+	if !errors.Is(err, ErrMissingServiceVersion) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -165,23 +166,23 @@ func TestClient_GetACL_validation(t *testing.T) {
 		ServiceID:      "foo",
 		ServiceVersion: 1,
 	})
-	if err != ErrMissingName {
+	if !errors.Is(err, ErrMissingName) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.GetACL(&GetACLInput{
 		Name:           "test",
 		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.GetACL(&GetACLInput{
 		Name:      "test",
 		ServiceID: "foo",
 	})
-	if err != ErrMissingServiceVersion {
+	if !errors.Is(err, ErrMissingServiceVersion) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -193,23 +194,23 @@ func TestClient_UpdateACL_validation(t *testing.T) {
 		ServiceID:      "foo",
 		ServiceVersion: 1,
 	})
-	if err != ErrMissingName {
+	if !errors.Is(err, ErrMissingName) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.UpdateACL(&UpdateACLInput{
 		Name:           "test",
 		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = TestClient.UpdateACL(&UpdateACLInput{
 		Name:      "test",
 		ServiceID: "foo",
 	})
-	if err != ErrMissingServiceVersion {
+	if !errors.Is(err, ErrMissingServiceVersion) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -221,23 +222,23 @@ func TestClient_DeleteACL_validation(t *testing.T) {
 		ServiceID:      "foo",
 		ServiceVersion: 1,
 	})
-	if err != ErrMissingName {
+	if !errors.Is(err, ErrMissingName) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	err = TestClient.DeleteACL(&DeleteACLInput{
 		Name:           "test",
 		ServiceVersion: 0,
 	})
-	if err != ErrMissingServiceID {
+	if !errors.Is(err, ErrMissingServiceID) {
 		t.Errorf("bad error: %s", err)
 	}
 
 	err = TestClient.DeleteACL(&DeleteACLInput{
 		Name:      "test",
 		ServiceID: "foo",
 	})
-	if err != ErrMissingServiceVersion {
+	if !errors.Is(err, ErrMissingServiceVersion) {
 		t.Errorf("bad error: %s", err)
 	}
 }
diff --git a/fastly/alerts_test.go b/fastly/alerts_test.go
@@ -1,6 +1,7 @@
 package fastly
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -238,7 +239,7 @@ func TestClient_GetAlertDefinition_validation(t *testing.T) {
 	_, err = TestClient.GetAlertDefinition(&GetAlertDefinitionInput{
 		ID: nil,
 	})
-	if err != ErrMissingID {
+	if !errors.Is(err, ErrMissingID) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -248,7 +249,7 @@ func TestClient_UpdateAlertDefinition_validation(t *testing.T) {
 	_, err = TestClient.UpdateAlertDefinition(&UpdateAlertDefinitionInput{
 		ID: nil,
 	})
-	if err != ErrMissingID {
+	if !errors.Is(err, ErrMissingID) {
 		t.Errorf("bad error: %s", err)
 	}
 }
@@ -257,7 +258,7 @@ func TestClient_DeleteAlertDefinition_validation(t *testing.T) {
 	err := TestClient.DeleteAlertDefinition(&DeleteAlertDefinitionInput{
 		ID: nil,
 	})
-	if err != ErrMissingID {
+	if !errors.Is(err, ErrMissingID) {
 		t.Errorf("bad error: %s", err)
 	}
 }