Adapt callers to new config function signatures

canonical · Oct 26, 2023 · a34cf14 · a34cf14
1 parent 685f7ab
commit a34cf14
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/windows-agent/internal/proservices/landscape/landscape.go b/windows-agent/internal/proservices/landscape/landscape.go
@@ -54,7 +54,7 @@ type connection struct {
 
 // Config is a configuration provider for ProToken and the Landscape URL.
 type Config interface {
-	LandscapeClientConfig(context.Context) (string, error)
+	LandscapeClientConfig(context.Context) (string, config.ConfigSource, error)
 
 	Subscription(context.Context) (string, config.ConfigSource, error)
 
@@ -97,7 +97,7 @@ func NewClient(conf Config, db *database.DistroDB, args ...Option) (*Client, err
 
 // hostagentURL parses the landscape config file to find the hostagent URL.
 func (c *Client) hostagentURL(ctx context.Context) (string, error) {
-	config, err := c.conf.LandscapeClientConfig(ctx)
+	config, _, err := c.conf.LandscapeClientConfig(ctx)
 	if err != nil {
 		return "", err
 	}
@@ -370,7 +370,7 @@ func (conn *connection) connected() bool {
 func (c *Client) transportCredentials(ctx context.Context) (cred credentials.TransportCredentials, err error) {
 	defer decorate.OnError(&err, "Landscape credentials")
 
-	conf, err := c.conf.LandscapeClientConfig(ctx)
+	conf, _, err := c.conf.LandscapeClientConfig(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("could not obtain Landscape config: %v", err)
 	}

diff --git a/windows-agent/internal/proservices/landscape/landscape_test.go b/windows-agent/internal/proservices/landscape/landscape_test.go
@@ -798,14 +798,14 @@ type mockConfig struct {
 	mu sync.Mutex
 }
 
-func (m *mockConfig) LandscapeClientConfig(ctx context.Context) (string, error) {
+func (m *mockConfig) LandscapeClientConfig(ctx context.Context) (string, config.ConfigSource, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
 	if m.landscapeConfigErr {
-		return "", errors.New("Mock error")
+		return "", config.SourceNone, errors.New("Mock error")
 	}
-	return m.landscapeClientConfig, nil
+	return m.landscapeClientConfig, config.SourceGUI, nil
 }
 
 func (m *mockConfig) ProvisioningTasks(ctx context.Context, distroName string) ([]task.Task, error) {

diff --git a/windows-agent/internal/proservices/proservices.go b/windows-agent/internal/proservices/proservices.go
@@ -81,7 +81,7 @@ func New(ctx context.Context, args ...Option) (s Manager, err error) {
 		return s, err
 	}
 
-	conf := config.New(ctx, config.WithRegistry(opts.registry))
+	conf := config.New(ctx, opts.cacheDir, config.WithRegistry(opts.registry))
 	if err := conf.FetchMicrosoftStoreSubscription(ctx); err != nil {
 		log.Warningf(ctx, "%v", err)
 	}
@@ -92,7 +92,7 @@ func New(ctx context.Context, args ...Option) (s Manager, err error) {
 	}
 	defer db.Close(ctx)
 
-	if err := conf.UpdateRegistrySettings(ctx, opts.cacheDir, db); err != nil {
+	if err := conf.UpdateRegistrySettings(ctx, db); err != nil {
 		log.Warningf(ctx, "Could not update registry settings: %v", err)
 	}