Merge branch 'master' into coverity-ssl

services/jenkins/jenkins-base.js

@@ -0,0 +1,30 @@
+'use strict'
+
+const { BaseJsonService } = require('..')
+const serverSecrets = require('../../lib/server-secrets')
+
+module.exports = class JenkinsBase extends BaseJsonService {
+  async fetch({
+    url,
+    schema,
+    qs,
+    errorMessages = { 404: 'instance or job not found' },
+    disableStrictSSL,
+  }) {
+    const options = { qs, strictSSL: disableStrictSSL === undefined }
+
+    if (serverSecrets.jenkins_user) {
+      options.auth = {
+        user: serverSecrets.jenkins_user,
+        pass: serverSecrets.jenkins_pass,
+      }
+    }
+
+    return this._requestJson({
+      url,
+      options,
+      schema,
+      errorMessages,
+    })
+  }
+}

services/jenkins/jenkins-build-redirect.service.js

@@ -0,0 +1,16 @@
+'use strict'
+
+const { redirector } = require('..')
+
+module.exports = [
+  redirector({
+    category: 'build',
+    route: {
+      base: 'jenkins-ci',
+      pattern: 's/:protocol(http|https)/:host+/:job+',
+    },
+    transformPath: ({ protocol, host, job }) =>
+      `/jenkins/s/${protocol}/${host}/${job}`,
+    dateAdded: new Date('2019-04-14'),
+  }),
+]

services/jenkins/jenkins-build-redirect.tester.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { ServiceTester } = require('../tester')
+
+const t = (module.exports = new ServiceTester({
+  id: 'JenkinsBuildRedirect',
+  title: 'JenkinsBuildRedirect',
+  pathPrefix: '/jenkins-ci/s',
+}))
+
+t.create('jenkins ci')
+  .get('/https/updates.jenkins-ci.org/job/foo.svg', {
+    followRedirect: false,
+  })
+  .expectStatus(301)
+  .expectHeader(
+    'Location',
+    '/jenkins/s/https/updates.jenkins-ci.org/job/foo.svg'
+  )

services/jenkins/jenkins-build.service.js

@@ -1,107 +1,95 @@
 'use strict'
 
-const LegacyService = require('../legacy-service')
-const { makeBadgeData: getBadgeData } = require('../../lib/badge-data')
-const serverSecrets = require('../../lib/server-secrets')
+const Joi = require('joi')
+const { renderBuildStatusBadge } = require('../build-status')
+const JenkinsBase = require('./jenkins-base')
+const {
+  buildTreeParamQueryString,
+  buildUrl,
+  queryParamSchema,
+} = require('./jenkins-common')
 
