Add charmstore.ClientConfig and use it in charmstore.NewClient().

ericsnowcurrently · ericsnowcurrently · commit 58787a3cbee7 · 2016-03-11T14:36:47.000-07:00
diff --git a/apiserver/charmrevisionupdater/testing/suite.go b/apiserver/charmrevisionupdater/testing/suite.go
@@ -68,9 +68,9 @@ func (s *CharmSuite) SetUpTest(c *gc.C) {
 	// Patch the charm repo initializer function: it is replaced with a charm
 	// store repo pointing to the testing server.
 	s.jcSuite.PatchValue(&charmrevisionupdater.NewCharmStoreClient, func() *jujucharmstore.Client {
-		return jujucharmstore.NewClient(csclient.Params{
-			URL: s.Server.URL,
-		})
+		var config jujucharmstore.ClientConfig
+		config.URL = s.Server.URL
+		return jujucharmstore.NewClient(config)
 	})
 	s.charms = make(map[string]*state.Charm)
 }
diff --git a/apiserver/charmrevisionupdater/updater_test.go b/apiserver/charmrevisionupdater/updater_test.go
@@ -167,9 +167,9 @@ func (s *charmVersionSuite) TestEnvironmentUUIDUsed(c *gc.C) {
 
 	// Point the charm repo initializer to the testing server.
 	s.PatchValue(&charmrevisionupdater.NewCharmStoreClient, func() *charmstore.Client {
-		return charmstore.NewClient(csclient.Params{
-			URL: srv.URL,
-		})
+		var config charmstore.ClientConfig
+		config.URL = srv.URL
+		return charmstore.NewClient(config)
 	})
 
 	result, err := s.charmrevisionupdater.UpdateLatestRevisions()
diff --git a/charmstore/client.go b/charmstore/client.go
@@ -92,6 +92,23 @@ func (base baseClient) LatestRevisions(cURLs []*charm.URL) ([]charmrepo.CharmRev
 	return repo.Latest(cURLs...)
 }
 
+// ClientConfig holds the configuration of a charm store client.
+type ClientConfig struct {
+	charmrepo.NewCharmStoreParams
+}
+
+func (config ClientConfig) newCSClient() *csclient.Client {
+	return csclient.New(csclient.Params{
+		URL:          config.URL,
+		HTTPClient:   config.HTTPClient,
+		VisitWebPage: config.VisitWebPage,
+	})
+}
+
+func (config ClientConfig) newCSRepo() *charmrepo.CharmStore {
+	return charmrepo.NewCharmStore(config.NewCharmStoreParams)
+}
+
 // TODO(ericsnow) Factor out a metadataClient type that embeds "client",
 // and move the "meta" field there?
 
@@ -106,16 +123,16 @@ type Client struct {
 
 // NewClient returns a Juju charm store client for the given client
 // config.
-func NewClient(config csclient.Params) *Client {
-	base := csclient.New(config)
+func NewClient(config ClientConfig) *Client {
+	base := config.newCSClient()
 	closer := ioutil.NopCloser(nil)
 	return WrapBaseClient(base, closer)
 }
 
 // NewDefaultClient returns a Juju charm store client using a default
 // client config.
 func NewDefaultClient() *Client {
-	return NewClient(csclient.Params{})
+	return NewClient(ClientConfig{})
 }
 
 // WrapBaseClient returns a Juju charm store client that wraps
