resolve lint errors (#638)

src/cli/backup/exchange_test.go

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

src/cli/restore/exchange_test.go

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

src/cmd/purge/purge.go

@@ -73,7 +73,7 @@ func doFolderPurge(cmd *cobra.Command, args []string) error {
 	for _, mf := range mfs {
 
 		// compare the folder time to the deletion boundary time first
-		var delete bool
+		var del bool
 		dnLen := len(mf.DisplayName)
 		if 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))
 				continue
 			}
-			delete = dnTime.Before(beforeTime)
+			del = dnTime.Before(beforeTime)
 		}
 
-		if !delete {
+		if !del {
 			continue
 		}
 

src/internal/connector/support/errors_test.go

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

src/internal/kopia/model_store_test.go

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

src/pkg/filters/filters_test.go

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

src/pkg/selectors/onedrive.go

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