Merge dev into refactor/utils

scripts/aws/lib/construct/db.ts

@@ -1,65 +1,85 @@
-import { Construct } from 'constructs';
-import * as ec2 from 'aws-cdk-lib/aws-ec2'
+import { Construct } from "constructs";
+import * as ec2 from "aws-cdk-lib/aws-ec2";
 import * as rds from "aws-cdk-lib/aws-rds";
-import * as cdk from 'aws-cdk-lib';
+import * as cdk from "aws-cdk-lib";
 
 interface RdsProps {
-  vpc: ec2.Vpc
-  dbSG:ec2.SecurityGroup
+  vpc: ec2.Vpc;
+  dbSG: ec2.SecurityGroup;
 }
 
-export class Rds extends Construct{
-  readonly rdsCluster: rds.DatabaseCluster
+export class Rds extends Construct {
+  readonly rdsCluster: rds.DatabaseCluster;
 
-  constructor(scope: Construct, id:string, props: RdsProps){
+  constructor(scope: Construct, id: string, props: RdsProps) {
     super(scope, id);
 
-    const {vpc, dbSG} = props
-    const instanceType = ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE4_GRAVITON, ec2.InstanceSize.MEDIUM)
+    const { vpc, dbSG } = props;
+    const instanceType = ec2.InstanceType.of(
+      ec2.InstanceClass.BURSTABLE4_GRAVITON,
+      ec2.InstanceSize.MEDIUM,
+    );
 
     // RDSのパスワードを自動生成してSecrets Managerに格納
-    const rdsCredentials = rds.Credentials.fromGeneratedSecret('db_user',{
-      secretName: 'langflow-DbSecret',
-    })
-    
+    const rdsCredentials = rds.Credentials.fromGeneratedSecret("db_user", {
+      secretName: "langflow-DbSecret",
+    });
+
     // DB クラスターのパラメータグループ作成
-    const clusterParameterGroup = new rds.ParameterGroup(scope, 'ClusterParameterGroup',{
-      engine: rds.DatabaseClusterEngine.auroraMysql({
-        version: rds.AuroraMysqlEngineVersion.VER_3_02_0
-      }),
-      description: 'for-langflow',
-    })
-    clusterParameterGroup.bindToCluster({})
+    const clusterParameterGroup = new rds.ParameterGroup(
+      scope,
+      "ClusterParameterGroup",
+      {
+        engine: rds.DatabaseClusterEngine.auroraMysql({
+          version: rds.AuroraMysqlEngineVersion.of(
+            "8.0.mysql_aurora.3.05.2",
+            "8.0",
+          ),
+        }),
+        description: "for-langflow",
+      },
+    );
+    clusterParameterGroup.bindToCluster({});
 
     // DB インスタンスのパラメタグループ作成
-    const instanceParameterGroup = new rds.ParameterGroup(scope, 'InstanceParameterGroup',{
-      engine: rds.DatabaseClusterEngine.auroraMysql({
-        version: rds.AuroraMysqlEngineVersion.VER_3_02_0,
-      }),
-      description: 'for-langflow',
-    })
-    instanceParameterGroup.bindToInstance({})
+    const instanceParameterGroup = new rds.ParameterGroup(
+      scope,
+      "InstanceParameterGroup",
+      {
+        engine: rds.DatabaseClusterEngine.auroraMysql({
+          version: rds.AuroraMysqlEngineVersion.of(
+            "8.0.mysql_aurora.3.05.2",
+            "8.0",
+          ),
+        }),
+        description: "for-langflow",
+      },
+    );
+    instanceParameterGroup.bindToInstance({});
 
-    this.rdsCluster = new rds.DatabaseCluster(scope, 'LangflowDbCluster', {
+    this.rdsCluster = new rds.DatabaseCluster(scope, "LangflowDbCluster", {
       engine: rds.DatabaseClusterEngine.auroraMysql({
-        version: rds.AuroraMysqlEngineVersion.VER_3_02_0,
+        version: rds.AuroraMysqlEngineVersion.of(
+          "8.0.mysql_aurora.3.05.2",
+          "8.0",
+        ),
       }),
       storageEncrypted: true,
       credentials: rdsCredentials,
-      instanceIdentifierBase: 'langflow-instance',
-      vpc:vpc,
-      vpcSubnets:vpc.selectSubnets({
-        subnetGroupName: 'langflow-Isolated',
+      instanceIdentifierBase: "langflow-instance",
+      vpc: vpc,
+      vpcSubnets: vpc.selectSubnets({
+        subnetGroupName: "langflow-Isolated",
       }),
-      securityGroups:[dbSG],
+      securityGroups: [dbSG],
       writer: rds.ClusterInstance.provisioned("WriterInstance", {
         instanceType: instanceType,
         enablePerformanceInsights: true,
-        parameterGroup:instanceParameterGroup,
+        parameterGroup: instanceParameterGroup,
       }),
-      // 2台目以降はreaders:で設定 
+      // 2台目以降はreaders:で設定
       parameterGroup: clusterParameterGroup,
-      defaultDatabaseName: 'langflow',
-    })
+      defaultDatabaseName: "langflow",
+    });
   }
 }

scripts/aws/package.json

@@ -11,21 +11,21 @@
     "cdk": "cdk"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.1",
-    "@types/node": "20.1.7",
-    "aws-cdk": "^2.86.0",
-    "jest": "^29.5.0",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "~5.1.3"
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.12.12",
+    "aws-cdk": "^2.141.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-solutions-constructs/aws-cloudfront-s3": "^2.49.0",
-    "aws-cdk-lib": "^2.124.0",
-    "cdk-ecr-deployment": "^2.5.30",
-    "constructs": "^10.0.0",
-    "deploy-time-build": "^0.3.12",
-    "dotenv": "^16.3.1",
+    "@aws-solutions-constructs/aws-cloudfront-s3": "^2.57.0",
+    "aws-cdk-lib": "^2.141.0",
+    "cdk-ecr-deployment": "^3.0.55",
+    "constructs": "^10.3.0",
+    "deploy-time-build": "^0.3.21",
+    "dotenv": "^16.4.5",
     "source-map-support": "^0.5.21"
   }
 }

scripts/gcp/deploy_langflow_gcp.sh

@@ -48,8 +48,10 @@ apt -y upgrade
 
 # Install Python 3 pip, Langflow, and Nginx
 apt -y install python3-pip
-pip install langflow
-langflow --host 0.0.0.0 --port 7860
+pip3 install pip -U
+apt -y update
+pip3 install langflow
+langflow run --host 0.0.0.0 --port 7860
 EOF
 )