From b23db775aa03af2383581e449019e560cdd472b6 Mon Sep 17 00:00:00 2001
From: tamal <tamal@appscode.com>
Date: Wed, 22 Mar 2017 10:42:13 -0700
Subject: [PATCH] Fix bucket key

---
 cmd/tiller/tiller.go           | 14 ++++++++------
 pkg/storage/driver/releases.go |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index 550f95ade..321abdeca 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -183,8 +183,10 @@ func start(c *cobra.Command, args []string) {
 		case gcs.Kind:
 			if gcsConfigJSONKeyPath != "" {
 				jsonKey, err := ioutil.ReadFile(gcsConfigJSONKeyPath)
-				fmt.Fprintf(os.Stderr, "Cannot read json key file: %s\n", err)
-				os.Exit(1)
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "Cannot read json key file: %v\n", err)
+					os.Exit(1)
+				}
 				stowCfg[gcs.ConfigJSON] = string(jsonKey)
 			}
 			if gcsConfigProjectId != "" {
@@ -211,17 +213,17 @@ func start(c *cobra.Command, args []string) {
 				stowCfg[swift.ConfigUsername] = swiftConfigUsername
 			}
 		default:
-			fmt.Fprintf(os.Stderr, "Unknown provider: %s\n", storageProvider)
+			fmt.Fprintf(os.Stderr, "Unknown provider: %v\n", storageProvider)
 			os.Exit(1)
 		}
 		loc, err := stow.Dial(storageProvider, stowCfg)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Cannot connect to object store: %s\n", err)
+			fmt.Fprintf(os.Stderr, "Cannot connect to object store: %v\n", err)
 			os.Exit(1)
 		}
 		c, err := loc.Container(container)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Cannot find container: %s\n", err)
+			fmt.Fprintf(os.Stderr, "Cannot find container: %v\n", err)
 			os.Exit(1)
 		}
 		cs := rcs.NewExtensionsForConfigOrDie(clientcfg)
@@ -230,7 +232,7 @@ func start(c *cobra.Command, args []string) {
 
 	lstn, err := net.Listen("tcp", grpcAddr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Server died: %s\n", err)
+		fmt.Fprintf(os.Stderr, "Server died: %v\n", err)
 		os.Exit(1)
 	}
 
diff --git a/pkg/storage/driver/releases.go b/pkg/storage/driver/releases.go
index 15af61420..a9320e901 100644
--- a/pkg/storage/driver/releases.go
+++ b/pkg/storage/driver/releases.go
@@ -256,11 +256,11 @@ func (releases *Releases) Delete(key string) (rls *rspb.Release, err error) {
 }
 
 func (releases *Releases) itemIDFromTPR(rls *rapi.Release) string {
-	return fmt.Sprintf("%v/releases/%v/versions%v", releases.prefix, rls.Name, rls.Spec.Version)
+	return fmt.Sprintf("%v/releases/%v", releases.prefix, rls.Name)
 }
 
 func (releases *Releases) itemIDFromProto(rls *rspb.Release) string {
-	return fmt.Sprintf("%v/releases/%v/versions%v", releases.prefix, rls.Name, rls.Version)
+	return fmt.Sprintf("%v/releases/%v", releases.prefix, toTPRSafeKey(rls.Name))
 }
 
 func (releases *Releases) deleteReleaseData(rls *rspb.Release) error {