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

resolve lint errors (#638)

Browse Source
This commit is contained in:
Keepers 2022-08-23 14:22:25 -06:00 committed by GitHub
parent a1f79862f1
commit b524053e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 107 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/cli/backup/exchange_test.go
View File

@ -55,7 +55,7 @@ func (suite *ExchangeSuite) TestAddExchangeCommands() {
func (suite *ExchangeSuite) TestValidateBackupCreateFlags() { func (suite *ExchangeSuite) TestValidateBackupCreateFlags() {
table := []struct { table := []struct {
name string name string
any bool a bool
user, data []string user, data []string
expect assert.ErrorAssertionFunc expect assert.ErrorAssertionFunc
}{ }{
@ -65,7 +65,7 @@ func (suite *ExchangeSuite) TestValidateBackupCreateFlags() {
}, },
{ {
name: "any and data", name: "any and data",
any: true, a: true,
data: []string{dataEmail}, data: []string{dataEmail},
expect: assert.Error, expect: assert.Error,
}, },
@ -82,19 +82,19 @@ func (suite *ExchangeSuite) TestValidateBackupCreateFlags() {
}, },
{ {
name: "no users, any", name: "no users, any",
any: true, a: true,
expect: assert.NoError, expect: assert.NoError,
}, },
{ {
name: "users, any", name: "users, any",
any: true, a: true,
user: []string{"fnord"}, user: []string{"fnord"},
expect: assert.NoError, expect: assert.NoError,
}, },
} }
for _, test := range table { for _, test := range table {
suite.T().Run(test.name, func(t *testing.T) { suite.T().Run(test.name, func(t *testing.T) {
test.expect(t, validateExchangeBackupCreateFlags(test.any, test.user, test.data)) test.expect(t, validateExchangeBackupCreateFlags(test.a, test.user, test.data))
}) })
} }
} }
@ -102,13 +102,13 @@ func (suite *ExchangeSuite) TestValidateBackupCreateFlags() {
func (suite *ExchangeSuite) TestExchangeBackupCreateSelectors() { func (suite *ExchangeSuite) TestExchangeBackupCreateSelectors() {
table := []struct { table := []struct {
name string name string
any bool a bool
user, data []string user, data []string
expectIncludeLen int expectIncludeLen int
}{ }{
{ {
name: "any", name: "any",
any: true, a: true,
expectIncludeLen: 3, expectIncludeLen: 3,
}, },
{ {
@ -208,7 +208,7 @@ func (suite *ExchangeSuite) TestExchangeBackupCreateSelectors() {
} }
for _, test := range table { for _, test := range table {
suite.T().Run(test.name, func(t *testing.T) { suite.T().Run(test.name, func(t *testing.T) {
sel := exchangeBackupCreateSelectors(test.any, test.user, test.data) sel := exchangeBackupCreateSelectors(test.a, test.user, test.data)
assert.Equal(t, test.expectIncludeLen, len(sel.Includes)) assert.Equal(t, test.expectIncludeLen, len(sel.Includes))
}) })
} }
@ -300,7 +300,7 @@ func (suite *ExchangeSuite) TestValidateBackupDetailFlags() {
func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() { func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
stub := []string{"id-stub"} stub := []string{"id-stub"}
any := []string{utils.Wildcard} a := []string{utils.Wildcard}
table := []struct { table := []struct {
name string name string
contacts, contactFolders, emails, emailFolders, events, users []string contacts, contactFolders, emails, emailFolders, events, users []string
@ -312,7 +312,7 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users", name: "any users",
users: any, users: a,
expectIncludeLen: 3, expectIncludeLen: 3,
}, },
{ {
@ -327,19 +327,19 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users, any data", name: "any users, any data",
contacts: any, contacts: a,
contactFolders: any, contactFolders: a,
emails: any, emails: a,
emailFolders: any, emailFolders: a,
events: any, events: a,
users: any, users: a,
expectIncludeLen: 3, expectIncludeLen: 3,
}, },
{ {
name: "any users, any folders", name: "any users, any folders",
contactFolders: any, contactFolders: a,
emailFolders: any, emailFolders: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -361,9 +361,9 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users, contacts", name: "any users, contacts",
contacts: any, contacts: a,
contactFolders: stub, contactFolders: stub,
users: any, users: a,
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
{ {
@ -375,9 +375,9 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users, emails", name: "any users, emails",
emails: any, emails: a,
emailFolders: stub, emailFolders: stub,
users: any, users: a,
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
{ {
@ -389,8 +389,8 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users, events", name: "any users, events",
events: any, events: a,
users: any, users: a,
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
{ {
@ -401,11 +401,11 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users, contacts + email", name: "any users, contacts + email",
contacts: any, contacts: a,
contactFolders: any, contactFolders: a,
emails: any, emails: a,
emailFolders: any, emailFolders: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -419,10 +419,10 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users, email + event", name: "any users, email + event",
emails: any, emails: a,
emailFolders: any, emailFolders: a,
events: any, events: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -435,10 +435,10 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
}, },
{ {
name: "any users, event + contact", name: "any users, event + contact",
contacts: any, contacts: a,
contactFolders: any, contactFolders: a,
events: any, events: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -482,7 +482,7 @@ func (suite *ExchangeSuite) TestIncludeExchangeBackupDetailDataSelectors() {
func (suite *ExchangeSuite) TestFilterExchangeBackupDetailInfoSelectors() { func (suite *ExchangeSuite) TestFilterExchangeBackupDetailInfoSelectors() {
stub := "id-stub" stub := "id-stub"
any := utils.Wildcard a := utils.Wildcard
table := []struct { table := []struct {
name string name string
after, before, sender, subject string after, before, sender, subject string
@ -494,7 +494,7 @@ func (suite *ExchangeSuite) TestFilterExchangeBackupDetailInfoSelectors() {
}, },
{ {
name: "any receivedAfter", name: "any receivedAfter",
after: any, after: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {
@ -504,7 +504,7 @@ func (suite *ExchangeSuite) TestFilterExchangeBackupDetailInfoSelectors() {
}, },
{ {
name: "any receivedBefore", name: "any receivedBefore",
before: any, before: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {
@ -514,7 +514,7 @@ func (suite *ExchangeSuite) TestFilterExchangeBackupDetailInfoSelectors() {
}, },
{ {
name: "any sender", name: "any sender",
sender: any, sender: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {
@ -524,7 +524,7 @@ func (suite *ExchangeSuite) TestFilterExchangeBackupDetailInfoSelectors() {
}, },
{ {
name: "any subject", name: "any subject",
subject: any, subject: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {

70
src/cli/restore/exchange_test.go
View File

@ -136,7 +136,7 @@ func (suite *ExchangeSuite) TestValidateExchangeRestoreFlags() {
func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() { func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
stub := []string{"id-stub"} stub := []string{"id-stub"}
any := []string{utils.Wildcard} a := []string{utils.Wildcard}
table := []struct { table := []struct {
name string name string
contacts, contactFolders, emails, emailFolders, events, users []string contacts, contactFolders, emails, emailFolders, events, users []string
@ -148,7 +148,7 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users", name: "any users",
users: any, users: a,
expectIncludeLen: 3, expectIncludeLen: 3,
}, },
{ {
@ -163,19 +163,19 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users, any data", name: "any users, any data",
contacts: any, contacts: a,
contactFolders: any, contactFolders: a,
emails: any, emails: a,
emailFolders: any, emailFolders: a,
events: any, events: a,
users: any, users: a,
expectIncludeLen: 3, expectIncludeLen: 3,
}, },
{ {
name: "any users, any folders", name: "any users, any folders",
contactFolders: any, contactFolders: a,
emailFolders: any, emailFolders: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -197,9 +197,9 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users, contacts", name: "any users, contacts",
contacts: any, contacts: a,
contactFolders: stub, contactFolders: stub,
users: any, users: a,
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
{ {
@ -211,9 +211,9 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users, emails", name: "any users, emails",
emails: any, emails: a,
emailFolders: stub, emailFolders: stub,
users: any, users: a,
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
{ {
@ -225,8 +225,8 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users, events", name: "any users, events",
events: any, events: a,
users: any, users: a,
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
{ {
@ -237,11 +237,11 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users, contacts + email", name: "any users, contacts + email",
contacts: any, contacts: a,
contactFolders: any, contactFolders: a,
emails: any, emails: a,
emailFolders: any, emailFolders: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -255,10 +255,10 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users, email + event", name: "any users, email + event",
emails: any, emails: a,
emailFolders: any, emailFolders: a,
events: any, events: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -271,10 +271,10 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
}, },
{ {
name: "any users, event + contact", name: "any users, event + contact",
contacts: any, contacts: a,
contactFolders: any, contactFolders: a,
events: any, events: a,
users: any, users: a,
expectIncludeLen: 2, expectIncludeLen: 2,
}, },
{ {
@ -318,7 +318,7 @@ func (suite *ExchangeSuite) TestIncludeExchangeRestoreDataSelectors() {
func (suite *ExchangeSuite) TestFilterExchangeRestoreInfoSelectors() { func (suite *ExchangeSuite) TestFilterExchangeRestoreInfoSelectors() {
stub := "id-stub" stub := "id-stub"
any := utils.Wildcard a := utils.Wildcard
table := []struct { table := []struct {
name string name string
after, before, sender, subject string after, before, sender, subject string
@ -330,7 +330,7 @@ func (suite *ExchangeSuite) TestFilterExchangeRestoreInfoSelectors() {
}, },
{ {
name: "any receivedAfter", name: "any receivedAfter",
after: any, after: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {
@ -340,7 +340,7 @@ func (suite *ExchangeSuite) TestFilterExchangeRestoreInfoSelectors() {
}, },
{ {
name: "any receivedBefore", name: "any receivedBefore",
before: any, before: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {
@ -350,7 +350,7 @@ func (suite *ExchangeSuite) TestFilterExchangeRestoreInfoSelectors() {
}, },
{ {
name: "any senders", name: "any senders",
sender: any, sender: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {
@ -360,7 +360,7 @@ func (suite *ExchangeSuite) TestFilterExchangeRestoreInfoSelectors() {
}, },
{ {
name: "any subjects", name: "any subjects",
subject: any, subject: a,
expectFilterLen: 1, expectFilterLen: 1,
}, },
{ {

6
src/cmd/purge/purge.go
View File

@ -73,7 +73,7 @@ func doFolderPurge(cmd *cobra.Command, args []string) error {
for _, mf := range mfs { for _, mf := range mfs {
// compare the folder time to the deletion boundary time first // compare the folder time to the deletion boundary time first
var delete bool var del bool
dnLen := len(mf.DisplayName) dnLen := len(mf.DisplayName)
if dnLen > stLen { if dnLen > stLen {
dnSuff := mf.DisplayName[dnLen-stLen:] dnSuff := mf.DisplayName[dnLen-stLen:]
@ -82,10 +82,10 @@ func doFolderPurge(cmd *cobra.Command, args []string) error {
Info(ctx, errors.Wrapf(err, "Error: deleting folder [%s]", mf.DisplayName)) Info(ctx, errors.Wrapf(err, "Error: deleting folder [%s]", mf.DisplayName))
continue continue
} }
delete = dnTime.Before(beforeTime) del = dnTime.Before(beforeTime)
} }
if !delete { if !del {
continue continue
} }

6
src/internal/connector/support/errors_test.go
View File

@ -39,10 +39,10 @@ func (suite *GraphConnectorErrorSuite) TestWrapAndAppend_OnVar() {
func (suite *GraphConnectorErrorSuite) TestAsRecoverableError() { func (suite *GraphConnectorErrorSuite) TestAsRecoverableError() {
err := assert.AnError err := assert.AnError
var recover RecoverableGCError var rcv RecoverableGCError
suite.False(errors.As(err, &recover)) suite.False(errors.As(err, &rcv))
aRecoverable := SetRecoverableError(err) aRecoverable := SetRecoverableError(err)
suite.True(errors.As(aRecoverable, &recover)) suite.True(errors.As(aRecoverable, &rcv))
} }
func (suite *GraphConnectorErrorSuite) TestAsNonRecoverableError() { func (suite *GraphConnectorErrorSuite) TestAsNonRecoverableError() {

5
src/internal/kopia/model_store_test.go
View File

@ -54,9 +54,8 @@ func (suite *ModelStoreUnitSuite) TestCloseWithoutInitDoesNotPanic() {
// --------------- // ---------------
type ModelStoreIntegrationSuite struct { type ModelStoreIntegrationSuite struct {
suite.Suite suite.Suite
ctx context.Context ctx context.Context
m *ModelStore m *ModelStore
cfgDir string
} }
func TestModelStoreIntegrationSuite(t *testing.T) { func TestModelStoreIntegrationSuite(t *testing.T) {

36
src/pkg/filters/filters_test.go
View File

@ -18,9 +18,9 @@ func TestFiltersSuite(t *testing.T) {
} }
func (suite *FiltersSuite) TestEquals() { func (suite *FiltersSuite) TestEquals() {
make := filters.NewEquals makeFilt := filters.NewEquals
f := make(false, "", "foo") f := makeFilt(false, "", "foo")
nf := make(true, "", "foo") nf := makeFilt(true, "", "foo")
table := []struct { table := []struct {
input string input string
@ -39,9 +39,9 @@ func (suite *FiltersSuite) TestEquals() {
} }
func (suite *FiltersSuite) TestGreater() { func (suite *FiltersSuite) TestGreater() {
make := filters.NewGreater makeFilt := filters.NewGreater
f := make(false, "", "5") f := makeFilt(false, "", "5")
nf := make(true, "", "5") nf := makeFilt(true, "", "5")
table := []struct { table := []struct {
input string input string
@ -61,9 +61,9 @@ func (suite *FiltersSuite) TestGreater() {
} }
func (suite *FiltersSuite) TestLess() { func (suite *FiltersSuite) TestLess() {
make := filters.NewLess makeFilt := filters.NewLess
f := make(false, "", "5") f := makeFilt(false, "", "5")
nf := make(true, "", "5") nf := makeFilt(true, "", "5")
table := []struct { table := []struct {
input string input string
@ -83,9 +83,9 @@ func (suite *FiltersSuite) TestLess() {
} }
func (suite *FiltersSuite) TestBetween() { func (suite *FiltersSuite) TestBetween() {
make := filters.NewBetween makeFilt := filters.NewBetween
f := make(false, "", "abc", "def") f := makeFilt(false, "", "abc", "def")
nf := make(true, "", "abc", "def") nf := makeFilt(true, "", "abc", "def")
table := []struct { table := []struct {
input string input string
@ -106,9 +106,9 @@ func (suite *FiltersSuite) TestBetween() {
} }
func (suite *FiltersSuite) TestContains() { func (suite *FiltersSuite) TestContains() {
make := filters.NewContains makeFilt := filters.NewContains
f := make(false, "", "smurfs") f := makeFilt(false, "", "smurfs")
nf := make(true, "", "smurfs") nf := makeFilt(true, "", "smurfs")
table := []struct { table := []struct {
input string input string
@ -127,9 +127,9 @@ func (suite *FiltersSuite) TestContains() {
} }
func (suite *FiltersSuite) TestIn() { func (suite *FiltersSuite) TestIn() {
make := filters.NewIn makeFilt := filters.NewIn
f := make(false, "", "murf") f := makeFilt(false, "", "murf")
nf := make(true, "", "murf") nf := makeFilt(true, "", "murf")
table := []struct { table := []struct {
input string input string

7
src/pkg/selectors/onedrive.go
View File

@ -270,10 +270,9 @@ func (s OneDriveScope) Get(cat onedriveCategory) []string {
} }
// sets a value by category to the scope. Only intended for internal use. // sets a value by category to the scope. Only intended for internal use.
func (s OneDriveScope) set(cat onedriveCategory, v string) OneDriveScope { // func (s OneDriveScope) set(cat onedriveCategory, v string) OneDriveScope {
s[cat.String()] = v // return set(s, cat, v)
return s // }
}
// setDefaults ensures that user scopes express `AnyTgt` for their child category types. // setDefaults ensures that user scopes express `AnyTgt` for their child category types.
func (s OneDriveScope) setDefaults() { func (s OneDriveScope) setDefaults() {