Rename getUniqueId to createUniqueId

dherault · Jul 3, 2019 · c3fcc4c · c3fcc4c
1 parent b9b1d72
commit c3fcc4c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/src/ApiGateway.js b/src/ApiGateway.js
@@ -15,7 +15,7 @@ const createAuthScheme = require('./createAuthScheme');
 const functionHelper = require('./functionHelper');
 const Endpoint = require('./Endpoint');
 const parseResources = require('./parseResources');
-const { detectEncoding, getUniqueId } = require('./utils');
+const { detectEncoding, createUniqueId } = require('./utils');
 const authFunctionNameExtractor = require('./authFunctionNameExtractor');
 const requestBodyValidator = require('./requestBodyValidator');
 
@@ -345,7 +345,7 @@ module.exports = class ApiGateway {
           }
         }
         // Shared mutable state is the root of all evil they say
-        const requestId = getUniqueId();
+        const requestId = createUniqueId();
         this.requests[requestId] = { done: false };
         this.currentRequestId = requestId;
 

diff --git a/src/ApiGatewayWebSocket.js b/src/ApiGatewayWebSocket.js
@@ -8,7 +8,7 @@ const hapiPluginWebsocket = require('hapi-plugin-websocket');
 const debugLog = require('./debugLog');
 const createLambdaContext = require('./createLambdaContext');
 const functionHelper = require('./functionHelper');
-const { getUniqueId } = require('./utils');
+const { createUniqueId } = require('./utils');
 const authFunctionNameExtractor = require('./authFunctionNameExtractor');
 const wsHelpers = require('./websocketHelpers');
 
@@ -154,7 +154,7 @@ module.exports = class ApiGatewayWebSocket {
             initially: false,
             connect: ({ ws, req }) => {
               const queryStringParameters = parseQuery(req.url);
-              const connection = { connectionId:getUniqueId(), connectionTime:Date.now() };
+              const connection = { connectionId:createUniqueId(), connectionTime:Date.now() };
 
               debugLog(`connect:${connection.connectionId}`);
 

diff --git a/src/createLambdaContext.js b/src/createLambdaContext.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { getUniqueId } = require('./utils');
+const { createUniqueId } = require('./utils');
 
 // https://docs.aws.amazon.com/lambda/latest/dg/limits.html
 // default function timeout in seconds
@@ -26,7 +26,7 @@ module.exports = function createLambdaContext(fun, provider, cb) {
     getRemainingTimeInMillis: () => endTime - new Date().getTime(),
 
     // properties
-    awsRequestId: `offline_awsRequestId_${getUniqueId()}`,
+    awsRequestId: `offline_awsRequestId_${createUniqueId()}`,
     clientContext: {},
     functionName,
     functionVersion: `offline_functionVersion_for_${functionName}`,

diff --git a/src/createLambdaProxyContext.js b/src/createLambdaProxyContext.js
@@ -5,7 +5,7 @@ const {
   normalizeMultiValueQuery,
   normalizeQuery,
   nullIfEmpty,
-  getUniqueId,
+  createUniqueId,
 } = require('./utils');
 
 /*
@@ -79,7 +79,7 @@ module.exports = function createLambdaProxyContext(request, options, stageVariab
       resourceId: 'offlineContext_resourceId',
       apiId: 'offlineContext_apiId',
       stage: options.stage,
-      requestId: `offlineContext_requestId_${getUniqueId()}`,
+      requestId: `offlineContext_requestId_${createUniqueId()}`,
       identity: {
         cognitoIdentityPoolId: process.env.SLS_COGNITO_IDENTITY_POOL_ID || 'offlineContext_cognitoIdentityPoolId',
         accountId: process.env.SLS_ACCOUNT_ID || 'offlineContext_accountId',

diff --git a/src/createVelocityContext.js b/src/createVelocityContext.js
@@ -2,7 +2,7 @@
 
 const jsEscapeString = require('js-string-escape');
 const { decode } = require('jsonwebtoken');
-const { isPlainObject, getUniqueId } = require('./utils');
+const { isPlainObject, createUniqueId } = require('./utils');
 const jsonPath = require('./jsonPath');
 
 function escapeJavaScript(x) {
@@ -66,7 +66,7 @@ module.exports = function createVelocityContext(request, options, payload) {
         userAgent:                     request.headers['user-agent'] || '',
         userArn:                       'offlineContext_userArn',
       },
-      requestId:    `offlineContext_requestId_${getUniqueId()}`,
+      requestId:    `offlineContext_requestId_${createUniqueId()}`,
       resourceId:   'offlineContext_resourceId',
       resourcePath: request.route.path,
       stage:        options.stage,

diff --git a/src/functionHelper.js b/src/functionHelper.js
@@ -4,7 +4,7 @@ const { fork, spawn } = require('child_process');
 const path = require('path');
 const trimNewlines = require('trim-newlines');
 const debugLog = require('./debugLog');
-const { getUniqueId } = require('./utils');
+const { createUniqueId } = require('./utils');
 
 const handlerCache = {};
 const messageCallbacks = {};
@@ -150,7 +150,7 @@ module.exports = {
     }
 
     return (event, context, done) => {
-      const id = getUniqueId();
+      const id = createUniqueId();
       messageCallbacks[id] = done;
       handlerContext.inflight.add(id);
       handlerContext.process.send(Object.assign({}, funOptions, { id, event, context }));

diff --git a/src/utils.js b/src/utils.js
@@ -43,7 +43,7 @@ module.exports = {
     return createHash('md5').digest('hex');
   },
 
-  getUniqueId() {
+  createUniqueId() {
     return cuid();
   },
 };
diff --git a/src/websocketHelpers.js b/src/websocketHelpers.js
@@ -1,5 +1,5 @@
 const { DateTime } = require('luxon');
-const { getUniqueId } = require('./utils');
+const { createUniqueId } = require('./utils');
 
 // TODO this should be probably moved to utils, and combined with other header
 // functions and utilities
@@ -34,7 +34,7 @@ const createRequestContext = (action, eventType, connection) => {
     connectionId:connection.connectionId,
     domainName: 'localhost',
     eventType,
-    extendedRequestId: `${getUniqueId()}`,
+    extendedRequestId: `${createUniqueId()}`,
     identity: {
       accountId: null,
       accessKey: null,
@@ -50,8 +50,8 @@ const createRequestContext = (action, eventType, connection) => {
       userArn: null,
     },
     messageDirection: 'IN',
-    messageId: `${getUniqueId()}`,
-    requestId: `${getUniqueId()}`,
+    messageId: `${createUniqueId()}`,
+    requestId: `${createUniqueId()}`,
     requestTime: formatToClfTime(now),
     requestTimeEpoch: now.getTime(),
     routeKey: action,
@@ -76,9 +76,9 @@ exports.createConnectEvent = (action, eventType, connection, options) => {
   const headers = {
     Host: 'localhost',
     'Sec-WebSocket-Extensions': 'permessage-deflate; client_max_window_bits',
-    'Sec-WebSocket-Key': `${getUniqueId()}`,
+    'Sec-WebSocket-Key': `${createUniqueId()}`,
     'Sec-WebSocket-Version': '13',
-    'X-Amzn-Trace-Id': `Root=${getUniqueId()}`,
+    'X-Amzn-Trace-Id': `Root=${createUniqueId()}`,
     'X-Forwarded-For': '127.0.0.1',
     'X-Forwarded-Port': `${options.port + 1}`,
     'X-Forwarded-Proto': `http${options.httpsProtocol ? 's' : ''}`,