diff options
| author |   Kiran Kamineni <kiran.k.kamineni@intel.com> | 2019-07-11 17:21:27 -0700 |
|---|---|---|
| committer | Kiran Kamineni <kiran.k.kamineni@intel.com> | 2019-07-11 18:28:51 -0700 |
| commit | d0182270d9169c4928bdbdefc5b83b67ff3b457e (patch) | |
| tree | 3a64a080e4c80f19401f23d65e61ddbcab719952 /src/k8splugin/internal/helm | |
| parent | ba082d48a4be3471b58444e94f2b89ebe3a9d5e8 (diff) | |
Create dir before extracting archive
Some archives don't include a directory entry.
Eg: tgz archives generated by helm package.
This bug fix checks that a directory exists before
an extracted file is created there.
Issue-ID: MULTICLOUD-705
Change-Id: If6720948d470b83786901574f5d8d3227835a047
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
Diffstat (limited to 'src/k8splugin/internal/helm')
| -rw-r--r-- | src/k8splugin/internal/helm/helm.go | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/k8splugin/internal/helm/helm.go b/src/k8splugin/internal/helm/helm.go index 1ab701ae..2150758b 100644 --- a/src/k8splugin/internal/helm/helm.go +++ b/src/k8splugin/internal/helm/helm.go @@ -21,11 +21,12 @@ import ( "io/ioutil" "k8s.io/helm/pkg/strvals" "os" - "path" "path/filepath" "regexp" "strings" + utils "github.com/onap/multicloud-k8s/src/k8splugin/internal" + "github.com/ghodss/yaml" pkgerrors "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime/schema" @@ -135,15 +136,6 @@ func (h *TemplateClient) mergeValues(dest map[string]interface{}, src map[string return dest } -func (h *TemplateClient) ensureDirectory(f string) error { - base := path.Dir(f) - _, err := os.Stat(base) - if err != nil && !os.IsNotExist(err) { - return err - } - return os.MkdirAll(base, 0755) -} - // GenerateKubernetesArtifacts a mapping of type to fully evaluated helm template func (h *TemplateClient) GenerateKubernetesArtifacts(inputPath string, valueFiles []string, values []string) ([]KubernetesResourceTemplate, error) { @@ -245,7 +237,7 @@ func (h *TemplateClient) GenerateKubernetesArtifacts(inputPath string, valueFile } mfilePath := filepath.Join(outputDir, m.Name) - h.ensureDirectory(mfilePath) + utils.EnsureDirectory(mfilePath) err = ioutil.WriteFile(mfilePath, []byte(data), 0666) if err != nil { return retData, err |