Extended usage of build-status.js tomore services (#2763)

* Extended usage of build-status.js

* Removed remaining status arguments

services/azure-devops/azure-devops-build.service.js

@@ -2,7 +2,8 @@
 
 const BaseSvgService = require('../base-svg-scraping')
 const { NotFound } = require('../errors')
-const { keywords, fetch, render } = require('./azure-devops-helpers')
+const { keywords, fetch } = require('./azure-devops-helpers')
+const { renderBuildStatusBadge } = require('../../lib/build-status')
 
 const documentation = `
 <p>
@@ -50,7 +51,7 @@ module.exports = class AzureDevOpsBuild extends BaseSvgService {
           projectId: '8cf3ec0e-d0c2-4fcd-8206-ad204f254a96',
           definitionId: '2',
         },
-        staticPreview: render({ status: 'succeeded' }),
+        staticPreview: renderBuildStatusBadge({ status: 'succeeded' }),
         keywords,
         documentation,
       },
@@ -64,7 +65,7 @@ module.exports = class AzureDevOpsBuild extends BaseSvgService {
           definitionId: '2',
           branch: 'master',
         },
-        staticPreview: render({ status: 'succeeded' }),
+        staticPreview: renderBuildStatusBadge({ status: 'succeeded' }),
         keywords,
         documentation,
       },
@@ -86,6 +87,6 @@ module.exports = class AzureDevOpsBuild extends BaseSvgService {
     if (status === 'unknown') {
       throw new NotFound({ prettyMessage: 'project not found' })
     }
-    return render({ status })
+    return renderBuildStatusBadge({ status })
   }
 }

services/azure-devops/azure-devops-helpers.js

@@ -2,17 +2,14 @@
 
 const Joi = require('joi')
 const serverSecrets = require('../../lib/server-secrets')
+const { isBuildStatus } = require('../../lib/build-status')
 
 const keywords = ['vso', 'vsts', 'azure-devops']
 
 const schema = Joi.object({
-  message: Joi.equal(
-    'succeeded',
-    'partially suceeded',
-    'failed',
-    'unknown',
-    'set up now'
-  ).required(),
+  message: Joi.alternatives()
+    .try(isBuildStatus, Joi.equal('unknown'), Joi.equal('set up now'))
+    .required(),
 }).required()
 
 async function fetch(serviceInstance, { url, qs = {}, errorMessages }) {
@@ -26,26 +23,6 @@ async function fetch(serviceInstance, { url, qs = {}, errorMessages }) {
   return { status }
 }
 
-function render({ status }) {
-  switch (status) {
-    case 'succeeded':
-      return {
-        message: 'passing',
-        color: 'brightgreen',
-      }
-    case 'partially succeeded':
-      return {
-        message: 'passing',
-        color: 'orange',
-      }
-    case 'failed':
-      return {
-        message: 'failing',
-        color: 'red',
-      }
-  }
-}
-
 function getHeaders() {
   const headers = {}
   if (serverSecrets.azure_devops_token) {
@@ -57,4 +34,4 @@ function getHeaders() {
   return headers
 }
 
-module.exports = { keywords, fetch, render, getHeaders }
+module.exports = { keywords, fetch, getHeaders }

services/azure-devops/azure-devops-release.service.js

@@ -1,7 +1,8 @@
 'use strict'
 
 const BaseSvgService = require('../base-svg-scraping')
-const { keywords, fetch, render } = require('./azure-devops-helpers')
+const { keywords, fetch } = require('./azure-devops-helpers')
+const { renderBuildStatusBadge } = require('../../lib/build-status')
 
 const documentation = `
 <p>
@@ -46,7 +47,7 @@ module.exports = class AzureDevOpsRelease extends BaseSvgService {
           definitionId: '1',
           environmentId: '1',
         },
-        staticPreview: render({ status: 'succeeded' }),
+        staticPreview: renderBuildStatusBadge({ status: 'succeeded' }),
         keywords,
         documentation,
       },
@@ -69,6 +70,6 @@ module.exports = class AzureDevOpsRelease extends BaseSvgService {
         500: 'inaccessible or definition not found',
       },
     })
-    return render(props)
+    return renderBuildStatusBadge(props)
   }
 }