Skip to content
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

chore(deps): bump the go-modules group with 2 updates #21

Merged
merged 2 commits into from
Nov 20, 2023
Merged

chore(deps): bump the go-modules group with 2 updates #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c098eeb
chore(deps): bump the go-modules group with 2 updates
dependabot[bot] Nov 20, 2023
6392802
fix unit tests
hwbrzzl Nov 20, 2023
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.20

require (
github.com/aws/aws-sdk-go-v2 v1.23.0
github.com/aws/aws-sdk-go-v2/credentials v1.16.1
github.com/aws/aws-sdk-go-v2/service/s3 v1.42.2
github.com/aws/aws-sdk-go-v2/credentials v1.16.2
github.com/aws/aws-sdk-go-v2/service/s3 v1.43.0
github.com/gabriel-vasile/mimetype v1.4.3
github.com/gookit/color v1.5.4
github.com/goravel/framework v1.13.2
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ github.com/aws/aws-sdk-go-v2 v1.23.0 h1:PiHAzmiQQr6JULBUdvR8fKlA+UPKLT/8KbiqpFBW
github.com/aws/aws-sdk-go-v2 v1.23.0/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.1 h1:ZY3108YtBNq96jNZTICHxN1gSBSbnvIdYwwqnvCV4Mc=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.1/go.mod h1:t8PYl/6LzdAqsU4/9tz28V/kU+asFePvpOMkdul0gEQ=
github.com/aws/aws-sdk-go-v2/credentials v1.16.1 h1:WessyrdgyFN5TB+eLQdrFSlN/3oMnqukIFhDxK6z8h0=
github.com/aws/aws-sdk-go-v2/credentials v1.16.1/go.mod h1:RQJyPxKcr+m4ArlIG1LUhMOrjposVfzbX6H8oR6oCgE=
github.com/aws/aws-sdk-go-v2/credentials v1.16.2 h1:0sdZ5cwfOAipTzZ7eOL0gw4LAhk/RZnTa16cDqIt8tg=
github.com/aws/aws-sdk-go-v2/credentials v1.16.2/go.mod h1:sDdvGhXrSVT5yzBDR7qXz+rhbpiMpUYfF3vJ01QSdrc=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.3 h1:DUwbD79T8gyQ23qVXFUthjzVMTviSHi3y4z58KvghhM=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.3/go.mod h1:7sGSz1JCKHWWBHq98m6sMtWQikmYPpxjqOydDemiVoM=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.3 h1:AplLJCtIaUZDCbr6+gLYdsYNxne4iuaboJhVt9d+WXI=
Expand All @@ -25,8 +25,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.3 h1:kJOolE8xB
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.3/go.mod h1:Owv1I59vaghv1Ax8zz8ELY8DN7/Y0rGS+WWAmjgi950=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.3 h1:KV0z2RDc7euMtg8aUT1czv5p29zcLlXALNFsd3jkkEc=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.3/go.mod h1:KZgs2ny8HsxRIRbDwgvJcHHBZPOzQr/+NtGwnP+w2ec=
github.com/aws/aws-sdk-go-v2/service/s3 v1.42.2 h1:NnduxUd9+Fq9DcCDdJK8v6l9lR1xDX4usvog+JuQAno=
github.com/aws/aws-sdk-go-v2/service/s3 v1.42.2/go.mod h1:NXRKkiRF+erX2hnybnVU660cYT5/KChRD4iUgJ97cI8=
github.com/aws/aws-sdk-go-v2/service/s3 v1.43.0 h1:cwTuq73Tv6jtNJIMgTDKsih5O2YsVrKGpg20H98tbmo=
github.com/aws/aws-sdk-go-v2/service/s3 v1.43.0/go.mod h1:NXRKkiRF+erX2hnybnVU660cYT5/KChRD4iUgJ97cI8=
github.com/aws/smithy-go v1.17.0 h1:wWJD7LX6PBV6etBUwO0zElG0nWN9rUhp0WdYeHSHAaI=
github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
Expand Down
22 changes: 17 additions & 5 deletions s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"io"
"os"
"path/filepath"
"strings"
"time"

Expand Down Expand Up @@ -130,7 +131,7 @@ func (r *S3) Delete(files ...string) error {
Bucket: aws.String(r.bucket),
Delete: &types.Delete{
Objects: objectIdentifiers,
Quiet: true,
Quiet: aws.Bool(true),
},
})

Expand Down Expand Up @@ -164,7 +165,7 @@ func (r *S3) DeleteDirectory(directory string) error {
}
}

if listObjectsV2Response.IsTruncated {
if *listObjectsV2Response.IsTruncated {
listObjectsV2Response, err = r.instance.ListObjectsV2(r.ctx, &s3.ListObjectsV2Input{
Bucket: aws.String(r.bucket),
ContinuationToken: listObjectsV2Response.ContinuationToken,
Expand Down Expand Up @@ -219,7 +220,12 @@ func (r *S3) Files(path string) ([]string, error) {
return nil, err
}
for _, object := range listObjsResponse.Contents {
files = append(files, strings.ReplaceAll(*object.Key, validPath, ""))
file := strings.ReplaceAll(*object.Key, validPath, "")
if file == "" {
continue
}

files = append(files, file)
}

return files, nil
Expand Down Expand Up @@ -305,12 +311,18 @@ func (r *S3) Path(file string) string {
}

func (r *S3) Put(file string, content string) error {
if ext := filepath.Ext(file); ext != "" {
if err := r.MakeDirectory(filepath.Dir(file)); err != nil {
return err
}
}

mtype := mimetype.Detect([]byte(content))
_, err := r.instance.PutObject(r.ctx, &s3.PutObjectInput{
Bucket: aws.String(r.bucket),
Key: aws.String(file),
Body: strings.NewReader(content),
ContentLength: int64(len(content)),
ContentLength: aws.Int64(int64(len(content))),
ContentType: aws.String(mtype.String()),
})

Expand Down Expand Up @@ -348,7 +360,7 @@ func (r *S3) Size(file string) (int64, error) {
return 0, err
}

return resp.ContentLength, nil
return *resp.ContentLength, nil
}

func (r *S3) TemporaryUrl(file string, t time.Time) (string, error) {
Expand Down
6 changes: 4 additions & 2 deletions s3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ func TestStorage(t *testing.T) {
mimeType, err = driver.MimeType(path)
assert.Nil(t, err)
assert.Equal(t, "image/png", mimeType)

assert.Nil(t, driver.DeleteDirectory("MimeType"))
},
},
{
Expand All @@ -269,7 +271,7 @@ func TestStorage(t *testing.T) {
name: "Put",
setup: func() {
assert.Nil(t, driver.Put("Put/1.txt", "Goravel"))
assert.True(t, driver.Exists("Put"))
assert.True(t, driver.Exists("Put/"))
assert.True(t, driver.Exists("Put/1.txt"))
assert.True(t, driver.Missing("Put/2.txt"))
assert.Nil(t, driver.DeleteDirectory("Put"))
Expand All @@ -291,7 +293,7 @@ func TestStorage(t *testing.T) {
fileInfo := &File{path: "test.txt"}
path, err := driver.PutFile("PutFile", fileInfo)
assert.Nil(t, err)
assert.True(t, driver.Exists("PutFile"))
assert.True(t, driver.Exists("PutFile/"))
assert.True(t, driver.Exists(path))
data, err := driver.Get(path)
assert.Nil(t, err)
Expand Down