Merge pull request #80510 from benbardin/backport21.2-80182

release-21.2: backupccl: Fix SHOW BACKUPS on a bucket's base directory

pkg/ccl/backupccl/manifest_handling.go

@@ -18,6 +18,7 @@ import (
 	"io/ioutil"
 	"net/url"
 	"path"
+	"regexp"
 	"sort"
 	"strings"
 
@@ -83,6 +84,11 @@ const (
 	latestFileName          = "LATEST"
 )
 
+// On some cloud storage platforms (i.e. GS, S3), backups in a base bucket may
+// omit a leading slash. However, backups in a subdirectory of a base bucket
+// will contain one.
+var backupPathRE = regexp.MustCompile("^/?[^\\/]+/[^\\/]+/[^\\/]+/" + backupManifestName + "$")
+
 var errEncryptionInfoRead = errors.New(`ENCRYPTION-INFO not found`)
 
 // isGZipped detects whether the given bytes represent GZipped data. This check
@@ -1057,13 +1063,12 @@ func ListFullBackupsInCollection(
 ) ([]string, error) {
 	var backupPaths []string
 	if err := store.List(ctx, "", listingDelimDataSlash, func(f string) error {
-		if ok, err := path.Match("/*/*/*/"+backupManifestName, f); err != nil {
-			return err
-		} else if ok {
+		if backupPathRE.MatchString(f) {
 			backupPaths = append(backupPaths, f)
 		}
 		return nil
 	}); err != nil {
+		// Can't happen, just required to handle the error for lint.
 		return nil, err
 	}
 	for i, backupPath := range backupPaths {