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

Fix existing tests

Browse Source
This commit is contained in:
Abin Simon 2023-10-16 19:39:42 +05:30
parent 34caca8a5d
commit 04d3e9019b
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/restore/groups_test.go
View File

@ -53,6 +53,7 @@ func (suite *GroupsUnitSuite) TestAddGroupsCommands() {
"--" + flags.RunModeFN, flags.RunModeFlagTest, "--" + flags.RunModeFN, flags.RunModeFlagTest,
"--" + flags.BackupFN, flagsTD.BackupInput, "--" + flags.BackupFN, flagsTD.BackupInput,
"--" + flags.SiteFN, flagsTD.SiteInput, "--" + flags.SiteFN, flagsTD.SiteInput,
"--" + flags.SiteIDFN, flagsTD.SiteInput,
"--" + flags.LibraryFN, flagsTD.LibraryInput, "--" + flags.LibraryFN, flagsTD.LibraryInput,
"--" + flags.FileFN, flagsTD.FlgInputs(flagsTD.FileNameInput), "--" + flags.FileFN, flagsTD.FlgInputs(flagsTD.FileNameInput),
"--" + flags.FolderFN, flagsTD.FlgInputs(flagsTD.FolderPathInput), "--" + flags.FolderFN, flagsTD.FlgInputs(flagsTD.FolderPathInput),
@ -83,7 +84,8 @@ func (suite *GroupsUnitSuite) TestAddGroupsCommands() {
opts := utils.MakeGroupsOpts(cmd) opts := utils.MakeGroupsOpts(cmd)
assert.Equal(t, flagsTD.BackupInput, flags.BackupIDFV) assert.Equal(t, flagsTD.BackupInput, flags.BackupIDFV)
assert.Equal(t, flagsTD.SiteInput, opts.Site) assert.Equal(t, flagsTD.SiteInput, opts.SiteID[0])
assert.Equal(t, flagsTD.SiteInput, opts.WebURL[0])
assert.Equal(t, flagsTD.LibraryInput, opts.Library) assert.Equal(t, flagsTD.LibraryInput, opts.Library)
assert.ElementsMatch(t, flagsTD.FileNameInput, opts.FileName) assert.ElementsMatch(t, flagsTD.FileNameInput, opts.FileName)
assert.ElementsMatch(t, flagsTD.FolderPathInput, opts.FolderPath) assert.ElementsMatch(t, flagsTD.FolderPathInput, opts.FolderPath)

11
src/internal/m365/controller_test.go
View File

@ -18,6 +18,7 @@ import (
"github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/data"
"github.com/alcionai/corso/src/internal/m365/mock" "github.com/alcionai/corso/src/internal/m365/mock"
"github.com/alcionai/corso/src/internal/m365/resource" "github.com/alcionai/corso/src/internal/m365/resource"
"github.com/alcionai/corso/src/internal/m365/service/common"
exchMock "github.com/alcionai/corso/src/internal/m365/service/exchange/mock" exchMock "github.com/alcionai/corso/src/internal/m365/service/exchange/mock"
"github.com/alcionai/corso/src/internal/m365/stub" "github.com/alcionai/corso/src/internal/m365/stub"
"github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/m365/support"
@ -57,18 +58,18 @@ func (suite *ControllerUnitSuite) TestPopulateOwnerIDAndNamesFrom() {
var ( var (
itn = map[string]string{id: name} itn = map[string]string{id: name}
nti = map[string]string{name: id} nti = map[string]string{name: id}
lookup = &ResourceClient{ lookup = &common.ResourceClient{
enum: resource.Users, Enum: resource.Users,
getter: &mock.IDNameGetter{ID: id, Name: name}, Getter: &mock.IDNameGetter{ID: id, Name: name},
} }
noLookup = &ResourceClient{enum: resource.Users, getter: &mock.IDNameGetter{}} noLookup = &common.ResourceClient{Enum: resource.Users, Getter: &mock.IDNameGetter{}}
) )
table := []struct { table := []struct {
name string name string
protectedResource string protectedResource string
ins inMock.Cache ins inMock.Cache
rc *ResourceClient rc *common.ResourceClient
expectID string expectID string
expectName string expectName string
expectErr require.ErrorAssertionFunc expectErr require.ErrorAssertionFunc

20
src/internal/m365/service/common/lookup.go
View File

@ -15,22 +15,22 @@ import (
// Resource Lookup Handling // Resource Lookup Handling
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
func GetResourceClient(rc resource.Category, ac api.Client) (*resourceClient, error) { func GetResourceClient(rc resource.Category, ac api.Client) (*ResourceClient, error) {
switch rc { switch rc {
case resource.Users: case resource.Users:
return &resourceClient{enum: rc, getter: ac.Users()}, nil return &ResourceClient{Enum: rc, Getter: ac.Users()}, nil
case resource.Sites: case resource.Sites:
return &resourceClient{enum: rc, getter: ac.Sites()}, nil return &ResourceClient{Enum: rc, Getter: ac.Sites()}, nil
case resource.Groups: case resource.Groups:
return &resourceClient{enum: rc, getter: ac.Groups()}, nil return &ResourceClient{Enum: rc, Getter: ac.Groups()}, nil
default: default:
return nil, clues.New("unrecognized owner resource type").With("resource_enum", rc) return nil, clues.New("unrecognized owner resource type").With("resource_enum", rc)
} }
} }
type resourceClient struct { type ResourceClient struct {
enum resource.Category Enum resource.Category
getter getIDAndNamer Getter getIDAndNamer
} }
type getIDAndNamer interface { type getIDAndNamer interface {
@ -45,7 +45,7 @@ type getIDAndNamer interface {
) )
} }
var _ idname.GetResourceIDAndNamer = &resourceClient{} var _ idname.GetResourceIDAndNamer = &ResourceClient{}
// GetResourceIDAndNameFrom looks up the resource's canonical id and display name. // GetResourceIDAndNameFrom looks up the resource's canonical id and display name.
// If the resource is present in the idNameSwapper, then that interface's id and // If the resource is present in the idNameSwapper, then that interface's id and
@ -53,7 +53,7 @@ var _ idname.GetResourceIDAndNamer = &resourceClient{}
// api to fetch the user or site using the resource value. This fallback assumes // api to fetch the user or site using the resource value. This fallback assumes
// that the resource is a well formed ID or display name of appropriate design // that the resource is a well formed ID or display name of appropriate design
// (PrincipalName for users, WebURL for sites). // (PrincipalName for users, WebURL for sites).
func (r resourceClient) GetResourceIDAndNameFrom( func (r ResourceClient) GetResourceIDAndNameFrom(
ctx context.Context, ctx context.Context,
owner string, owner string,
ins idname.Cacher, ins idname.Cacher,
@ -73,7 +73,7 @@ func (r resourceClient) GetResourceIDAndNameFrom(
err error err error
) )
id, name, err = r.getter.GetIDAndName(ctx, owner, api.CallConfig{}) id, name, err = r.Getter.GetIDAndName(ctx, owner, api.CallConfig{})
if err != nil { if err != nil {
if graph.IsErrUserNotFound(err) { if graph.IsErrUserNotFound(err) {
return nil, clues.Stack(graph.ErrResourceOwnerNotFound, err) return nil, clues.Stack(graph.ErrResourceOwnerNotFound, err)