From 7350ca1ef4cd3331e3f41da1d69feee0619ce843 Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Wed, 3 Jul 2024 23:08:46 -0500 Subject: [PATCH] fix(construct.awscdk.cloudfront-url-rewrite): disable eslint no-var for cloudfront js v1 compatibility Signed-off-by: Braden Mars --- .../src/handler.function.ts | 23 ++++++++++--------- .../cloudfront-url-rewrite.spec.ts.snap | 14 +++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/construct/awscdk/cloudfront-url-rewrite/src/handler.function.ts b/packages/construct/awscdk/cloudfront-url-rewrite/src/handler.function.ts index 2d089bf..82c595f 100644 --- a/packages/construct/awscdk/cloudfront-url-rewrite/src/handler.function.ts +++ b/packages/construct/awscdk/cloudfront-url-rewrite/src/handler.function.ts @@ -1,21 +1,22 @@ +/* eslint-disable no-var */ import type { CloudFrontFunctionsEvent } from 'aws-lambda' -const FROM_HOSTNAME = '' -const REDIRECT_URI_PATTERN = new RegExp('', 'g') -const TO_HOSTNAME = '' -const TARGET_URI_PATTERN = '' +var FROM_HOSTNAME = '' +var REDIRECT_URI_PATTERN = new RegExp('', 'g') +var TO_HOSTNAME = '' +var TARGET_URI_PATTERN = '' /** * cloudfront-js supports a limited subset of javascript/ecma features. */ // eslint-disable-next-line @typescript-eslint/require-await,@typescript-eslint/no-unused-vars function handler(event: CloudFrontFunctionsEvent) { - const request = event.request - const headers = request.headers - const uri = request.uri + var request = event.request + var headers = request.headers + var uri = request.uri - const hostParams = headers.host - let host = '' + var hostParams = headers.host + var host = '' if (hostParams && hostParams.value) { host = hostParams.value } @@ -24,8 +25,8 @@ function handler(event: CloudFrontFunctionsEvent) { return request } - const newUri = uri.replace(REDIRECT_URI_PATTERN, TARGET_URI_PATTERN) - const newUrl = `https://${TO_HOSTNAME}${newUri}` + var newUri = uri.replace(REDIRECT_URI_PATTERN, TARGET_URI_PATTERN) + var newUrl = `https://${TO_HOSTNAME}${newUri}` return { statusCode: 301, statusDescription: 'Moved Permanently', diff --git a/packages/construct/awscdk/cloudfront-url-rewrite/test/__snapshots__/cloudfront-url-rewrite.spec.ts.snap b/packages/construct/awscdk/cloudfront-url-rewrite/test/__snapshots__/cloudfront-url-rewrite.spec.ts.snap index e857e4a..3423008 100644 --- a/packages/construct/awscdk/cloudfront-url-rewrite/test/__snapshots__/cloudfront-url-rewrite.spec.ts.snap +++ b/packages/construct/awscdk/cloudfront-url-rewrite/test/__snapshots__/cloudfront-url-rewrite.spec.ts.snap @@ -77,19 +77,19 @@ var REDIRECT_URI_PATTERN = new RegExp(\\"^/oldpath/(.*)\\", \\"g\\"); var TO_HOSTNAME = \\"new.example.com\\"; var TARGET_URI_PATTERN = \\"/newpath/$1\\"; function handler(event) { - const request = event.request; - const headers = request.headers; - const uri = request.uri; - const hostParams = headers.host; - let host = \\"\\"; + var request = event.request; + var headers = request.headers; + var uri = request.uri; + var hostParams = headers.host; + var host = \\"\\"; if (hostParams && hostParams.value) { host = hostParams.value; } if (!host || host !== FROM_HOSTNAME) { return request; } - const newUri = uri.replace(REDIRECT_URI_PATTERN, TARGET_URI_PATTERN); - const newUrl = \`https://\${TO_HOSTNAME}\${newUri}\`; + var newUri = uri.replace(REDIRECT_URI_PATTERN, TARGET_URI_PATTERN); + var newUrl = \`https://\${TO_HOSTNAME}\${newUri}\`; return { statusCode: 301, statusDescription: \\"Moved Permanently\\",