Merge pull request #1447 from jinroh/swift-thumbnails-prefixed

Fix missing prefix for thumbnail swift container
cozy · Jun 29, 2018 · 6cab7bc · 6cab7bc
2 parents 168c50a + 1c868bb
commit 6cab7bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
@@ -315,7 +315,7 @@ func (i *Instance) ThumbsFS() vfs.Thumbser {
 		return vfsafero.NewThumbsFs(baseFS)
 	case config.SchemeSwift:
 		if i.SwiftCluster > 0 {
-			return vfsswift.NewThumbsFsV2(config.GetSwiftConnection(), i.Domain)
+			return vfsswift.NewThumbsFsV2(config.GetSwiftConnection(), i)
 		}
 		return vfsswift.NewThumbsFs(config.GetSwiftConnection(), i.Domain)
 	default:

diff --git a/pkg/vfs/vfsswift/thumbs_v2.go b/pkg/vfs/vfsswift/thumbs_v2.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/cozy/cozy-stack/pkg/prefixer"
 	"github.com/cozy/cozy-stack/pkg/vfs"
 	"github.com/cozy/swift"
 )
@@ -18,8 +19,8 @@ var unixEpochZero = time.Time{}
 //
 // This version stores the thumbnails in the same container as the main data
 // container.
-func NewThumbsFsV2(c *swift.Connection, domain string) vfs.Thumbser {
-	return &thumbsV2{c: c, container: swiftV2ContainerPrefixData + domain}
+func NewThumbsFsV2(c *swift.Connection, db prefixer.Prefixer) vfs.Thumbser {
+	return &thumbsV2{c: c, container: swiftV2ContainerPrefixData + db.DBPrefix()}
 }
 
 type thumbsV2 struct {
@@ -58,7 +59,13 @@ func (t *thumbsV2) CreateThumb(img *vfs.FileDoc, format string) (vfs.ThumbFiler,
 	obj, err := t.c.ObjectCreate(t.container, name, false, "", img.Mime,
 		objMeta.ObjectHeaders())
 	if err != nil {
-		return nil, err
+		if _, _, errc := t.c.Container(t.container); errc == swift.ContainerNotFound {
+			if errc = t.c.ContainerCreate(t.container, nil); errc != nil {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 	th := &thumb{
 		WriteCloser: obj,