remove selector printable, list discreteOwner

The selectors printable code wasn't being used in any
valid way, so that's out.  Backup List printing now refers
to the DiscreteOwner in the embedded selector as the
ResourceOwner reference.  Renamed the "Selectors"
column in the List print table to "Resource Owner" to
better match what should be contained in that field.

src/cli/utils/exchange_test.go

@@ -325,42 +325,36 @@ func (suite *ExchangeUtilsSuite) TestAddExchangeInclude() {
 	}{
 		{
 			name:             "no inputs",
-			resources:        empty,
 			folders:          empty,
 			items:            empty,
 			expectIncludeLen: 0,
 		},
 		{
 			name:             "single inputs",
-			resources:        single,
 			folders:          single,
 			items:            single,
 			expectIncludeLen: 1,
 		},
 		{
 			name:             "multi inputs",
-			resources:        multi,
 			folders:          multi,
 			items:            multi,
 			expectIncludeLen: 1,
 		},
 		{
 			name:             "folder contains",
-			resources:        empty,
 			folders:          containsOnly,
 			items:            empty,
 			expectIncludeLen: 1,
 		},
 		{
 			name:             "folder prefixes",
-			resources:        empty,
 			folders:          prefixOnly,
 			items:            empty,
 			expectIncludeLen: 1,
 		},
 		{
 			name:             "folder prefixes and contains",
-			resources:        empty,
 			folders:          containsAndPrefix,
 			items:            empty,
 			expectIncludeLen: 2,

src/internal/connector/exchange/data_collections_test.go

@@ -525,14 +525,16 @@ func (suite *DataCollectionsIntegrationSuite) TestEventsSerializationRegression(
 			expected: DefaultCalendar,
 			scope: selectors.NewExchangeBackup(users).EventCalendars(
 				[]string{DefaultCalendar},
-				selectors.PrefixMatch())[0],
+				selectors.PrefixMatch(),
+			)[0],
 		},
 		{
 			name:     "Birthday Calendar",
 			expected: "Birthdays",
 			scope: selectors.NewExchangeBackup(users).EventCalendars(
 				[]string{"Birthdays"},
-				selectors.PrefixMatch())[0],
+				selectors.PrefixMatch(),
+			)[0],
 		},
 	}
 

src/pkg/backup/backup.go

@@ -28,8 +28,8 @@ type Backup struct {
 	// Status of the operation
 	Status string `json:"status"`
 
-	// Selectors used in this operation
-	Selectors selectors.Selector `json:"selectors"`
+	// Selector used in this operation
+	Selector selectors.Selector `json:"selectors"`
 
 	// stats are embedded so that the values appear as top-level properties
 	stats.Errs
@@ -58,7 +58,7 @@ func New(
 		SnapshotID:      snapshotID,
 		DetailsID:       detailsID,
 		Status:          status,
-		Selectors:       selector,
+		Selector:        selector,
 		ReadWrites:      rw,
 		StartAndEndTime: se,
 	}
@@ -89,14 +89,13 @@ func PrintAll(ctx context.Context, bs []*Backup) {
 }
 
 type Printable struct {
-	ID            model.StableID      `json:"id"`
-	ErrorCount    int                 `json:"errorCount"`
-	StartedAt     time.Time           `json:"started at"`
-	Status        string              `json:"status"`
-	Version       string              `json:"version"`
-	Selectors     selectors.Printable `json:"selectors"`
-	BytesRead     int64               `json:"bytesRead"`
-	BytesUploaded int64               `json:"bytesUploaded"`
+	ID            model.StableID `json:"id"`
+	ErrorCount    int            `json:"errorCount"`
+	StartedAt     time.Time      `json:"started at"`
+	Status        string         `json:"status"`
+	Version       string         `json:"version"`
+	BytesRead     int64          `json:"bytesRead"`
+	BytesUploaded int64          `json:"bytesUploaded"`
 }
 
 // MinimumPrintable reduces the Backup to its minimally printable details.
@@ -107,7 +106,6 @@ func (b Backup) MinimumPrintable() any {
 		StartedAt:     b.StartedAt,
 		Status:        b.Status,
 		Version:       "0",
-		Selectors:     b.Selectors.ToPrintable(),
 		BytesRead:     b.BytesRead,
 		BytesUploaded: b.BytesUploaded,
 	}
@@ -120,7 +118,7 @@ func (b Backup) Headers() []string {
 		"Started At",
 		"ID",
 		"Status",
-		"Selectors",
+		"Resource Owner",
 	}
 }
 
@@ -134,6 +132,6 @@ func (b Backup) Values() []string {
 		common.FormatTabularDisplayTime(b.StartedAt),
 		string(b.ID),
 		status,
-		b.Selectors.ToPrintable().Resources(),
+		b.Selector.DiscreteOwner,
 	}
 }

src/pkg/backup/backup_test.go

