fix(config): update convict .root() to .getProperties() calls

mozilla · Aug 17, 2015 · 4b6cab9 · 4b6cab9
1 parent 55f7120
commit 4b6cab9
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 27 deletions.
diff --git a/bin/basket.js b/bin/basket.js
@@ -10,7 +10,7 @@ to the [basket API](https://github.com/mozilla/basket) for user engagement.
 /*/
 
 var request = require('request')
-var config = require('../config').root()
+var config = require('../config').getProperties()
 var log = require('../lib/log')(config.log.level, 'fxa-basket-sender')
 var SQSReceiver = require('../lib/sqs')(log)
 

diff --git a/bin/email_bouncer.js b/bin/email_bouncer.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var config = require('../config').root()
+var config = require('../config').getProperties()
 var log = require('../lib/log')(config.log.level, 'fxa-email-bouncer')
 var error = require('../lib/error')
 var Token = require('../lib/tokens')(log, config.tokenLifetimes)

diff --git a/bin/key_server.js b/bin/key_server.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var config = require('../config').root()
+var config = require('../config').getProperties()
 var jwtool = require('fxa-jwtool')
 
 function main() {

diff --git a/scripts/test-remote-quick.js b/scripts/test-remote-quick.js
@@ -6,7 +6,7 @@
 
 var path = require('path')
 var spawn = require('child_process').spawn
-var config = require('../config').root()
+var config = require('../config').getProperties()
 var TestServer = require('../test/test_server')
 
 TestServer.start(config, false)

diff --git a/test/local/account_preverified_token_tests.js b/test/local/account_preverified_token_tests.js
@@ -8,7 +8,7 @@ var Client = require('../client')
 var JWTool = require('fxa-jwtool')
 
 process.env.TRUSTED_JKUS = 'http://127.0.0.1:9000/.well-known/public-keys'
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 var secretKey = JWTool.JWK.fromFile(
   config.secretKeyFile,
   {

diff --git a/test/local/base_path_tests.js b/test/local/base_path_tests.js
@@ -9,7 +9,7 @@ var P = require('../../lib/promise')
 var request = require('request')
 
 process.env.PUBLIC_URL = 'http://127.0.0.1:9000/auth'
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/local/concurrent_tests.js b/test/local/concurrent_tests.js
@@ -9,7 +9,7 @@ var P = require('../../lib/promise')
 
 
 process.env.VERIFIER_VERSION = '1'
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/local/db_tests.js b/test/local/db_tests.js
@@ -7,7 +7,7 @@ var test = require('../ptaptest')
 var uuid = require('uuid')
 var log = { trace: console.log }
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 var TestServer = require('../test_server')
 var Token = require('../../lib/tokens')(log)
 var DB = require('../../lib/db')(

diff --git a/test/local/email_validity_tests.js b/test/local/email_validity_tests.js
@@ -7,7 +7,7 @@ var TestServer = require('../test_server')
 var Client = require('../client')
 var P = require('../../lib/promise')
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/local/mailer_locales_tests.js b/test/local/mailer_locales_tests.js
@@ -4,7 +4,7 @@
 
 require('ass')
 var test = require('tap').test
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 var log = {}
 
 require('../../lib/mailer')(config, log)

diff --git a/test/local/resend_blackout_tests.js b/test/local/resend_blackout_tests.js
@@ -8,7 +8,7 @@ var Client = require('../client')
 var P = require('../../lib/promise')
 
 process.env.RESEND_BLACKOUT_PERIOD = '500'
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/local/token_expiry_tests.js b/test/local/token_expiry_tests.js
@@ -7,7 +7,7 @@ var TestServer = require('../test_server')
 var Client = require('../client')
 
 process.env.PASSWORD_CHANGE_TOKEN_TTL = '-1'
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 function fail() { throw new Error() }
 

diff --git a/test/local/verifier_upgrade_tests.js b/test/local/verifier_upgrade_tests.js
@@ -9,7 +9,7 @@ var createDBServer = require('fxa-auth-db-mysql')
 var log = { trace: console.log }
 
 process.env.VERIFIER_VERSION = '0'
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 var Token = require('../../lib/tokens')(log)
 var DB = require('../../lib/db')(
   config.db.backend,

diff --git a/test/mail_helper.js b/test/mail_helper.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var config = require('../config').root()
+var config = require('../config').getProperties()
 
 // SMTP half
 

diff --git a/test/remote/account_create_tests.js b/test/remote/account_create_tests.js
@@ -6,7 +6,7 @@ var test = require('../ptaptest')
 var TestServer = require('../test_server')
 var crypto = require('crypto')
 var Client = require('../client')
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/account_destroy_tests.js b/test/remote/account_destroy_tests.js
@@ -6,7 +6,7 @@ var test = require('../ptaptest')
 var TestServer = require('../test_server')
 var Client = require('../client')
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/account_locale_tests.js b/test/remote/account_locale_tests.js
@@ -6,7 +6,7 @@ var test = require('../ptaptest')
 var TestServer = require('../test_server')
 var Client = require('../client')
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 var key = {
   'algorithm': 'RS',
   'n': '4759385967235610503571494339196749614544606692567785790953934768202714280652973091341316862993582789079872007974809511698859885077002492642203267408776123',

diff --git a/test/remote/account_login_tests.js b/test/remote/account_login_tests.js
@@ -9,7 +9,7 @@ var crypto = require('crypto')
 var Client = require('../client')
 
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/account_status_tests.js b/test/remote/account_status_tests.js
@@ -6,7 +6,7 @@ var test = require('../ptaptest')
 var TestServer = require('../test_server')
 var Client = require('../client')
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/account_unlock_tests.js b/test/remote/account_unlock_tests.js
@@ -8,7 +8,7 @@ var Client = require('../client')
 var TestServer = require('../test_server')
 
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/certificate_sign_tests.js b/test/remote/certificate_sign_tests.js
@@ -7,7 +7,7 @@ var TestServer = require('../test_server')
 var Client = require('../client')
 var jwtool = require('fxa-jwtool')
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 var pubSigKey = jwtool.JWK.fromFile(config.publicKeyFile)
 
 var publicKey = {

diff --git a/test/remote/flow_tests.js b/test/remote/flow_tests.js
@@ -8,7 +8,7 @@ var TestServer = require('../test_server')
 var jwtool = require('fxa-jwtool')
 
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 var pubSigKey = jwtool.JWK.fromFile(config.publicKeyFile)
 
 TestServer.start(config)

diff --git a/test/remote/misc_tests.js b/test/remote/misc_tests.js
@@ -10,7 +10,7 @@ var hawk = require('hawk')
 var request = require('request')
 
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/password_change_tests.js b/test/remote/password_change_tests.js
@@ -8,7 +8,7 @@ var Client = require('../client')
 var TestServer = require('../test_server')
 
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/password_forgot_tests.js b/test/remote/password_forgot_tests.js
@@ -8,7 +8,7 @@ var Client = require('../client')
 var TestServer = require('../test_server')
 
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/recovery_email_verify_tests.js b/test/remote/recovery_email_verify_tests.js
@@ -8,7 +8,7 @@ var Client = require('../client')
 var TestServer = require('../test_server')
 
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {

diff --git a/test/remote/session_destroy_tests.js b/test/remote/session_destroy_tests.js
@@ -6,7 +6,7 @@ var test = require('../ptaptest')
 var TestServer = require('../test_server')
 var Client = require('../client')
 
-var config = require('../../config').root()
+var config = require('../../config').getProperties()
 
 TestServer.start(config)
 .then(function main(server) {