Merge pull request #144 from aws-samples/wangzt-dev

fixed some inconsistency in cdk

Author: wzt1001

source/resources/lib/ecs/ecs-stack.ts

@@ -19,11 +19,9 @@ constructor(scope: Construct, id: string, props: cdk.StackProps
   & {OSHostSecretName: string}) {
     super(scope, id, props);
 
-    // 选择所有的 isolated 和 private with egress 子网
     // const isolatedSubnets = this._vpc.selectSubnets({ subnetType: ec2.SubnetType.PRIVATE_ISOLATED }).subnets;
     // const privateSubnets = this._vpc.selectSubnets({ subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS }).subnets;
 
-    // 合并所有非公共子网
     // const nonPublicSubnets = [...isolatedSubnets, ...privateSubnets];
     // const subnets = this._vpc.selectSubnets().subnets;
 
@@ -34,14 +32,6 @@ constructor(scope: Construct, id: string, props: cdk.StackProps
       { name: 'genbi-frontend', dockerfile: 'Dockerfile', port: 80, dockerfileDirectory: path.join(__dirname, '../../../../report-front-end')},
     ];
 
-    // const repositoriesAndImages = services.map(service => {
-    //   const dockerImageAsset = new DockerImageAsset(this, `${service.name}DockerImage`, {
-    //     directory: service.dockerfileDirectory, // Dockerfile location
-    //     file: service.dockerfile, // Dockerfile filename
-    //   });
-    //   return { dockerImageAsset, port: service.port };
-    // });
-
     const GenBiStreamlitDockerImageAsset = {'dockerImageAsset': new DockerImageAsset(this, 'GenBiStreamlitDockerImage', {
         directory: services[0].dockerfileDirectory, 
         file: services[0].dockerfile, 
@@ -186,7 +176,7 @@ constructor(scope: Construct, id: string, props: cdk.StackProps
       taskDefinition: taskDefinitionStreamlit,
       publicLoadBalancer: true,
       taskSubnets: { subnets: props.subnets },
-      assignPublicIp: false
+      assignPublicIp: true
     });
 
     // ======= 2. API Service =======
@@ -226,7 +216,7 @@ constructor(scope: Construct, id: string, props: cdk.StackProps
       taskDefinition: taskDefinitionAPI,
       publicLoadBalancer: true,
       taskSubnets: { subnets: props.subnets },
-      assignPublicIp: false
+      assignPublicIp: true
     });
 
     // ======= 3. Frontend Service =======
@@ -273,7 +263,7 @@ constructor(scope: Construct, id: string, props: cdk.StackProps
       publicLoadBalancer: true,
       // taskSubnets: { subnetType: ec2.SubnetType.PUBLIC },
       taskSubnets: { subnets: props.subnets },
-      assignPublicIp: false
+      assignPublicIp: true
     });
 
     this.streamlitEndpoint = fargateServiceStreamlit.loadBalancer.loadBalancerDnsName;

source/resources/lib/main-stack.ts

@@ -3,7 +3,7 @@ import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import { AOSStack } from './aos/aos-stack';
-import { LLMStack } from './model/llm-stack';
+// import { LLMStack } from './model/llm-stack';
 import { ECSStack } from './ecs/ecs-stack';
 import { CognitoStack } from './cognito/cognito-stack';
 import { RDSStack } from './rds/rds-stack';
@@ -25,11 +25,11 @@ export class MainStack extends cdk.Stack {
     });
 
     // ======== Step 1. Define the LLMStack =========
-    const s3ModelAssetsBucket = new CfnParameter(this, "S3ModelAssetsBucket", {
-      type: "String",
-      description: "S3 Bucket for model & code assets",
-      default: "not-set"
-    });
+    // const s3ModelAssetsBucket = new CfnParameter(this, "S3ModelAssetsBucket", {
+    //   type: "String",
+    //   description: "S3 Bucket for model & code assets",
+    //   default: "not-set"
+    // });
 
     // ======== Step 2. Define the AOSStack ========= 
     const _AosStack = new AOSStack(this, 'aos-Stack', {
@@ -41,9 +41,15 @@ export class MainStack extends cdk.Stack {
     const aosEndpoint = _AosStack.endpoint;
 
     // ======== Step 3. Define the RDSStack =========
-    // const _RdsStack = new RDSStack(this, 'rds-Stack', {
-    //   env: props.env,
-    // });
+    if (_deployRds) {
+      const _RdsStack = new RDSStack(this, 'rds-Stack', {
+        env: props.env,
+      });
+      new cdk.CfnOutput(this, 'RDSEndpoint', {
+        value: _RdsStack.endpoint,
+        description: 'The endpoint of the RDS instance',
+      });
+    }
 
     // ======== Step 4. Define Cognito =========
     const _CognitoStack = new CognitoStack(this, 'cognito-Stack', {
@@ -71,16 +77,6 @@ export class MainStack extends cdk.Stack {
       description: 'The endpoint of the OpenSearch domain'
     });
 
-    if (_deployRds) {
-      const _RdsStack = new RDSStack(this, 'rds-Stack', {
-        env: props.env,
-      });
-      new cdk.CfnOutput(this, 'RDSEndpoint', {
-        value: _RdsStack.endpoint,
-        description: 'The endpoint of the RDS instance',
-      });
-    }
-    
     new cdk.CfnOutput(this, 'StreamlitEndpoint', {
       value: _EcsStack.streamlitEndpoint,
       description: 'The endpoint of the Streamlit service'