Skip to content

Commit 2ad9d12

Browse files
drazisil-codecovdrazisil-codecov
authored
feature: support basic authentication when using a proxy (#1069)
* feat: add basic auth to proxy call --------- Signed-off-by: Joe Becher <[email protected]>
1 parent 3be8503 commit 2ad9d12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+455
-329
lines changed

‎jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ module.exports = {
1111
setupFilesAfterEnv: ['<rootDir>/test/test_helpers.ts'],
1212
reporters: ['jest-spec-reporter'],
1313
testPathIgnorePatterns: ['<rootDir>/dist/'],
14+
modulePathIgnorePatterns: ['<rootDir>/dist'],
1415
}

‎npm-shrinkwrap.json

Lines changed: 10 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"scripts": {
1010
"lint": "eslint \"src/**/*.ts\"",
11-
"test": "npm run lint && npm run build && jest --runInBand",
11+
"test": "npm run lint && npm run build && npx browserslist@latest --update-db && jest --runInBand",
1212
"test:e2e": "jest test/e2e/output.test.ts",
1313
"build:clean": "rm -rf dist",
1414
"build": "tsc --build",

‎src/ci_providers/provider_appveyorci.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ export function detect(envs: UploaderEnvs): boolean {
88
}
99

1010
function _getBuild(inputs: UploaderInputs) {
11-
const { args, environment: envs } = inputs
11+
const { args, envs } = inputs
1212
return args.build || envs.APPVEYOR_JOB_ID || ''
1313
}
1414

1515
function _getBuildURL(inputs: UploaderInputs) {
16-
const { environment: envs } = inputs
16+
const { envs } = inputs
1717
if (
1818
envs.APPVEYOR_URL &&
1919
envs.APPVEYOR_REPO_NAME &&
@@ -28,7 +28,7 @@ function _getBuildURL(inputs: UploaderInputs) {
2828
}
2929

3030
function _getBranch(inputs: UploaderInputs) {
31-
const { args, environment: envs } = inputs
31+
const { args, envs } = inputs
3232
return args.branch || envs.APPVEYOR_REPO_BRANCH || ''
3333
}
3434

@@ -44,7 +44,7 @@ function _getJob(envs: UploaderEnvs) {
4444
}
4545

4646
function _getPR(inputs: UploaderInputs): string {
47-
const { args, environment: envs } = inputs
47+
const { args, envs } = inputs
4848
return args.pr || envs.APPVEYOR_PULL_REQUEST_NUMBER || ''
4949
}
5050

@@ -57,12 +57,12 @@ export function getServiceName(): string {
5757
}
5858

5959
function _getSHA(inputs: UploaderInputs) {
60-
const { args, environment: envs } = inputs
60+
const { args, envs } = inputs
6161
return args.sha || envs.APPVEYOR_PULL_REQUEST_HEAD_COMMIT || envs.APPVEYOR_REPO_COMMIT || ''
6262
}
6363

6464
function _getSlug(inputs: UploaderInputs) {
65-
const { args, environment: envs } = inputs
65+
const { args, envs } = inputs
6666
if (args.slug !== '') return args.slug
6767
return envs.APPVEYOR_REPO_NAME || ''
6868
}
@@ -73,7 +73,7 @@ export async function getServiceParams(inputs: UploaderInputs): Promise<IService
7373
build: _getBuild(inputs),
7474
buildURL: _getBuildURL(inputs),
7575
commit: _getSHA(inputs),
76-
job: _getJob(inputs.environment),
76+
job: _getJob(inputs.envs),
7777
pr: _getPR(inputs),
7878
service: _getService(),
7979
slug: _getSlug(inputs),

‎src/ci_providers/provider_azurepipelines.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ export function detect(envs: UploaderEnvs): boolean {
88
}
99

1010
function _getBuild(inputs: UploaderInputs): string {
11-
const { args, environment: envs } = inputs
11+
const { args, envs } = inputs
1212
return args.build || envs.BUILD_BUILDNUMBER || ''
1313
}
1414

1515
function _getBuildURL(inputs: UploaderInputs): string {
16-
const { environment: envs } = inputs
16+
const { envs } = inputs
1717
if (envs.SYSTEM_TEAMPROJECT && envs.BUILD_BUILDID) {
1818
return (
1919
`${envs.SYSTEM_TEAMFOUNDATIONSERVERURI}${envs.SYSTEM_TEAMPROJECT}/_build/results?buildId=${envs.BUILD_BUILDID}`
@@ -23,7 +23,7 @@ function _getBuildURL(inputs: UploaderInputs): string {
2323
}
2424

2525
function _getBranch(inputs: UploaderInputs): string {
26-
const { args, environment: envs } = inputs
26+
const { args, envs } = inputs
2727
let branch = ''
2828
if (envs.BUILD_SOURCEBRANCH) {
2929
branch = envs.BUILD_SOURCEBRANCH.toString().replace('refs/heads/', '')
@@ -36,7 +36,7 @@ function _getJob(envs: UploaderEnvs): string {
3636
}
3737

3838
function _getPR(inputs: UploaderInputs): string {
39-
const { args, environment: envs } = inputs
39+
const { args, envs } = inputs
4040
return (
4141
args.pr ||
4242
envs.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER ||
@@ -54,7 +54,7 @@ export function getServiceName(): string {
5454
}
5555

5656
function _getSHA(inputs: UploaderInputs): string {
57-
const { args, environment: envs } = inputs
57+
const { args, envs } = inputs
5858
let commit = envs.BUILD_SOURCEVERSION || ''
5959

6060
if (_getPR(inputs)) {
@@ -74,17 +74,17 @@ function _getSHA(inputs: UploaderInputs): string {
7474
}
7575

7676
function _getProject(inputs: UploaderInputs): string {
77-
const { environment: envs } = inputs
77+
const { envs } = inputs
7878
return envs.SYSTEM_TEAMPROJECT || ''
7979
}
8080

8181
function _getServerURI(inputs: UploaderInputs): string {
82-
const { environment: envs } = inputs
82+
const { envs } = inputs
8383
return envs.SYSTEM_TEAMFOUNDATIONSERVERURI || ''
8484
}
8585

8686
function _getSlug(inputs: UploaderInputs): string {
87-
const { args, environment: envs } = inputs
87+
const { args, envs } = inputs
8888
if (args.slug !== '') return args.slug
8989
return envs.BUILD_REPOSITORY_NAME || parseSlugFromRemoteAddr('') || ''
9090
}
@@ -100,7 +100,7 @@ export async function getServiceParams(inputs: UploaderInputs): Promise<IService
100100
build: _getBuild(inputs),
101101
buildURL: _getBuildURL(inputs),
102102
commit: _getSHA(inputs),
103-
job: _getJob(inputs.environment),
103+
job: _getJob(inputs.envs),
104104
pr: _getPR(inputs),
105105
project: _getProject(inputs),
106106
server_uri: _getServerURI(inputs),

‎src/ci_providers/provider_bitbucket.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function detect(envs: UploaderEnvs): boolean {
77
}
88

99
function _getBuild(inputs: UploaderInputs): string {
10-
const { args, environment: envs } = inputs
10+
const { args, envs } = inputs
1111
return args.build || envs.BITBUCKET_BUILD_NUMBER || ''
1212
}
1313

@@ -17,7 +17,7 @@ function _getBuildURL(): string {
1717
}
1818

1919
function _getBranch(inputs: UploaderInputs): string {
20-
const { args, environment: envs } = inputs
20+
const { args, envs } = inputs
2121
return args.branch || envs.BITBUCKET_BRANCH || ''
2222
}
2323

@@ -26,7 +26,7 @@ function _getJob(envs: UploaderEnvs): string {
2626
}
2727

2828
function _getPR(inputs: UploaderInputs): string {
29-
const { args, environment: envs } = inputs
29+
const { args, envs } = inputs
3030
return args.pr || envs.BITBUCKET_PR_ID || ''
3131
}
3232

@@ -39,7 +39,7 @@ export function getServiceName(): string {
3939
}
4040

4141
function _getSHA(inputs: UploaderInputs): string {
42-
const { args, environment: envs } = inputs
42+
const { args, envs } = inputs
4343
let commit = envs.BITBUCKET_COMMIT || ''
4444

4545
if (commit && validateSHA(commit, 12)) {
@@ -50,7 +50,7 @@ function _getSHA(inputs: UploaderInputs): string {
5050
}
5151

5252
function _getSlug(inputs: UploaderInputs): string {
53-
const { args, environment: envs } = inputs
53+
const { args, envs } = inputs
5454
if (args.slug !== '') return args.slug
5555
return envs.BITBUCKET_REPO_FULL_NAME || ''
5656
}
@@ -61,7 +61,7 @@ export async function getServiceParams(inputs: UploaderInputs): Promise<IService
6161
build: _getBuild(inputs),
6262
buildURL: _getBuildURL(),
6363
commit: _getSHA(inputs),
64-
job: _getJob(inputs.environment),
64+
job: _getJob(inputs.envs),
6565
pr: _getPR(inputs),
6666
service: _getService(),
6767
slug: _getSlug(inputs),

‎src/ci_providers/provider_bitrise.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ export function detect(envs: UploaderEnvs): boolean {
77
}
88

99
function _getBuild(inputs: UploaderInputs): string {
10-
const { args, environment: envs } = inputs
10+
const { args, envs } = inputs
1111
return args.build || envs.BITRISE_BUILD_NUMBER || ''
1212
}
1313

1414
function _getBuildURL(inputs: UploaderInputs): string {
15-
const { environment: envs } = inputs
15+
const { envs } = inputs
1616
return envs.BITRISE_BUILD_URL || ''
1717
}
1818

1919
function _getBranch(inputs: UploaderInputs): string {
20-
const { args, environment: envs } = inputs
20+
const { args, envs } = inputs
2121
return args.branch || envs.BITRISE_GIT_BRANCH || ''
2222
}
2323

@@ -26,7 +26,7 @@ function _getJob() {
2626
}
2727

2828
function _getPR(inputs: UploaderInputs): string {
29-
const { args, environment: envs } = inputs
29+
const { args, envs } = inputs
3030
return args.pr || envs.BITRISE_PULL_REQUEST || ''
3131
}
3232

@@ -39,7 +39,7 @@ export function getServiceName(): string {
3939
}
4040

4141
function _getSHA(inputs: UploaderInputs): string {
42-
const { args, environment: envs } = inputs
42+
const { args, envs } = inputs
4343
return args.sha || envs.GIT_CLONE_COMMIT_HASH || ''
4444
}
4545

‎src/ci_providers/provider_buildkite.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export function detect(envs: UploaderEnvs): boolean {
1818
* @returns {string}
1919
*/
2020
function _getBuild(inputs: UploaderInputs): string {
21-
const { args, environment: envs } = inputs
21+
const { args, envs } = inputs
2222
return args.build || envs.BUILDKITE_BUILD_NUMBER || ''
2323
}
2424

@@ -29,7 +29,7 @@ function _getBuild(inputs: UploaderInputs): string {
2929
* @returns {string}
3030
*/
3131
function _getBuildURL(inputs: UploaderInputs): string {
32-
return inputs.environment.BUILDKITE_BUILD_URL || ''
32+
return inputs.envs.BUILDKITE_BUILD_URL || ''
3333
}
3434

3535
/**
@@ -39,7 +39,7 @@ function _getBuildURL(inputs: UploaderInputs): string {
3939
* @returns {string}
4040
*/
4141
function _getBranch(inputs: UploaderInputs): string {
42-
const { args, environment: envs } = inputs
42+
const { args, envs } = inputs
4343
return args.branch || envs.BUILDKITE_BRANCH || ''
4444
}
4545

@@ -88,7 +88,7 @@ export function getServiceName(): string {
8888
* @returns {string}
8989
*/
9090
function _getSHA(inputs: UploaderInputs): string {
91-
const { args, environment: envs } = inputs
91+
const { args, envs } = inputs
9292
if (Boolean(args.sha) || Boolean(envs.BUILDKITE_COMMIT)) {
9393
return args.sha || envs.BUILDKITE_COMMIT || ''
9494
}
@@ -101,7 +101,7 @@ function _getSHA(inputs: UploaderInputs): string {
101101
* @returns {string}
102102
*/
103103
function _getSlug(inputs: UploaderInputs): string {
104-
const { args, environment: envs } = inputs
104+
const { args, envs } = inputs
105105
return setSlug(args.slug, envs.BUILDKITE_ORGANIZATION_SLUG, envs.BUILDKITE_PIPELINE_SLUG)
106106
}
107107
/**
@@ -116,7 +116,7 @@ export async function getServiceParams(inputs: UploaderInputs): Promise<IService
116116
build: _getBuild(inputs),
117117
buildURL: _getBuildURL(inputs),
118118
commit: _getSHA(inputs),
119-
job: _getJob(inputs.environment),
119+
job: _getJob(inputs.envs),
120120
pr: _getPR(inputs),
121121
service: _getService(),
122122
slug: _getSlug(inputs),

‎src/ci_providers/provider_circleci.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function detect(envs: UploaderEnvs): boolean {
77
}
88

99
function _getBuildURL(inputs: UploaderInputs): string {
10-
return inputs.environment['CIRCLE_BUILD_URL'] ?? ''
10+
return inputs.envs['CIRCLE_BUILD_URL'] ?? ''
1111
}
1212

1313
// This is the value that gets passed to the Codecov uploader
@@ -21,17 +21,17 @@ export function getServiceName(): string {
2121
}
2222

2323
function _getBranch(inputs: UploaderInputs): string {
24-
const { args, environment: envs } = inputs
24+
const { args, envs } = inputs
2525
return args.branch || envs.CIRCLE_BRANCH || ''
2626
}
2727

2828
function _getSHA(inputs: UploaderInputs): string {
29-
const { args, environment: envs } = inputs
29+
const { args, envs } = inputs
3030
return args.sha || envs.CIRCLE_SHA1 || ''
3131
}
3232

3333
function _getSlug(inputs: UploaderInputs): string {
34-
const { args, environment: envs } = inputs
34+
const { args, envs } = inputs
3535

3636
const slug = setSlug(
3737
args.slug,
@@ -49,12 +49,12 @@ function _getSlug(inputs: UploaderInputs): string {
4949
}
5050

5151
function _getBuild(inputs: UploaderInputs): string {
52-
const { args, environment: envs } = inputs
52+
const { args, envs } = inputs
5353
return args.build || envs.CIRCLE_BUILD_NUM || ''
5454
}
5555

5656
function _getPR(inputs: UploaderInputs): string {
57-
const { args, environment: envs } = inputs
57+
const { args, envs } = inputs
5858
return args.pr || envs.CIRCLE_PR_NUMBER || ''
5959
}
6060

@@ -68,7 +68,7 @@ export async function getServiceParams(inputs: UploaderInputs): Promise<IService
6868
build: _getBuild(inputs),
6969
buildURL: _getBuildURL(inputs),
7070
commit: _getSHA(inputs),
71-
job: _getJob(inputs.environment),
71+
job: _getJob(inputs.envs),
7272
pr: _getPR(inputs),
7373
service: _getService(),
7474
slug: _getSlug(inputs),

0 commit comments

Comments
 (0)