From 45e26d79566a0a41cf0ba35fff368974e807f6b6 Mon Sep 17 00:00:00 2001 From: Andreas Stenius Date: Mon, 22 Feb 2021 16:50:24 +0100 Subject: [PATCH] badges-backend: template replace should replace all occurences. Signed-off-by: Andreas Stenius --- app-config.yaml | 9 +++++++-- .../src/lib/BadgeBuilder/DefaultBadgeBuilder.ts | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 9896b2feec..2cab686e96 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -406,10 +406,12 @@ pagerduty: badges: pingback: kind: 'entity' + title: 'View _{entity.metadata.name} in _{app.title}' description: 'Link back to _{app.title}' link: '_{entity_url}' - label: 'View _{entity.metadata.name} in' - message: '_{app.title}' + label: '_{app.title}' + message: '_{entity.kind}: _{entity.metadata.name}' + style: flat-square lifecycle: kind: 'entity' @@ -417,6 +419,7 @@ badges: link: '_{entity_url}' label: 'Lifecycle' message: '_{entity.spec.lifecycle}' + style: for-the-badge owner: kind: 'entity' @@ -426,6 +429,7 @@ badges: label: 'Owner' message: '_{entity.spec.owner}' color: 'blue' + style: social docs: kind: 'entity' @@ -433,3 +437,4 @@ badges: label: 'Documentation' message: '_{entity.metadata.name}' color: 'navyblue' + style: plastic diff --git a/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.ts b/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.ts index 9b136dcf22..80bca52470 100644 --- a/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.ts +++ b/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.ts @@ -88,7 +88,7 @@ export class DefaultBadgeBuilder implements BadgeBuilder { private render(template: string, context: object): string { try { - return interpolate(template.replace('_{', '${'), context); + return interpolate(template.replace(/_{/g, '${'), context); } catch (err) { return `${err} [${template}]`; }