diff --git a/src/pkg/selectors/exchange.go b/src/pkg/selectors/exchange.go index e0126a05d..91ec2a1d2 100644 --- a/src/pkg/selectors/exchange.go +++ b/src/pkg/selectors/exchange.go @@ -217,7 +217,7 @@ func (s *exchange) EventCalendars(users, events []string) []ExchangeScope { scopes = append( scopes, - makeScope[ExchangeScope](Item, ExchangeEventCalendar, users, events), + makeScope[ExchangeScope](Group, ExchangeEventCalendar, users, events), ) return scopes @@ -477,7 +477,7 @@ const ( ExchangeEvent exchangeCategory = "ExchangeEvent" ExchangeEventCalendar exchangeCategory = "ExchangeEventCalendar" ExchangeMail exchangeCategory = "ExchangeMail" - ExchangeMailFolder exchangeCategory = "ExchangeFolder" + ExchangeMailFolder exchangeCategory = "ExchangeMailFolder" ExchangeUser exchangeCategory = "ExchangeUser" // append new data cats here diff --git a/src/pkg/selectors/exchange_test.go b/src/pkg/selectors/exchange_test.go index 9e5d8e832..bd70f8387 100644 --- a/src/pkg/selectors/exchange_test.go +++ b/src/pkg/selectors/exchange_test.go @@ -881,8 +881,8 @@ func (suite *ExchangeSelectorSuite) TestExchangeRestore_Reduce() { } const ( - contact = "tid/uid/contact/cfld/cid" - event = "tid/uid/event/ecld/eid" + contact = "tid/uid/contacts/cfld/cid" + event = "tid/uid/events/ecld/eid" mail = "tid/uid/mail/mfld/mid" ) diff --git a/src/pkg/selectors/scopes.go b/src/pkg/selectors/scopes.go index 3d4eef46a..33804dea1 100644 --- a/src/pkg/selectors/scopes.go +++ b/src/pkg/selectors/scopes.go @@ -293,9 +293,9 @@ func pathTypeIn(path []string) pathType { switch path[2] { case "mail": return exchangeMailPath - case "contact": + case "contacts": return exchangeContactPath - case "event": + case "events": return exchangeEventPath } diff --git a/src/pkg/selectors/scopes_test.go b/src/pkg/selectors/scopes_test.go index 3828f9391..96a7ade88 100644 --- a/src/pkg/selectors/scopes_test.go +++ b/src/pkg/selectors/scopes_test.go @@ -244,8 +244,8 @@ func (suite *SelectorScopesSuite) TestPathTypeIn() { t := suite.T() assert.Equal(t, unknownPathType, pathTypeIn([]string{}), "empty") assert.Equal(t, exchangeMailPath, pathTypeIn([]string{"", "", "mail"}), "mail") - assert.Equal(t, exchangeContactPath, pathTypeIn([]string{"", "", "contact"}), "contact") - assert.Equal(t, exchangeEventPath, pathTypeIn([]string{"", "", "event"}), "event") + assert.Equal(t, exchangeContactPath, pathTypeIn([]string{"", "", "contacts"}), "contact") + assert.Equal(t, exchangeEventPath, pathTypeIn([]string{"", "", "events"}), "event") assert.Equal(t, unknownPathType, pathTypeIn([]string{"", "", "fnords"}), "bogus") }