pkg/gcs: check errors with errors.Is

a-nogikh · a-nogikh · commit b0714e3765d1 · 2025-05-02T15:32:12.000Z
After googleapis/google-cloud-go#11519, the cloud storage library wraps the errors which we used to check directly. This has led to multiple asset upload errors.
diff --git a/pkg/gcs/gcs.go b/pkg/gcs/gcs.go
@@ -143,7 +143,7 @@ func (c *client) DeleteFile(gcsFile string) error {
 		return err
 	}
 	err = c.client.Bucket(bucket).Object(filename).Delete(c.ctx)
-	if err == storage.ErrObjectNotExist {
+	if errors.Is(err, storage.ErrObjectNotExist) {
 		return ErrFileNotFound
 	}
 	return err
@@ -155,7 +155,7 @@ func (c *client) FileExists(gcsFile string) (bool, error) {
 		return false, err
 	}
 	_, err = c.client.Bucket(bucket).Object(filename).Attrs(c.ctx)
-	if err == storage.ErrObjectNotExist {
+	if errors.Is(err, storage.ErrObjectNotExist) {
 		return false, nil
 	} else if err != nil {
 		return false, err

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func (c *client) DeleteFile(gcsFile string) error {`
`143`	`143`	`return err`
`144`	`144`	`}`
`145`	`145`	`err = c.client.Bucket(bucket).Object(filename).Delete(c.ctx)`
`146`		`- if err == storage.ErrObjectNotExist {`
	`146`	`+ if errors.Is(err, storage.ErrObjectNotExist) {`
`147`	`147`	`return ErrFileNotFound`
`148`	`148`	`}`
`149`	`149`	`return err`
`@@ -155,7 +155,7 @@ func (c *client) FileExists(gcsFile string) (bool, error) {`
`155`	`155`	`return false, err`
`156`	`156`	`}`
`157`	`157`	`_, err = c.client.Bucket(bucket).Object(filename).Attrs(c.ctx)`
`158`		`- if err == storage.ErrObjectNotExist {`
	`158`	`+ if errors.Is(err, storage.ErrObjectNotExist) {`
`159`	`159`	`return false, nil`
`160`	`160`	`} else if err != nil {`
`161`	`161`	`return false, err`