Fix bug around secretVar not being fetched properly

Brightspace · Jun 16, 2017 · 28cb55c · 28cb55c
1 parent 8d66f0e
commit 28cb55c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ There are two ways to specifiy options:
         targetDirectory: 'sample',
         creds: {
             key: 'key',
-            secret: 'S3_SECRET'
+            secretVar: 'S3_SECRET', or secret: '{SECRET}'
         },
         devTagVar: 'TRAVIS_COMMIT', or devTag: 'Custom dev Tag'
         versionVar: 'TRAVIS_TAG' or version: 'SEMVAR VERSION: Ex. 1.0.0'
@@ -96,10 +96,10 @@ There are two ways to specifiy options:
             "targetDirectory": "sample",
             "creds": {
                 "key": "key",
-                "secret": "S3_SECRET"
+                "secretVar": "S3_SECRET", secret: '{SECRET}'
             },
-            "devTag": "TRAVIS_COMMIT",
-            "version": "TRAVIS_TAG"
+            "devTagVar": "TRAVIS_COMMIT",
+            "versionVar": "TRAVIS_TAG"
         }
     }
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "frau-appconfig-webpack-plugin",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "Webpack plugin for frau-appconfig-builder",
     "main": "lib/index.js",
     "scripts": {

diff --git a/src/index.js b/src/index.js
@@ -83,6 +83,8 @@ FrauAppConfigPlugin.prototype.apply = function(compiler) {
 
             const publisherOptions = {
                 ...frauPublisher,
+                key: frauPublisher.creds.key,
+                secret: frauPublisher.creds.secret || process.env[frauPublisher.creds.secretVar],
                 version: frauPublisher.version || process.env[frauPublisher.versionVar],
                 devTag: frauPublisher.devTag || process.env[frauPublisher.devTagVar]
             };