diff --git a/src/pkg/path/category_type.go b/src/pkg/path/category_type.go index b8c20020f..c403e3c19 100644 --- a/src/pkg/path/category_type.go +++ b/src/pkg/path/category_type.go @@ -96,14 +96,10 @@ var serviceCategories = map[ServiceType]map[CategoryType]struct{}{ ChannelMessagesCategory: {}, LibrariesCategory: {}, }, - TeamsService: { - ChannelMessagesCategory: {}, - LibrariesCategory: {}, - }, } func validateServiceAndCategoryStrings(s, c string) (ServiceType, CategoryType, error) { - service := toServiceType(s) + service := ToServiceType(s) if service == UnknownService { return UnknownService, UnknownCategory, clues.Stack(ErrorUnknownService).With("service", fmt.Sprintf("%q", s)) } diff --git a/src/pkg/path/service_category_test.go b/src/pkg/path/service_category_test.go index d2b19b244..2d98ed49c 100644 --- a/src/pkg/path/service_category_test.go +++ b/src/pkg/path/service_category_test.go @@ -157,7 +157,7 @@ func (suite *ServiceCategoryUnitSuite) TestToServiceType() { suite.Run(test.name, func() { t := suite.T() - assert.Equal(t, test.expected, toServiceType(test.service)) + assert.Equal(t, test.expected, ToServiceType(test.service)) }) } } diff --git a/src/pkg/path/service_type.go b/src/pkg/path/service_type.go index 14847ce35..9059615a2 100644 --- a/src/pkg/path/service_type.go +++ b/src/pkg/path/service_type.go @@ -23,19 +23,17 @@ type ServiceType int //go:generate stringer -type=ServiceType -linecomment const ( UnknownService ServiceType = 0 - ExchangeService ServiceType = 1 // exchange - OneDriveService ServiceType = 2 // onedrive - SharePointService ServiceType = 3 // sharepoint - ExchangeMetadataService ServiceType = 4 // exchangeMetadata - OneDriveMetadataService ServiceType = 5 // onedriveMetadata - SharePointMetadataService ServiceType = 6 // sharepointMetadata - GroupsService ServiceType = 7 // groups - GroupsMetadataService ServiceType = 8 // groupsMetadata - TeamsService ServiceType = 9 // teams - TeamsMetadataService ServiceType = 10 // teamsMetadata + ExchangeService ServiceType = 1 // exchange + OneDriveService ServiceType = 2 // onedrive + SharePointService ServiceType = 3 // sharepoint + ExchangeMetadataService ServiceType = 4 // exchangeMetadata + OneDriveMetadataService ServiceType = 5 // onedriveMetadata + SharePointMetadataService ServiceType = 6 // sharepointMetadata + GroupsService ServiceType = 7 // groups + GroupsMetadataService ServiceType = 8 // groupsMetadata ) -func toServiceType(service string) ServiceType { +func ToServiceType(service string) ServiceType { s := strings.ToLower(service) switch s { @@ -47,8 +45,6 @@ func toServiceType(service string) ServiceType { return SharePointService case strings.ToLower(GroupsService.String()): return GroupsService - case strings.ToLower(TeamsService.String()): - return TeamsService case strings.ToLower(ExchangeMetadataService.String()): return ExchangeMetadataService case strings.ToLower(OneDriveMetadataService.String()): @@ -57,8 +53,6 @@ func toServiceType(service string) ServiceType { return SharePointMetadataService case strings.ToLower(GroupsMetadataService.String()): return GroupsMetadataService - case strings.ToLower(TeamsMetadataService.String()): - return TeamsMetadataService default: return UnknownService } diff --git a/src/pkg/path/servicetype_string.go b/src/pkg/path/servicetype_string.go index 4b9ab16ec..6fa499364 100644 --- a/src/pkg/path/servicetype_string.go +++ b/src/pkg/path/servicetype_string.go @@ -17,13 +17,11 @@ func _() { _ = x[SharePointMetadataService-6] _ = x[GroupsService-7] _ = x[GroupsMetadataService-8] - _ = x[TeamsService-9] - _ = x[TeamsMetadataService-10] } -const _ServiceType_name = "UnknownServiceexchangeonedrivesharepointexchangeMetadataonedriveMetadatasharepointMetadatagroupsgroupsMetadatateamsteamsMetadata" +const _ServiceType_name = "UnknownServiceexchangeonedrivesharepointexchangeMetadataonedriveMetadatasharepointMetadatagroupsgroupsMetadata" -var _ServiceType_index = [...]uint8{0, 14, 22, 30, 40, 56, 72, 90, 96, 110, 115, 128} +var _ServiceType_index = [...]uint8{0, 14, 22, 30, 40, 56, 72, 90, 96, 110} func (i ServiceType) String() string { if i < 0 || i >= ServiceType(len(_ServiceType_index)-1) {