зеркало из https://github.com/mozilla/fxa.git
task(ci): Remove redis dev password from source
Because: - We are cleaning up stray password even those just used for dev This Commit: - Removes the dev password, fxa123, from source
This commit is contained in:
Родитель
843c3f03ad
Коммит
1e455ec9c8
|
@ -121,12 +121,10 @@ executors:
|
|||
- image: jdlk7/firestore-emulator
|
||||
- image: memcached
|
||||
- image: redis
|
||||
command: --requirepass fxa123
|
||||
environment:
|
||||
NODE_ENV: development
|
||||
FIRESTORE_EMULATOR_HOST: localhost:9090
|
||||
CUSTOMS_SERVER_URL: none
|
||||
REDIS_PASSWORD: fxa123
|
||||
HUSKY_SKIP_INSTALL: 1
|
||||
|
||||
# For anything that needs a full stack to run and needs browsers available for
|
||||
|
@ -140,7 +138,6 @@ executors:
|
|||
docker:
|
||||
- image: mozilla/fxa-circleci:ci-functional-test-runner-nx
|
||||
- image: redis
|
||||
command: --requirepass fxa123
|
||||
- image: memcached
|
||||
- image: pafortin/goaws
|
||||
- image: cimg/mysql:8.0.28
|
||||
|
@ -166,7 +163,6 @@ executors:
|
|||
REACT_CONVERSION_POST_VERIFY_OTHER_ROUTES: true
|
||||
REACT_CONVERSION_POST_VERIFY_CAD_VIA_QR_ROUTES: true
|
||||
CUSTOMS_SERVER_URL: none
|
||||
REDIS_PASSWORD: fxa123
|
||||
HUSKY_SKIP_INSTALL: 1
|
||||
|
||||
# Contains a pre-installed fxa stack and browsers for doing ui test
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
#!/bin/bash -ex
|
||||
|
||||
docker run --rm --name redis-server --net fxa -p 6379:6379 redis --requirepass fxa123
|
||||
if [ -z "$REDIS_PASSWORD" ]; then
|
||||
REQUIREPASS_ARG="";
|
||||
else
|
||||
REQUIREPASS_ARG="--requirepass $REDIS_PASSWORD";
|
||||
fi
|
||||
|
||||
docker run --rm --name redis-server --net fxa -p 6379:6379 redis $REQUIREPASS_ARG
|
||||
|
|
|
@ -12,7 +12,7 @@ const logger = morgan('short');
|
|||
|
||||
// create a connection to the redis datastore
|
||||
let db = new Redis({
|
||||
password: process.env.REDIS_PASSWORD || 'fxa123',
|
||||
password: process.env.REDIS_PASSWORD || '',
|
||||
});
|
||||
|
||||
db.on('error', function () {
|
||||
|
|
|
@ -145,7 +145,7 @@ const mockConfig = {
|
|||
const mockRedisConfig = {
|
||||
host: process.env.REDIS_HOST || 'localhost',
|
||||
port: process.env.REDIS_PORT || 6379,
|
||||
password: process.env.REDIS_PASSWORD || 'fxa123',
|
||||
password: process.env.REDIS_PASSWORD || '',
|
||||
maxPending: 1000,
|
||||
retryCount: 5,
|
||||
initialBackoff: '100 milliseconds',
|
||||
|
|
|
@ -171,7 +171,7 @@ const conf = (module.exports = convict({
|
|||
format: String,
|
||||
},
|
||||
password: {
|
||||
default: 'fxa123',
|
||||
default: '',
|
||||
doc: 'Redis password',
|
||||
env: 'REDIS_PASSWORD',
|
||||
sensitive: true,
|
||||
|
|
|
@ -288,7 +288,7 @@ const conf = convict({
|
|||
doc: 'port for redis server',
|
||||
},
|
||||
password: {
|
||||
default: 'fxa123',
|
||||
default: '',
|
||||
env: 'REDIS_PASSWORD',
|
||||
format: String,
|
||||
sensitive: true,
|
||||
|
|
|
@ -77,7 +77,7 @@ export function makeRedisConfig() {
|
|||
doc: 'IP address or host name for Redis server',
|
||||
},
|
||||
password: {
|
||||
default: 'fxa123',
|
||||
default: '',
|
||||
env: 'REDIS_PASSWORD',
|
||||
format: String,
|
||||
sensitive: true,
|
||||
|
|
|
@ -10,7 +10,7 @@ const Ajv = require('ajv');
|
|||
const ajv = new Ajv();
|
||||
const Redis = require('ioredis');
|
||||
const redis = new Redis({
|
||||
password: process.env.REDIS_PASSWORD || 'fxa123',
|
||||
password: process.env.REDIS_PASSWORD || '',
|
||||
host: process.env.REDIS_HOST || 'localhost',
|
||||
port: process.env.REDIS_PORT || 6379,
|
||||
keyPrefix: 'featureFlags:',
|
||||
|
|
|
@ -15,7 +15,7 @@ describe('#integration - featureFlags integration:', () => {
|
|||
interval: 10000,
|
||||
host: process.env.REDIS_HOST || 'localhost',
|
||||
port: process.env.REDIS_PORT || 6379,
|
||||
password: process.env.REDIS_PASSWORD || 'fxa123',
|
||||
password: process.env.REDIS_PASSWORD || '',
|
||||
};
|
||||
log = { info() {}, warn() {}, error() {} };
|
||||
featureFlags = initialise(config, log, {});
|
||||
|
|
|
@ -37,7 +37,7 @@ describe('#integration - scripts/feature-flags:', function () {
|
|||
|
||||
before(async () => {
|
||||
redis = new Redis({
|
||||
password: process.env.REDIS_PASSWORD || 'fxa123',
|
||||
password: process.env.REDIS_PASSWORD || '',
|
||||
host: process.env.REDIS_HOST || 'localhost',
|
||||
port: process.env.REDIS_PORT || 6379,
|
||||
keyPrefix: 'featureFlags:',
|
||||
|
|
Загрузка…
Ссылка в новой задаче