From ecd296eaf70319c71ea53bfb0d0fcacb9cb142a7 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Wed, 10 Nov 2021 17:54:33 +0000 Subject: [PATCH] Revert "Merge pull request #11328 from radiantly/ui/feature/allow-${}-style-interpolation" This reverts commit cd55c0cda3310c06abe989b8d145d9946945ae8d, reversing changes made to 14af8cb7a9e7fc0a65178e6ca7708b3f395f0d70. --- .changelog/11328.txt | 3 - .../consul-ui/app/helpers/render-template.js | 11 +- .../helpers/render-template-test.js | 128 +----------------- website/content/docs/agent/options.mdx | 7 +- 4 files changed, 6 insertions(+), 143 deletions(-) delete mode 100644 .changelog/11328.txt diff --git a/.changelog/11328.txt b/.changelog/11328.txt deleted file mode 100644 index 637a3876e..000000000 --- a/.changelog/11328.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:improvement -config: Allow ${} style interpolation for UI Dashboard template URLs -``` diff --git a/ui/packages/consul-ui/app/helpers/render-template.js b/ui/packages/consul-ui/app/helpers/render-template.js index 071f2d1df..57c006b84 100644 --- a/ui/packages/consul-ui/app/helpers/render-template.js +++ b/ui/packages/consul-ui/app/helpers/render-template.js @@ -1,15 +1,8 @@ import Helper from '@ember/component/helper'; import { inject as service } from '@ember/service'; -// regexp that matches {{item.Name}} or ${item.Name} -// what this regex does -// (?:\$|\{) - Match either $ or { -// \{ - Match { -// ([a-z.0-9_-]+) - Capturing group -// (?:(?<=\$\{[^{]+) - Use a positive lookbehind to assert that ${ was matched previously -// |\} ) - or match a } -// \} - Match } -const templateRe = /(?:\$|\{)\{([a-z.0-9_-]+)(?:(?<=\$\{[^{]+)|\})\}/gi; +// simple mustache regexp `/{{item.Name}}/` +const templateRe = /{{([A-Za-z.0-9_-]+)}}/g; let render; export default class RenderTemplateHelper extends Helper { @service('encoder') encoder; diff --git a/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js b/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js index 0eb773630..6136ca7ac 100644 --- a/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js +++ b/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js @@ -94,133 +94,7 @@ module('Integration | Helper | render-template', function(hooks) { result: 'http://localhost/?=%23Na%2Fme', }, ].forEach(item => { - test('it renders {{}} style interpolation`', async function(assert) { - this.set('template', item.href); - this.set('vars', item.vars); - - await render(hbs`{{render-template template vars}}`); - - assert.equal(this.element.textContent.trim(), item.result); - }); - }); - - [ - { - href: 'http://localhost/?=${Name}/${ID}', - vars: { - Name: 'name', - ID: 'id', - }, - result: 'http://localhost/?=name/id', - }, - { - href: 'http://localhost/?=${Name}/${ID}', - vars: { - Name: '{{Name}}', - ID: '{{ID}}', - }, - result: 'http://localhost/?=%7B%7BName%7D%7D/%7B%7BID%7D%7D', - }, - { - href: 'http://localhost/?=${deep.Name}/${deep.ID}', - vars: { - deep: { - Name: '{{Name}}', - ID: '{{ID}}', - }, - }, - result: 'http://localhost/?=%7B%7BName%7D%7D/%7B%7BID%7D%7D', - }, - { - href: 'http://localhost/?=${}/${}', - vars: { - Name: 'name', - ID: 'id', - }, - // If you don't pass actual variables then nothing - // gets replaced and nothing is URL encoded - result: 'http://localhost/?=${}/${}', - }, - { - href: 'http://localhost/?=${Service_Name}/${Meta-Key}', - vars: { - Service_Name: 'name', - ['Meta-Key']: 'id', - }, - result: 'http://localhost/?=name/id', - }, - { - href: 'http://localhost/?=${Service_Name}/${Meta-Key}', - vars: { - WrongPropertyName: 'name', - ['Meta-Key']: 'id', - }, - result: 'http://localhost/?=/id', - }, - { - href: 'http://localhost/?=${.Name}', - vars: { - ['.Name']: 'name', - }, - result: 'http://localhost/?=', - }, - { - href: 'http://localhost/?=${.}', - vars: { - ['.']: 'name', - }, - result: 'http://localhost/?=', - }, - { - href: 'http://localhost/?=${deep..Name}', - vars: { - deep: { - Name: 'Name', - ID: 'ID', - }, - }, - result: 'http://localhost/?=', - }, - { - href: 'http://localhost/?=${deep.Name}', - vars: { - deep: { - Name: '#Na/me', - ID: 'ID', - }, - }, - result: 'http://localhost/?=%23Na%2Fme', - }, - ].forEach(item => { - test('it renders ${} style interpolation', async function(assert) { - this.set('template', item.href); - this.set('vars', item.vars); - - await render(hbs`{{render-template template vars}}`); - - assert.equal(this.element.textContent.trim(), item.result); - }); - }); - - [ - { - href: 'http://localhost/?=${Name}/{{ID}}', - vars: { - Name: 'name', - ID: 'id', - }, - result: 'http://localhost/?=name/id', - }, - { - href: 'http://localhost/?=${Name}}/{{ID}', - vars: { - Name: 'name', - ID: 'id', - }, - result: 'http://localhost/?=name}/{{ID}', - }, - ].forEach(item => { - test('it renders both styles of interpolation when used together', async function(assert) { + test('it renders', async function(assert) { this.set('template', item.href); this.set('vars', item.vars); diff --git a/website/content/docs/agent/options.mdx b/website/content/docs/agent/options.mdx index 1fff6541c..174d41380 100644 --- a/website/content/docs/agent/options.mdx +++ b/website/content/docs/agent/options.mdx @@ -2189,10 +2189,9 @@ bind_addr = "{{ GetPrivateInterfaces | include \"network\" \"10.0.0.0/8\" | attr The placeholders available are: - - `${Service.Name}` or `{{Service.Name}}` - Replaced with the current service's name. - - `${Service.Namespace}` or `{{Service.Namespace}}` - Replaced with the current - service's namespace or empty if namespaces are not enabled. - - `${Datacenter}` or `{{Datacenter}}` - Replaced with the current service's datacenter. + - `{{Service.Name}}` - Replaced with the current service's name. + - `{{Service.Namespace}}` - Replaced with the current service's namespace or empty if namespaces are not enabled. + - `{{Datacenter}}` - Replaced with the current service's datacenter. - `ui_dir` - **This field is deprecated in Consul 1.9.0. See the [`ui_config.dir`](#ui_config_dir) field instead.** Equivalent to the [`-ui-dir`](#_ui_dir) command-line