From b72a768a05fe14b5896e594cd230e31af9d0e9cc Mon Sep 17 00:00:00 2001 From: Zhongpeng Lin Date: Sun, 12 Mar 2023 22:04:12 -0700 Subject: [PATCH] use errors.AsErr (#1849) Co-authored-by: Manu Gupta --- pkg/storage/s3/checker.go | 3 +-- pkg/storage/s3/getter.go | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/storage/s3/checker.go b/pkg/storage/s3/checker.go index e98c7678..b5d039c1 100644 --- a/pkg/storage/s3/checker.go +++ b/pkg/storage/s3/checker.go @@ -2,7 +2,6 @@ package s3 import ( "context" - errs "errors" "sync" "github.com/aws/aws-sdk-go/aws" @@ -46,7 +45,7 @@ func (s *Storage) Exists(ctx context.Context, module, version string) (bool, err continue } var aerr awserr.Error - if errs.As(err, &aerr) && aerr.Code() == "NotFound" { + if errors.AsErr(err, &aerr) && aerr.Code() == "NotFound" { err = nil exists = false } diff --git a/pkg/storage/s3/getter.go b/pkg/storage/s3/getter.go index 8bc04fe8..f3c748dc 100644 --- a/pkg/storage/s3/getter.go +++ b/pkg/storage/s3/getter.go @@ -2,7 +2,6 @@ package s3 import ( "context" - errs "errors" "fmt" "io" @@ -24,7 +23,7 @@ func (s *Storage) Info(ctx context.Context, module, version string) ([]byte, err infoReader, err := s.open(ctx, config.PackageVersionedName(module, version, "info")) if err != nil { var aerr awserr.Error - if errs.As(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { + if errors.AsErr(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { return nil, errors.E(op, errors.M(module), errors.V(version), errors.KindNotFound) } return nil, errors.E(op, err, errors.M(module), errors.V(version)) @@ -47,7 +46,7 @@ func (s *Storage) GoMod(ctx context.Context, module, version string) ([]byte, er modReader, err := s.open(ctx, config.PackageVersionedName(module, version, "mod")) if err != nil { var aerr awserr.Error - if errs.As(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { + if errors.AsErr(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { return nil, errors.E(op, errors.M(module), errors.V(version), errors.KindNotFound) } return nil, errors.E(op, err, errors.M(module), errors.V(version)) @@ -71,7 +70,7 @@ func (s *Storage) Zip(ctx context.Context, module, version string) (storage.Size zipReader, err := s.open(ctx, config.PackageVersionedName(module, version, "zip")) if err != nil { var aerr awserr.Error - if errs.As(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { + if errors.AsErr(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { return nil, errors.E(op, errors.M(module), errors.V(version), errors.KindNotFound) } return nil, errors.E(op, err, errors.M(module), errors.V(version)) @@ -92,7 +91,7 @@ func (s *Storage) open(ctx context.Context, path string) (storage.SizeReadCloser goo, err := s.s3API.GetObjectWithContext(ctx, getParams) if err != nil { var aerr awserr.Error - if errs.As(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { + if errors.AsErr(err, &aerr) && aerr.Code() == s3.ErrCodeNoSuchKey { return nil, errors.E(op, errors.KindNotFound) } return nil, errors.E(op, err)