@digitraffic/common 2024.9.25-1 → 2024.10.9-1

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

@@ -1,3 +1,4 @@
+import { Model } from "aws-cdk-lib/aws-apigateway";
 import { DigitrafficStaticIntegration } from "../../../aws/infra/api/static-integration.js";
 import { MediaType } from "../../../aws/types/mediatypes.js";
 describe("response tests", () => {
@@ -15,9 +16,14 @@ describe("response tests", () => {
     });
     it("createMethodResponse works", () => {
         const methodResponse = DigitrafficStaticIntegration.createMethodResponse({
-            "test-header": "test-value",
-        });
+            "test-header": "test-value"
+        }, MediaType.TEXT_PLAIN, Model.EMPTY_MODEL);
         expect(methodResponse).toEqual({
+            responseModels: {
+                "text/plain": {
+                    modelId: "Empty"
+                }
+            },
             responseParameters: {
                 "method.response.header.test-header": true,
             },

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

@@ -1,4 +1,4 @@
-import { type IntegrationResponse, type MethodResponse, MockIntegration, type Resource } from "aws-cdk-lib/aws-apigateway";
+import { type IModel, type IntegrationResponse, type MethodResponse, MockIntegration, type Resource } from "aws-cdk-lib/aws-apigateway";
 import { MediaType } from "../../types/mediatypes.js";
 /**
  * Static integration, that returns the given response with given mediaType from given resource.
@@ -8,8 +8,8 @@ import { MediaType } from "../../types/mediatypes.js";
  * @param response
  */
 export declare class DigitrafficStaticIntegration extends MockIntegration {
-    constructor(resource: Resource, mediaType: MediaType, response: string, enableCors?: boolean, apiKeyRequired?: boolean, headers?: Record<string, string>);
-    static json<K>(resource: Resource, response: K, enableCors?: boolean, apiKeyRequired?: boolean, headers?: Record<string, string>): DigitrafficStaticIntegration;
+    constructor(resource: Resource, mediaType: MediaType, response: string, model: IModel, enableCors?: boolean, apiKeyRequired?: boolean, headers?: Record<string, string>);
+    static json<K>(resource: Resource, response: K, model: IModel, enableCors?: boolean, apiKeyRequired?: boolean, headers?: Record<string, string>): DigitrafficStaticIntegration;
     static createIntegrationResponse(response: string, mediaType: MediaType, headers?: Record<string, string>): IntegrationResponse;
-    static createMethodResponse(headers: Record<string, string>): MethodResponse;
+    static createMethodResponse(headers: Record<string, string>, mediaType: MediaType, model: IModel): MethodResponse;
 }

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

@@ -1,4 +1,4 @@
-import { MockIntegration, PassthroughBehavior } from "aws-cdk-lib/aws-apigateway";
+import { MockIntegration, PassthroughBehavior, } from "aws-cdk-lib/aws-apigateway";
 import { MediaType } from "../../types/mediatypes.js";
 const INTEGRATION_RESPONSE_200 = `{
     "statusCode": 200
@@ -11,7 +11,7 @@ const INTEGRATION_RESPONSE_200 = `{
  * @param response
  */
 export class DigitrafficStaticIntegration extends MockIntegration {
-    constructor(resource, mediaType, response, enableCors = true, apiKeyRequired = true, headers = {}) {
+    constructor(resource, mediaType, response, model, enableCors = true, apiKeyRequired = true, headers = {}) {
         if (enableCors) {
             headers = { ...headers, "Access-Control-Allow-Origin": "*" };
         }
@@ -26,12 +26,12 @@ export class DigitrafficStaticIntegration extends MockIntegration {
         ["GET", "HEAD"].forEach((httpMethod) => {
             resource.addMethod(httpMethod, this, {
                 apiKeyRequired,
-                methodResponses: [DigitrafficStaticIntegration.createMethodResponse(headers)],
+                methodResponses: [DigitrafficStaticIntegration.createMethodResponse(headers, mediaType, model)],
             });
         });
     }
-    static json(resource, response, enableCors = true, apiKeyRequired = true, headers = {}) {
-        return new DigitrafficStaticIntegration(resource, MediaType.APPLICATION_JSON, JSON.stringify(response), enableCors, apiKeyRequired, headers);
+    static json(resource, response, model, enableCors = true, apiKeyRequired = true, headers = {}) {
+        return new DigitrafficStaticIntegration(resource, MediaType.APPLICATION_JSON, JSON.stringify(response), model, enableCors, apiKeyRequired, headers);
     }
     static createIntegrationResponse(response, mediaType, headers = {}) {
         const params = mapRecord(headers, (entry) => ["method.response.header." + entry[0], `'${entry[1]}'`]);
@@ -43,12 +43,15 @@ export class DigitrafficStaticIntegration extends MockIntegration {
             responseParameters: params,
         };
     }
-    static createMethodResponse(headers) {
+    static createMethodResponse(headers, mediaType, model) {
         const allowedHeaders = Object.keys(headers);
         const entries = Object.fromEntries(allowedHeaders.map((key) => [key, true]));
         return {
             statusCode: "200",
             responseParameters: prefixKeys("method.response.header.", entries),
+            responseModels: {
+                [mediaType]: model
+            }
         };
     }
 }

package/dist/aws/infra/canaries/canary.js

@@ -4,7 +4,7 @@ import { CanaryAlarm } from "./canary-alarm.js";
 export class DigitrafficCanary extends Canary {
     constructor(scope, canaryName, role, params, environmentVariables) {
         super(scope, canaryName, {
-            runtime: params.runtime ?? Runtime.SYNTHETICS_NODEJS_PUPPETEER_6_2,
+            runtime: params.runtime ?? Runtime.SYNTHETICS_NODEJS_PUPPETEER_9_0,
             role,
             test: Test.custom({
                 code: new AssetCode("dist", {

package/dist/aws/runtime/apikey.d.ts

@@ -1,2 +1,2 @@
-import type { ApiKey } from "aws-sdk/clients/apigateway.js";
-export declare function getApiKeyFromAPIGateway(keyId: string): Promise<ApiKey>;
+import { type GetApiKeyCommandOutput } from "@aws-sdk/client-api-gateway";
+export declare function getApiKeyFromAPIGateway(keyId: string): Promise<GetApiKeyCommandOutput>;

package/dist/aws/runtime/apikey.js

@@ -1,21 +1,13 @@
-//import { APIGatewayClient, GetApiKeyCommand } from "@aws-sdk/client-api-gateway";
-//import type { GetApiKeyCommandOutput } from "@aws-sdk/client-api-gateway";
-import { APIGateway } from "aws-sdk";
+import { APIGatewayClient, GetApiKeyCommand } from "@aws-sdk/client-api-gateway";
+import { FetchHttpHandler } from "@smithy/fetch-http-handler";
 export async function getApiKeyFromAPIGateway(keyId) {
-    const ag = new APIGateway();
-    return ag
-        .getApiKey({
-        apiKey: keyId,
-        includeValue: true,
-    })
-        .promise();
-    /*
-    const client = new APIGatewayClient();
+    const client = new APIGatewayClient({
+        requestHandler: new FetchHttpHandler()
+    });
     const command = new GetApiKeyCommand({
         apiKey: keyId,
-        includeValue: true,
+        includeValue: true
     });
-
-    return client.send(command);*/
+    return (await client.send(command));
 }
 //# sourceMappingURL=apikey.js.map

package/dist/aws/runtime/environment.d.ts

@@ -3,7 +3,3 @@ export declare enum EnvKeys {
     SECRET_ID = "SECRET_ID",
     SECRET_OVERRIDE_AWS_REGION = "SECRET_OVERRIDE_AWS_REGION"
 }
-/**
- * @deprecated Use digitraffic/common/utils/utils#getEnvVariable
- */
-export declare function envValue(key: string, defaultValue?: string): string;

package/dist/aws/runtime/environment.js

@@ -4,17 +4,4 @@ export var EnvKeys;
     EnvKeys["SECRET_ID"] = "SECRET_ID";
     EnvKeys["SECRET_OVERRIDE_AWS_REGION"] = "SECRET_OVERRIDE_AWS_REGION";
 })(EnvKeys || (EnvKeys = {}));
-/**
- * @deprecated Use digitraffic/common/utils/utils#getEnvVariable
- */
-export function envValue(key, defaultValue) {
-    const value = process.env[key];
-    if (value === null || value === undefined) {
-        if (defaultValue) {
-            return defaultValue;
-        }
-        throw new Error(`Missing environment value ${key}`);
-    }
-    return value;
-}
 //# sourceMappingURL=environment.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2024.9.25-1",
+  "version": "2024.10.9-1",
   "description": "",
   "type": "module",
   "repository": {
@@ -104,69 +104,69 @@
     "./dist/aws/runtime/digitraffic-integration-response": "./dist/aws/runtime/digitraffic-integration-response.js"
   },
   "peerDependencies": {
-    "@aws-sdk/client-api-gateway": "^3.624.0",
-    "@aws-sdk/client-s3": "^3.627.0",
-    "@aws-sdk/client-secrets-manager": "^3.624.0",
-    "@aws-sdk/client-sns": "^3.624.0",
-    "@aws-sdk/lib-storage": "^3.627.0",
-    "aws-cdk-lib": "^2.151.0",
-    "aws-sdk": "^2.1670.0",
+    "@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",
+    "@smithy/fetch-http-handler": "3.2.9",
+    "aws-cdk-lib": "^2.161.1",
     "change-case": "^5.4.4",
     "constructs": "~10.3.0",
-    "date-fns": "~3.6.0",
-    "date-fns-tz": "~3.1.3",
+    "date-fns": "3.6.0",
+    "date-fns-tz": "3.2.0",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
-    "ky": "^1.5.0",
+    "ky": "^1.7.2",
     "lodash-es": "~4.17.21",
     "node-ttl": "^0.2.0",
-    "pg-native": "^3.1.0",
+    "pg-native": "^3.2.0",
     "pg-promise": "^11.9.1",
     "zod": "~3.23.8"
   },
   "devDependencies": {
-    "@aws-sdk/client-api-gateway": "^3.637.0",
-    "@aws-sdk/client-s3": "^3.637.0",
-    "@aws-sdk/client-secrets-manager": "^3.637.0",
-    "@aws-sdk/client-sns": "^3.637.0",
-    "@aws-sdk/lib-storage": "^3.637.0",
-    "@digitraffic/eslint-config": "^2.1.0",
+    "@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",
+    "@digitraffic/eslint-config": "^3.0.1",
     "@jest/globals": "^29.7.0",
     "@rushstack/eslint-config": "^3.7.1",
-    "@rushstack/heft": "^0.67.0",
-    "@rushstack/heft-jest-plugin": "^0.12.9",
-    "@rushstack/heft-lint-plugin": "^0.4.1",
-    "@rushstack/heft-typescript-plugin": "^0.5.25",
-    "@smithy/types": "^3.3.0",
-    "@types/aws-lambda": "8.10.143",
+    "@rushstack/heft": "^0.67.2",
+    "@rushstack/heft-jest-plugin": "^0.12.14",
+    "@rushstack/heft-lint-plugin": "^0.4.6",
+    "@rushstack/heft-typescript-plugin": "^0.5.30",
+    "@smithy/fetch-http-handler": "3.2.9",
+    "@smithy/types": "^3.5.0",
+    "@types/aws-lambda": "8.10.145",
     "@types/etag": "^1.8.3",
     "@types/geojson": "7946.0.14",
     "@types/geojson-validation": "^1.0.3",
-    "@types/jest": "29.5.12",
-    "@types/lodash-es": "4.17.7",
+    "@types/jest": "29.5.13",
+    "@types/lodash-es": "4.17.12",
     "@types/madge": "5.0.3",
     "@types/node": "20.14.9",
     "@typescript-eslint/eslint-plugin": "~7.14.1",
     "@typescript-eslint/parser": "^7.18.0",
-    "aws-cdk-lib": "^2.155.0",
-    "aws-sdk": "^2.1686.0",
+    "aws-cdk-lib": "^2.161.1",
     "change-case": "^5.4.4",
     "constructs": "~10.3.0",
-    "date-fns": "~3.6.0",
-    "date-fns-tz": "~3.1.3",
-    "eslint": "^8.57.0",
+    "date-fns": "3.6.0",
+    "date-fns-tz": "3.2.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-deprecation": "~3.0.0",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "ky": "^1.7.1",
+    "ky": "^1.7.2",
     "lodash": "^4.17.21",
     "lodash-es": "~4.17.21",
     "madge": "^8.0.0",
     "node-ttl": "^0.2.0",
-    "pg-native": "^3.1.0",
+    "pg-native": "^3.2.0",
     "pg-promise": "^11.9.1",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",