Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: convert config to ts #535

Merged
merged 1 commit into from
May 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/lib/config.js → src/lib/config.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,48 @@
var config = require('snyk-config')(__dirname + '/../..');
import * as snykConfig from 'snyk-config';
import * as userConfig from './user-config';
import * as url from 'url';

var DEFAULT_TIMEOUT = 5 * 60; // in seconds
const DEFAULT_TIMEOUT = 5 * 60; // in seconds
interface Config {
API: string;
disableSuggestions: string;
org: string;
ROOT: string;
timeout: number;
PROJECT_NAME: string;
}

const config: Config = snykConfig(__dirname + '/../..');

// allow user config override of the api end point
var endpoint = require('./user-config').get('endpoint');
const endpoint = userConfig.get('endpoint');
if (endpoint) {
config.API = endpoint;
}

var disableSuggestions = require('./user-config').get('disableSuggestions');
const disableSuggestions = userConfig.get('disableSuggestions');
if (disableSuggestions) {
config.disableSuggestions = disableSuggestions;
}

var org = require('./user-config').get('org');
const org = userConfig.get('org');
if (!config.org && org) {
config.org = org;
}

// client request timeout
// to change, set this config key to the desired value in seconds
// invalid (non-numeric) value will fallback to the default
var timeout = require('./user-config').get('timeout');
const timeout = userConfig.get('timeout');
if (!config.timeout) {
config.timeout = +timeout ? +timeout : DEFAULT_TIMEOUT;
}

// this is a bit of an assumption that our web site origin is the same
// as our API origin, but for now it's okay - RS 2015-10-16
if (!config.ROOT) {
var url = require('url');
var apiUrl = url.parse(config.API);
const apiUrl = url.parse(config.API);
config.ROOT = apiUrl.protocol + '//' + apiUrl.host;
}

module.exports = config;
export = config;
2 changes: 1 addition & 1 deletion src/lib/snyk-test/run-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import moduleToObject = require('snyk-module');
import * as depGraphLib from '@snyk/dep-graph';

import analytics = require('../analytics');
import config = require('../config');
import * as config from '../config';
import detect = require('../../lib/detect');
import plugins = require('../plugins');
import {ModuleInfo} from '../module-info';
Expand Down