From 837d79a32cd58e32b06a9da758636bde23733b8f Mon Sep 17 00:00:00 2001
From: fibonacci1729 <brian@deis.com>
Date: Tue, 23 Aug 2016 16:02:44 -0600
Subject: [PATCH] chore(storage-naming): update to storage api invocations in
 release_server and environment

---
 cmd/tiller/environment/environment.go |  3 +--
 cmd/tiller/release_server.go          | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cmd/tiller/environment/environment.go b/cmd/tiller/environment/environment.go
index 5e0e81216..3b0ca7d99 100644
--- a/cmd/tiller/environment/environment.go
+++ b/cmd/tiller/environment/environment.go
@@ -31,7 +31,6 @@ import (
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/storage"
-	"k8s.io/helm/pkg/storage/driver"
 	"k8s.io/kubernetes/pkg/client/unversioned"
 )
 
@@ -208,7 +207,7 @@ func New() *Environment {
 
 	return &Environment{
 		EngineYard: ey,
-		Releases:   storage.Init(driver.NewMemory()),
+		Releases:   storage.Init(nil),
 		KubeClient: kube.New(nil),
 	}
 }
diff --git a/cmd/tiller/release_server.go b/cmd/tiller/release_server.go
index 0fe6a192a..122b370d0 100644
--- a/cmd/tiller/release_server.go
+++ b/cmd/tiller/release_server.go
@@ -158,7 +158,7 @@ func (s *releaseServer) GetReleaseStatus(c ctx.Context, req *services.GetRelease
 	if req.Name == "" {
 		return nil, errMissingRelease
 	}
-	rel, err := s.env.Releases.Get(req.Name)
+	rel, err := s.env.Releases.Get(req.Name, req.Version)
 	if err != nil {
 		return nil, err
 	}
@@ -183,7 +183,7 @@ func (s *releaseServer) GetReleaseContent(c ctx.Context, req *services.GetReleas
 	if req.Name == "" {
 		return nil, errMissingRelease
 	}
-	rel, err := s.env.Releases.Get(req.Name)
+	rel, err := s.env.Releases.Get(req.Name, req.Version)
 	return &services.GetReleaseContentResponse{Release: rel}, err
 }
 
@@ -250,7 +250,7 @@ func (s *releaseServer) prepareUpdate(req *services.UpdateReleaseRequest) (*rele
 	}
 
 	// finds the non-deleted release with the given name
-	currentRelease, err := s.env.Releases.Get(req.Name)
+	currentRelease, err := s.env.Releases.Get(req.Name, req.Version)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -302,7 +302,7 @@ func (s *releaseServer) uniqName(start string, reuse bool) (string, error) {
 			return "", fmt.Errorf("release name %q exceeds max length of %d", start, releaseNameMaxLen)
 		}
 
-		if rel, err := s.env.Releases.Get(start); err == driver.ErrReleaseNotFound {
+		if rel, err := s.env.Releases.Get(start, 0); err == driver.ErrReleaseNotFound {
 			return start, nil
 		} else if st := rel.Info.Status.Code; reuse && (st == release.Status_DELETED || st == release.Status_FAILED) {
 			// Allowe re-use of names if the previous release is marked deleted.
@@ -323,7 +323,7 @@ func (s *releaseServer) uniqName(start string, reuse bool) (string, error) {
 			log.Printf("info: Candidate name %q exceeds maximum length %d. Skipping.", name, releaseNameMaxLen)
 			continue
 		}
-		if _, err := s.env.Releases.Get(name); err == driver.ErrReleaseNotFound {
+		if _, err := s.env.Releases.Get(name, 0); err == driver.ErrReleaseNotFound {
 			return name, nil
 		}
 		log.Printf("info: Name %q is taken. Searching again.", name)
@@ -525,7 +525,7 @@ func (s *releaseServer) UninstallRelease(c ctx.Context, req *services.UninstallR
 		return nil, errMissingRelease
 	}
 
-	rel, err := s.env.Releases.Get(req.Name)
+	rel, err := s.env.Releases.Get(req.Name, 0)
 	if err != nil {
 		log.Printf("uninstall: Release not loaded: %s", req.Name)
 		return nil, err