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

fix: 404 errors on backups #1058

Merged
merged 8 commits into from
Feb 20, 2022
Merged

fix: 404 errors on backups #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
10bb2eb
404 on backups
goenning Feb 19, 2022
7ac43a0
fix tests
goenning Feb 19, 2022
7f2408c
Merge branch 'main' into go/fix-backup-404
goenning Feb 19, 2022
b11f5a2
more logs
goenning Feb 19, 2022
bfd1bfb
Merge branch 'main' into go/fix-backup-404
goenning Feb 20, 2022
b37050a
use correct preffix
goenning Feb 20, 2022
ac44ee9
fix dockerfile
goenning Feb 20, 2022
9f79a6c
Merge branch 'main' into go/fix-backup-404
goenning Feb 20, 2022
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
3 changes: 3 additions & 0 deletions app/handlers/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package handlers

import (
"github.com/getfider/fider/app/pkg/backup"
"github.com/getfider/fider/app/pkg/errors"
"github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/web"
)

Expand All @@ -11,6 +13,7 @@ func ExportBackupZip() web.HandlerFunc {

file, err := backup.Create(c)
if err != nil {
log.Error(c, errors.Wrap(err, "failed to create backup"))
return c.Failure(err)
}

Expand Down
2 changes: 1 addition & 1 deletion app/pkg/backup/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func Create(ctx context.Context) (*bytes.Buffer, error) {
func addBlobToZipFile(ctx context.Context, zipWriter *zip.Writer, bkey string) error {
getBlob := &query.GetBlobByKey{Key: bkey}
if err := bus.Dispatch(ctx, getBlob); err != nil {
return err
return errors.Wrap(err, "failed to get blob with key %s", bkey)
}

fileName := fmt.Sprintf("blobs/%s", bkey)
Expand Down
8 changes: 4 additions & 4 deletions app/services/blob/blob_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func AllOperations(ctx context.Context) {
}
err = bus.Dispatch(ctx, q)
Expect(q.Result).IsNil()
Expect(err).Equals(blob.ErrNotFound)
Expect(errors.Cause(err)).Equals(blob.ErrNotFound)
}
}

Expand Down Expand Up @@ -163,12 +163,12 @@ func SameKey_DifferentTenant(ctx context.Context) {

q = &query.GetBlobByKey{Key: key}
err = bus.Dispatch(ctxWithTenant2, q)
Expect(err).Equals(blob.ErrNotFound)
Expect(errors.Cause(err)).Equals(blob.ErrNotFound)
Expect(q.Result).IsNil()

q = &query.GetBlobByKey{Key: key}
err = bus.Dispatch(ctx, q)
Expect(err).Equals(blob.ErrNotFound)
Expect(errors.Cause(err)).Equals(blob.ErrNotFound)
Expect(q.Result).IsNil()

err = bus.Dispatch(ctxWithTenant1, &cmd.DeleteBlob{Key: key})
Expand Down Expand Up @@ -217,7 +217,7 @@ func SameKey_DifferentTenant_Delete(ctx context.Context) {

q = &query.GetBlobByKey{Key: key}
err = bus.Dispatch(ctx, q)
Expect(err).Equals(blob.ErrNotFound)
Expect(errors.Cause(err)).Equals(blob.ErrNotFound)
Expect(q.Result).IsNil()

err = bus.Dispatch(ctxWithTenant2, &cmd.DeleteBlob{Key: key})
Expand Down
11 changes: 8 additions & 3 deletions app/services/blob/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package s3
import (
"bytes"
"context"
"fmt"
"io/ioutil"
"path"
"sort"
Expand Down Expand Up @@ -76,13 +77,17 @@ func listBlobs(ctx context.Context, q *query.ListBlobs) error {
prefix := basePath(ctx, q.Prefix)
response, err := DefaultClient.ListObjectsWithContext(ctx, &s3.ListObjectsInput{
Bucket: aws.String(env.Config.BlobStorage.S3.BucketName),
MaxKeys: aws.Int64(3000),
MaxKeys: aws.Int64(1000),
Prefix: aws.String(prefix),
})
if err != nil {
return wrap(err, "failed to list blobs from S3")
}

if response.IsTruncated != nil && *response.IsTruncated {
return wrap(err, "failed to return list of blobs because it was truncated")
}

files := make([]string, 0)
for _, item := range response.Contents {
key := *item.Key
Expand All @@ -108,7 +113,7 @@ func getBlobByKey(ctx context.Context, q *query.GetBlobByKey) error {
})
if err != nil {
if isNotFound(err) {
return blob.ErrNotFound
return wrap(blob.ErrNotFound, "unable to find blob '%s' on S3", q.Key)
}
return wrap(err, "failed to get blob '%s' from S3", q.Key)
}
Expand Down Expand Up @@ -166,7 +171,7 @@ func basePath(ctx context.Context, segment string) string {

tenant, ok := ctx.Value(app.TenantCtxKey).(*entity.Tenant)
if ok {
return path.Join("tenants", strconv.Itoa(tenant.ID), segment)
return fmt.Sprintf("tenants/%s/%s", strconv.Itoa(tenant.ID), segment)
}
return segment
}
Expand Down