Remove base64 chart member encoding

pull/498/head
jackgr 9 years ago
parent 100dd3b09a
commit 242ad69d35

@ -20,7 +20,6 @@ import (
"archive/tar" "archive/tar"
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"encoding/base64"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@ -412,16 +411,16 @@ func (c *Chart) loadMember(filename string) (*Member, error) {
return nil, err return nil, err
} }
b, err := ioutil.ReadFile(filename) content, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
return nil, err return nil, err
} }
path := strings.TrimPrefix(filename, dir) path := strings.TrimPrefix(filename, dir)
content := base64.StdEncoding.EncodeToString(b) path = strings.TrimLeft(path, "/")
result := &Member{ result := &Member{
Path: path, Path: path,
Content: []byte(content), Content: content,
} }
return result, nil return result, nil

@ -17,7 +17,6 @@ limitations under the License.
package chart package chart
import ( import (
"encoding/base64"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"path/filepath" "path/filepath"
@ -204,7 +203,7 @@ func findMember(root, path string, members []*Member) error {
for _, member := range members { for _, member := range members {
if member.Path == path { if member.Path == path {
filename := filepath.Join(root, path) filename := filepath.Join(root, path)
if err := compareContent(filename, string(member.Content)); err != nil { if err := compareContent(filename, member.Content); err != nil {
return err return err
} }
@ -235,7 +234,7 @@ func TestLoadMember(t *testing.T) {
} }
filename := filepath.Join(c.loader.dir(), testmember) filename := filepath.Join(c.loader.dir(), testmember)
if err := compareContent(filename, string(member.Content)); err != nil { if err := compareContent(filename, member.Content); err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }
@ -268,20 +267,19 @@ func TestLoadContent(t *testing.T) {
t.Logf("%s:\n%s\n\n", member.Path, member.Content) t.Logf("%s:\n%s\n\n", member.Path, member.Content)
want := wantMember.Content want := wantMember.Content
if !reflect.DeepEqual(want, have) { if !reflect.DeepEqual(want, have) {
t.Errorf("Unexpected chart member %s\nwant:\n%s\nhave:\n%s\n", member.Path, want, have) t.Errorf("Unexpected chart member %s\nwant:\n%v\nhave:\n%v\n", member.Path, want, have)
} }
} }
} }
func compareContent(filename, content string) error { func compareContent(filename string, content []byte) error {
b, err := ioutil.ReadFile(filename) compare, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
return fmt.Errorf("Cannot read test file %s: %s", filename, err) return fmt.Errorf("Cannot read test file %s: %s", filename, err)
} }
compare := base64.StdEncoding.EncodeToString(b) if !reflect.DeepEqual(compare, content) {
if content != compare { return fmt.Errorf("Expected member content\n%v\ngot\n%v", compare, content)
return fmt.Errorf("Expected member content\n%v\ngot\n%v", []byte(compare), []byte(content))
} }
return nil return nil

Loading…
Cancel
Save