Deprecate public-bucket-url

environs/tools/tools_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package tools_test
 
 import (
         "bytes"
         "fmt"
         "io/ioutil"
         "os"
+        "path"
         "path/filepath"
         "time"
 
         gc "launchpad.net/gocheck"
         "launchpad.net/loggo"
 
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/environs/simplestreams"
         "launchpad.net/juju-core/environs/storage"
@@ skipping 123 matching lines @@
         }
         index, products, err := envtools.MarshalToolsMetadataJSON(metadata, time.Now())
         c.Assert(err, gc.IsNil)
         objects := []metadataFile{
                 {simplestreams.DefaultIndexPath + simplestreams.UnsignedSuffix, index},
                 {envtools.ProductMetadataPath, products},
         }
         return objects
 }
 
-func (s *SimpleStreamsToolsSuite) uploadToStorage(c *gc.C, storage storage.Storage, verses ...version.Binary) map[version.Binary]string {
+func (s *SimpleStreamsToolsSuite) uploadToStorage(c *gc.C, stor storage.Storage, verses ...version.Binary) map[version.Binary]string {
         uploaded := map[version.Binary]string{}
         if len(verses) == 0 {
                 return uploaded
         }
         var err error
         for _, vers := range verses {
-                uploaded[vers], err = storage.URL(fmt.Sprintf("tools/releases/tools-%s.tar.gz", vers.String()))
+                uploaded[vers], err = stor.URL(fmt.Sprintf("tools/releases/tools-%s.tar.gz", vers.String()))
                 c.Assert(err, gc.IsNil)
         }
         objects := s.generateMetadata(c, verses...)
         for _, object := range objects {
-                path := filepath.Join("tools", object.path)
-                err = storage.Put(path, bytes.NewReader(object.data), int64(len(object.data)))
+                toolspath := path.Join("tools", object.path)
+                err = stor.Put(toolspath, bytes.NewReader(object.data), int64(len(object.data)))
                 c.Assert(err, gc.IsNil)
         }
         return uploaded
 }
 
 func (s *SimpleStreamsToolsSuite) uploadVersions(c *gc.C, dir string, verses ...version.Binary) map[version.Binary]string {
         uploaded := map[version.Binary]string{}
         if len(verses) == 0 {
                 return uploaded
         }
@@ skipping 397 matching lines @@
         c.Assert(err, gc.NotNil)
         c.Check(err, gc.ErrorMatches, "tools mismatch: expected series warty, got hoary")
 }
 
 func (s *ToolsListSuite) TestCheckToolsSeriesRejectsToolsForMixedSeries(c *gc.C) {
         list := fakeToolsList("precise", "raring")
         err := envtools.CheckToolsSeries(list, "precise")
         c.Assert(err, gc.NotNil)
         c.Check(err, gc.ErrorMatches, "expected single series, got .*")
 }