From edd4e561124d1d9620f510cf020b8227ff08e85e Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <ivanov.maxim@gmail.com>
Date: Wed, 22 Feb 2017 22:02:40 +0000
Subject: [PATCH] fix(helm): resolve symlinks when loading chart
Possible fix for #1639
---
glide.lock | 12 ++++++++----
glide.yaml | 1 +
pkg/chartutil/load.go | 3 ++-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/glide.lock b/glide.lock
index f93937190..c09094fdd 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: dc6dba0ab64a9b16ea6af2d166771cef0a62b946535b399590db00ac2fe7096f
-updated: 2017-02-16T09:14:15.738334986-08:00
+hash: b4a2318bb042d673a7843e99b9d4f096e8d0fd0a3ec94968534be4cf39101045
+updated: 2017-02-23T23:08:54.111587509Z
imports:
- name: cloud.google.com/go
version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -96,6 +96,8 @@ imports:
version: 465937c80b3c07a7c7ad20cc934898646a91c1de
- name: github.com/exponent-io/jsonpath
version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5
+- name: github.com/facebookgo/symwalk
+ version: 42004b9f322246749dd73ad71008b1f3160c0052
- name: github.com/ghodss/yaml
version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
- name: github.com/go-openapi/jsonpointer
@@ -182,7 +184,7 @@ imports:
- name: github.com/Masterminds/semver
version: 59c29afe1a994eacb71c833025ca7acf874bb1da
- name: github.com/Masterminds/sprig
- version: 69011c0cd9b4d2e0733c4d9e2c8e2a5a0d0a2f2f
+ version: 2d2df7bd8bda53b5a55ed04422173cedd50500ea
- name: github.com/mattn/go-runewidth
version: d6bea18f789704b5f83375793155289da36a3c7f
- name: github.com/mitchellh/go-wordwrap
@@ -225,6 +227,8 @@ imports:
- openpgp/errors
- openpgp/packet
- openpgp/s2k
+ - pbkdf2
+ - scrypt
- ssh/terminal
- name: golang.org/x/net
version: e90d6d0afc4c315a0d87a568ae68577cc15149a0
@@ -290,7 +294,7 @@ imports:
- name: gopkg.in/yaml.v2
version: a83829b6f1293c91addabc89d0571c246397bbf4
- name: k8s.io/kubernetes
- version: 029c3a408176b55c30846f0faedf56aae5992e9b
+ version: e9eeec655e7fdee50d4e19200f9707d1cd4a3371
subpackages:
- cmd/kubeadm/app/apis/kubeadm
- cmd/kubeadm/app/apis/kubeadm/install
diff --git a/glide.yaml b/glide.yaml
index c17e0b9d4..487d2a07c 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -64,6 +64,7 @@ import:
- package: github.com/gobwas/glob
version: ^0.2.1
- package: github.com/evanphx/json-patch
+- package: github.com/facebookgo/symwalk
testImports:
- package: github.com/stretchr/testify
version: ^1.1.4
diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go
index ca06c0c89..2bdcb568a 100644
--- a/pkg/chartutil/load.go
+++ b/pkg/chartutil/load.go
@@ -22,6 +22,7 @@ import (
"compress/gzip"
"errors"
"fmt"
+ "github.com/facebookgo/symwalk"
"io"
"io/ioutil"
"os"
@@ -239,7 +240,7 @@ func LoadDir(dir string) (*chart.Chart, error) {
files := []*afile{}
topdir += string(filepath.Separator)
- err = filepath.Walk(topdir, func(name string, fi os.FileInfo, err error) error {
+ err = symwalk.Walk(topdir, func(name string, fi os.FileInfo, err error) error {
n := strings.TrimPrefix(name, topdir)
// Normalize to / since it will also work on Windows
--
GitLab