diff --git a/services/github/github-size.service.js b/services/github/github-size.service.js index 3dfa6692b15dbef159f6af28e52a21e1343e7ef0..de2e2bc0a217afe7446d87bb3539e00cb334167e 100644 --- a/services/github/github-size.service.js +++ b/services/github/github-size.service.js @@ -21,7 +21,7 @@ export default class GithubSize extends GithubAuthV3Service { static route = { base: 'github/size', - pattern: ':user/:repo/:path*', + pattern: ':user/:repo/:path+', queryParamSchema, } diff --git a/services/node/node-base.js b/services/node/node-base.js index 61f049595eec91c48b36c04af86842e493c42a6a..04b0b6375c54ee4ff5c51596284be863e0fa8298 100644 --- a/services/node/node-base.js +++ b/services/node/node-base.js @@ -27,8 +27,8 @@ export default class NodeVersionBase extends NPMBase { }, { title: `${prefix} (scoped)`, - pattern: '@:scope/:packageName', - namedParams: { scope: 'stdlib', packageName: 'stdlib' }, + pattern: ':scope/:packageName', + namedParams: { scope: '@stdlib', packageName: 'stdlib' }, staticPreview: this.renderStaticPreview({ nodeVersionRange: '>= 6.0.0', }), @@ -48,8 +48,8 @@ export default class NodeVersionBase extends NPMBase { }, { title: `${prefix} (scoped with tag)`, - pattern: '@:scope/:packageName/:tag', - namedParams: { scope: 'stdlib', packageName: 'stdlib', tag: 'latest' }, + pattern: ':scope/:packageName/:tag', + namedParams: { scope: '@stdlib', packageName: 'stdlib', tag: 'latest' }, staticPreview: this.renderStaticPreview({ nodeVersionRange: '>= 6.0.0', tag: 'latest', @@ -59,8 +59,8 @@ export default class NodeVersionBase extends NPMBase { }, { title: `${prefix} (scoped with tag, custom registry)`, - pattern: '@:scope/:packageName/:tag', - namedParams: { scope: 'stdlib', packageName: 'stdlib', tag: 'latest' }, + pattern: ':scope/:packageName/:tag', + namedParams: { scope: '@stdlib', packageName: 'stdlib', tag: 'latest' }, queryParams: { registry_uri: 'https://registry.npmjs.com' }, staticPreview: this.renderStaticPreview({ nodeVersionRange: '>= 6.0.0', diff --git a/services/pypi/pypi-base.js b/services/pypi/pypi-base.js index 4a3b27a7d19551059bd0aa36d9b925b7631879cc..012af06f4974038e933b8b9907ec0a6e50feaf61 100644 --- a/services/pypi/pypi-base.js +++ b/services/pypi/pypi-base.js @@ -22,7 +22,7 @@ export default class PypiBase extends BaseJsonService { static buildRoute(base) { return { base, - pattern: ':egg*', + pattern: ':egg+', } } diff --git a/services/pypi/pypi-framework-versions.service.js b/services/pypi/pypi-framework-versions.service.js index 1da6edb1e875019cda49726c64faaeaae308c73f..1072fed32fd2a163132b255577c3406fccbf687a 100644 --- a/services/pypi/pypi-framework-versions.service.js +++ b/services/pypi/pypi-framework-versions.service.js @@ -50,7 +50,7 @@ export default class PypiFrameworkVersion extends PypiBase { base: 'pypi/frameworkversions', pattern: `:frameworkName(${Object.keys(frameworkNameMap).join( '|' - )})/:packageName*`, + )})/:packageName+`, } static examples = [ diff --git a/services/sonar/sonar-fortify-rating.service.js b/services/sonar/sonar-fortify-rating.service.js index 96ca325b60e11bccd8aab5958a7692c28969e322..bc2e220ee8f9899a61d8783bdefb66cb67e0eea6 100644 --- a/services/sonar/sonar-fortify-rating.service.js +++ b/services/sonar/sonar-fortify-rating.service.js @@ -31,8 +31,7 @@ export default class SonarFortifyRating extends SonarBase { }, staticPreview: this.render({ rating: 4 }), keywords, - documentation: ` - <p> + documentation: `<p> Note that the Fortify Security Rating badge will only work on Sonar instances that have the <a href='https://marketplace.microfocus.com/fortify/content/fortify-sonarqube-plugin'>Fortify SonarQube Plugin</a> installed. The badge is not available for projects analyzed on SonarCloud.io </p> diff --git a/services/sonar/sonar-helpers.js b/services/sonar/sonar-helpers.js index c5e49b27289527b5edff7764f36c909a49d2e7e8..f27da1125d500d1b340842652195db1b7dedeab4 100644 --- a/services/sonar/sonar-helpers.js +++ b/services/sonar/sonar-helpers.js @@ -47,15 +47,14 @@ const queryParamWithFormatSchema = Joi.object({ }).required() const keywords = ['sonarcloud', 'sonarqube'] -const documentation = ` - <p> +const documentation = `<p> The Sonar badges will work with both SonarCloud.io and self-hosted SonarQube instances. Just enter the correct protocol and path for your target Sonar deployment. </p> <p> If you are targeting a legacy SonarQube instance that is version 5.3 or earlier, then be sure to include the version query parameter with the value of your SonarQube version. - </p + </p> ` export { diff --git a/services/sonar/sonar-tests.service.js b/services/sonar/sonar-tests.service.js index 7408a2e33725bce4a93cf3b5193d2c0e89029a0e..90b5adbc1ac4bbe8922f2bc5ce3ab50319ed0fbf 100644 --- a/services/sonar/sonar-tests.service.js +++ b/services/sonar/sonar-tests.service.js @@ -43,8 +43,7 @@ class SonarTestsSummary extends SonarBase { isCompact: false, }), keywords, - documentation: ` - ${documentation} + documentation: `${documentation} ${testResultsDocumentation} `, },