Merge pull request #34 from screwdriver-cd/Vendored

fix: Remove vendored code as it was patched upstream
screwdriver-cd · Mar 8, 2018 · aee37b1 · aee37b1
2 parents 5e73bac + 774b14b
commit aee37b1
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 1,168 deletions.
diff --git a/bin/server b/bin/server
@@ -9,10 +9,6 @@ const config = require('config');
 const strategyConfig = config.get('strategy');
 let strategyModule = `catbox-${strategyConfig.plugin}`;
 
-// Use the vendor package until resolution of PR https://github.com/fhemberger/catbox-s3/pull/55
-if (strategyConfig.plugin === 's3') {
-    strategyModule = `../vendor/${strategyModule}`;
-}
 // eslint-disable-next-line import/no-dynamic-require
 const strategy = require(strategyModule);
 const cache = Object.assign({ engine: strategy }, strategyConfig[strategyConfig.plugin]);

diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "boom": "^4.0.0",
     "catbox": "^7.1.2",
     "catbox-memory": "^2.0.3",
-    "catbox-s3": "^2.0.0",
+    "catbox-s3": "^3.0.0",
     "config": "^1.21.0",
     "good": "^7.0.2",
     "good-console": "^6.2.0",

diff --git a/vendor/catbox-s3/LICENSE.txt b/vendor/catbox-s3/LICENSE.txt
diff --git a/vendor/catbox-s3/README.md b/vendor/catbox-s3/README.md
diff --git a/vendor/catbox-s3/index.js b/vendor/catbox-s3/index.js