Check if skippedFiles directory exists

replicatedhq · Jul 24, 2020 · 866834c · 866834c
1 parent a5ee157
commit 866834c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/kotsadm/pkg/handlers/download.go b/kotsadm/pkg/handlers/download.go
@@ -86,8 +86,13 @@ func DownloadApp(w http.ResponseWriter, r *http.Request) {
 		filepath.Join(archivePath, "upstream"),
 		filepath.Join(archivePath, "base"),
 		filepath.Join(archivePath, "overlays"),
-		filepath.Join(archivePath, "skippedFiles"),
 	}
+
+	skippedFilesPath := filepath.Join(archivePath, "skippedFiles")
+	if _, err := os.Stat(skippedFilesPath); err == nil {
+		paths = append(paths, skippedFilesPath)
+	}
+
 	tmpDir, err := ioutil.TempDir("", "kotsadm")
 	if err != nil {
 		logger.Error(err)

diff --git a/kotsadm/pkg/version/archive.go b/kotsadm/pkg/version/archive.go
@@ -32,7 +32,11 @@ func CreateAppVersionArchive(appID string, sequence int64, archivePath string) e
 		filepath.Join(archivePath, "upstream"),
 		filepath.Join(archivePath, "base"),
 		filepath.Join(archivePath, "overlays"),
-		filepath.Join(archivePath, "skippedFiles"),
+	}
+
+	skippedFilesPath := filepath.Join(archivePath, "skippedFiles")
+	if _, err := os.Stat(skippedFilesPath); err == nil {
+		paths = append(paths, skippedFilesPath)
 	}
 
 	tmpDir, err := ioutil.TempDir("", "kotsadm")