From 79b6c0957f563d8e54c497dd9e52ce5d805654bc Mon Sep 17 00:00:00 2001 From: ashmrtn Date: Tue, 28 Mar 2023 09:45:28 -0700 Subject: [PATCH] Re-enable import order linting (#2928) Fixes current errors as well --- #### Does this PR need a docs update or release note? - [ ] :white_check_mark: Yes, it's included - [ ] :clock1: Yes, but in a later PR - [x] :no_entry: No #### Type of change - [ ] :sunflower: Feature - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [ ] :robot: Supportability/Tests - [ ] :computer: CI/Deployment - [x] :broom: Tech Debt/Cleanup #### Issue(s) * closes #2927 #### Test Plan - [x] :muscle: Manual - [ ] :zap: Unit test - [ ] :green_heart: E2E --- src/.golangci.yml | 1 + src/cmd/purge/purge.go | 2 +- src/internal/connector/graph/betasdk/beta_client_test.go | 2 +- src/internal/connector/graph/shared.go | 3 ++- src/internal/connector/onedrive/api/drive.go | 2 +- src/internal/connector/onedrive/api/mock/drive.go | 2 +- src/internal/streamstore/mock/mock.go | 4 ++-- src/internal/tester/suite_test.go | 3 ++- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/.golangci.yml b/src/.golangci.yml index 545c00469..c35a4fbb7 100644 --- a/src/.golangci.yml +++ b/src/.golangci.yml @@ -3,6 +3,7 @@ run: linters: enable: + - gci - gofmt - gofumpt - errcheck diff --git a/src/cmd/purge/purge.go b/src/cmd/purge/purge.go index af7b3067d..5fe93dddd 100644 --- a/src/cmd/purge/purge.go +++ b/src/cmd/purge/purge.go @@ -6,10 +6,10 @@ import ( "time" "github.com/alcionai/clues" - . "github.com/alcionai/corso/src/cli/print" "github.com/pkg/errors" "github.com/spf13/cobra" + . "github.com/alcionai/corso/src/cli/print" "github.com/alcionai/corso/src/cli/utils" "github.com/alcionai/corso/src/internal/common" "github.com/alcionai/corso/src/internal/connector" diff --git a/src/internal/connector/graph/betasdk/beta_client_test.go b/src/internal/connector/graph/betasdk/beta_client_test.go index 6f03a7eff..65f9c689d 100644 --- a/src/internal/connector/graph/betasdk/beta_client_test.go +++ b/src/internal/connector/graph/betasdk/beta_client_test.go @@ -3,11 +3,11 @@ package betasdk import ( "testing" + "github.com/alcionai/clues" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/clues" "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/account" diff --git a/src/internal/connector/graph/shared.go b/src/internal/connector/graph/shared.go index 090e46fcd..208f50420 100644 --- a/src/internal/connector/graph/shared.go +++ b/src/internal/connector/graph/shared.go @@ -4,8 +4,9 @@ package graph // Microsoft Graph Applications. import ( - "github.com/alcionai/corso/src/internal/common/ptr" "github.com/microsoftgraph/msgraph-sdk-go/models" + + "github.com/alcionai/corso/src/internal/common/ptr" ) func UnwrapEmailAddress(contact models.Recipientable) string { diff --git a/src/internal/connector/onedrive/api/drive.go b/src/internal/connector/onedrive/api/drive.go index 42b91afe6..d73b0c099 100644 --- a/src/internal/connector/onedrive/api/drive.go +++ b/src/internal/connector/onedrive/api/drive.go @@ -7,7 +7,6 @@ import ( "time" "github.com/alcionai/clues" - "github.com/alcionai/corso/src/internal/connector/graph/api" abstractions "github.com/microsoft/kiota-abstractions-go" msdrives "github.com/microsoftgraph/msgraph-sdk-go/drives" "github.com/microsoftgraph/msgraph-sdk-go/models" @@ -16,6 +15,7 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/connector/graph" + "github.com/alcionai/corso/src/internal/connector/graph/api" "github.com/alcionai/corso/src/pkg/logger" ) diff --git a/src/internal/connector/onedrive/api/mock/drive.go b/src/internal/connector/onedrive/api/mock/drive.go index ce113293b..2b84c25c1 100644 --- a/src/internal/connector/onedrive/api/mock/drive.go +++ b/src/internal/connector/onedrive/api/mock/drive.go @@ -3,9 +3,9 @@ package mock import ( "context" + "github.com/alcionai/clues" "github.com/microsoftgraph/msgraph-sdk-go/models" - "github.com/alcionai/clues" "github.com/alcionai/corso/src/internal/connector/graph/api" ) diff --git a/src/internal/streamstore/mock/mock.go b/src/internal/streamstore/mock/mock.go index ef1f51e53..295633ada 100644 --- a/src/internal/streamstore/mock/mock.go +++ b/src/internal/streamstore/mock/mock.go @@ -6,10 +6,10 @@ import ( "io" "github.com/alcionai/clues" - "github.com/alcionai/corso/src/pkg/backup/details" - "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/internal/streamstore" + "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/fault" ) var _ streamstore.Streamer = &Streamer{} diff --git a/src/internal/tester/suite_test.go b/src/internal/tester/suite_test.go index 29f834e68..74a6e095c 100644 --- a/src/internal/tester/suite_test.go +++ b/src/internal/tester/suite_test.go @@ -3,9 +3,10 @@ package tester_test import ( "testing" - "github.com/alcionai/corso/src/internal/tester" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + + "github.com/alcionai/corso/src/internal/tester" ) type TesterUnitSuite struct {