Merge branch 'release/1.10.4'

DianaIonita · May 9, 2024 · 096fa2f · 096fa2f
2 parents 2f438f4 + 0f6ac2d
commit 096fa2f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 references:
   container_config: &container_config
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:22.1.0
   poke_npmrc: &poke_npmrc
     run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-api-gateway-caching",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "A plugin for the serverless framework which helps with configuring caching for API Gateway endpoints.",
   "main": "src/apiGatewayCachingPlugin.js",
   "scripts": {

diff --git a/src/cacheKeyParameters.js b/src/cacheKeyParameters.js
@@ -28,7 +28,7 @@ const applyCacheKeyParameterSettings = (settings, serverless) => {
     for (let cacheKeyParameter of endpointSettings.cacheKeyParameters) {
       if (!cacheKeyParameter.mappedFrom) {
         let existingValue = method.Properties.RequestParameters[`method.${cacheKeyParameter.name}`];
-        method.Properties.RequestParameters[`method.${cacheKeyParameter.name}`] = (existingValue == null || existingValue == undefined) ? true : existingValue;
+        method.Properties.RequestParameters[`method.${cacheKeyParameter.name}`] = (existingValue == null || existingValue == undefined) ? false : existingValue;
 
         // without this check, endpoints 500 when using cache key parameters like "Authorization" or headers with the same characters in different casing (e.g. "origin" and "Origin")
         if (method.Properties.Integration.Type !== 'AWS_PROXY') {
@@ -43,7 +43,7 @@ const applyCacheKeyParameterSettings = (settings, serverless) => {
           cacheKeyParameter.mappedFrom.includes('method.request.header') ||
           cacheKeyParameter.mappedFrom.includes('method.request.path')
         ) {
-          method.Properties.RequestParameters[cacheKeyParameter.mappedFrom] = (existingValue == null || existingValue == undefined) ? true : existingValue;
+          method.Properties.RequestParameters[cacheKeyParameter.mappedFrom] = (existingValue == null || existingValue == undefined) ? false : existingValue;
         }
 
         // in v1.8.0 "lambda" integration check was removed because setting cache key parameters seemed to work for both AWS_PROXY and AWS (lambda) integration

diff --git a/test/configuring-cache-key-parameters-for-additional-endpoints.js b/test/configuring-cache-key-parameters-for-additional-endpoints.js
@@ -54,7 +54,7 @@ describe('Configuring path parameters for additional endpoints defined as CloudF
             for (let parameter of cacheKeyParameters) {
                 expect(apiGatewayMethod.Properties.RequestParameters)
                     .to.deep.include({
-                        [`method.${parameter.name}`]: true
+                        [`method.${parameter.name}`]: false
                     });
             }
         });

diff --git a/test/configuring-cache-key-parameters.js b/test/configuring-cache-key-parameters.js
@@ -65,7 +65,7 @@ describe('Configuring cache key parameters', () => {
       for (let parameter of cacheKeyParameters) {
         expect(method.Properties.RequestParameters)
           .to.deep.include({
-            [`method.${parameter.name}`]: true
+            [`method.${parameter.name}`]: false
           });
       }
     });
@@ -123,7 +123,7 @@ describe('Configuring cache key parameters', () => {
         for (let parameter of cacheKeyParameters) {
           expect(method.Properties.RequestParameters)
             .to.deep.include({
-              [`method.${parameter.name}`]: true
+              [`method.${parameter.name}`]: false
             });
         }
       });
@@ -203,7 +203,7 @@ describe('Configuring cache key parameters', () => {
         for (let parameter of cacheKeyParameters) {
           expect(method.Properties.RequestParameters)
             .to.deep.include({
-              [`method.${parameter.name}`]: true
+              [`method.${parameter.name}`]: false
             });
         }
       });
@@ -308,7 +308,7 @@ describe('Configuring cache key parameters', () => {
           for (let parameter of firstEndpointCacheKeyParameters) {
             expect(method.Properties.RequestParameters)
               .to.deep.include({
-                [`method.${parameter.name}`]: true
+                [`method.${parameter.name}`]: false
               });
           }
         });
@@ -343,7 +343,7 @@ describe('Configuring cache key parameters', () => {
           for (let parameter of secondEndpointCacheKeyParameters) {
             expect(method.Properties.RequestParameters)
               .to.deep.include({
-                [`method.${parameter.name}`]: true
+                [`method.${parameter.name}`]: false
               });
           }
         });
@@ -399,7 +399,7 @@ describe('Configuring cache key parameters', () => {
         for (let parameter of firstEndpointCacheKeyParameters) {
           expect(method.Properties.RequestParameters)
             .to.deep.include({
-              [`method.${parameter.name}`]: true
+              [`method.${parameter.name}`]: false
             });
         }
       });
@@ -434,7 +434,7 @@ describe('Configuring cache key parameters', () => {
         for (let parameter of secondEndpointCacheKeyParameters) {
           expect(method.Properties.RequestParameters)
             .to.deep.include({
-              [`method.${parameter.name}`]: true
+              [`method.${parameter.name}`]: false
             });
         }
       });
@@ -506,7 +506,7 @@ describe('Configuring cache key parameters', () => {
           for (let parameter of cacheKeyParameters) {
             expect(method.Properties.RequestParameters)
               .to.deep.include({
-                [`method.${parameter.name}`]: true
+                [`method.${parameter.name}`]: false
               });
           }
         });
@@ -568,7 +568,7 @@ describe('Configuring cache key parameters', () => {
           ) {
             expect(method.Properties.RequestParameters)
               .to.deep.include({
-                [parameter.mappedFrom]: true
+                [parameter.mappedFrom]: false
               });
           }
         }
@@ -609,7 +609,7 @@ describe('Configuring cache key parameters', () => {
           ) {
             expect(method.Properties.RequestParameters)
               .to.deep.include({
-                [parameter.mappedFrom]: true
+                [parameter.mappedFrom]: false
               });
           }
         }