larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for running backup chats from the cli

Browse Source 
Some necessary changes to get a green backup creation from the cli.
This commit is contained in:
ryanfkeepers 2024-01-23 17:01:24 -07:00
parent bd50d8eeaa
commit 7e3d5d2074
6 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal/m365/controller.go
View File

@ -112,7 +112,7 @@ func (ctrl *Controller) setResourceHandler(
var rh *resourceGetter var rh *resourceGetter
switch serviceInOperation { switch serviceInOperation {
case path.ExchangeService, path.OneDriveService: case path.ExchangeService, path.OneDriveService, path.TeamsChatsService:
rh = &resourceGetter{ rh = &resourceGetter{
enum: resource.Users, enum: resource.Users,
getter: ctrl.AC.Users(), getter: ctrl.AC.Users(),

4
src/internal/m365/service/teamschats/enabled.go
View File

@ -3,7 +3,6 @@ package teamschats
import ( import (
"context" "context"
"github.com/alcionai/clues"
"github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/microsoftgraph/msgraph-sdk-go/models"
"github.com/alcionai/corso/src/pkg/services/m365/api" "github.com/alcionai/corso/src/pkg/services/m365/api"
@ -14,5 +13,6 @@ func IsServiceEnabled(
gbi api.GetByIDer[models.Userable], gbi api.GetByIDer[models.Userable],
resource string, resource string,
) (bool, error) { ) (bool, error) {
return true, clues.New("needs implementation") // TODO(rkeepers): investgate service enablement checks
return true, nil
} }

2
src/internal/m365/service/teamschats/enabled_test.go
View File

@ -49,7 +49,7 @@ func (suite *EnabledUnitSuite) TestIsServiceEnabled() {
return mockGU{} return mockGU{}
}, },
expect: assert.True, expect: assert.True,
expectErr: assert.Error, expectErr: assert.NoError,
}, },
} }
for _, test := range table { for _, test := range table {

14
src/pkg/path/service_category_test.go
View File

@ -163,9 +163,10 @@ func (suite *ServiceCategoryUnitSuite) TestToServiceType() {
} }
for _, test := range table { for _, test := range table {
suite.Run(test.name, func() { suite.Run(test.name, func() {
t := suite.T() assert.Equal(
suite.T(),
assert.Equal(t, test.expected, ToServiceType(test.service)) test.expected.String(),
ToServiceType(test.service).String())
}) })
} }
} }
@ -189,9 +190,10 @@ func (suite *ServiceCategoryUnitSuite) TestToCategoryType() {
} }
for _, test := range table { for _, test := range table {
suite.Run(test.name, func() { suite.Run(test.name, func() {
t := suite.T() assert.Equal(
suite.T(),
assert.Equal(t, test.expected, ToCategoryType(test.category)) test.expected.String(),
ToCategoryType(test.category).String())
}) })
} }
} }

20
src/pkg/path/service_type.go
View File

@ -36,16 +36,16 @@ const (
) )
var strToSvc = map[string]ServiceType{ var strToSvc = map[string]ServiceType{
ExchangeService.String(): ExchangeService, strings.ToLower(ExchangeService.String()): ExchangeService,
ExchangeMetadataService.String(): ExchangeMetadataService, strings.ToLower(ExchangeMetadataService.String()): ExchangeMetadataService,
OneDriveService.String(): OneDriveService, strings.ToLower(OneDriveService.String()): OneDriveService,
OneDriveMetadataService.String(): OneDriveMetadataService, strings.ToLower(OneDriveMetadataService.String()): OneDriveMetadataService,
SharePointService.String(): SharePointService, strings.ToLower(SharePointService.String()): SharePointService,
SharePointMetadataService.String(): SharePointMetadataService, strings.ToLower(SharePointMetadataService.String()): SharePointMetadataService,
GroupsService.String(): GroupsService, strings.ToLower(GroupsService.String()): GroupsService,
GroupsMetadataService.String(): GroupsMetadataService, strings.ToLower(GroupsMetadataService.String()): GroupsMetadataService,
TeamsChatsService.String(): TeamsChatsService, strings.ToLower(TeamsChatsService.String()): TeamsChatsService,
TeamsChatsMetadataService.String(): TeamsChatsMetadataService, strings.ToLower(TeamsChatsMetadataService.String()): TeamsChatsMetadataService,
} }
func ToServiceType(service string) ServiceType { func ToServiceType(service string) ServiceType {

3
src/pkg/selectors/selectors.go
View File

@ -355,6 +355,9 @@ func selectorAsIface[T any](s Selector) (T, error) {
case ServiceGroups: case ServiceGroups:
a, err = func() (any, error) { return s.ToGroupsRestore() }() a, err = func() (any, error) { return s.ToGroupsRestore() }()
t = a.(T) t = a.(T)
case ServiceTeamsChats:
a, err = func() (any, error) { return s.ToTeamsChatsRestore() }()
t = a.(T)
default: default:
err = clues.Stack(ErrorUnrecognizedService, clues.New(s.Service.String())) err = clues.Stack(ErrorUnrecognizedService, clues.New(s.Service.String()))
} }