APPS-1469 Fix azure ListObjects method (#203)

aerospike · Jan 22, 2025 · b7fb429 · b7fb429
1 parent 590d729
commit b7fb429
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/cmd/internal/app/asbackup.go b/cmd/internal/app/asbackup.go
@@ -72,6 +72,14 @@ func (a *ASBackupParams) isUnblockMRT() bool {
 	return a.BackupXDRParams != nil && a.BackupXDRParams.UnblockMRT
 }
 
+func (a *ASBackupParams) SkipWriterInit() bool {
+	if a.BackupParams != nil {
+		return !a.BackupParams.Estimate
+	}
+
+	return true
+}
+
 func NewASBackup(
 	ctx context.Context,
 	params *ASBackupParams,
@@ -92,7 +100,7 @@ func NewASBackup(
 
 	// We don't need writer for estimates.
 	var writer backup.Writer
-	if !params.BackupParams.Estimate {
+	if params.SkipWriterInit() {
 		writer, err = initializeBackupWriter(ctx, params, secretAgent)
 		if err != nil {
 			return nil, err

diff --git a/io/azure/blob/reader.go b/io/azure/blob/reader.go
@@ -313,6 +313,10 @@ func (r *Reader) checkRestoreDirectory(ctx context.Context, path string) error {
 
 // ListObjects list all object in the path.
 func (r *Reader) ListObjects(ctx context.Context, path string) ([]string, error) {
+	if !strings.HasSuffix(path, "/") {
+		path += "/"
+	}
+
 	result := make([]string, 0)
 
 	pager := r.client.NewListBlobsFlatPager(r.containerName, &azblob.ListBlobsFlatOptions{

diff --git a/io/gcp/storage/reader.go b/io/gcp/storage/reader.go
@@ -320,6 +320,10 @@ func (r *Reader) checkRestoreDirectory(ctx context.Context, path string) error {
 
 // ListObjects list all object in the path.
 func (r *Reader) ListObjects(ctx context.Context, path string) ([]string, error) {
+	if !strings.HasSuffix(path, "/") {
+		path += "/"
+	}
+
 	result := make([]string, 0)
 
 	it := r.bucketHandle.Objects(ctx, &storage.Query{