From d0182270d9169c4928bdbdefc5b83b67ff3b457e Mon Sep 17 00:00:00 2001
From: Kiran Kamineni <kiran.k.kamineni@intel.com>
Date: Thu, 11 Jul 2019 17:21:27 -0700
Subject: 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>
---
 src/k8splugin/internal/helm/helm.go  | 14 +++-----------
 src/k8splugin/internal/rb/archive.go |  7 +++++++
 src/k8splugin/internal/utils.go      | 12 ++++++++++++
 3 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'src/k8splugin/internal')

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
diff --git a/src/k8splugin/internal/rb/archive.go b/src/k8splugin/internal/rb/archive.go
index 624adfba..c0753134 100644
--- a/src/k8splugin/internal/rb/archive.go
+++ b/src/k8splugin/internal/rb/archive.go
@@ -24,6 +24,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	utils "github.com/onap/multicloud-k8s/src/k8splugin/internal"
 )
 
 func isTarGz(r io.Reader) error {
@@ -113,6 +115,11 @@ func ExtractTarBall(r io.Reader) (string, error) {
 				}
 			}
 		case tar.TypeReg:
+			err = utils.EnsureDirectory(target)
+			if err != nil {
+				return "", pkgerrors.Wrap(err, "Creating Directory")
+			}
+
 			f, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
 			if err != nil {
 				return "", pkgerrors.Wrap(err, "Creating file")
diff --git a/src/k8splugin/internal/utils.go b/src/k8splugin/internal/utils.go
index 627fb305..47a236c2 100644
--- a/src/k8splugin/internal/utils.go
+++ b/src/k8splugin/internal/utils.go
@@ -18,6 +18,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"path"
 	"plugin"
 	"strings"
 
@@ -128,3 +129,14 @@ func CheckInitialSettings() error {
 
 	return nil
 }
+
+//EnsureDirectory makes sure that the directories specified in the path exist
+//If not, it will create them, if possible.
+func 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)
+}
-- 
cgit 1.2.3-korg