Merge branch 'master' into better-log

Author: drazisil-codecov

.circleci/config.yml

@@ -395,7 +395,7 @@ jobs:
             - release_tag
   release:
     docker:
-      - image: google/cloud-sdk:348.0.0-slim
+      - image: google/cloud-sdk:349.0.0-slim
     steps:
       - attach_workspace:
           # Must be absolute path or relative path from working_directory

src/ci_providers/provider_local.js

@@ -18,12 +18,15 @@ function _getBuildURL(inputs) {
 
 function _getBranch(inputs) {
   const { args } = inputs
+  if (args.branch) {
+    return args.branch
+  }
   try {
     const branchName = childprocess
       .spawnSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'])
       .stdout.toString()
       .trimRight()
-    return args.branch || branchName
+    return branchName
   } catch (error) {
     logAndThrow(`There was an error getting the branch name from git: ${error}`)
   }
@@ -52,25 +55,31 @@ function getServiceName() {
 
 function _getSHA(inputs) {
   const { args } = inputs
+  if (args.sha) {
+    return args.sha
+  }
   try {
     const sha = childprocess
       .spawnSync('git', ['rev-parse', 'HEAD'])
       .stdout.toString()
       .trimRight()
-    return args.sha || sha
+    return sha
   } catch (error) {
     logAndThrow(`There was an error getting the commit SHA from git: ${error}`)
   }
 }
 
 function _getSlug(inputs) {
   const { args } = inputs
+  if (args.slug) {
+    return args.slug
+  }
   try {
     const slug = childprocess
       .spawnSync('git', ['config', '--get', 'remote.origin.url'])
       .stdout.toString()
       .trimRight()
-    return args.slug || parseSlug(slug)
+    return parseSlug(slug)
   } catch (error) {
     logAndThrow(`There was an error getting the slug from git: ${error}`)
   }

src/ci_providers/provider_teamcity.js

@@ -1,3 +1,5 @@
+const { parseSlugFromRemoteAddr } = require('../helpers/git')
+
 function detect(envs) {
   return !!envs.TEAMCITY_VERSION
 }
@@ -29,7 +31,7 @@ function _getSHA(inputs) {
 
 function _getSlug(inputs) {
   const { args } = inputs
-  return args.slug || ''
+  return args.slug || parseSlugFromRemoteAddr('') || ''
 }
 
 function _getBuild(inputs) {

src/helpers/validate.js

@@ -6,7 +6,7 @@ const validator = require('validator')
  * @returns boolean
  */
 function validateToken(token) {
-  return validator.isAlphanumeric(token)
+  return validator.isAlphanumeric(token) || validator.isUUID(token)
 }
 
 function validateURL(url) {

src/index.js

@@ -87,6 +87,9 @@ async function main(args) {
 
   // == Step 3: sanitize and set token
   const token = await tokenHelpers.getToken(inputs, projectRoot)
+  if (token === '') {
+    log('-> No token specified or token is empty')
+  }
 
   // == Step 4: get network
   let uploadFile = ''

test/helpers/validate.test.js

@@ -5,9 +5,13 @@ const realEnv = { ...process.env }
 
 describe('Input Validators', () => {
   describe('Tokens', () => {
-    it('Returns true with a valid token', () => {
+    it('Returns true with a valid alphanumeric token', () => {
       expect(validate.validateToken('1bc123')).toBe(true)
     })
+    it('Returns true with a valid UUID token', () => {
+      // Use a randomly generated UUIDv4
+      expect(validate.validateToken('5becd1a9-efa8-4bd8-8f94-e9f8613820c3')).toBe(true)
+    })
     it('Returns false with an invalid token', () => {
       expect(validate.validateToken('1bc1 23')).toBe(false)
     })

test/index.test.js

@@ -4,6 +4,9 @@ const { version } = require('../package.json')
 const nock = require('nock')
 const fs = require('fs')
 
+// Backup the env
+const realEnv = { ...process.env }
+
 describe('Uploader Core', () => {
   const env = process.env
 
@@ -68,6 +71,28 @@ describe('Uploader Core', () => {
     expect(log).toHaveBeenCalledWith(expect.stringMatching(/<<<<<< ENV/))
   })
 
+  describe('Token', () => {
+    beforeEach(() => {
+      delete process.env.CODECOV_TOKEN
+    })
+
+    afterEach(() => {
+      process.env = realEnv
+    })
+
+    it('Can upload without token', async () => {
+      jest.spyOn(process, 'exit').mockImplementation(() => {})
+      const log = jest.spyOn(console, 'log').mockImplementation(() => {})
+      await app.main({
+        name: 'customname',
+        url: 'https://codecov.io',
+        dryRun: true,
+        env: 'SOMETHING,ANOTHER',
+      })
+      expect(log).toHaveBeenCalledWith(expect.stringMatching('-> No token specified or token is empty'))
+    })
+  })
+
   describe('Flags', () => {
     it('can upload with flags', async () => {
       process.env.CI = 'true'

test/providers/provider_local.test.js

@@ -32,6 +32,30 @@ describe('Local Params', () => {
     })
   })
 
+  it('returns on override args', () => {
+    const inputs = {
+      args: {
+        branch: 'main',
+        pr: '1',
+        sha: 'testingsha',
+        slug: 'owner/repo',
+      },
+      envs: {},
+    }
+    const expected = {
+      branch: 'main',
+      build: '',
+      buildURL: '',
+      commit: 'testingsha',
+      job: '',
+      pr: '1',
+      service: '',
+      slug: 'owner/repo',
+    }
+    const params = providerLocal.getServiceParams(inputs)
+    expect(params).toMatchObject(expected)
+  })
+
   it('returns errors on git command failures', () => {
     const inputs = {
       args: {},

test/providers/provider_teamcity.test.js

@@ -1,4 +1,5 @@
 const td = require('testdouble')
+const childProcess = require('child_process')
 
 const providerTeamCity = require('../../src/ci_providers/provider_teamcity')
 
@@ -51,6 +52,47 @@ describe('TeamCity Params', () => {
       service: 'teamcity',
       slug: '',
     }
+    const spawnSync = td.replace(childProcess, 'spawnSync')
+    td.when(
+      spawnSync('git', [
+        'config',
+        '--get',
+        'remote.origin.url',
+      ]),
+    ).thenReturn({ stdout: '' })
+    const params = providerTeamCity.getServiceParams(inputs)
+    expect(params).toMatchObject(expected)
+  })
+
+  it('gets correct params and remote slug', () => {
+    const inputs = {
+      args: {},
+      envs: {
+        CI: true,
+        TEAMCITY_VERSION: true,
+        BRANCH_NAME: 'main',
+        BUILD_VCS_NUMBER: 'testingsha',
+        BUILD_NUMBER: 1,
+      },
+    }
+    const expected = {
+      branch: 'main',
+      build: 1,
+      buildURL: '',
+      commit: 'testingsha',
+      job: '',
+      pr: '',
+      service: 'teamcity',
+      slug: 'testOrg/testRepo',
+    }
+    const spawnSync = td.replace(childProcess, 'spawnSync')
+    td.when(
+      spawnSync('git', [
+        'config',
+        '--get',
+        'remote.origin.url',
+      ]),
+    ).thenReturn({ stdout: 'https://github.com/testOrg/testRepo.git' })
     const params = providerTeamCity.getServiceParams(inputs)
     expect(params).toMatchObject(expected)
   })
@@ -72,6 +114,14 @@ describe('TeamCity Params', () => {
         BUILD_NUMBER: 1,
       },
     }
+    const spawnSync = td.replace(childProcess, 'spawnSync')
+    td.when(
+      spawnSync('git', [
+        'config',
+        '--get',
+        'remote.origin.url',
+      ]),
+    ).thenReturn({ stdout: '' })
     const expected = {
       branch: 'branch',
       build: 3,