CSEC_PUBLIC/catalyst
1
0
Fork 0
mirror of https://github.com/SecurityBrewery/catalyst.git synced 2025-12-07 15:52:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve restore

Browse Source
This commit is contained in:
Jonas Plum
2022-10-23 02:07:53 +02:00
committed by Jonas Plum
parent 406d8290ab
commit 83e3a2e725
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
auth.go
View File

@@ -30,7 +30,8 @@ func (c *catalystResolver) UserCreateIfNotExists(ctx context.Context, user *maut
} }
if user == nil || user.APIKey { if user == nil || user.APIKey {
_, err = c.database.UserCreateSetupAPIKey(ctx, password) // ignore error, because we don't care if the user already exists
_, _ = c.database.UserCreateSetupAPIKey(ctx, password)
} else { } else {
_, err = c.database.UserCreate(ctx, &model.UserForm{ _, err = c.database.UserCreate(ctx, &model.UserForm{
Apikey: user.APIKey, Apikey: user.APIKey,

3
restore.go
View File

@@ -83,7 +83,8 @@ func restoreS3(catalystStorage *storage.Storage, p string) error {
entries, err := fs.ReadDir(minioDir, ".") entries, err := fs.ReadDir(minioDir, ".")
if err != nil { if err != nil {
return err // directory might not exist
return nil
} }
for _, entry := range entries { for _, entry := range entries {