From dd55744f15a08b54a4b7cfd5c8d62710e676547f Mon Sep 17 00:00:00 2001
From: ashmrtn <3891298+ashmrtn@users.noreply.github.com>
Date: Tue, 25 Jul 2023 12:38:12 -0700
Subject: [PATCH] Hide storage path for merge collections (#3902)

#### Does this PR need a docs update or release note?

- [ ] :white_check_mark: Yes, it's included
- [ ] :clock1: Yes, but in a later PR
- [x] :no_entry: No

#### Type of change

- [ ] :sunflower: Feature
- [ ] :bug: Bugfix
- [ ] :world_map: Documentation
- [ ] :robot: Supportability/Tests
- [ ] :computer: CI/Deployment
- [x] :broom: Tech Debt/Cleanup

#### Issue(s)

* #3895

#### Test Plan

- [x] :muscle: Manual
- [ ] :zap: Unit test
- [ ] :green_heart: E2E
---
 src/internal/kopia/merge_collection.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/internal/kopia/merge_collection.go b/src/internal/kopia/merge_collection.go
index ff32c4e73..25897fd58 100644
--- a/src/internal/kopia/merge_collection.go
+++ b/src/internal/kopia/merge_collection.go
@@ -70,7 +70,9 @@ func (mc *mergeCollection) Items(
 		for _, c := range mc.cols {
 			// Unfortunately doesn't seem to be a way right now to see if the
 			// iteration failed and we should be exiting early.
-			ictx := clues.Add(ctx, "merged_collection_storage_path", c.storagePath)
+			ictx := clues.Add(
+				ctx,
+				"merged_collection_storage_path", path.LoggableDir(c.storagePath))
 			logger.Ctx(ictx).Debug("sending items from merged collection")
 
 			for item := range c.Items(ictx, errs) {
@@ -95,7 +97,9 @@ func (mc *mergeCollection) FetchItemByName(
 		"merged_collection_count", len(mc.cols))
 
 	for _, c := range mc.cols {
-		ictx := clues.Add(ctx, "merged_collection_storage_path", c.storagePath)
+		ictx := clues.Add(
+			ctx,
+			"merged_collection_storage_path", path.LoggableDir(c.storagePath))
 
 		logger.Ctx(ictx).Debug("looking for item in merged collection")