From 078951fc9d16544234d2442e82463daa3b6b5bde Mon Sep 17 00:00:00 2001
From: nsxshota <nsxshota@amazon.co.jp>
Date: Tue, 21 Nov 2023 15:24:03 +0900
Subject: [PATCH] update cdk code

---
 deploy/scripts/cdk/lib/construct/backend.ts  |  2 +-
 deploy/scripts/cdk/lib/construct/frontend.ts |  5 +++--
 deploy/scripts/cdk/lib/construct/network.ts  | 14 ++++++++++----
 src/frontend/Dockerfile                      |  1 +
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/deploy/scripts/cdk/lib/construct/backend.ts b/deploy/scripts/cdk/lib/construct/backend.ts
index 8d99a610e..62f56762a 100644
--- a/deploy/scripts/cdk/lib/construct/backend.ts
+++ b/deploy/scripts/cdk/lib/construct/backend.ts
@@ -78,7 +78,7 @@ export class BackEndCluster extends Construct {
         "password": ecs.Secret.fromSecretsManager(secretsDB, 'password'),
       },
     });
-    this.backendServiceName = 'langflow-backend-service'
+    this.backendServiceName = 'backend'
     const backendService = new ecs.FargateService(this, 'BackEndService', {
       cluster: props.cluster,
       serviceName: this.backendServiceName,
diff --git a/deploy/scripts/cdk/lib/construct/frontend.ts b/deploy/scripts/cdk/lib/construct/frontend.ts
index e61bd9a75..451438cc5 100644
--- a/deploy/scripts/cdk/lib/construct/frontend.ts
+++ b/deploy/scripts/cdk/lib/construct/frontend.ts
@@ -60,15 +60,16 @@ export class FrontEndCluster extends Construct {
           {
               containerPort: containerPort,
               protocol: ecs.Protocol.TCP,
+              appProtocol:ecs.AppProtocol.http,
           },
       ],
   });
-  const frontendServiceName = 'langflow-frontend-service'
+  const frontendServiceName = 'frontend'
   const frontendService = new ecs.FargateService(
       this,
       'FrontendService',
       {
-        serviceName: 'langflow-frontend-service',
+        serviceName: frontendServiceName,
         cluster: props.cluster,
         desiredCount: 1,
         assignPublicIp: false,
diff --git a/deploy/scripts/cdk/lib/construct/network.ts b/deploy/scripts/cdk/lib/construct/network.ts
index 035a051bc..22f12d4ec 100644
--- a/deploy/scripts/cdk/lib/construct/network.ts
+++ b/deploy/scripts/cdk/lib/construct/network.ts
@@ -28,6 +28,9 @@ export class Network extends Construct {
 
   constructor(scope: Construct, id: string) {
     super(scope, id)
+    const alb_listen_port=80
+    const front_service_port=3000
+    const back_service_port=7860
 
     // VPC等リソースの作成
     this.vpc = new ec2.Vpc(scope, 'VPC', {
@@ -75,7 +78,7 @@ export class Network extends Construct {
       description: 'for alb',
       vpc: this.vpc,
     })
-    this.albSG.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.tcp(80))
+    this.albSG.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.tcp(alb_listen_port))
 
     this.alb = new elb.ApplicationLoadBalancer(this,'alb',{
       internetFacing: true, //インターネットからのアクセスを許可するかどうか指定
@@ -84,10 +87,10 @@ export class Network extends Construct {
       vpc:this.vpc,   
     })
 
-    const listener = this.alb.addListener('Listener', { port: 80 });
+    const listener = this.alb.addListener('Listener', { port: alb_listen_port });
 
     this.targetGroup = listener.addTargets('targetGroup', {
-      port: 3000,
+      port: front_service_port,
       protocol: elb.ApplicationProtocol.HTTP,
       healthCheck: {
         enabled: true,
@@ -114,7 +117,7 @@ export class Network extends Construct {
       description: 'for langflow-back-ecs',
       vpc: this.vpc,
     })
-    this.ecsBackSG.addIngressRule(this.ecsFrontSG, ec2.Port.tcp(7860))
+    this.ecsBackSG.addIngressRule(this.ecsFrontSG, ec2.Port.tcp(back_service_port))
 
     // RDSに設定するセキュリティグループ
     this.dbSG = new ec2.SecurityGroup(scope, 'DBSecurityGroup', {
@@ -150,6 +153,9 @@ export class Network extends Construct {
       assumedBy: new iam.ServicePrincipal('ecs-tasks.amazonaws.com'),
     });
     this.backendTaskRole.addToPolicy(ECSExecPolicyStatement);
+    // KendraとBedrockのアクセス権付与
+    // this.backendTaskRole.addToPolicy();
+    
 
     this.frontendTaskRole = new iam.Role(this, 'FrontendTaskRole', {
       assumedBy: new iam.ServicePrincipal('ecs-tasks.amazonaws.com'),
diff --git a/src/frontend/Dockerfile b/src/frontend/Dockerfile
index 0b33e09b8..6479c5580 100644
--- a/src/frontend/Dockerfile
+++ b/src/frontend/Dockerfile
@@ -23,4 +23,5 @@ RUN chmod +x set_proxy.sh && \
 USER node
 
 RUN npm install --loglevel warn
+RUN npm update
 CMD ["npm", "run", "dev:docker"]
\ No newline at end of file