PBM-1257: Fix panic during command describe-backup (#926)

boris-ilijic · web-flow · commit 36d338d7f4ca · 2024-03-13T09:40:58.000+01:00
Fix var shadowing in describe-backup with collection
diff --git a/cmd/pbm/backup.go b/cmd/pbm/backup.go
@@ -357,7 +357,7 @@ func describeBackup(ctx context.Context, conn connect.Client, pbm sdk.Client, b
 	var stg storage.Storage
 	if b.coll {
 		l := log.FromContext(ctx).NewDefaultEvent()
-		stg, err := util.GetStorage(ctx, conn, l)
+		stg, err = util.GetStorage(ctx, conn, l)
 		if err != nil {
 			return nil, errors.Wrap(err, "get storage")
 		}

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ func describeBackup(ctx context.Context, conn connect.Client, pbm sdk.Client, b`
`357`	`357`	`var stg storage.Storage`
`358`	`358`	`if b.coll {`
`359`	`359`	`l := log.FromContext(ctx).NewDefaultEvent()`
`360`		`- stg, err := util.GetStorage(ctx, conn, l)`
	`360`	`+ stg, err = util.GetStorage(ctx, conn, l)`
`361`	`361`	`if err != nil {`
`362`	`362`	`return nil, errors.Wrap(err, "get storage")`
`363`	`363`	`}`