From b069dbbaad2cce25c67d7088e373d496b2156007 Mon Sep 17 00:00:00 2001
From: Paul Melnikow <github@paulmelnikow.com>
Date: Thu, 18 Apr 2019 18:15:48 -0500
Subject: [PATCH] Use route `pattern`s in [snap-ci nsp gratipay githubmanifest
 codacy cauditor bithound] (#3327)

Ref #3329
---
 services/bithound/bithound.service.js      | 2 +-
 services/cauditor/cauditor.service.js      | 2 +-
 services/codacy/codacy-coverage.service.js | 3 +--
 services/codacy/codacy-grade.service.js    | 3 +--
 services/codacy/codacy-grade.tester.js     | 6 +++---
 services/github/github-manifest.service.js | 3 +--
 services/gratipay/gratipay.service.js      | 4 ++--
 services/nsp/nsp.service.js                | 2 +-
 services/snap-ci/snap-ci.service.js        | 4 ++--
 9 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/services/bithound/bithound.service.js b/services/bithound/bithound.service.js
index ac7097a730..0a36660e95 100644
--- a/services/bithound/bithound.service.js
+++ b/services/bithound/bithound.service.js
@@ -6,7 +6,7 @@ module.exports = deprecatedService({
   category: 'dependencies',
   route: {
     base: 'bithound',
-    format: '(?:code/|dependencies/|devDependencies/)?(?:.+?)',
+    pattern: ':various*',
   },
   label: 'bithound',
   dateAdded: new Date('2018-07-08'),
diff --git a/services/cauditor/cauditor.service.js b/services/cauditor/cauditor.service.js
index 73466c910b..64cfbf49dd 100644
--- a/services/cauditor/cauditor.service.js
+++ b/services/cauditor/cauditor.service.js
@@ -6,7 +6,7 @@ module.exports = deprecatedService({
   category: 'other',
   route: {
     base: 'cauditor',
-    format: '(?:mi|ccn|npath|hi|i|ca|ce|dit)/(?:[^/]+)/(?:[^/]+)/(?:.+)',
+    pattern: ':various*',
   },
   label: 'cauditor',
   dateAdded: new Date('2018-02-15'),
diff --git a/services/codacy/codacy-coverage.service.js b/services/codacy/codacy-coverage.service.js
index 4c21ff96f4..fe8da74e61 100644
--- a/services/codacy/codacy-coverage.service.js
+++ b/services/codacy/codacy-coverage.service.js
@@ -21,8 +21,7 @@ module.exports = class CodacyCoverage extends BaseSvgScrapingService {
   static get route() {
     return {
       base: 'codacy/coverage',
-      format: '(?!grade/)([^/]+)(?:/(.+))?',
-      capture: ['projectId', 'branch'],
+      pattern: ':projectId/:branch*',
     }
   }
 
diff --git a/services/codacy/codacy-grade.service.js b/services/codacy/codacy-grade.service.js
index 3a58d738c0..b375fa829b 100644
--- a/services/codacy/codacy-grade.service.js
+++ b/services/codacy/codacy-grade.service.js
@@ -14,8 +14,7 @@ module.exports = class CodacyGrade extends BaseSvgScrapingService {
   static get route() {
     return {
       base: 'codacy/grade',
-      format: '(?:grade/)?(?!coverage/)([^/]+)(?:/(.+))?',
-      capture: ['projectId', 'branch'],
+      pattern: ':projectId/:branch*',
     }
   }
 
diff --git a/services/codacy/codacy-grade.tester.js b/services/codacy/codacy-grade.tester.js
index 13db31f1b2..cc8020e210 100644
--- a/services/codacy/codacy-grade.tester.js
+++ b/services/codacy/codacy-grade.tester.js
@@ -4,21 +4,21 @@ const t = (module.exports = require('../tester').createServiceTester())
 const { codacyGrade } = require('./codacy-helpers')
 
 t.create('Code quality')
-  .get('/grade/e27821fb6289410b8f58338c7e0bc686.json')
+  .get('/e27821fb6289410b8f58338c7e0bc686.json')
   .expectBadge({
     label: 'code quality',
     message: codacyGrade,
   })
 
 t.create('Code quality on branch')
-  .get('/grade/e27821fb6289410b8f58338c7e0bc686/master.json')
+  .get('/e27821fb6289410b8f58338c7e0bc686/master.json')
   .expectBadge({
     label: 'code quality',
     message: codacyGrade,
   })
 
 t.create('Code quality (package not found)')
-  .get('/grade/00000000000000000000000000000000/master.json')
+  .get('/00000000000000000000000000000000/master.json')
   .expectBadge({
     label: 'code quality',
     message: 'project or branch not found',
diff --git a/services/github/github-manifest.service.js b/services/github/github-manifest.service.js
index 3aaac1c90d..b9491c469c 100644
--- a/services/github/github-manifest.service.js
+++ b/services/github/github-manifest.service.js
@@ -83,8 +83,7 @@ class DynamicGithubManifest extends ConditionalGithubAuthService {
   static get route() {
     return {
       base: 'github/manifest-json',
-      format: '(?!v)([^/]+)/([^/]+)/([^/]+)/?([^/]+)?',
-      capture: ['key', 'user', 'repo', 'branch'],
+      pattern: ':key([^v/][^/]*)/:user/:repo/:branch*',
     }
   }
 
diff --git a/services/gratipay/gratipay.service.js b/services/gratipay/gratipay.service.js
index 96af37c504..3ad1964d72 100644
--- a/services/gratipay/gratipay.service.js
+++ b/services/gratipay/gratipay.service.js
@@ -12,14 +12,14 @@ module.exports = [
   deprecatedService({
     route: {
       base: 'gittip',
-      pattern: ':various?',
+      pattern: ':various*',
     },
     ...commonAttrs,
   }),
   deprecatedService({
     route: {
       base: 'gratipay',
-      pattern: ':various?',
+      pattern: ':various*',
     },
     ...commonAttrs,
   }),
diff --git a/services/nsp/nsp.service.js b/services/nsp/nsp.service.js
index 75316c8fcc..ef85af6728 100644
--- a/services/nsp/nsp.service.js
+++ b/services/nsp/nsp.service.js
@@ -5,7 +5,7 @@ const { deprecatedService } = require('..')
 module.exports = deprecatedService({
   route: {
     base: 'nsp/npm',
-    format: '(?:.+)',
+    pattern: ':various*',
   },
   label: 'nsp',
   category: 'other',
diff --git a/services/snap-ci/snap-ci.service.js b/services/snap-ci/snap-ci.service.js
index 73d03fe920..4b3cf224dc 100644
--- a/services/snap-ci/snap-ci.service.js
+++ b/services/snap-ci/snap-ci.service.js
@@ -12,14 +12,14 @@ module.exports = [
   deprecatedService({
     route: {
       base: 'snap',
-      format: '(?:[^/]+/[^/]+)(?:/(?:.+))',
+      pattern: ':various*',
     },
     ...commonAttrs,
   }),
   deprecatedService({
     route: {
       base: 'snap-ci',
-      format: '(?:[^/]+/[^/]+)(?:/(?:.+))',
+      pattern: ':various*',
     },
     ...commonAttrs,
   }),