Skip to content

Commit 7fdc33e

Browse files
committed
refactor: rename DEPLOYMENT_CONFIG_FILE to DEPLOYMENT_CONFIG_FILE_PATH for consistency
1 parent eec511b commit 7fdc33e

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
2828
if (nop) {
2929
let filename = env.SETTINGS_FILE_PATH
3030
if (!deploymentConfig) {
31-
filename = env.DEPLOYMENT_CONFIG_FILE
31+
filename = env.DEPLOYMENT_CONFIG_FILE_PATH
3232
deploymentConfig = {}
3333
}
3434
const nopcommand = new NopCommand(filename, repo, null, e, 'ERROR')
@@ -53,7 +53,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
5353
if (nop) {
5454
let filename = env.SETTINGS_FILE_PATH
5555
if (!deploymentConfig) {
56-
filename = env.DEPLOYMENT_CONFIG_FILE
56+
filename = env.DEPLOYMENT_CONFIG_FILE_PATH
5757
deploymentConfig = {}
5858
}
5959
const nopcommand = new NopCommand(filename, repo, null, e, 'ERROR')
@@ -78,7 +78,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
7878
if (nop) {
7979
let filename = env.SETTINGS_FILE_PATH
8080
if (!deploymentConfig) {
81-
filename = env.DEPLOYMENT_CONFIG_FILE
81+
filename = env.DEPLOYMENT_CONFIG_FILE_PATH
8282
deploymentConfig = {}
8383
}
8484
const nopcommand = new NopCommand(filename, repo, null, e, 'ERROR')
@@ -104,7 +104,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
104104
if (nop) {
105105
let filename = env.SETTINGS_FILE_PATH
106106
if (!deploymentConfig) {
107-
filename = env.DEPLOYMENT_CONFIG_FILE
107+
filename = env.DEPLOYMENT_CONFIG_FILE_PATH
108108
deploymentConfig = {}
109109
}
110110
const nopcommand = new NopCommand(filename, repo, null, e, 'ERROR')
@@ -123,7 +123,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
123123
*/
124124
async function loadYamlFileSystem () {
125125
if (deploymentConfig === undefined) {
126-
const deploymentConfigPath = env.DEPLOYMENT_CONFIG_FILE
126+
const deploymentConfigPath = env.DEPLOYMENT_CONFIG_FILE_PATH
127127
if (fs.existsSync(deploymentConfigPath)) {
128128
deploymentConfig = yaml.load(fs.readFileSync(deploymentConfigPath))
129129
} else {

lib/deploymentConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DeploymentConfig {
1313
static overridevalidators = {}
1414

1515
static {
16-
const deploymentConfigPath = process.env.DEPLOYMENT_CONFIG_FILE ? process.env.DEPLOYMENT_CONFIG_FILE : 'deployment-settings.yml'
16+
const deploymentConfigPath = env.DEPLOYMENT_CONFIG_FILE_PATH
1717
if (fs.existsSync(deploymentConfigPath)) {
1818
this.config = yaml.load(fs.readFileSync(deploymentConfigPath))
1919
} else {

lib/env.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
ADMIN_REPO: process.env.ADMIN_REPO || 'admin',
33
CONFIG_PATH: process.env.CONFIG_PATH || '.github',
44
SETTINGS_FILE_PATH: process.env.SETTINGS_FILE_PATH || 'settings.yml',
5-
DEPLOYMENT_CONFIG_FILE: process.env.DEPLOYMENT_CONFIG_FILE || 'deployment-settings.yml',
5+
DEPLOYMENT_CONFIG_FILE_PATH: process.env.DEPLOYMENT_CONFIG_FILE || 'deployment-settings.yml',
66
CREATE_PR_COMMENT: process.env.CREATE_PR_COMMENT || 'true',
77
CREATE_ERROR_ISSUE: process.env.CREATE_ERROR_ISSUE || 'true',
88
BLOCK_REPO_RENAME_BY_HUMAN: process.env.BLOCK_REPO_RENAME_BY_HUMAN || 'false'

test/unit/lib/env.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ describe('env', () => {
1818
expect(SETTINGS_FILE_PATH).toEqual('settings.yml')
1919
})
2020

21-
it('loads default DEPLOYMENT_CONFIG_FILE if not passed', () => {
22-
const SETTINGS_FILE_PATH = envTest.DEPLOYMENT_CONFIG_FILE
21+
it('loads default DEPLOYMENT_CONFIG_FILE_PATH if not passed', () => {
22+
const SETTINGS_FILE_PATH = envTest.DEPLOYMENT_CONFIG_FILE_PATH
2323
expect(SETTINGS_FILE_PATH).toEqual('deployment-settings.yml')
2424
})
2525

@@ -47,8 +47,8 @@ describe('env', () => {
4747
expect(CONFIG_PATH).toEqual('.config')
4848
const SETTINGS_FILE_PATH = envTest.SETTINGS_FILE_PATH
4949
expect(SETTINGS_FILE_PATH).toEqual('safe-settings.yml')
50-
const DEPLOYMENT_CONFIG_FILE = envTest.DEPLOYMENT_CONFIG_FILE
51-
expect(DEPLOYMENT_CONFIG_FILE).toEqual('safe-settings-deployment.yml')
50+
const DEPLOYMENT_CONFIG_FILE_PATH = envTest.DEPLOYMENT_CONFIG_FILE_PATH
51+
expect(DEPLOYMENT_CONFIG_FILE_PATH).toEqual('safe-settings-deployment.yml')
5252
const CREATE_PR_COMMENT = envTest.CREATE_PR_COMMENT
5353
expect(CREATE_PR_COMMENT).toEqual('false')
5454
})

0 commit comments

Comments
 (0)