Open platform to collect and prioritize feedback
fix: 404 errors on backups (#1058)
Guilherme Oenningbbfe41963951
diff --git a/app/handlers/backup.go b/app/handlers/backup.goindex 5bba216c6..e57ccb398 100644--- a/app/handlers/backup.go+++ b/app/handlers/backup.go@@ -2,6 +2,8 @@ package handlersimport ("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")@@ -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)}diff --git a/app/pkg/backup/backup.go b/app/pkg/backup/backup.goindex 8accd2169..b96933d7c 100644--- a/app/pkg/backup/backup.go+++ b/app/pkg/backup/backup.go@@ -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)diff --git a/app/services/blob/blob_test.go b/app/services/blob/blob_test.goindex 7c4a2da7e..cc5c7e1f8 100644--- a/app/services/blob/blob_test.go+++ b/app/services/blob/blob_test.go@@ -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)}}@@ -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})@@ -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})diff --git a/app/services/blob/s3/s3.go b/app/services/blob/s3/s3.goindex d2d3c9b27..48d5ed24c 100644--- a/app/services/blob/s3/s3.go+++ b/app/services/blob/s3/s3.go@@ -3,6 +3,7 @@ package s3import ("bytes""context"+ "fmt""io/ioutil""path""sort"@@ -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@@ -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)}@@ -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}