@digitraffic/common 2024.11.13-1 → 2024.12.10-1

package/README.md

@@ -72,3 +72,4 @@ const lambda = MonitoredDBFunction.create(stack, 'get-metadata');
 ```
 
 See the documentation for more information.
+

package/dist/__test__/infra/api/integration.test.js

@@ -43,7 +43,10 @@ describe("integration tests", () => {
                 parseJson: (data) => JSON.stringify(data)
             },
             context: {
-                c1: "context1"
+                c1: "context1",
+                authorizer: {
+                    c2: "context2"
+                }
             }
         });
     }
@@ -113,6 +116,14 @@ describe("integration tests", () => {
             c1: "context1"
         });
     });
+    test("context parameter authorizer", () => {
+        const i = createIntegration()
+            .addContextParameter("authorizer.c2");
+        const t = createTemplate(i);
+        expect(t).toEqual({
+            "authorizer.c2": "context2"
+        });
+    });
     test("all parameters and header", () => {
         const i = createIntegration()
             .passAllQueryParameters()

package/dist/aws/infra/api/integration.d.ts

@@ -12,8 +12,14 @@ export declare class DigitrafficIntegration<T extends string> {
     readonly parameters: ApiParameter[];
     readonly sunset?: string;
     _passAllQueryParameters: boolean;
+    _passBody: boolean;
     constructor(lambda: IFunction, mediaType?: MediaType, sunset?: string);
     passAllQueryParameters(): this;
+    /**
+     * Body is passed as an escaped string, so broken input won't break anything.  You should
+     * parse and validate the input in the lambda.
+     */
+    passBody(): this;
     addPathParameter(...names: T[]): this;
     addQueryParameter(...names: T[]): this;
     addMultiValueQueryParameter(...names: T[]): this;

package/dist/aws/infra/api/integration.js

@@ -4,17 +4,20 @@ import { DigitrafficIntegrationResponse } from "../../runtime/digitraffic-integr
 const VELOCITY_ALL_PARAMS = `#foreach($paramName in $params.keySet())
     #set($tmp = $paramMap.put($paramName, $params[$paramName]))
 #end`;
