fix: codebuild args

Author: eddiemoore

src/ci_providers/provider_codebuild.js

@@ -14,9 +14,12 @@ function _getBuildURL(inputs) {
 
 function _getBranch(inputs) {
   const { args, envs } = inputs
-  return args.branch || envs.CODEBUILD_WEBHOOK_HEAD_REF
-    ? envs.CODEBUILD_WEBHOOK_HEAD_REF.replace(/^refs\/heads\//, '')
-    : ''
+  return (
+    args.branch ||
+    (envs.CODEBUILD_WEBHOOK_HEAD_REF
+      ? envs.CODEBUILD_WEBHOOK_HEAD_REF.replace(/^refs\/heads\//, '')
+      : '')
+  )
 }
 
 function _getJob(envs) {
@@ -25,11 +28,13 @@ function _getJob(envs) {
 
 function _getPR(inputs) {
   const { args, envs } = inputs
-  return args.pr ||
+  return (
+    args.pr ||
     (envs.CODEBUILD_WEBHOOK_HEAD_REF &&
-      envs.CODEBUILD_SOURCE_VERSION.startsWith('pr/'))
-    ? envs.CODEBUILD_SOURCE_VERSION.replace(/^pr\//, '')
-    : ''
+    envs.CODEBUILD_SOURCE_VERSION.startsWith('pr/')
+      ? envs.CODEBUILD_SOURCE_VERSION.replace(/^pr\//, '')
+      : '')
+  )
 }
 
 function _getService() {
@@ -47,12 +52,15 @@ function _getSHA(inputs) {
 
 function _getSlug(inputs) {
   const { args, envs } = inputs
-  return args.slug || envs.CODEBUILD_SOURCE_REPO_URL
-    ? envs.CODEBUILD_SOURCE_REPO_URL.replace(/^.*github.com\//, '').replace(
-        /\.git$/,
-        '',
-      )
-    : ''
+  return (
+    args.slug ||
+    (envs.CODEBUILD_SOURCE_REPO_URL
+      ? envs.CODEBUILD_SOURCE_REPO_URL.replace(/^.*github.com\//, '').replace(
+          /\.git$/,
+          '',
+        )
+      : '')
+  )
 }
 
 function getServiceParams(inputs) {

test/providers/provider_codebuild.test.js

@@ -56,4 +56,38 @@ describe('CodeBuild Params', () => {
     const params = providerCodeBuild.getServiceParams(inputs)
     expect(params).toMatchObject(expected)
   })
+
+  it('gets correct params for overrides', () => {
+    const inputs = {
+      args: {
+        branch: 'branch',
+        build: 3,
+        pr: '7',
+        sha: 'testsha',
+        slug: 'testOrg/testRepo',
+      },
+      envs: {
+        CI: true,
+        CODEBUILD_CI: true,
+        CODEBUILD_WEBHOOK_HEAD_REF: 'refs/heads/master',
+        CODEBUILD_RESOLVED_SOURCE_VERSION: 'testingsha',
+        CODEBUILD_BUILD_ID: 2,
+        CODEBUILD_SOURCE_VERSION: 'pr/1',
+        CODEBUILD_SOURCE_REPO_URL: 'https://github.com/repo.git',
+      },
+    }
+    const expected = {
+      branch: 'branch',
+      build: 3,
+      buildURL: '',
+      commit: 'testsha',
+      job: 2,
+      pr: '7',
+      service: 'codebuild',
+      slug: 'testOrg/testRepo',
+    }
+
+    const params = providerCodeBuild.getServiceParams(inputs)
+    expect(params).toMatchObject(expected)
+  })
 })