Remove spurious truthiness checks on serverSecrets (#2634)

`serverSecrets` is always truthy.

Close #2606
This commit is contained in:
Paul Melnikow
2019-01-04 12:49:48 -05:00
committed by GitHub
parent 9bc2e512b7
commit 5233a25ddc
10 changed files with 10 additions and 13 deletions

View File

@@ -48,7 +48,7 @@ function render({ status }) {
function getHeaders() {
const headers = {}
if (serverSecrets && serverSecrets.azure_devops_token) {
if (serverSecrets.azure_devops_token) {
const pat = serverSecrets.azure_devops_token
const auth = Buffer.from(`:${pat}`).toString('base64')
headers.Authorization = `basic ${auth}`

View File

@@ -45,7 +45,7 @@ module.exports = class Bintray extends LegacyService {
},
}
if (serverSecrets && serverSecrets.bintray_user) {
if (serverSecrets.bintray_user) {
options.auth = {
user: serverSecrets.bintray_user,
pass: serverSecrets.bintray_apikey,

View File

@@ -47,7 +47,7 @@ module.exports = class JenkinsBuild extends LegacyService {
options.uri = `${scheme}://${host}/${job}/api/json?tree=color`
}
if (serverSecrets && serverSecrets.jenkins_user) {
if (serverSecrets.jenkins_user) {
options.auth = {
user: serverSecrets.jenkins_user,
pass: serverSecrets.jenkins_pass,

View File

@@ -72,7 +72,7 @@ class BaseJenkinsCoverage extends BaseJsonService {
tree: treeParam,
},
}
if (serverSecrets && serverSecrets.jenkins_user) {
if (serverSecrets.jenkins_user) {
options.auth = {
user: serverSecrets.jenkins_user,
pass: serverSecrets.jenkins_pass,

View File

@@ -51,7 +51,7 @@ module.exports = class JenkinsTests extends LegacyService {
)}`
}
if (serverSecrets && serverSecrets.jenkins_user) {
if (serverSecrets.jenkins_user) {
options.auth = {
user: serverSecrets.jenkins_user,
pass: serverSecrets.jenkins_pass,

View File

@@ -11,10 +11,7 @@ module.exports = class JiraBase extends BaseJsonService {
async fetch({ url, qs, schema, errorMessages }) {
const options = { qs }
if (
serverSecrets &&
(serverSecrets.jira_user || serverSecrets.jira_username)
) {
if (serverSecrets.jira_user || serverSecrets.jira_username) {
/*
for legacy reasons we still allow
jira_username, jira_password

View File

@@ -205,7 +205,7 @@ module.exports = class Nexus extends BaseJsonService {
const options = { qs }
if (serverSecrets && serverSecrets.nexus_user) {
if (serverSecrets.nexus_user) {
options.auth = {
user: serverSecrets.nexus_user,
pass: serverSecrets.nexus_pass,

View File

@@ -44,7 +44,7 @@ module.exports = class Sensiolabs extends LegacyService {
},
}
if (serverSecrets && serverSecrets.sl_insight_userUuid) {
if (serverSecrets.sl_insight_userUuid) {
options.auth = {
user: serverSecrets.sl_insight_userUuid,
pass: serverSecrets.sl_insight_apiToken,

View File

@@ -83,7 +83,7 @@ module.exports = class Sonarqube extends LegacyService {
Accept: 'application/json',
},
}
if (serverSecrets && serverSecrets.sonarqube_token) {
if (serverSecrets.sonarqube_token) {
options.auth = {
user: serverSecrets.sonarqube_token,
}

View File

@@ -20,7 +20,7 @@ module.exports = class TeamCityBase extends BaseJsonService {
const url = `${protocol}://${hostAndPath}/${apiPath}`
const options = { qs }
// JetBrains API Auth Docs: https://confluence.jetbrains.com/display/TCD18/REST+API#RESTAPI-RESTAuthentication
if (serverSecrets && serverSecrets.teamcity_user) {
if (serverSecrets.teamcity_user) {
options.auth = {
user: serverSecrets.teamcity_user,
pass: serverSecrets.teamcity_pass,