-// This legacy service should be rewritten to use e.g. BaseJsonService.
-//
-// Tips for rewriting:
-// https://github.com/badges/shields/blob/master/doc/rewriting-services.md
-//
-// Do not base new services on this code.
-module.exports = class JenkinsBuild extends LegacyService {
+// https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/BallColor.java#L56
+const colorStatusMap = {
+  red: 'failing',
+  red_anime: 'building',
+  yellow: 'unstable',
+  yellow_anime: 'building',
+  blue: 'passing',
+  blue_anime: 'building',
+  green: 'passing',
+  green_anime: 'building',
+  grey: 'not built',
+  grey_anime: 'building',
+  disabled: 'not built',
+  disabled_anime: 'building',
+  aborted: 'not built',
+  aborted_anime: 'building',
+  notbuilt: 'not built',
+  notbuilt_anime: 'building',
+}
+
+const schema = Joi.object({
+  color: Joi.allow(...Object.keys(colorStatusMap)).required(),
+}).required()
+
+module.exports = class JenkinsBuild extends JenkinsBase {
   static get category() {
     return 'build'
   }
 
+  static get defaultBadgeData() {
+    return {
+      label: 'build',
+    }
+  }
+
   static get route() {
     return {
       base: 'jenkins/s',
-      pattern: ':scheme(http|https)?/:host/:job*',
+      pattern: ':protocol(http|https)/:host/:job+',
+      queryParamSchema,
     }
   }
 
   static get examples() {
     return [
       {
         title: 'Jenkins',
-        pattern: ':scheme/:host/:job',
         namedParams: {
-          scheme: 'https',
+          protocol: 'https',
           host: 'jenkins.qa.ubuntu.com',
           job:
             'view/Precise/view/All%20Precise/job/precise-desktop-amd64_default',
         },
-        staticPreview: {
-          label: 'build',
-          message: 'passing',
-          color: 'brightgreen',
-        },
+        staticPreview: renderBuildStatusBadge({ status: 'passing' }),
       },
     ]
   }
 
-  static registerLegacyRouteHandler({ camp, cache }) {
-    camp.route(
-      /^\/jenkins(?:-ci)?\/s\/(http(?:s)?)\/([^/]+)\/(.+)\.(svg|png|gif|jpg|json)$/,
-      cache((data, match, sendBadge, request) => {
-        const scheme = match[1] // http(s)
-        const host = match[2] // example.org:8080
-        const job = match[3] // folder/job
-        const format = match[4]
-        const options = {
-          json: true,
-          uri: `${scheme}://${host}/job/${job}/api/json?tree=color`,
-        }
-        if (job.indexOf('/') > -1) {
-          options.uri = `${scheme}://${host}/${job}/api/json?tree=color`
-        }
+  static render({ status }) {
+    if (status === 'unstable') {
+      return {
+        message: status,
+        color: 'yellow',
+      }
+    }
 
-        if (serverSecrets.jenkins_user) {
-          options.auth = {
-            user: serverSecrets.jenkins_user,
-            pass: serverSecrets.jenkins_pass,
-          }
-        }
+    return renderBuildStatusBadge({ status })
+  }
 
-        const badgeData = getBadgeData('build', data)
-        request(options, (err, res, json) => {
-          if (err !== null) {
-            badgeData.text[1] = 'inaccessible'
-            sendBadge(format, badgeData)
-            return
-          }
+  transform({ json }) {
+    return { status: colorStatusMap[json.color] }
+  }
 
-          try {
-            if (json.color === 'blue' || json.color === 'green') {
-              badgeData.colorscheme = 'brightgreen'
-              badgeData.text[1] = 'passing'
-            } else if (json.color === 'red') {
-              badgeData.colorscheme = 'red'
-              badgeData.text[1] = 'failing'
-            } else if (json.color === 'yellow') {
-              badgeData.colorscheme = 'yellow'
-              badgeData.text[1] = 'unstable'
-            } else if (
-              json.color === 'grey' ||
-              json.color === 'disabled' ||
-              json.color === 'aborted' ||
-              json.color === 'notbuilt'
-            ) {
-              badgeData.colorscheme = 'lightgrey'
-              badgeData.text[1] = 'not built'
-            } else {
-              badgeData.colorscheme = 'lightgrey'
-              badgeData.text[1] = 'building'
-            }
-            sendBadge(format, badgeData)
-          } catch (e) {
-            badgeData.text[1] = 'invalid'
-            sendBadge(format, badgeData)
-          }
-        })
-      })
-    )
+  async handle({ protocol, host, job }, { disableStrictSSL }) {
+    const json = await this.fetch({
+      url: buildUrl({ protocol, host, job, lastBuild: false }),
+      schema,
+      qs: buildTreeParamQueryString('color'),
+      disableStrictSSL,
+    })
+    const { status } = this.transform({ json })
+    return this.constructor.render({ status })
   }
 }

services/jenkins/jenkins-build.spec.js

@@ -0,0 +1,57 @@
+'use strict'
+
+const { test, forCases, given } = require('sazerac')
+const { renderBuildStatusBadge } = require('../build-status')
+const JenkinsBuild = require('./jenkins-build.service')
+
+describe('JenkinsBuild', function() {
+  test(JenkinsBuild.prototype.transform, () => {
+    forCases([
+      given({ json: { color: 'red_anime' } }),
+      given({ json: { color: 'yellow_anime' } }),
+      given({ json: { color: 'blue_anime' } }),
+      given({ json: { color: 'green_anime' } }),
+      given({ json: { color: 'grey_anime' } }),
+      given({ json: { color: 'disabled_anime' } }),
+      given({ json: { color: 'aborted_anime' } }),
+      given({ json: { color: 'notbuilt_anime' } }),
+    ]).expect({
+      status: 'building',
+    })
+    forCases([
+      given({ json: { color: 'grey' } }),
+      given({ json: { color: 'disabled' } }),
+      given({ json: { color: 'aborted' } }),
+      given({ json: { color: 'notbuilt' } }),
+    ]).expect({
+      status: 'not built',
+    })
+    forCases([
+      given({ json: { color: 'blue' } }),
+      given({ json: { color: 'green' } }),
+    ]).expect({
+      status: 'passing',
+    })
+    given({ json: { color: 'red' } }).expect({ status: 'failing' })
+    given({ json: { color: 'yellow' } }).expect({ status: 'unstable' })
+  })
+
+  test(JenkinsBuild.render, () => {
+    given({ status: 'unstable' }).expect({
+      message: 'unstable',
+      color: 'yellow',
+    })
+    given({ status: 'passing' }).expect(
+      renderBuildStatusBadge({ status: 'passing' })
+    )
+    given({ status: 'failing' }).expect(
+      renderBuildStatusBadge({ status: 'failing' })
+    )
+    given({ status: 'building' }).expect(
+      renderBuildStatusBadge({ status: 'building' })
+    )
+    given({ status: 'not built' }).expect(
+      renderBuildStatusBadge({ status: 'not built' })
+    )
+  })
+})

services/jenkins/jenkins-build.tester.js

@@ -0,0 +1,53 @@
+'use strict'
+
+const Joi = require('joi')
+const sinon = require('sinon')
+const serverSecrets = require('../../lib/server-secrets')
+const { isBuildStatus } = require('../build-status')
+const t = (module.exports = require('../tester').createServiceTester())
+
+const isJenkinsBuildStatus = Joi.alternatives(
+  isBuildStatus,
+  Joi.string().allow('unstable')
+)
+
+t.create('build job not found')
+  .get('/https/updates.jenkins-ci.org/job/does-not-exist.json')
+  .expectBadge({ label: 'build', message: 'instance or job not found' })
+
+t.create('build found (view)')
+  .get(
+    '/https/jenkins.qa.ubuntu.com/view/Precise/view/All%20Precise/job/precise-desktop-amd64_default.json'
+  )
+  .expectBadge({ label: 'build', message: isJenkinsBuildStatus })
+
+t.create('build found (job)')
+  .get('/https/jenkins.ubuntu.com/server/curtin-vmtest-daily-x.json')
+  .expectBadge({ label: 'build', message: isJenkinsBuildStatus })
+
+const user = 'admin'
+const pass = 'password'
+
+function mockCreds() {
+  serverSecrets['jenkins_user'] = undefined
+  serverSecrets['jenkins_pass'] = undefined
+  sinon.stub(serverSecrets, 'jenkins_user').value(user)
+  sinon.stub(serverSecrets, 'jenkins_pass').value(pass)
+}
+
+t.create('with mock credentials')
+  .before(mockCreds)
+  .get('/https/jenkins.ubuntu.com/server/job/curtin-vmtest-daily-x.json')
+  .intercept(nock =>
+    nock('https://jenkins.ubuntu.com/server/job/curtin-vmtest-daily-x')
+      .get(`/api/json?tree=color`)
+      // This ensures that the expected credentials from serverSecrets are actually being sent with the HTTP request.
+      // Without this the request wouldn't match and the test would fail.
+      .basicAuth({
+        user,
+        pass,
+      })
+      .reply(200, { color: 'blue' })
+  )
+  .finally(sinon.restore)
+  .expectBadge({ label: 'build', message: 'passing' })

services/jenkins/jenkins-common.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const Joi = require('joi')
+
+const queryParamSchema = Joi.object({
+  disableStrictSSL: Joi.equal(''),
+}).required()
+
+const buildUrl = ({ protocol, host, job, lastBuild = true, plugin }) => {
+  const jobPrefix = job.indexOf('/') > -1 ? '' : 'job/'
+  return `${protocol}://${host}/${jobPrefix}${job}/${
+    lastBuild ? 'lastBuild/' : ''
+  }${plugin ? `${plugin}/` : ''}api/json`
+}
+
+module.exports = {
+  queryParamSchema,
+  buildTreeParamQueryString: tree => ({ tree }),
+  buildUrl,
+}