From 91b9f2e825c09ecdf0567e0cc67e9621974aa94b Mon Sep 17 00:00:00 2001 From: ashmrtn Date: Fri, 23 Dec 2022 09:23:06 -0800 Subject: [PATCH] Propagate options to repo and operations (#1932) ## Description Make sure the options struct is passed through the entire stack so we actually have access to flag values. ## 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 - [x] :bug: Bugfix - [ ] :world_map: Documentation - [ ] :robot: Test - [ ] :computer: CI/Deployment - [x] :hamster: Trivial/Minor ## Issue(s) * closes #1931 ## Test Plan - [x] :muscle: Manual - [ ] :zap: Unit test - [ ] :green_heart: E2E --- src/cli/backup/exchange.go | 3 +-- src/internal/connector/exchange/data_collections.go | 2 +- src/pkg/repository/repository.go | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cli/backup/exchange.go b/src/cli/backup/exchange.go index dbc5a7fd9..b7128e4ad 100644 --- a/src/cli/backup/exchange.go +++ b/src/cli/backup/exchange.go @@ -16,7 +16,6 @@ import ( "github.com/alcionai/corso/src/internal/model" "github.com/alcionai/corso/src/pkg/backup" "github.com/alcionai/corso/src/pkg/backup/details" - "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" @@ -264,7 +263,7 @@ func createExchangeCmd(cmd *cobra.Command, args []string) error { return Only(ctx, err) } - r, err := repository.Connect(ctx, acct, s, control.Options{}) + r, err := repository.Connect(ctx, acct, s, options.Control()) if err != nil { return Only(ctx, errors.Wrapf(err, "Failed to connect to the %s repository", s.Provider)) } diff --git a/src/internal/connector/exchange/data_collections.go b/src/internal/connector/exchange/data_collections.go index 92bc9e531..e587b0934 100644 --- a/src/internal/connector/exchange/data_collections.go +++ b/src/internal/connector/exchange/data_collections.go @@ -192,7 +192,7 @@ func DataCollections( acct, scope, dps, - control.Options{}, + ctrlOpts, su) if err != nil { user := scope.Get(selectors.ExchangeUser) diff --git a/src/pkg/repository/repository.go b/src/pkg/repository/repository.go index 1ff93b0c5..42a530d7e 100644 --- a/src/pkg/repository/repository.go +++ b/src/pkg/repository/repository.go @@ -125,6 +125,7 @@ func Initialize( Account: acct, Storage: s, Bus: bus, + Opts: opts, dataLayer: w, modelStore: ms, } @@ -192,6 +193,7 @@ func Connect( Account: acct, Storage: s, Bus: bus, + Opts: opts, dataLayer: w, modelStore: ms, }, nil