From 7b1126aed4effa2d0e31452f2c876cf6aef26f1c Mon Sep 17 00:00:00 2001 From: Miguel Martinez Trivino Date: Tue, 17 Oct 2023 17:19:57 +0200 Subject: [PATCH] fix(azure): existing file regression Signed-off-by: Miguel Martinez Trivino --- internal/blobmanager/azureblob/backend.go | 3 +-- internal/blobmanager/s3/backend.go | 5 ++--- internal/blobmanager/s3/backend_test.go | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/internal/blobmanager/azureblob/backend.go b/internal/blobmanager/azureblob/backend.go index d2f09503a..e9fe40701 100644 --- a/internal/blobmanager/azureblob/backend.go +++ b/internal/blobmanager/azureblob/backend.go @@ -84,8 +84,7 @@ func resourceName(digest string) string { // Exists check that the artifact is already present in the repository func (b *Backend) Exists(ctx context.Context, digest string) (bool, error) { _, err := b.Describe(ctx, digest) - notFoundErr := &backend.ErrNotFound{} - if err != nil && errors.As(err, ¬FoundErr) { + if err != nil && backend.IsNotFound(err) { return false, nil } diff --git a/internal/blobmanager/s3/backend.go b/internal/blobmanager/s3/backend.go index 6aabf8413..d41230963 100644 --- a/internal/blobmanager/s3/backend.go +++ b/internal/blobmanager/s3/backend.go @@ -91,8 +91,7 @@ func NewBackend(creds *Credentials, connOpts ...ConnOpt) (*Backend, error) { // Exists check that the artifact is already present in the repository func (b *Backend) Exists(ctx context.Context, digest string) (bool, error) { _, err := b.Describe(ctx, digest) - notFoundErr := &backend.ErrNotFound{} - if err != nil && errors.As(err, ¬FoundErr) { + if err != nil && backend.IsNotFound(err) { return false, nil } @@ -129,7 +128,7 @@ func (b *Backend) Describe(ctx context.Context, digest string) (*pb.CASResource, var awsErr awserr.Error if err != nil { if errors.As(err, &awsErr) && awsErr.Code() == "NotFound" { - return nil, &backend.ErrNotFound{} + return nil, backend.NewErrNotFound("artifact") } return nil, fmt.Errorf("failed to read from bucket: %w", err) diff --git a/internal/blobmanager/s3/backend_test.go b/internal/blobmanager/s3/backend_test.go index 90fdcd37b..64d6d639c 100644 --- a/internal/blobmanager/s3/backend_test.go +++ b/internal/blobmanager/s3/backend_test.go @@ -117,8 +117,7 @@ func (s *testSuite) TestDescribe() { s.T().Run("doesn't exist", func(t *testing.T) { artifact, err := s.backend.Describe(context.Background(), "aabbccddeeff") s.Error(err) - notFoundErr := &backend.ErrNotFound{} - s.ErrorAs(err, ¬FoundErr) + s.True(backend.IsNotFound(err)) s.Nil(artifact) })