From 0127d1a7464a3c08d925222f366c60ba45c504c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Fournier?= Date: Tue, 11 Apr 2023 16:06:37 +0200 Subject: [PATCH] Fix eslint issues with --fix --- src/lib/metrics.test.ts | 18 +++++++++--------- src/lib/services/email-service.ts | 2 +- src/lib/util/is-email.ts | 2 +- .../e2e/api/admin/project/variants.e2e.test.ts | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/metrics.test.ts b/src/lib/metrics.test.ts index 3f4866384e..ccbc43359b 100644 --- a/src/lib/metrics.test.ts +++ b/src/lib/metrics.test.ts @@ -66,7 +66,7 @@ test('should collect metrics for requests', async () => { const metrics = await prometheusRegister.metrics(); expect(metrics).toMatch( - /http_request_duration_milliseconds{quantile="0\.99",path="somePath",method="GET",status="200",appName="undefined"}.*1337/, + /http_request_duration_milliseconds\{quantile="0\.99",path="somePath",method="GET",status="200",appName="undefined"\}.*1337/, ); }); @@ -79,7 +79,7 @@ test('should collect metrics for updated toggles', async () => { const metrics = await prometheusRegister.metrics(); expect(metrics).toMatch( - /feature_toggle_update_total{toggle="TestToggle",project="default",environment="default"} 1/, + /feature_toggle_update_total\{toggle="TestToggle",project="default",environment="default"\} 1/, ); }); @@ -97,7 +97,7 @@ test('should collect metrics for client metric reports', async () => { const metrics = await prometheusRegister.metrics(); expect(metrics).toMatch( - /feature_toggle_usage_total{toggle="TestToggle",active="true",appName="undefined"} 10\nfeature_toggle_usage_total{toggle="TestToggle",active="false",appName="undefined"} 5/, + /feature_toggle_usage_total\{toggle="TestToggle",active="true",appName="undefined"\} 10\nfeature_toggle_usage_total\{toggle="TestToggle",active="false",appName="undefined"\} 5/, ); }); @@ -110,7 +110,7 @@ test('should collect metrics for db query timings', async () => { const metrics = await prometheusRegister.metrics(); expect(metrics).toMatch( - /db_query_duration_seconds{quantile="0\.99",store="foo",action="bar"} 0.1337/, + /db_query_duration_seconds\{quantile="0\.99",store="foo",action="bar"\} 0.1337/, ); }); @@ -119,7 +119,7 @@ test('should collect metrics for feature toggle size', async () => { setTimeout(done, 10); }); const metrics = await prometheusRegister.metrics(); - expect(metrics).toMatch(/feature_toggles_total{version="(.*)"} 0/); + expect(metrics).toMatch(/feature_toggles_total\{version="(.*)"\} 0/); }); test('should collect metrics for feature toggle size', async () => { @@ -127,7 +127,7 @@ test('should collect metrics for feature toggle size', async () => { setTimeout(done, 10); }); const metrics = await prometheusRegister.metrics(); - expect(metrics).toMatch(/client_apps_total{range="(.*)"} 0/); + expect(metrics).toMatch(/client_apps_total\{range="(.*)"\} 0/); }); test('Should collect metrics for database', async () => { @@ -163,10 +163,10 @@ test('Should collect metrics for client sdk versions', async () => { 'client_sdk_versions', ); expect(metrics).toMatch( - /client_sdk_versions\{sdk_name="unleash-client-node",sdk_version="3\.2\.5"} 3/, + /client_sdk_versions\{sdk_name="unleash-client-node",sdk_version="3\.2\.5"\} 3/, ); expect(metrics).toMatch( - /client_sdk_versions\{sdk_name="unleash-client-java",sdk_version="5\.0\.0"} 3/, + /client_sdk_versions\{sdk_name="unleash-client-java",sdk_version="5\.0\.0"\} 3/, ); eventStore.emit(CLIENT_REGISTER, { sdkVersion: 'unleash-client-node:3.2.5', @@ -175,7 +175,7 @@ test('Should collect metrics for client sdk versions', async () => { 'client_sdk_versions', ); expect(newmetrics).toMatch( - /client_sdk_versions\{sdk_name="unleash-client-node",sdk_version="3\.2\.5"} 4/, + /client_sdk_versions\{sdk_name="unleash-client-node",sdk_version="3\.2\.5"\} 4/, ); }); diff --git a/src/lib/services/email-service.ts b/src/lib/services/email-service.ts index f285d0f4fa..25a928f04d 100644 --- a/src/lib/services/email-service.ts +++ b/src/lib/services/email-service.ts @@ -229,6 +229,6 @@ export class EmailService { } stripSpecialCharacters(str: string): string { - return str?.replace(/[`~!@#$%^&*()_|+=?;:'",.<>\{\}\[\]\\\/]/gi, ''); + return str?.replace(/[`~!@#$%^&*()_|+=?;:'",.<>{}[\]\\/]/gi, ''); } } diff --git a/src/lib/util/is-email.ts b/src/lib/util/is-email.ts index a086d329f4..57fac8b8e8 100644 --- a/src/lib/util/is-email.ts +++ b/src/lib/util/is-email.ts @@ -1,6 +1,6 @@ // Email address matcher. // eslint-disable-next-line no-useless-escape -const matcher = /.+\@.+\..+/; +const matcher = /.[^\n\r@\u2028\u2029]*@.+\..+/; /** * Loosely validate an email address. diff --git a/src/test/e2e/api/admin/project/variants.e2e.test.ts b/src/test/e2e/api/admin/project/variants.e2e.test.ts index 0dcdeb29a6..c36087e444 100644 --- a/src/test/e2e/api/admin/project/variants.e2e.test.ts +++ b/src/test/e2e/api/admin/project/variants.e2e.test.ts @@ -490,7 +490,7 @@ test('PUTing an invalid variant throws 400 exception', async () => { .expect((res) => { expect(res.body.details).toHaveLength(1); expect(res.body.details[0].message).toMatch( - /.*weightType\" must be one of/, + /.*weightType" must be one of/, ); }); }); @@ -525,7 +525,7 @@ test('Invalid variant in PATCH also throws 400 exception', async () => { .expect((res) => { expect(res.body.details).toHaveLength(1); expect(res.body.details[0].message).toMatch( - /.*weight\" must be less than or equal to 1000/, + /.*weight" must be less than or equal to 1000/, ); }); });