cherry pick #3654 to release-1.1 (#3655)

Signed-off-by: ti-srebot <[email protected]> Co-authored-by: Yilong Li <[email protected]>
pingcap · Dec 27, 2020 · db89860 · db89860
1 parent 3c82347
commit db89860
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/cmd/backup-manager/app/util/remote.go b/cmd/backup-manager/app/util/remote.go
@@ -95,6 +95,7 @@ func NewStorageBackend(provider v1alpha1.StorageProvider) (*blob.Bucket, error)
 }
 
 // genStorageArgs returns the arg for --storage option and the remote/local path for br
+// TODO: add unit test
 func genStorageArgs(provider v1alpha1.StorageProvider) ([]string, error) {
 	st := util.GetStorageType(provider)
 	switch st {
@@ -212,7 +213,7 @@ func newGcsStorage(conf *gcsConfig) (*blob.Bucket, error) {
 // newGcsStorageOption constructs the arg for --storage option and the remote path for br
 func newGcsStorageOption(conf *gcsConfig) []string {
 	var gcsoptions []string
-	path := fmt.Sprintf("gcs://%s", path.Join(conf.bucket, conf.prefix))
+	path := fmt.Sprintf("gcs://%s/", path.Join(conf.bucket, conf.prefix))
 	gcsoptions = append(gcsoptions, fmt.Sprintf("--storage=%s", path))
 	if conf.storageClass != "" {
 		gcsoptions = append(gcsoptions, fmt.Sprintf("--gcs.storage-class=%s", conf.storageClass))

diff --git a/cmd/backup-manager/app/util/util.go b/cmd/backup-manager/app/util/util.go
@@ -99,7 +99,7 @@ func GetStoragePath(backup *v1alpha1.Backup) (string, error) {
 	case v1alpha1.BackupStorageTypeGcs:
 		prefix = backup.Spec.StorageProvider.Gcs.Prefix
 		bucket = backup.Spec.StorageProvider.Gcs.Bucket
-		url = fmt.Sprintf("gcs://%s", path.Join(bucket, prefix))
+		url = fmt.Sprintf("gcs://%s/", path.Join(bucket, prefix))
 		return url, nil
 	case v1alpha1.BackupStorageTypeLocal:
 		prefix = backup.Spec.StorageProvider.Local.Prefix

diff --git a/cmd/backup-manager/app/util/util_test.go b/cmd/backup-manager/app/util/util_test.go
@@ -243,7 +243,7 @@ func TestGetRemotePath(t *testing.T) {
 					},
 				},
 			},
-			expect: "gcs://test1-demo1",
+			expect: "gcs://test1-demo1/",
 		},
 		{
 			name: "unknow storage type",
-Original file line number
+Diff line change
@@ Expand Up / @@ -243,7 +243,7 @@ func TestGetRemotePath(t *testing.T) { @@
     					},
     				},
     			},
-    			expect: "gcs://test1-demo1",
+    			expect: "gcs://test1-demo1/",
     		},
     		{
     			name: "unknow storage type",
@@ Expand Down @@