Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
b23b6302
Commit
b23b6302
authored
May 02, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: tweak linter
parent
74145157
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
10 deletions
+7
-10
s3_object_presigner.go
server/service/s3_object_presigner/s3_object_presigner.go
+7
-10
No files found.
server/service/s3_object_presigner/s3_object_presigner.go
View file @
b23b6302
...
@@ -4,7 +4,6 @@ import (
...
@@ -4,7 +4,6 @@ import (
"context"
"context"
"time"
"time"
"github.com/pkg/errors"
"google.golang.org/protobuf/types/known/timestamppb"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/usememos/memos/plugin/storage/s3"
"github.com/usememos/memos/plugin/storage/s3"
...
@@ -23,19 +22,19 @@ func NewS3ObjectPresigner(store *store.Store) *S3ObjectPresigner {
...
@@ -23,19 +22,19 @@ func NewS3ObjectPresigner(store *store.Store) *S3ObjectPresigner {
}
}
}
}
func
(
p
*
S3ObjectPresigner
)
CheckAndPresign
(
ctx
context
.
Context
)
error
{
func
(
p
*
S3ObjectPresigner
)
CheckAndPresign
(
ctx
context
.
Context
)
{
workspaceStorageSetting
,
err
:=
p
.
Store
.
GetWorkspaceStorageSetting
(
ctx
)
workspaceStorageSetting
,
err
:=
p
.
Store
.
GetWorkspaceStorageSetting
(
ctx
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"failed to get workspace storage setting"
)
return
}
}
s3Config
:=
workspaceStorageSetting
.
GetS3Config
()
s3Config
:=
workspaceStorageSetting
.
GetS3Config
()
if
s3Config
==
nil
{
if
s3Config
==
nil
{
return
errors
.
New
(
"no actived external storage found"
)
return
}
}
s3Client
,
err
:=
s3
.
NewClient
(
ctx
,
s3Config
)
s3Client
,
err
:=
s3
.
NewClient
(
ctx
,
s3Config
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"Failed to create s3 client"
)
return
}
}
s3StorageType
:=
storepb
.
ResourceStorageType_S3
s3StorageType
:=
storepb
.
ResourceStorageType_S3
...
@@ -44,7 +43,7 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
...
@@ -44,7 +43,7 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
StorageType
:
&
s3StorageType
,
StorageType
:
&
s3StorageType
,
})
})
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"list resources"
)
return
}
}
for
_
,
resource
:=
range
resources
{
for
_
,
resource
:=
range
resources
{
...
@@ -61,7 +60,7 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
...
@@ -61,7 +60,7 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
}
}
presignURL
,
err
:=
s3Client
.
PresignGetObject
(
ctx
,
s3ObjectPayload
.
Key
)
presignURL
,
err
:=
s3Client
.
PresignGetObject
(
ctx
,
s3ObjectPayload
.
Key
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"Failed to presign via s3 client"
)
return
}
}
s3ObjectPayload
.
LastPresignedTime
=
timestamppb
.
New
(
time
.
Now
())
s3ObjectPayload
.
LastPresignedTime
=
timestamppb
.
New
(
time
.
Now
())
if
err
:=
p
.
Store
.
UpdateResource
(
ctx
,
&
store
.
UpdateResource
{
if
err
:=
p
.
Store
.
UpdateResource
(
ctx
,
&
store
.
UpdateResource
{
...
@@ -72,11 +71,9 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
...
@@ -72,11 +71,9 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) error {
},
},
},
},
});
err
!=
nil
{
});
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"Failed to update resource"
)
return
}
}
}
}
return
nil
}
}
func
(
p
*
S3ObjectPresigner
)
Start
(
ctx
context
.
Context
)
{
func
(
p
*
S3ObjectPresigner
)
Start
(
ctx
context
.
Context
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment