[Feature] Move connector api module from internal -> pkg (#3166)

<!-- PR description-->

This PR moves the `api` module from `src/internal/connector/discovery`
to `src/pkg/services/m365/api` so that the Client can be reused.

#### Does this PR need a docs update or release note?

- [ ] ✅ Yes, it's included
- [ ] 🕐 Yes, but in a later PR
- [x] ⛔ No

#### Type of change

<!--- Please check the type of change your PR introduces: --->
- [x] 🌻 Feature
- [ ] 🐛 Bugfix
- [ ] 🗺️ Documentation
- [ ] 🤖 Supportability/Tests
- [ ] 💻 CI/Deployment
- [ ] 🧹 Tech Debt/Cleanup

#### Issue(s)

<!-- Can reference multiple issues. Use one of the following "magic
words" - "closes, fixes" to auto-close the Github issue. -->
* #ALC-2214

#### Test Plan

<!-- How will this be tested prior to merging.-->
- [ ] 💪 Manual
- [x] ⚡ Unit test
- [ ] 💚 E2E

---------

Co-authored-by: aviator-app[bot] <48659329+aviator-app[bot]@users.noreply.github.com>

src/internal/connector/discovery/discovery.go

@@ -6,10 +6,10 @@ import (
 	"github.com/alcionai/clues"
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 
-	"github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/graph"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/fault"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 // ---------------------------------------------------------------------------

src/internal/connector/discovery/discovery_test.go

@@ -10,12 +10,12 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/alcionai/corso/src/internal/connector/discovery"
-	"github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/tester"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/credentials"
 	"github.com/alcionai/corso/src/pkg/fault"
 	"github.com/alcionai/corso/src/pkg/path"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 type DiscoveryIntegrationSuite struct {

src/internal/connector/graph_connector.go

@@ -11,13 +11,13 @@ import (
 	"github.com/alcionai/clues"
 
 	"github.com/alcionai/corso/src/internal/common"
-	"github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"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/operations/inject"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/fault"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 // ---------------------------------------------------------------------------

src/internal/connector/sharepoint/api/helper_test.go

@@ -6,17 +6,17 @@ import (
 	"github.com/alcionai/clues"
 	"github.com/stretchr/testify/require"
 
-	discover "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/graph"
 	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
-func createTestBetaService(t *testing.T, credentials account.M365Config) *discover.BetaService {
+func createTestBetaService(t *testing.T, credentials account.M365Config) *api.BetaService {
 	adapter, err := graph.CreateAdapter(
 		credentials.AzureTenantID,
 		credentials.AzureClientID,
 		credentials.AzureClientSecret)
 	require.NoError(t, err, clues.ToCore(err))
 
-	return discover.NewBetaService(adapter)
+	return api.NewBetaService(adapter)
 }

src/internal/connector/sharepoint/api/pages.go

@@ -11,7 +11,6 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/sites"
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
-	dapi "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/graph"
 	betamodels "github.com/alcionai/corso/src/internal/connector/graph/betasdk/models"
 	betasites "github.com/alcionai/corso/src/internal/connector/graph/betasdk/sites"
@@ -20,13 +19,14 @@ import (
 	"github.com/alcionai/corso/src/internal/diagnostics"
 	"github.com/alcionai/corso/src/pkg/backup/details"
 	"github.com/alcionai/corso/src/pkg/fault"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 // GetSitePages retrieves a collection of Pages related to the give Site.
 // Returns error if error experienced during the call
 func GetSitePages(
 	ctx context.Context,
-	serv *dapi.BetaService,
+	serv *api.BetaService,
 	siteID string,
 	pages []string,
 	errs *fault.Bus,
@@ -100,7 +100,7 @@ func GetSite(ctx context.Context, gs graph.Servicer, siteID string) (models.Site
 }
 
 // fetchPages utility function to return the tuple of item
-func FetchPages(ctx context.Context, bs *dapi.BetaService, siteID string) ([]NameID, error) {
+func FetchPages(ctx context.Context, bs *api.BetaService, siteID string) ([]NameID, error) {
 	var (
 		builder = bs.Client().SitesById(siteID).Pages()
 		opts    = fetchPageOptions()
@@ -159,7 +159,7 @@ func fetchPageOptions() *betasites.ItemPagesRequestBuilderGetRequestConfiguratio
 // https://github.com/alcionai/corso/issues/2707
 func DeleteSitePage(
 	ctx context.Context,
-	serv *dapi.BetaService,
+	serv *api.BetaService,
 	siteID, pageID string,
 ) error {
 	err := serv.Client().SitesById(siteID).PagesById(pageID).Delete(ctx, nil)
@@ -184,7 +184,7 @@ func retrieveSitePageOptions() *betasites.ItemPagesSitePageItemRequestBuilderGet
 
 func RestoreSitePage(
 	ctx context.Context,
-	service *dapi.BetaService,
+	service *api.BetaService,
 	itemData data.Stream,
 	siteID, destName string,
 ) (details.ItemInfo, error) {

src/internal/connector/sharepoint/api/pages_test.go

@@ -11,20 +11,20 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/alcionai/corso/src/internal/common"
-	discover "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/sharepoint"
 	"github.com/alcionai/corso/src/internal/connector/sharepoint/api"
 	spMock "github.com/alcionai/corso/src/internal/connector/sharepoint/mock"
 	"github.com/alcionai/corso/src/internal/tester"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/fault"
+	m365api "github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 type SharePointPageSuite struct {
 	tester.Suite
 	siteID  string
 	creds   account.M365Config
-	service *discover.BetaService
+	service *m365api.BetaService
 }
 
 func (suite *SharePointPageSuite) SetupSuite() {

src/internal/connector/sharepoint/collection.go

@@ -11,7 +11,6 @@ import (
 	kjson "github.com/microsoft/kiota-serialization-json-go"
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
-	dapi "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/graph"
 	"github.com/alcionai/corso/src/internal/connector/sharepoint/api"
 	"github.com/alcionai/corso/src/internal/connector/support"
@@ -22,6 +21,7 @@ import (
 	"github.com/alcionai/corso/src/pkg/fault"
 	"github.com/alcionai/corso/src/pkg/logger"
 	"github.com/alcionai/corso/src/pkg/path"
+	m365api "github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 type DataCategory int
@@ -56,7 +56,7 @@ type Collection struct {
 	category      DataCategory
 	service       graph.Servicer
 	ctrl          control.Options
-	betaService   *dapi.BetaService
+	betaService   *m365api.BetaService
 	statusUpdater support.StatusUpdater
 }
 

src/internal/connector/sharepoint/data_collections.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/alcionai/clues"
 
-	dapi "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/graph"
 	"github.com/alcionai/corso/src/internal/connector/onedrive"
 	"github.com/alcionai/corso/src/internal/connector/sharepoint/api"
@@ -19,6 +18,7 @@ import (
 	"github.com/alcionai/corso/src/pkg/logger"
 	"github.com/alcionai/corso/src/pkg/path"
 	"github.com/alcionai/corso/src/pkg/selectors"
+	m365api "github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 type statusUpdater interface {
@@ -243,7 +243,7 @@ func collectPages(
 		return nil, clues.Wrap(err, "creating azure client adapter")
 	}
 
-	betaService := dapi.NewBetaService(adpt)
+	betaService := m365api.NewBetaService(adpt)
 
 	tuples, err := api.FetchPages(ctx, betaService, siteID)
 	if err != nil {

src/internal/connector/sharepoint/restore.go

@@ -10,7 +10,6 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
-	dapi "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/graph"
 	"github.com/alcionai/corso/src/internal/connector/onedrive"
 	"github.com/alcionai/corso/src/internal/connector/sharepoint/api"
@@ -23,6 +22,7 @@ import (
 	"github.com/alcionai/corso/src/pkg/fault"
 	"github.com/alcionai/corso/src/pkg/logger"
 	"github.com/alcionai/corso/src/pkg/path"
+	m365api "github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 //----------------------------------------------------------------------------
@@ -315,7 +315,7 @@ func RestorePageCollection(
 
 	var (
 		el      = errs.Local()
-		service = dapi.NewBetaService(adpt)
+		service = m365api.NewBetaService(adpt)
 		items   = dc.Items(ctx, errs)
 	)
 

src/pkg/services/m365/api/api.go

@@ -11,12 +11,11 @@ import (
 // interfaces
 // ---------------------------------------------------------------------------
 
-// Client is used to fulfill the interface for discovery
-// queries that are traditionally backed by GraphAPI.  A
-// struct is used in this case, instead of deferring to
-// pure function wrappers, so that the boundary separates the
-// granular implementation of the graphAPI and kiota away
-// from the exchange package's broader intents.
+// Client is used to fulfill queries that are traditionally
+// backed by GraphAPI. A struct is used in this case, instead
+// of deferring to pure function wrappers, so that the boundary
+// separates the granular implementation of the graphAPI and
+// kiota away from the other packages.
 type Client struct {
 	Credentials account.M365Config
 
@@ -25,7 +24,7 @@ type Client struct {
 	stable graph.Servicer
 }
 
-// NewClient produces a new exchange api client.  Must be used in
+// NewClient produces a new api client.  Must be used in
 // place of creating an ad-hoc client struct.
 func NewClient(creds account.M365Config) (Client, error) {
 	s, err := newService(creds)
@@ -39,7 +38,7 @@ func NewClient(creds account.M365Config) (Client, error) {
 // service generates a new service.  Used for paged and other long-running
 // requests instead of the client's stable service, so that in-flight state
 // within the adapter doesn't get clobbered
-func (c Client) service() (*graph.Service, error) {
+func (c Client) Service() (*graph.Service, error) {
 	return newService(c.Credentials)
 }
 

src/pkg/services/m365/api/sites.go

@@ -37,7 +37,7 @@ type Sites struct {
 
 // GetAll retrieves all sites.
 func (c Sites) GetAll(ctx context.Context, errs *fault.Bus) ([]models.Siteable, error) {
-	service, err := c.service()
+	service, err := c.Service()
 	if err != nil {
 		return nil, err
 	}

src/pkg/services/m365/api/users.go

@@ -100,7 +100,7 @@ func userOptions(fs *string) *users.UsersRequestBuilderGetRequestConfiguration {
 
 // GetAll retrieves all users.
 func (c Users) GetAll(ctx context.Context, errs *fault.Bus) ([]models.Userable, error) {
-	service, err := c.service()
+	service, err := c.Service()
 	if err != nil {
 		return nil, err
 	}

src/pkg/services/m365/m365.go

@@ -10,10 +10,10 @@ import (
 	"github.com/alcionai/corso/src/internal/common"
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/connector/discovery"
-	"github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/fault"
 	"github.com/alcionai/corso/src/pkg/path"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 // ServiceAccess is true if a resource owner is capable of