layout: Fix corner cases

src/restic/backend/layout_cloud.go

@@ -14,7 +14,11 @@ var cloudLayoutPaths = defaultLayoutPaths
 
 // Dirname returns the directory path for a given file type and name.
 func (l *CloudLayout) Dirname(h restic.Handle) string {
-	return l.URL + l.Join(l.Path, "/", cloudLayoutPaths[h.Type])
+	if h.Type == restic.ConfigFile {
+		return l.URL + l.Join(l.Path, "/")
+	}
+
+	return l.URL + l.Join(l.Path, "/", cloudLayoutPaths[h.Type]) + "/"
 }
 
 // Filename returns a path to a file, including its name.

src/restic/backend/layout_s3.go

@@ -20,7 +20,11 @@ var s3LayoutPaths = map[restic.FileType]string{
 
 // Dirname returns the directory path for a given file type and name.
 func (l *S3Layout) Dirname(h restic.Handle) string {
-	return l.URL + l.Join(l.Path, "/", s3LayoutPaths[h.Type])
+	if h.Type == restic.ConfigFile {
+		return l.URL + l.Join(l.Path, "/")
+	}
+
+	return l.URL + l.Join(l.Path, "/", s3LayoutPaths[h.Type]) + "/"
 }
 
 // Filename returns a path to a file, including its name.

src/restic/backend/layout_test.go

@@ -149,47 +149,59 @@ func TestCloudLayout(t *testing.T) {
 
 func TestCloudLayoutURLs(t *testing.T) {
 	var tests = []struct {
-		l  Layout
+		l   Layout
-		h  restic.Handle
+		h   restic.Handle
-		fn string
+		fn  string
+		dir string
 	}{
 		{
 			&CloudLayout{URL: "https://hostname.foo", Path: "", Join: path.Join},
 			restic.Handle{Type: restic.DataFile, Name: "foobar"},
 			"https://hostname.foo/data/foobar",
+			"https://hostname.foo/data/",
 		},
 		{
 			&CloudLayout{URL: "https://hostname.foo:1234/prefix/repo", Path: "/", Join: path.Join},
 			restic.Handle{Type: restic.LockFile, Name: "foobar"},
 			"https://hostname.foo:1234/prefix/repo/locks/foobar",
+			"https://hostname.foo:1234/prefix/repo/locks/",
 		},
 		{
 			&CloudLayout{URL: "https://hostname.foo:1234/prefix/repo", Path: "/", Join: path.Join},
 			restic.Handle{Type: restic.ConfigFile, Name: "foobar"},
 			"https://hostname.foo:1234/prefix/repo/config",
+			"https://hostname.foo:1234/prefix/repo/",
 		},
 		{
 			&S3Layout{URL: "https://hostname.foo", Path: "/", Join: path.Join},
 			restic.Handle{Type: restic.DataFile, Name: "foobar"},
 			"https://hostname.foo/data/foobar",
+			"https://hostname.foo/data/",
 		},
 		{
 			&S3Layout{URL: "https://hostname.foo:1234/prefix/repo", Path: "", Join: path.Join},
 			restic.Handle{Type: restic.LockFile, Name: "foobar"},
 			"https://hostname.foo:1234/prefix/repo/lock/foobar",
+			"https://hostname.foo:1234/prefix/repo/lock/",
 		},
 		{
 			&S3Layout{URL: "https://hostname.foo:1234/prefix/repo", Path: "/", Join: path.Join},
 			restic.Handle{Type: restic.ConfigFile, Name: "foobar"},
 			"https://hostname.foo:1234/prefix/repo/config",
+			"https://hostname.foo:1234/prefix/repo/",
 		},
 	}
 
 	for _, test := range tests {
-		t.Run("cloud", func(t *testing.T) {
+		t.Run(fmt.Sprintf("%T", test.l), func(t *testing.T) {
-			res := test.l.Filename(test.h)
+			fn := test.l.Filename(test.h)
-			if res != test.fn {
+			if fn != test.fn {
-				t.Fatalf("wrong filename, want %v, got %v", test.fn, res)
+				t.Fatalf("wrong filename, want %v, got %v", test.fn, fn)
+			}
+
+			dir := test.l.Dirname(test.h)
+			if dir != test.dir {
+				t.Fatalf("wrong dirname, want %v, got %v", test.dir, dir)
 			}
 		})
 	}