From ff2db0c553ac3e6c8e873249032407675eb8df11 Mon Sep 17 00:00:00 2001 From: ashmrtn Date: Mon, 26 Sep 2022 11:34:19 -0700 Subject: [PATCH] Export path package to other codebases (#912) ## Description Moves the `path` package to the `pkg` package so other code outside of Corso can use it if they need it ## Type of change - [ ] :sunflower: Feature - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [ ] :robot: Test - [ ] :computer: CI/Deployment - [x] :hamster: Trivial/Minor ## Issue(s) * closes #908 ## Test Plan - [ ] :muscle: Manual - [x] :zap: Unit test - [x] :green_heart: E2E --- src/cli/backup/exchange_integration_test.go | 2 +- src/cli/restore/exchange_integration_test.go | 2 +- src/internal/connector/exchange/exchange_data_collection.go | 2 +- .../connector/exchange/exchange_data_collection_test.go | 2 +- src/internal/connector/exchange/exchange_service_test.go | 2 +- src/internal/connector/exchange/mail_folder_cache.go | 2 +- src/internal/connector/exchange/mail_folder_cache_test.go | 2 +- src/internal/connector/exchange/query_options.go | 2 +- src/internal/connector/exchange/service_functions.go | 2 +- src/internal/connector/exchange/service_iterators.go | 2 +- src/internal/connector/exchange/service_restore.go | 2 +- src/internal/connector/graph/service.go | 2 +- src/internal/connector/mockconnector/mock_data_collection.go | 2 +- src/internal/connector/onedrive/collection.go | 2 +- src/internal/connector/onedrive/collections.go | 2 +- src/internal/connector/onedrive/restore.go | 2 +- src/internal/connector/onedrive/restore_test.go | 2 +- src/internal/data/data_collection.go | 2 +- src/internal/data/data_collection_test.go | 2 +- src/internal/kopia/data_collection.go | 2 +- src/internal/kopia/data_collection_test.go | 2 +- src/internal/kopia/wrapper.go | 2 +- src/internal/kopia/wrapper_test.go | 2 +- src/internal/operations/restore.go | 2 +- src/{internal => pkg}/path/categorytype_string.go | 0 src/{internal => pkg}/path/path.go | 0 src/{internal => pkg}/path/path_test.go | 0 src/{internal => pkg}/path/resource_path.go | 0 src/{internal => pkg}/path/resource_path_test.go | 2 +- src/{internal => pkg}/path/service_category_test.go | 0 src/{internal => pkg}/path/servicetype_string.go | 0 src/pkg/selectors/exchange.go | 2 +- src/pkg/selectors/exchange_test.go | 2 +- src/pkg/selectors/helpers_test.go | 2 +- src/pkg/selectors/onedrive.go | 2 +- src/pkg/selectors/scopes.go | 2 +- src/pkg/selectors/scopes_test.go | 2 +- src/pkg/selectors/testdata/details.go | 2 +- 38 files changed, 32 insertions(+), 32 deletions(-) rename src/{internal => pkg}/path/categorytype_string.go (100%) rename src/{internal => pkg}/path/path.go (100%) rename src/{internal => pkg}/path/path_test.go (100%) rename src/{internal => pkg}/path/resource_path.go (100%) rename src/{internal => pkg}/path/resource_path_test.go (99%) rename src/{internal => pkg}/path/service_category_test.go (100%) rename src/{internal => pkg}/path/servicetype_string.go (100%) diff --git a/src/cli/backup/exchange_integration_test.go b/src/cli/backup/exchange_integration_test.go index 8a61a118d..c72baad96 100644 --- a/src/cli/backup/exchange_integration_test.go +++ b/src/cli/backup/exchange_integration_test.go @@ -15,10 +15,10 @@ import ( "github.com/alcionai/corso/src/cli/config" "github.com/alcionai/corso/src/cli/print" "github.com/alcionai/corso/src/internal/operations" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/control" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/repository" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/storage" diff --git a/src/cli/restore/exchange_integration_test.go b/src/cli/restore/exchange_integration_test.go index 6135cdbb3..dd665845e 100644 --- a/src/cli/restore/exchange_integration_test.go +++ b/src/cli/restore/exchange_integration_test.go @@ -10,11 +10,11 @@ import ( "github.com/alcionai/corso/src/cli" "github.com/alcionai/corso/src/cli/config" "github.com/alcionai/corso/src/internal/operations" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/repository" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/storage" diff --git a/src/internal/connector/exchange/exchange_data_collection.go b/src/internal/connector/exchange/exchange_data_collection.go index 8c5832787..017835075 100644 --- a/src/internal/connector/exchange/exchange_data_collection.go +++ b/src/internal/connector/exchange/exchange_data_collection.go @@ -18,9 +18,9 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/support" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" ) var ( diff --git a/src/internal/connector/exchange/exchange_data_collection_test.go b/src/internal/connector/exchange/exchange_data_collection_test.go index 261b916e5..aa572410d 100644 --- a/src/internal/connector/exchange/exchange_data_collection_test.go +++ b/src/internal/connector/exchange/exchange_data_collection_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) type ExchangeDataCollectionSuite struct { diff --git a/src/internal/connector/exchange/exchange_service_test.go b/src/internal/connector/exchange/exchange_service_test.go index d378a6a15..c61f5c21b 100644 --- a/src/internal/connector/exchange/exchange_service_test.go +++ b/src/internal/connector/exchange/exchange_service_test.go @@ -13,10 +13,10 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/mockconnector" "github.com/alcionai/corso/src/internal/connector/support" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/control" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" ) diff --git a/src/internal/connector/exchange/mail_folder_cache.go b/src/internal/connector/exchange/mail_folder_cache.go index 7fe9aac33..7fa0b94f5 100644 --- a/src/internal/connector/exchange/mail_folder_cache.go +++ b/src/internal/connector/exchange/mail_folder_cache.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/alcionai/corso/src/internal/connector/graph" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) // cachedContainer is used for local unit tests but also makes it so that this diff --git a/src/internal/connector/exchange/mail_folder_cache_test.go b/src/internal/connector/exchange/mail_folder_cache_test.go index 88e8a094c..59b0cf933 100644 --- a/src/internal/connector/exchange/mail_folder_cache_test.go +++ b/src/internal/connector/exchange/mail_folder_cache_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/connector/graph" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/internal/tester" + "github.com/alcionai/corso/src/pkg/path" ) const ( diff --git a/src/internal/connector/exchange/query_options.go b/src/internal/connector/exchange/query_options.go index 6308c9af3..c85c47df9 100644 --- a/src/internal/connector/exchange/query_options.go +++ b/src/internal/connector/exchange/query_options.go @@ -15,7 +15,7 @@ import ( msitem "github.com/microsoftgraph/msgraph-sdk-go/users/item/messages/item" "github.com/pkg/errors" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" ) diff --git a/src/internal/connector/exchange/service_functions.go b/src/internal/connector/exchange/service_functions.go index a1d6a36a0..f10b2ace8 100644 --- a/src/internal/connector/exchange/service_functions.go +++ b/src/internal/connector/exchange/service_functions.go @@ -13,8 +13,8 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/support" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/account" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" ) diff --git a/src/internal/connector/exchange/service_iterators.go b/src/internal/connector/exchange/service_iterators.go index 920899537..87d4e7c8c 100644 --- a/src/internal/connector/exchange/service_iterators.go +++ b/src/internal/connector/exchange/service_iterators.go @@ -10,7 +10,7 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/support" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" ) diff --git a/src/internal/connector/exchange/service_restore.go b/src/internal/connector/exchange/service_restore.go index 7de4a31fc..b6efe907d 100644 --- a/src/internal/connector/exchange/service_restore.go +++ b/src/internal/connector/exchange/service_restore.go @@ -10,9 +10,9 @@ import ( "github.com/alcionai/corso/src/internal/common" "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/support" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" ) // GetRestoreContainer utility function to create diff --git a/src/internal/connector/graph/service.go b/src/internal/connector/graph/service.go index 63a0b2f49..a9cf9cf26 100644 --- a/src/internal/connector/graph/service.go +++ b/src/internal/connector/graph/service.go @@ -5,8 +5,8 @@ import ( msgraphsdk "github.com/microsoftgraph/msgraph-sdk-go" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/account" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" ) diff --git a/src/internal/connector/mockconnector/mock_data_collection.go b/src/internal/connector/mockconnector/mock_data_collection.go index 0e7e563fa..ce4b17d79 100644 --- a/src/internal/connector/mockconnector/mock_data_collection.go +++ b/src/internal/connector/mockconnector/mock_data_collection.go @@ -10,8 +10,8 @@ import ( "github.com/alcionai/corso/src/internal/common" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/path" ) // MockExchangeDataCollection represents a mock exchange mailbox diff --git a/src/internal/connector/onedrive/collection.go b/src/internal/connector/onedrive/collection.go index 85263ff32..e579654e1 100644 --- a/src/internal/connector/onedrive/collection.go +++ b/src/internal/connector/onedrive/collection.go @@ -8,9 +8,9 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/support" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" ) const ( diff --git a/src/internal/connector/onedrive/collections.go b/src/internal/connector/onedrive/collections.go index 45b2a5f58..6ea6dafc8 100644 --- a/src/internal/connector/onedrive/collections.go +++ b/src/internal/connector/onedrive/collections.go @@ -11,7 +11,7 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/support" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) // Collections is used to retrieve OneDrive data for a diff --git a/src/internal/connector/onedrive/restore.go b/src/internal/connector/onedrive/restore.go index 3b12e0ccc..0a06abeb5 100644 --- a/src/internal/connector/onedrive/restore.go +++ b/src/internal/connector/onedrive/restore.go @@ -11,8 +11,8 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/support" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" ) const ( diff --git a/src/internal/connector/onedrive/restore_test.go b/src/internal/connector/onedrive/restore_test.go index 7b775bd0d..2c5bff1f8 100644 --- a/src/internal/connector/onedrive/restore_test.go +++ b/src/internal/connector/onedrive/restore_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) type OneDriveRestoreSuite struct { diff --git a/src/internal/data/data_collection.go b/src/internal/data/data_collection.go index 22916e5a5..3b98fbaa8 100644 --- a/src/internal/data/data_collection.go +++ b/src/internal/data/data_collection.go @@ -3,8 +3,8 @@ package data import ( "io" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/path" ) // ------------------------------------------------------------------------------------------------ diff --git a/src/internal/data/data_collection_test.go b/src/internal/data/data_collection_test.go index fdb54c7b3..b593001a8 100644 --- a/src/internal/data/data_collection_test.go +++ b/src/internal/data/data_collection_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) type mockColl struct { diff --git a/src/internal/kopia/data_collection.go b/src/internal/kopia/data_collection.go index fed1bc002..3ce8ffeb1 100644 --- a/src/internal/kopia/data_collection.go +++ b/src/internal/kopia/data_collection.go @@ -4,7 +4,7 @@ import ( "io" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) var ( diff --git a/src/internal/kopia/data_collection_test.go b/src/internal/kopia/data_collection_test.go index 82788ee3f..7b2910911 100644 --- a/src/internal/kopia/data_collection_test.go +++ b/src/internal/kopia/data_collection_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) // --------------- diff --git a/src/internal/kopia/wrapper.go b/src/internal/kopia/wrapper.go index d4c213c7f..93da8cc00 100644 --- a/src/internal/kopia/wrapper.go +++ b/src/internal/kopia/wrapper.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" ) const ( diff --git a/src/internal/kopia/wrapper_test.go b/src/internal/kopia/wrapper_test.go index 4ad36a13a..4965eb14a 100644 --- a/src/internal/kopia/wrapper_test.go +++ b/src/internal/kopia/wrapper_test.go @@ -18,9 +18,9 @@ import ( "github.com/alcionai/corso/src/internal/connector/mockconnector" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/path" ) const ( diff --git a/src/internal/operations/restore.go b/src/internal/operations/restore.go index a4272e628..a3a53332b 100644 --- a/src/internal/operations/restore.go +++ b/src/internal/operations/restore.go @@ -13,12 +13,12 @@ import ( "github.com/alcionai/corso/src/internal/events" "github.com/alcionai/corso/src/internal/kopia" "github.com/alcionai/corso/src/internal/model" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/internal/stats" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/store" ) diff --git a/src/internal/path/categorytype_string.go b/src/pkg/path/categorytype_string.go similarity index 100% rename from src/internal/path/categorytype_string.go rename to src/pkg/path/categorytype_string.go diff --git a/src/internal/path/path.go b/src/pkg/path/path.go similarity index 100% rename from src/internal/path/path.go rename to src/pkg/path/path.go diff --git a/src/internal/path/path_test.go b/src/pkg/path/path_test.go similarity index 100% rename from src/internal/path/path_test.go rename to src/pkg/path/path_test.go diff --git a/src/internal/path/resource_path.go b/src/pkg/path/resource_path.go similarity index 100% rename from src/internal/path/resource_path.go rename to src/pkg/path/resource_path.go diff --git a/src/internal/path/resource_path_test.go b/src/pkg/path/resource_path_test.go similarity index 99% rename from src/internal/path/resource_path_test.go rename to src/pkg/path/resource_path_test.go index 1062d87d0..b690948d6 100644 --- a/src/internal/path/resource_path_test.go +++ b/src/pkg/path/resource_path_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/path" + "github.com/alcionai/corso/src/pkg/path" ) const ( diff --git a/src/internal/path/service_category_test.go b/src/pkg/path/service_category_test.go similarity index 100% rename from src/internal/path/service_category_test.go rename to src/pkg/path/service_category_test.go diff --git a/src/internal/path/servicetype_string.go b/src/pkg/path/servicetype_string.go similarity index 100% rename from src/internal/path/servicetype_string.go rename to src/pkg/path/servicetype_string.go diff --git a/src/pkg/selectors/exchange.go b/src/pkg/selectors/exchange.go index 9b1dddefd..a4e41dedf 100644 --- a/src/pkg/selectors/exchange.go +++ b/src/pkg/selectors/exchange.go @@ -5,9 +5,9 @@ import ( "strconv" "github.com/alcionai/corso/src/internal/common" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/filters" + "github.com/alcionai/corso/src/pkg/path" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/selectors/exchange_test.go b/src/pkg/selectors/exchange_test.go index 8353ff718..207b8a1ac 100644 --- a/src/pkg/selectors/exchange_test.go +++ b/src/pkg/selectors/exchange_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/common" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/filters" + "github.com/alcionai/corso/src/pkg/path" ) type ExchangeSelectorSuite struct { diff --git a/src/pkg/selectors/helpers_test.go b/src/pkg/selectors/helpers_test.go index f16bff6fb..fcdfab382 100644 --- a/src/pkg/selectors/helpers_test.go +++ b/src/pkg/selectors/helpers_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/filters" + "github.com/alcionai/corso/src/pkg/path" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/selectors/onedrive.go b/src/pkg/selectors/onedrive.go index f4275daa5..3bf5a72a0 100644 --- a/src/pkg/selectors/onedrive.go +++ b/src/pkg/selectors/onedrive.go @@ -1,8 +1,8 @@ package selectors import ( - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/path" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/selectors/scopes.go b/src/pkg/selectors/scopes.go index 45db46568..8f38111b0 100644 --- a/src/pkg/selectors/scopes.go +++ b/src/pkg/selectors/scopes.go @@ -3,10 +3,10 @@ package selectors import ( "context" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/filters" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/path" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/selectors/scopes_test.go b/src/pkg/selectors/scopes_test.go index 56f73ea1e..5ffc44986 100644 --- a/src/pkg/selectors/scopes_test.go +++ b/src/pkg/selectors/scopes_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/filters" + "github.com/alcionai/corso/src/pkg/path" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/selectors/testdata/details.go b/src/pkg/selectors/testdata/details.go index e61114b96..5772a94a6 100644 --- a/src/pkg/selectors/testdata/details.go +++ b/src/pkg/selectors/testdata/details.go @@ -4,8 +4,8 @@ import ( stdpath "path" "time" - "github.com/alcionai/corso/src/internal/path" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/path" ) // mustParsePath takes a string representing a resource path and returns a path