addressed review 2

Author: gbiagini97

appsync-events-bedrock-cdk/lib/appsync-events-bedrock-cdk-stack.ts

@@ -1,28 +1,47 @@
 import * as cdk from 'aws-cdk-lib';
-import { CfnInclude } from 'aws-cdk-lib/cloudformation-include';
 import { Construct } from 'constructs';
 import { CfnApiKey } from 'aws-cdk-lib/aws-appsync';
 import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { Runtime } from 'aws-cdk-lib/aws-lambda';
 import { PolicyDocument, PolicyStatement, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
+import { CfnApi, CfnChannelNamespace } from "aws-cdk-lib/aws-appsync"
 import { CorsHttpMethod, HttpApi, HttpMethod } from 'aws-cdk-lib/aws-apigatewayv2';
 import { HttpLambdaIntegration } from 'aws-cdk-lib/aws-apigatewayv2-integrations';
+import { Duration, Expiration } from 'aws-cdk-lib';
 
 export class AppsyncEventsBedrockCdkStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props?: cdk.StackProps) {
     super(scope, id, props);
 
-    // L1 constructs not available yet
-    const template = new CfnInclude(this, "EventsApiCfnTemplate", {
-      templateFile: './lib/events-api-cfn.yaml'
-    })
-
-    const eventsApi = template.getResource('EventsApi') as cdk.CfnResource
+    const eventsApi = new CfnApi(this, 'Events', {
+      name: 'bedrock-failover',
+
+      eventConfig: {
+        authProviders: [{
+          authType: 'API_KEY',
+        }],
+        connectionAuthModes: [{
+          authType: 'API_KEY',
+        }],
+        defaultPublishAuthModes: [{
+          authType: 'API_KEY'
+        }],
+        defaultSubscribeAuthModes: [{
+          authType: 'API_KEY',
+        }],
+      },
+    });
 
-    const channel = template.getResource('Channel') as cdk.CfnResource
-    const channelName = "BedrockChat"
+    const channel = new CfnChannelNamespace(this, 'DefaultChannel', {
+      name: 'BedrockChat',
+      apiId: eventsApi.attrApiId
+    })
 
-    const apiKey = template.getResource('ApiKey') as CfnApiKey
+    const apiKey = new CfnApiKey(this, "AppsyncApiKey", {
+        apiId: eventsApi.attrApiId,
+        description: "Default API Key",
+        expires: Expiration.after(Duration.days(30)).toEpoch(),
+       });
 
     const lambda = new NodejsFunction(this, 'Chat', {
       entry: "src/chat.ts",
@@ -33,7 +52,7 @@ export class AppsyncEventsBedrockCdkStack extends cdk.Stack {
         REGION: this.region,
         EVENTS_API_URL: eventsApi.getAtt('Dns.Http').toString(),
         API_KEY: apiKey.attrApiKey,
-        CHANNEL_NAME: channelName
+        CHANNEL_NAME: channel.name
       },
       role: new Role(this, 'ChatRole', {
         assumedBy: new ServicePrincipal("lambda.amazonaws.com"),
@@ -69,7 +88,6 @@ export class AppsyncEventsBedrockCdkStack extends cdk.Stack {
       )
     })
 
-
     const api = new HttpApi(this, 'ChatApi', {
       apiName: "chat-api",
       corsPreflight: {
@@ -86,19 +104,16 @@ export class AppsyncEventsBedrockCdkStack extends cdk.Stack {
       },
     })
 
-
     api.addRoutes({
       path: '/chat',
       methods: [HttpMethod.POST],
       integration: new HttpLambdaIntegration('LambdaIntegration', lambda)
     })
 
-
     new cdk.CfnOutput(this, "EventsApiHttp", {
       value: eventsApi.getAtt('Dns.Http').toString()
     })
 
-
     new cdk.CfnOutput(this, "EventsApiRealtime", {
       value: eventsApi.getAtt('Dns.Realtime').toString()
     })
@@ -108,7 +123,7 @@ export class AppsyncEventsBedrockCdkStack extends cdk.Stack {
     })
 
     new cdk.CfnOutput(this, "ChannelName", {
-      value: channelName
+      value: channel.name
     })
 
     new cdk.CfnOutput(this, "Region", {

appsync-events-bedrock-cdk/lib/events-api-cfn.yaml

@@ -21,20 +21,18 @@
     "@types/jest": "^29.5.14",
     "@types/node": "22.7.9",
     "@types/ws": "^8.5.13",
-    "aws-cdk": "2.165.0",
+    "aws-cdk": "^2.175.1",
     "esbuild": "^0.24.0",
     "jest": "^29.7.0",
-    "socket.io": "^4.8.1",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.2",
     "typescript": "~5.6.3",
     "ws": "^8.18.0"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.165.0",
+    "aws-cdk-lib": "2.175.1",
     "constructs": "^10.0.0",
-    "socket.io-client": "^4.8.1",
     "source-map-support": "^0.5.21"
   }
 }

appsync-events-bedrock-cdk/package.json

@@ -19,17 +19,10 @@ export interface ChatRequest {
     prompt: string
 }
 
-
 export const handler = async (event: APIGatewayProxyEventV2) => {
 
-    // log event
-    console.log(JSON.stringify(event))
-
     const body = JSON.parse(event.body ?? "") as ChatRequest
 
-    // log env vars
-    //console.log(process.env)
-
     // filter requests by checking if prompt is present
     if (!body.prompt) {
         throw Error("Missing prompt")
@@ -43,7 +36,6 @@ export const handler = async (event: APIGatewayProxyEventV2) => {
 
     console.log("Final channel name: " + channelName)
 
-
     const command = new ConverseStreamCommand({
         modelId: modelId,
         messages: [{
@@ -97,17 +89,4 @@ export const handler = async (event: APIGatewayProxyEventV2) => {
         throw Error("Error in lambda function:" + JSON.stringify(error))
     }
 
-}
-
-
-
-/*
-TEST EVENT
-
-
-{
-  "prompt": "what is the capital of paris",
-  "userId": "gbiagini"
-}
-
-*/
+}

appsync-events-bedrock-cdk/src/chat.ts

@@ -2,24 +2,19 @@ import { AppSyncEventsRequestApiKey } from "../utils/appsyncRequest"
 import { readFileSync } from "fs"
 import { makeRequest } from "../utils/apigwRequest";
 
-
 describe("AppSync Event API with API_KEY auth mode", () => {
 
     const file = readFileSync("cdk-outputs.json");
     const data = JSON.parse(file.toString())
     const stackName = "AppsyncEventsBedrockCdkStack"
 
-
     process.env.API_KEY = data[stackName].ApiKey
     process.env.EVENTS_API_HTTP = data[stackName].EventsApiHttp
     process.env.EVENTS_API_REALTIME = data[stackName].EventsApiRealtime
     process.env.REGION = data[stackName].Region
     process.env.CHANNEL_NAME = data[stackName].ChannelName
     process.env.CHAT_API_URL = data[stackName].ChatApiUrl
 
-
-
-
     test("The user is able to publish a message", async () => {
 
         if (!process.env.EVENTS_API_HTTP) throw new Error("EVENTS_API_HTTP is not defined")

appsync-events-bedrock-cdk/test/appsync-events-bedrock-cdk.test.ts

@@ -1,6 +1,5 @@
 import https from 'https'
 
-
 export interface RequestParams {
     url: string;
     method: string;
@@ -17,7 +16,6 @@ export interface RequestParams {
     userId?: string;
   }
 
-
 export const makeRequest = async (params: RequestParams, body: ChatRequest): Promise<ApiResponse> => {
     const endpoint = new URL(params.url);
     const options = {

appsync-events-bedrock-cdk/utils/apigwRequest.ts

@@ -1,7 +1,6 @@
 import { HttpRequest } from '@aws-sdk/protocol-http'
 import * as https from 'https'
 
-
 export interface RequestParamsEvent {
   config: Config
   channelName: String
@@ -14,7 +13,6 @@ export interface Config {
   region: string,
 }
 
-
 export const AppSyncEventsRequestApiKey = async (params: RequestParamsEvent) => {
   let endpoint: URL
 
@@ -25,7 +23,6 @@ export const AppSyncEventsRequestApiKey = async (params: RequestParamsEvent) =>
     endpoint = new URL(params.config.url)
   }
 
-
   const request = new HttpRequest({
     hostname: endpoint.host,
     port: 443,
@@ -41,7 +38,6 @@ export const AppSyncEventsRequestApiKey = async (params: RequestParamsEvent) =>
     })
   })
 
-
   return new Promise<any>((resolve, reject) => {
     const httpRequest = https.request({ ...request, host: endpoint.hostname }, (result) => {
       let responseBody = '';
@@ -64,5 +60,4 @@ export const AppSyncEventsRequestApiKey = async (params: RequestParamsEvent) =>
     httpRequest.end()
   })
 
-
 }

appsync-events-bedrock-cdk/utils/appsyncRequest.ts

@@ -19,6 +19,4 @@ VITE_EVENTS_API_HTTP=${cdkOutputs[stackName].EventsApiHttp}
 VITE_EVENTS_API_REAL_TIME=${cdkOutputs[stackName].EventsApiRealtime}
 VITE_CHAT_API_URL=${cdkOutputs[stackName].ChatApiUrl}`,
     'utf8',
-);
-
-
+);