+const VELOCITY_PASS_BODY = `#set($tmp = $paramMap.put('body', $util.escapeJavaScript($input.json('$'))))`;
 export class DigitrafficIntegration {
     lambda;
     mediaType;
     parameters = [];
     sunset;
     _passAllQueryParameters;
+    _passBody;
     constructor(lambda, mediaType = MediaType.TEXT_PLAIN, sunset) {
         this.lambda = lambda;
         this.mediaType = mediaType;
         this.sunset = sunset;
         this._passAllQueryParameters = false;
+        this._passBody = false;
     }
     passAllQueryParameters() {
         if (this.parameters.some((p) => p.type === "querystring"))
@@ -22,6 +25,14 @@ export class DigitrafficIntegration {
         this._passAllQueryParameters = true;
         return this;
     }
+    /**
+     * Body is passed as an escaped string, so broken input won't break anything.  You should
+     * parse and validate the input in the lambda.
+     */
+    passBody() {
+        this._passBody = true;
+        return this;
+    }
     addPathParameter(...names) {
         names.forEach((name) => this.parameters.push({ type: "path", name }));
         return this;
@@ -81,7 +92,7 @@ export class DigitrafficIntegration {
         const parameterAssignments = [];
         this.parameters.forEach((parameter) => {
             if (parameter.type === "context") {
-                parameterAssignments.push(`#set($tmp = $paramMap.put('${parameter.name}', $util.escapeJavaScript($context['${parameter.name}'])))`);
+                parameterAssignments.push(`#set($tmp = $paramMap.put('${parameter.name}', $util.escapeJavaScript($context.${parameter.name})))`);
             }
             else if (parameter.type === "multivaluequerystring") {
                 // make multivaluequerystring values to array
@@ -105,6 +116,7 @@ export class DigitrafficIntegration {
 #set($params = $input.params().get("querystring"))
 ${parameterAssignments.join("\n")}
 ${this._passAllQueryParameters ? VELOCITY_ALL_PARAMS : ""}
+${this._passBody ? VELOCITY_PASS_BODY : ""}
 {
 #foreach($paramName in $paramMap.keySet())
 #if( $paramName[0] != '_')

package/dist/utils/retry.js

@@ -125,10 +125,6 @@ async function retryRecursive(asyncFn, retries, retryCountInj, logError, timeout
  */
 export async function retry(asyncFn, retries = 3, logError = RetryLogError.LOG_LAST_RETRY_AS_ERROR_OTHERS_AS_WARNS, timeoutBetweenRetries = timeoutFunctions.noTimeout, retryPredicate = retryPredicates.alwaysRetry) {
     retryCount = 0;
-    logger.debug({
-        message: `Retrying with ${retries} retries`,
-        method: "retry.retry",
-    });
     return retryRecursive(asyncFn, retries, 0, logError, timeoutBetweenRetries, retryPredicate);
 }
 function wrapArgsToFn(fn, ...args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2024.11.13-1",
+  "version": "2024.12.10-1",
   "description": "",
   "type": "module",
   "repository": {
@@ -104,36 +104,37 @@
     "./dist/aws/runtime/digitraffic-integration-response": "./dist/aws/runtime/digitraffic-integration-response.js"
   },
   "peerDependencies": {
-    "@aws-sdk/client-api-gateway": "^3.667.0",
-    "@aws-sdk/client-s3": "^3.667.0",
-    "@aws-sdk/client-secrets-manager": "^3.667.0",
-    "@aws-sdk/client-sns": "^3.667.0",
-    "@aws-sdk/lib-storage": "^3.667.0",
+    "@aws-sdk/client-api-gateway": "^3.687.0",
+    "@aws-sdk/client-s3": "^3.687.0",
+    "@aws-sdk/client-secrets-manager": "^3.687.0",
+    "@aws-sdk/client-sns": "^3.687.0",
+    "@aws-sdk/lib-storage": "^3.687.0",
+    "@date-fns/tz": "1.2.0",
     "@smithy/fetch-http-handler": "3.2.9",
-    "aws-cdk-lib": "^2.161.1",
+    "aws-cdk-lib": "^2.166.0",
     "change-case": "^5.4.4",
-    "constructs": "~10.3.0",
+    "constructs": "~10.4.2",
     "date-fns": "~4.1.0",
-    "@date-fns/tz": "1.1.2",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "ky": "^1.7.2",
-    "lodash-es": "~4.17.21",
+    "lodash-es": "^4.17.21",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.2.0",
-    "pg-promise": "^11.9.1",
-    "zod": "~3.23.8"
+    "pg-promise": "^11.10.1",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aws-sdk/client-api-gateway": "^3.669.0",
-    "@aws-sdk/client-s3": "^3.669.0",
-    "@aws-sdk/client-secrets-manager": "^3.669.0",
-    "@aws-sdk/client-sns": "^3.669.0",
-    "@aws-sdk/lib-storage": "^3.669.0",
+    "@aws-sdk/client-api-gateway": "^3.687.0",
+    "@aws-sdk/client-s3": "^3.687.0",
+    "@aws-sdk/client-secrets-manager": "^3.687.0",
+    "@aws-sdk/client-sns": "^3.687.0",
+    "@aws-sdk/lib-storage": "^3.687.0",
+    "@date-fns/tz": "1.2.0",
     "@digitraffic/eslint-config": "^3.0.1",
     "@jest/globals": "^29.7.0",
     "@rushstack/eslint-config": "^3.7.1",
-    "@rushstack/heft": "^0.68.2",
+    "@rushstack/heft": "^0.68.6",
     "@rushstack/heft-jest-plugin": "^0.12.18",
     "@rushstack/heft-lint-plugin": "^0.5.0",
     "@rushstack/heft-typescript-plugin": "^0.5.35",
@@ -143,18 +144,17 @@
     "@types/etag": "^1.8.3",
     "@types/geojson": "7946.0.14",
     "@types/geojson-validation": "^1.0.3",
-    "@types/jest": "29.5.13",
+    "@types/jest": "29.5.14",
     "@types/lodash-es": "4.17.12",
     "@types/madge": "5.0.3",
-    "@types/node": "20.14.9",
+    "@types/node": "20.17.6",
     "@typescript-eslint/eslint-plugin": "~7.14.1",
     "@typescript-eslint/parser": "^7.18.0",
-    "aws-cdk-lib": "^2.162.0",
-    "aws-sdk": "^2.1691.0",
+    "aws-cdk-lib": "^2.166.0",
+    "aws-sdk": "^2.1692.0",
     "change-case": "^5.4.4",
-    "constructs": "~10.3.1",
+    "constructs": "~10.4.2",
     "date-fns": "~4.1.0",
-    "@date-fns/tz": "1.1.2",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-deprecation": "~3.0.0",
@@ -168,7 +168,7 @@
     "madge": "^8.0.0",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.2.0",
-    "pg-promise": "^11.9.1",
+    "pg-promise": "^11.10.1",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.2.5",