Pass the expected string to NewSha256Verifier().

sdg0919 · Apr 26, 2016 · fd624c5 · fd624c5
1 parent 280786d
commit fd624c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/downloader/utils.go b/downloader/utils.go
@@ -36,13 +36,8 @@ func NewHTTPBlobOpener(hostnameVerification utils.SSLHostnameVerification) func(
 // NewSha256Verifier returns a verifier suitable for Request. The
 // verifier checks the SHA-256 checksum of the file to ensure that it
 // matches the one returned by the provided func.
-func NewSha256Verifier(getExpected func() (string, error)) func(*os.File) error {
+func NewSha256Verifier(expected string) func(*os.File) error {
 	return func(file *os.File) error {
-		expected, err := getExpected()
-		if err != nil {
-			return errors.Trace(err)
-		}
-
 		actual, _, err := utils.ReadSHA256(file)
 		if err != nil {
 			return errors.Trace(err)

diff --git a/worker/uniter/charm/bundles.go b/worker/uniter/charm/bundles.go
@@ -68,10 +68,11 @@ func (d *BundlesDir) download(info BundleInfo, target string, abort <-chan struc
 	if err != nil {
 		return errors.Annotate(err, "could not parse charm URL")
 	}
+	expectedSha256, err := info.ArchiveSha256()
 	req := downloader.Request{
 		URL:       curl,
 		TargetDir: d.downloadsPath(),
-		Verify:    downloader.NewSha256Verifier(info.ArchiveSha256),
+		Verify:    downloader.NewSha256Verifier(expectedSha256),
 	}
 	logger.Infof("downloading %s from API server", info.URL())
 	filename, err := d.downloader.Download(req, abort)