@@ -25,7 +25,7 @@ func TestBackupSuite(t *testing.T) {
 }
 
 func stubBackup(t time.Time) backup.Backup {
-	sel := selectors.NewExchangeBackup(selectors.Any())
+	sel := selectors.NewExchangeBackup([]string{"test"})
 	sel.Include(sel.AllData())
 
 	return backup.Backup{
@@ -39,7 +39,7 @@ func stubBackup(t time.Time) backup.Backup {
 		SnapshotID:   "snapshot",
 		DetailsID:    "details",
 		Status:       "status",
-		Selectors:    sel.Selector,
+		Selector:     sel.Selector,
 		Errs: stats.Errs{
 			ReadErrors:  errors.New("1"),
 			WriteErrors: errors.New("1"),
@@ -66,7 +66,7 @@ func (suite *BackupSuite) TestBackup_HeadersValues() {
 		"Started At",
 		"ID",
 		"Status",
-		"Selectors",
+		"Resource Owner",
 	}
 	hs := b.Headers()
 	assert.Equal(t, expectHs, hs)
@@ -76,7 +76,7 @@ func (suite *BackupSuite) TestBackup_HeadersValues() {
 		nowFmt,
 		"id",
 		"status (2 errors)",
-		selectors.All,
+		"test",
 	}
 
 	vs := b.Values()
@@ -96,11 +96,6 @@ func (suite *BackupSuite) TestBackup_MinimumPrintable() {
 	assert.Equal(t, 2, result.ErrorCount, "error count")
 	assert.Equal(t, now, result.StartedAt, "started at")
 	assert.Equal(t, b.Status, result.Status, "status")
-
-	bselp := b.Selectors.ToPrintable()
-	assert.Equal(t, bselp, result.Selectors, "selectors")
-	assert.Equal(t, bselp.Resources(), result.Selectors.Resources(), "selector resources")
-
 	assert.Equal(t, b.BytesRead, result.BytesRead, "size")
 	assert.Equal(t, b.BytesUploaded, result.BytesUploaded, "stored size")
 }

src/pkg/repository/repository.go

@@ -306,7 +306,7 @@ func (r repository) BackupDetails(ctx context.Context, backupID string) (*detail
 	deets, err := streamstore.New(
 		r.dataLayer,
 		r.Account.ID(),
-		b.Selectors.PathService()).ReadBackupDetails(ctx, dID)
+		b.Selector.PathService()).ReadBackupDetails(ctx, dID)
 	if err != nil {
 		return nil, nil, err
 	}

src/pkg/selectors/exchange.go

@@ -38,7 +38,6 @@ type (
 
 var (
 	_ Reducer        = &ExchangeRestore{}
-	_ printabler     = &ExchangeRestore{}
 	_ pathCategorier = &ExchangeRestore{}
 )
 
@@ -110,11 +109,6 @@ func (sr ExchangeRestore) SplitByResourceOwner(users []string) []ExchangeRestore
 	return ss
 }
 
-// Printable creates the minimized display of a selector, formatted for human readability.
-func (s exchange) Printable() Printable {
-	return toPrintable[ExchangeScope](s.Selector)
-}
-
 // PathCategories produces the aggregation of discrete users described by each type of scope.
 func (s exchange) PathCategories() selectorPathCategories {
 	return selectorPathCategories{

src/pkg/selectors/helpers_test.go

@@ -160,10 +160,6 @@ func stubSelector(resourceOwners []string) mockSel {
 	}
 }
 
-func (s mockSel) Printable() Printable {
-	return toPrintable[mockScope](s.Selector)
-}
-
 // ---------------------------------------------------------------------------
 // helper funcs
 // ---------------------------------------------------------------------------

src/pkg/selectors/onedrive.go

@@ -37,7 +37,6 @@ type (
 
 var (
 	_ Reducer        = &OneDriveRestore{}
-	_ printabler     = &OneDriveRestore{}
 	_ pathCategorier = &OneDriveRestore{}
 )
 
@@ -109,11 +108,6 @@ func (s OneDriveRestore) SplitByResourceOwner(users []string) []OneDriveRestore
 	return ss
 }
 
-// Printable creates the minimized display of a selector, formatted for human readability.
-func (s oneDrive) Printable() Printable {
-	return toPrintable[OneDriveScope](s.Selector)
-}
-
 // PathCategories produces the aggregation of discrete users described by each type of scope.
 func (s oneDrive) PathCategories() selectorPathCategories {
 	return selectorPathCategories{

src/pkg/selectors/scopes_test.go

@@ -393,33 +393,6 @@ func (suite *SelectorScopesSuite) TestMatchesPathValues() {
 	}
 }
 
-func (suite *SelectorScopesSuite) TestAddToSet() {
-	t := suite.T()
-	set := []string{}
-
-	set = addToSet(set, []string{})
-	assert.Len(t, set, 0)
-
-	set = addToSet(set, []string{"a"})
-	assert.Len(t, set, 1)
-	assert.Equal(t, set[0], "a")
-
-	set = addToSet(set, []string{"a"})
-	assert.Len(t, set, 1)
-
-	set = addToSet(set, []string{"a", "b"})
-	assert.Len(t, set, 2)
-	assert.Equal(t, set[0], "a")
-	assert.Equal(t, set[1], "b")
-
-	set = addToSet(set, []string{"c", "d"})
-	assert.Len(t, set, 4)
-	assert.Equal(t, set[0], "a")
-	assert.Equal(t, set[1], "b")
-	assert.Equal(t, set[2], "c")
-	assert.Equal(t, set[3], "d")
-}
-
 func (suite *SelectorScopesSuite) TestClean() {
 	table := []struct {
 		name   string