fixing a bug where max cache files would delete download cache

Author: AndrewFarley

lib/clean.js

@@ -37,19 +37,21 @@ function cleanup() {
 function cleanupCache() {
   const cacheLocation = getUserCachePath(this.options);
   if (fse.existsSync(cacheLocation)) {
-    this.serverless.cli.log(`Removing static caches at: ${cacheLocation}`);
+    if (this.serverless) {
+      this.serverless.cli.log(`Removing static caches at: ${cacheLocation}`);
+    }
 
     // Only remove cache folders that we added, just incase someone accidentally puts a weird
     // static cache location so we don't remove a bunch of personal stuff
     promises = [];
-    glob.sync([path.join(cacheLocation, '*')], {mark: true, dot: false}).forEach((file) => {
-      if (file.endsWith('_slspyc/')) {
-        promises.push( fse.removeAsync(file) );
-      }
+    glob.sync([path.join(cacheLocation, '*slspyc/')], {mark: true, dot: false}).forEach((file) => {
+      promises.push( fse.removeAsync(file) );
     });
     return BbPromise.all( promises );
   } else {
-    this.serverless.cli.log(`No static cache found`);
+    if (this.serverless) {
+      this.serverless.cli.log(`No static cache found`);
+    }
     return BbPromise.resolve();
   }
 }

lib/pip.js

@@ -65,7 +65,7 @@ function installRequirements(targetFolder, serverless, options) {
 
     // If we want a download cache...
     if (options.useDownloadCache) {
-      const downloadCacheDir = path.join(getUserCachePath(options), 'downloadCache_slspyc');
+      const downloadCacheDir = path.join(getUserCachePath(options), 'downloadCacheslspyc');
       serverless.cli.log(`Using download cache directory ${downloadCacheDir}`);
       fse.ensureDirSync(downloadCacheDir);
       pipCmd.push('--cache-dir', downloadCacheDir);
@@ -121,7 +121,7 @@ function installRequirements(targetFolder, serverless, options) {
     }
     // If we want a download cache...
     if (options.useDownloadCache) {
-      const downloadCacheDir = path.join(getUserCachePath(options), 'downloadCache_slspyc');
+      const downloadCacheDir = path.join(getUserCachePath(options), 'downloadCacheslspyc');
       serverless.cli.log(`Using download cache directory ${downloadCacheDir}`);
       fse.ensureDirSync(downloadCacheDir);
       // And now push it to a volume mount and to pip...

test.bats

@@ -78,7 +78,7 @@ teardown() {
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true/' serverless.yml
     sls package
     USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
-    ls $USR_CACHE_DIR/downloadCache_slspyc/http
+    ls $USR_CACHE_DIR/downloadCacheslspyc/http
 }
 
 @test "py3.6 uses download cache with useDownloadCache + cacheLocation option" {
@@ -87,7 +87,7 @@ teardown() {
     ! uname -sm|grep Linux || groups|grep docker || id -u|egrep '^0$' || skip "can't dockerize on linux if not root & not in docker group"
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true\n    cacheLocation: .requirements-cache/' serverless.yml
     sls package
-    ls .requirements-cache/downloadCache_slspyc/http
+    ls .requirements-cache/downloadCacheslspyc/http
 }
 
 @test "py3.6 uses download cache with dockerizePip + useDownloadCache option" {
@@ -97,7 +97,7 @@ teardown() {
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true/' serverless.yml
     sls --dockerizePip=true package
     USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
-    ls $USR_CACHE_DIR/downloadCache_slspyc/http
+    ls $USR_CACHE_DIR/downloadCacheslspyc/http
 }
 
 @test "py3.6 uses download cache with dockerizePip + useDownloadCache + cacheLocation option" {
@@ -106,7 +106,7 @@ teardown() {
     ! uname -sm|grep Linux || groups|grep docker || id -u|egrep '^0$' || skip "can't dockerize on linux if not root & not in docker group"
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true\n    cacheLocation: .requirements-cache/' serverless.yml
     sls --dockerizePip=true package
-    ls .requirements-cache/downloadCache_slspyc/http
+    ls .requirements-cache/downloadCacheslspyc/http
 }
 
 @test "py2.7 can package flask with default options" {