Merge pull request #853 from emosbaugh/check-skipperfiles-archive

Check skippedFiles archive
replicatedhq · Jul 24, 2020 · e147792 · e147792
2 parents a5ee157 + f85a6fd
commit e147792
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 8 deletions.
diff --git a/ffi/main.go b/ffi/main.go
@@ -98,7 +98,11 @@ func UpdateCheck(socket, fromArchivePath, namespace string) {
 			filepath.Join(tmpRoot, "upstream"),
 			filepath.Join(tmpRoot, "base"),
 			filepath.Join(tmpRoot, "overlays"),
-			filepath.Join(tmpRoot, "skippedFiles"),
+		}
+
+		skippedFilesPath := filepath.Join(tmpRoot, "skippedFiles")
+		if _, err := os.Stat(skippedFilesPath); err == nil {
+			paths = append(paths, skippedFilesPath)
 		}
 
 		err = os.Remove(fromArchivePath)

diff --git a/ffi/online.go b/ffi/online.go
@@ -161,7 +161,11 @@ func RewriteVersion(socket, fromArchivePath, outputFile, downstreamsStr, k8sName
 			filepath.Join(tmpRoot, "upstream"),
 			filepath.Join(tmpRoot, "base"),
 			filepath.Join(tmpRoot, "overlays"),
-			filepath.Join(tmpRoot, "skippedFiles"),
+		}
+
+		skippedFilesPath := filepath.Join(tmpRoot, "skippedFiles")
+		if _, err := os.Stat(skippedFilesPath); err == nil {
+			paths = append(paths, skippedFilesPath)
 		}
 
 		if err := tarGz.Archive(paths, outputFile); err != nil {

diff --git a/ffi/updatedownload.go b/ffi/updatedownload.go
@@ -119,7 +119,11 @@ func UpdateDownload(socket, fromArchivePath, namespace, registryJson, cursor str
 			filepath.Join(tmpRoot, "upstream"),
 			filepath.Join(tmpRoot, "base"),
 			filepath.Join(tmpRoot, "overlays"),
-			filepath.Join(tmpRoot, "skippedFiles"),
+		}
+
+		skippedFilesPath := filepath.Join(tmpRoot, "skippedFiles")
+		if _, err := os.Stat(skippedFilesPath); err == nil {
+			paths = append(paths, skippedFilesPath)
 		}
 
 		err = os.Remove(fromArchivePath)
@@ -294,7 +298,11 @@ func UpdateDownloadFromAirgap(socket, fromArchivePath, namespace, registryJson,
 			filepath.Join(tmpRoot, "upstream"),
 			filepath.Join(tmpRoot, "base"),
 			filepath.Join(tmpRoot, "overlays"),
-			filepath.Join(tmpRoot, "skippedFiles"),
+		}
+
+		skippedFilesPath := filepath.Join(tmpRoot, "skippedFiles")
+		if _, err := os.Stat(skippedFilesPath); err == nil {
+			paths = append(paths, skippedFilesPath)
 		}
 
 		err = os.Remove(fromArchivePath)

diff --git a/integration/replicated/generate.go b/integration/replicated/generate.go
@@ -144,7 +144,10 @@ func generateExpectedFilesystem(namespace, rawArchivePath string) ([]byte, error
 		path.Join(tmpRootDir, "upstream"),
 		path.Join(tmpRootDir, "base"),
 		path.Join(tmpRootDir, "overlays"),
-		path.Join(tmpRootDir, "skippedFiles"),
+	}
+	skippedFilesPath := path.Join(tmpRootDir, "skippedFiles")
+	if _, err := os.Stat(skippedFilesPath); err == nil {
+		paths = append(paths, skippedFilesPath)
 	}
 	if err := tarGz.Archive(paths, archiveFile); err != nil {
 		return nil, errors.Wrap(err, "failed to create archive")

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")

diff --git a/pkg/pull/archive.go b/pkg/pull/archive.go
@@ -32,7 +32,11 @@ func writeArchiveAsConfigMap(pullOptions PullOptions, u *upstreamtypes.Upstream,
 		path.Join(pullOptions.RootDir, u.Name, "upstream"),
 		path.Join(pullOptions.RootDir, u.Name, "base"),
 		path.Join(pullOptions.RootDir, u.Name, "overlays"),
-		path.Join(pullOptions.RootDir, u.Name, "skippedFiles"),
+	}
+
+	skippedFilesPath := path.Join(pullOptions.RootDir, "skippedFiles")
+	if _, err := os.Stat(skippedFilesPath); err == nil {
+		paths = append(paths, skippedFilesPath)
 	}
 
 	tempDir, err := ioutil.TempDir("", "kots")