Skip to content

Fix ObjectExists method to properly handle wrapped storage.ErrObjectN… #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaovilai merged 1 commit into from
Sep 18, 2025
+10 −3
Merged

Fix ObjectExists method to properly handle wrapped storage.ErrObjectN… #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelogs/unreleased/239-prasadjoshi12
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix ObjectExists method to properly handle wrapped storage.ErrObjectNotExist errors from Google Cloud Storage API.
6 changes: 3 additions & 3 deletions velero-plugin-for-gcp/object_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ import (

const (
kmsKeyNameConfigKey = "kmsKeyName"
serviceAccountConfigKey = "serviceAccount"
serviceAccountConfigKey = "serviceAccount"
credentialsFileConfigKey = "credentialsFile"
storeEndpointConfigKey = "storeEndpoint"
universeDomainKey = "universeDomain"
universeDomainKey = "universeDomain"
)

// bucketWriter wraps the GCP SDK functions for accessing object store so they can be faked for testing.
Expand Down Expand Up @@ -233,7 +233,7 @@ func (o *ObjectStore) PutObject(bucket, key string, body io.Reader) error {

func (o *ObjectStore) ObjectExists(bucket, key string) (bool, error) {
if _, err := o.bucketWriter.getAttrs(bucket, key); err != nil {
if err == storage.ErrObjectNotExist {
if errors.Is(err, storage.ErrObjectNotExist) {
return false, nil
}
return false, errors.WithStack(err)
Expand Down
6 changes: 6 additions & 0 deletions velero-plugin-for-gcp/object_store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"testing"

"cloud.google.com/go/storage"
pkgerrors "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
velerotest "github.com/vmware-tanzu/velero/pkg/test"
Expand Down Expand Up @@ -122,6 +123,11 @@ func TestObjectExists(t *testing.T) {
errorResponse: storage.ErrObjectNotExist,
expectedExists: false,
},
{
name: "doesn't exist - wrapped error",
errorResponse: pkgerrors.Wrap(storage.ErrObjectNotExist, "googleapi: Error 404: No such object"),
expectedExists: false,
},
{
name: "error checking for existence",
errorResponse: errors.New("bad"),
Expand Down