Use stats=0 for charm store interaction by CI

cmd/juju/deploy.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "errors"
         "fmt"
         "os"
 
@@ skipping 123 matching lines @@
         }
         curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
         if err != nil {
                 return err
         }
         repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
         if err != nil {
                 return err
         }
 
-        repo = config.AuthorizeCharmRepo(repo, conf)
-
-        curl, err = addCharmViaAPI(client, ctx, curl, repo, conf.Testing())
+        repo = config.SpecializeCharmRepo(repo, conf)
+
+        curl, err = addCharmViaAPI(client, ctx, curl, repo)
         if err != nil {
                 return err
         }
 
         if c.BumpRevision {
                 ctx.Stdout.Write([]byte("--upgrade (or -u) is deprecated and ignored; charms are always deployed with a unique revision.\n"))
         }
 
         charmInfo, err := client.CharmInfo(curl.String())
         if err != nil {
@@ skipping 48 matching lines @@
         }
         curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
         if err != nil {
                 return err
         }
         repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
         if err != nil {
                 return err
         }
 
-        repo = config.AuthorizeCharmRepo(repo, conf)
+        repo = config.SpecializeCharmRepo(repo, conf)
 
         // TODO(fwereade) it's annoying to roundtrip the bytes through the client
         // here, but it's the original behaviour and not convenient to change.
         // PutCharm will always be required in some form for local charms; and we
         // will need an EnsureStoreCharm method somewhere that gets the state.Charm
         // for use in the following checks.
         ch, err := conn.PutCharm(curl, repo, c.BumpRevision)
         if err != nil {
                 return err
         }
@@ skipping 32 matching lines @@
                         ConfigSettings: settings,
                         Constraints:    c.Constraints,
                         ToMachineSpec:  c.ToMachineSpec,
                 })
         return err
 }
 
 // addCharmViaAPI calls the appropriate client API calls to add the
 // given charm URL to state. Also displays the charm URL of the added
 // charm on stdout.
-func addCharmViaAPI(client *api.Client, ctx *cmd.Context, curl *charm.URL, repo charm.Repository, testing bool) (*charm.URL, error) {
+func addCharmViaAPI(client *api.Client, ctx *cmd.Context, curl *charm.URL, repo charm.Repository) (*charm.URL, error) {
         if curl.Revision < 0 {
-                latest, err := charm.Latest(repo, curl, testing)
+                latest, err := charm.Latest(repo, curl)
                 if err != nil {
                         return nil, err
                 }
                 curl = curl.WithRevision(latest)
         }
         switch curl.Schema {
         case "local":
-                ch, err := repo.Get(curl, false)
+                ch, err := repo.Get(curl)
                 if err != nil {
                         return nil, err
                 }
                 stateCurl, err := client.AddLocalCharm(curl, ch)
                 if err != nil {
                         return nil, err
                 }
                 curl = stateCurl
         case "cs":
                 err := client.AddCharm(curl)
                 if err != nil {
                         return nil, err
                 }
         default:
                 return nil, fmt.Errorf("unsupported charm URL schema: %q", curl.Schema)
         }
         report := fmt.Sprintf("Added charm %q to the environment.\n", curl)
         ctx.Stdout.Write([]byte(report))
         return curl, nil
 }