cherry pick #664 to release-4.0 (#673)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com> Co-authored-by: 3pointer <luancheng@pingcap.com>
pingcap · Jan 8, 2021 · 707abab · 707abab
1 parent 804aa90
commit 707abab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/pkg/storage/parse.go b/pkg/storage/parse.go
@@ -70,7 +70,10 @@ func ParseBackend(rawURL string, options *BackendOptions) (*backup.StorageBacken
 		return &backup.StorageBackend{Backend: &backup.StorageBackend_S3{S3: s3}}, nil
 
 	case "gs", "gcs":
-		prefix := strings.Trim(u.Path[1:], "/")
+		if u.Host == "" {
+			return nil, errors.Annotatef(berrors.ErrStorageInvalidConfig, "please specify the bucket for gcs in %s", rawURL)
+		}
+		prefix := strings.Trim(u.Path, "/")
 		gcs := &backup.GCS{Bucket: u.Host, Prefix: prefix}
 		if options == nil {
 			options = &BackendOptions{}

diff --git a/pkg/storage/parse_test.go b/pkg/storage/parse_test.go
@@ -91,6 +91,15 @@ func (r *testStorageSuite) TestCreateStorage(c *C) {
 	c.Assert(gcs.Endpoint, Equals, "https://gcs.example.com/")
 	c.Assert(gcs.CredentialsBlob, Equals, "")
 
+	s, err = ParseBackend("gcs://bucket2", gcsOpt)
+	c.Assert(err, IsNil)
+	gcs = s.GetGcs()
+	c.Assert(gcs, NotNil)
+	c.Assert(gcs.Bucket, Equals, "bucket2")
+	c.Assert(gcs.Prefix, Equals, "")
+	c.Assert(gcs.Endpoint, Equals, "https://gcs.example.com/")
+	c.Assert(gcs.CredentialsBlob, Equals, "")
+
 	var credFeilPerm os.FileMode = 0o600
 	fakeCredentialsFile := filepath.Join(c.MkDir(), "fakeCredentialsFile")
 	err = ioutil.WriteFile(fakeCredentialsFile, []byte("fakeCredentials"), credFeilPerm)