b46f242bc4
This commit include a few things that improves the progresbars and other info messages are printed out during the CLI run.  --- #### Does this PR need a docs update or release note? - [ ] ✅ Yes, it's included - [x] 🕐 Yes, but in a later PR - [ ] ⛔ 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. --> * #<issue> #### Test Plan <!-- How will this be tested prior to merging.--> - [x] 💪 Manual - [ ] ⚡ Unit test - [ ] 💚 E2E
107 lines
2.3 KiB
Go
107 lines
2.3 KiB
Go
package repository
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/alcionai/clues"
|
|
|
|
"github.com/alcionai/corso/src/internal/data"
|
|
"github.com/alcionai/corso/src/internal/m365"
|
|
"github.com/alcionai/corso/src/internal/observe"
|
|
"github.com/alcionai/corso/src/internal/operations/inject"
|
|
"github.com/alcionai/corso/src/pkg/account"
|
|
"github.com/alcionai/corso/src/pkg/path"
|
|
"github.com/alcionai/corso/src/pkg/store"
|
|
)
|
|
|
|
type DataProvider interface {
|
|
inject.BackupProducer
|
|
inject.RestoreConsumer
|
|
|
|
inject.ToServiceHandler
|
|
|
|
VerifyAccess(ctx context.Context) error
|
|
DeserializeMetadataFiles(
|
|
ctx context.Context,
|
|
colls []data.RestoreCollection,
|
|
) ([]store.MetadataFile, error)
|
|
}
|
|
|
|
type DataProviderConnector interface {
|
|
// ConnectDataProvider initializes configurations
|
|
// and establishes the client connection with the
|
|
// data provider for this operation.
|
|
ConnectDataProvider(
|
|
ctx context.Context,
|
|
pst path.ServiceType,
|
|
) error
|
|
// DataProvider retrieves the data provider.
|
|
DataProvider() DataProvider
|
|
}
|
|
|
|
func (r *repository) DataProvider() DataProvider {
|
|
return r.Provider
|
|
}
|
|
|
|
func (r *repository) ConnectDataProvider(
|
|
ctx context.Context,
|
|
pst path.ServiceType,
|
|
) error {
|
|
var (
|
|
provider DataProvider
|
|
err error
|
|
)
|
|
|
|
switch r.Account.Provider {
|
|
case account.ProviderM365:
|
|
provider, err = connectToM365(ctx, *r, pst)
|
|
default:
|
|
err = clues.NewWC(ctx, "unrecognized provider")
|
|
}
|
|
|
|
if err != nil {
|
|
return clues.Wrap(err, "connecting data provider")
|
|
}
|
|
|
|
if err := provider.VerifyAccess(ctx); err != nil {
|
|
return clues.Wrap(err, fmt.Sprintf("verifying %s account connection", r.Account.Provider))
|
|
}
|
|
|
|
r.Provider = provider
|
|
|
|
return nil
|
|
}
|
|
|
|
func connectToM365(
|
|
ctx context.Context,
|
|
r repository,
|
|
pst path.ServiceType,
|
|
) (*m365.Controller, error) {
|
|
if r.Provider != nil {
|
|
ctrl, ok := r.Provider.(*m365.Controller)
|
|
if !ok {
|
|
// if the provider is initialized to a non-m365 controller, we should not
|
|
// attempt to connnect to m365 afterward.
|
|
return nil, clues.New("Attempted to connect to multiple data providers")
|
|
}
|
|
|
|
return ctrl, nil
|
|
}
|
|
|
|
progressBar := observe.MessageWithCompletion(ctx, observe.ProgressCfg{}, "Connecting to M365")
|
|
defer close(progressBar)
|
|
|
|
ctrl, err := m365.NewController(
|
|
ctx,
|
|
r.Account,
|
|
pst,
|
|
r.Opts,
|
|
r.counter)
|
|
if err != nil {
|
|
return nil, clues.Wrap(err, "creating m365 client controller")
|
|
}
|
|
|
|
return ctrl, nil
|
|
}
|