From d33e17967c157bf8c2b503ecdb101642f9e33315 Mon Sep 17 00:00:00 2001 From: Zhongpeng Lin Date: Wed, 23 Jun 2021 13:26:29 +0800 Subject: [PATCH 1/2] Using directory as prefix for S3 --- pkg/storage/s3/checker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/storage/s3/checker.go b/pkg/storage/s3/checker.go index 684cc23f1..a0e910a51 100644 --- a/pkg/storage/s3/checker.go +++ b/pkg/storage/s3/checker.go @@ -2,6 +2,7 @@ package s3 import ( "context" + "path" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" @@ -23,7 +24,7 @@ func (s *Storage) Exists(ctx context.Context, module, version string) (bool, err lsParams := &s3.ListObjectsInput{ Bucket: aws.String(s.bucket), - Prefix: aws.String(config.PackageVersionedName(module, version, "")), + Prefix: aws.String(path.Dir(config.PackageVersionedName(module, version, ""))), } loo, err := s.s3API.ListObjectsWithContext(ctx, lsParams) From 2178e73d67a07a5e1d81004a37fd91cc9486e0aa Mon Sep 17 00:00:00 2001 From: Zhongpeng Lin Date: Wed, 18 Aug 2021 16:41:13 -0700 Subject: [PATCH 2/2] address comments --- pkg/storage/s3/checker.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/storage/s3/checker.go b/pkg/storage/s3/checker.go index a0e910a51..c271259db 100644 --- a/pkg/storage/s3/checker.go +++ b/pkg/storage/s3/checker.go @@ -2,7 +2,7 @@ package s3 import ( "context" - "path" + "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" @@ -24,7 +24,7 @@ func (s *Storage) Exists(ctx context.Context, module, version string) (bool, err lsParams := &s3.ListObjectsInput{ Bucket: aws.String(s.bucket), - Prefix: aws.String(path.Dir(config.PackageVersionedName(module, version, ""))), + Prefix: aws.String(fmt.Sprintf("%s/@v", module)), } loo, err := s.s3API.ListObjectsWithContext(ctx, lsParams)